diff options
| author | Tim Burke <tim.burke@gmail.com> | 2019-07-03 09:52:41 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2019-07-03 22:29:47 -0700 |
| commit | 4c4bd778ea8fe8d02a2892524c7918da0ca25ea9 (patch) | |
| tree | 4d21a87d53af2aa5d7e9beb2a8cf873178a98dc7 /swift/common/db_replicator.py | |
| parent | dc84c69c652d899bf6b8177fa352cf980ae5ff8a (diff) | |
| download | swift-4c4bd778ea8fe8d02a2892524c7918da0ca25ea9.tar.gz | |
container-replicator: Add a timeout for get_shard_ranges
Previously this had no timeout, which meant that the replicator might
hang and fail to make progress indefinitely while trying to receive
shard ranges.
While we're at it, only call get_shard_ranges when the remote indicates
that it has shard ranges for us to sync -- this reduces the number of
requests necessary to bring unsharded replicas in sync.
Change-Id: I32f51f42d76db38271442a261600089404a00f91
Closes-Bug: #1835260
Diffstat (limited to 'swift/common/db_replicator.py')
| -rw-r--r-- | swift/common/db_replicator.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swift/common/db_replicator.py b/swift/common/db_replicator.py index a5698a6d5..8f15527ff 100644 --- a/swift/common/db_replicator.py +++ b/swift/common/db_replicator.py @@ -563,7 +563,7 @@ class Replicator(Daemon): :param partition: partition to be replicated to :param object_file: DB file name to be replicated - :param node_id: node id of the node to be replicated to + :param node_id: node id of the node to be replicated from :returns: a tuple (success, responses). ``success`` is a boolean that is True if the method completed successfully, False otherwise. ``responses`` is a list of booleans each of which indicates the |