HBASE-29796 [branch-2] Allow sleepForRetry replication config to be overridden by replication peers #7578
+142
−31
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
Add support for configuring sleepForRetries on a per-peer basis with automatic fallback to global configuration when not set. Changes: - Add optional int64 sleep_for_retries field (13) to ReplicationPeer protobuf - Field 12 reserved for remoteWALDir (future version compatibility) - Add getSleepForRetries/setSleepForRetries to ReplicationPeerConfig/Builder - Update ReplicationSource, ReplicationSourceWALReader, ReplicationSourceShipper to check peer config first, then fall back to global config - Add set_peer_sleep_for_retries shell command - Add Sleep For Retries column to Master UI Peers table - Add tests to ReplicationPeerConfigTestUtil and replication_admin_test.rb Behavior: - Value > 0: Uses per-peer configured sleep time - Value = 0 or not set: Falls back to global replication.source.sleepforretries config (default 1000ms) Backward compatible: Optional protobuf field, old/new clients interoperate
sidkhillon
commented
Dec 26, 2025
Comment on lines
+53
to
+54
| optional string remoteWALDir = 12; | ||
| optional int64 sleep_for_retries = 13; |
Contributor
Author
There was a problem hiding this comment.
I am unsure of the intended approach here. In #7577, we add sleep_for_retries as field 13. However, remoteWALDir does not exist in branch-2. I have added it here as a dummy value so that upgrades from branch-2 to branch-3 can be done seamlessly. If that is not the right approach, I'm happy to change it.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Currently, sleepForRetries (the sleep time between retry attempts during replication) is only configurable globally via the replication.source.sleepforretries configuration property. This makes it impossible to tune behavior for individual replication peers that may have different requirements.
This change would add support for configuring sleepForRetries on a per-peer basis, with fallback to the global configuration when not set. It also adds UI support for displaying the field and shell support for editing the value.
This is related to #7577 and was created because that PR will not cleanly merge into branch-2