xds-failover: disable moving to primary after fallback responds #36386
+224
−4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Adi Suissa-Peleg <[email protected]>
…to_primary Signed-off-by: Adi Suissa-Peleg <[email protected]>
nezdolik
reviewed
Oct 5, 2024
| @@ -112,6 +112,11 @@ minor_behavior_changes: | |||
| - area: tracers | |||
| change: | | |||
| Set status code based on GRPC status code for OpenTelemetry tracers (previously unset). | |||
| - area: xds-failover | |||
There was a problem hiding this comment.
I was first confused why do we need this temp feature until reading the PR description.
There was a problem hiding this comment.
Not sure if it is worth mentioning in release notes that this is a test feature
| test_server_->waitForGaugeEq("cluster_manager.warming_clusters", 0); | ||
| test_server_->waitForGaugeGe("cluster_manager.active_clusters", 2); | ||
| test_server_->waitForGaugeEq("cluster.failover_cluster_0.warming_state", 0); | ||
| EXPECT_EQ(2, test_server_->gauge("control_plane.connected_state")->value()); |
There was a problem hiding this comment.
was always thinking that this stat can only have either 0 or 1 value.
| // Immediately fail the connection. | ||
| failover_xds_stream_->finishGrpcStream(Grpc::Status::Internal); | ||
|
|
||
| // Ensure that Envoy still attempts to connect to the primary, |
There was a problem hiding this comment.
aren't we are ensuring that primary connection is not attempted? (since envoy.reloadable_features.xds_failover_to_primary_enabled is set to false and we have previously successfully connected to failover)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit Message: xds-failover: disable moving to primary after fallback responds
Additional Description:
In #35591 Envoy's implementation was modified to allow Envoy move to the primary xDS source, even after the fallback successfully responded.
This PR adds a runtime guard that reverts this behavior. This will be a temporary runtime guard that is introduced to allow testing of the new feature and will be later removed.
Note that there's no change to the current Envoy behavior, unless the runtime guard
envoy.reloadable_features.xds_failover_to_primary_enabledis explicitly set tofalse.Risk Level: low - behind a runtime guard.
Testing: Added unit and integration tests.
Docs Changes: N/A
Release Notes: Added an entry.
Platform Specific Features: N/A
Runtime guard:
envoy.reloadable_features.xds_failover_to_primary_enabledwas introduced that is set totrueby default, and keeps the current behavior.