mirrored_supervisor: Rework error handling after a failed update (backport #14018) #14020
Conversation
This file contains hidden or 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
[Why] The retry logic I added in 4621fe7 was completely wrong. If Khepri reached its own timeout of 30 seconds (as of this writing), the mirrored supervisor would retry 50 times because it would not check the time spent. This means it would retry for 25 minutes. Nice. That retry would be terminated forcefully by the parent supervisor after 5 minutes if it was part of a shutdown. [How] This time, the code simply pass the error (timeout or something else) down to the following `case`. It will shut the mirrored supervisor down. This fixes very long RabbitMQ node termination (at least 5 minutes, sometimes more) in testsuites. An example to reproduce: gmake -C deps/rabbitmq_mqtt \ RABBITMQ_METADATA_STORE=khepri \ ct-v5 t=cluster_size_3:session_takeover_v3_v5 In this one, the third node of the cluster will take 5+ minutes to stop. (cherry picked from commit 376dd2c)
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.
Why
The retry logic I added in 4621fe7 was completely wrong. If Khepri reached its own timeout of 30 seconds (as of this writing), the mirrored supervisor would retry 50 times because it would not check the time spent. This means it would retry for 25 minutes. Nice.
That retry would be terminated forcefully by the parent supervisor after 5 minutes if it was part of a shutdown.
How
This time, the code simply pass the error (timeout or something else) down to the following
case. It will shut the mirrored supervisor down.This fixes very long RabbitMQ node termination (at least 5 minutes, sometimes more) in testsuites. An example to reproduce:
In this one, the third node of the cluster will take 5+ minutes to stop.
This is an automatic backport of pull request #14018 done by Mergify.