Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug in return_conditions declares leading to wait for the full delay #1557

Merged
merged 4 commits into from
Oct 22, 2024

Conversation

OlivierHecart
Copy link
Contributor

No description provided.

@OlivierHecart OlivierHecart added the bug Something isn't working label Oct 21, 2024
Copy link
Member

@fuzzypixelz fuzzypixelz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is rather tangential but I have a question about a change in #1535:

if self.wait_declares && src_whatami != WhatAmI::Peer {
zenoh_runtime::ZRuntime::Net.block_in_place(
strong_runtime
.start_conditions()
.terminate_peer_connector_zid(src),
);
}

After scouting a router that didn't gossip about any other nodes, we only return in open if open/return_conditions/declares is true. Even though the router sends no initial interest declarations.

I tested with one router and one peer configured with open/return_conditions/declares:false and open/return_conditions/connect_scouted:true. The peer doesn't return from open before the scouting delay. Although AFAICT no declarations are expected from the router anyway.

@OlivierHecart
Copy link
Contributor Author

This is rather tangential but I have a question about a change in #1535:

if self.wait_declares && src_whatami != WhatAmI::Peer {
zenoh_runtime::ZRuntime::Net.block_in_place(
strong_runtime
.start_conditions()
.terminate_peer_connector_zid(src),
);
}

After scouting a router that didn't gossip about any other nodes, we only return in open if open/return_conditions/declares is true. Even though the router sends no initial interest declarations.

I tested with one router and one peer configured with open/return_conditions/declares:false and open/return_conditions/connect_scouted:true. The peer doesn't return from open before the scouting delay. Although AFAICT no declarations are expected from the router anyway.

This looks indeed wrong. Please check my fix.

@fuzzypixelz fuzzypixelz merged commit f264361 into main Oct 22, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants