diff --git a/bin/swift-reconciler-enqueue b/bin/swift-reconciler-enqueue index 662eb393fd..da653151c3 100755 --- a/bin/swift-reconciler-enqueue +++ b/bin/swift-reconciler-enqueue @@ -23,7 +23,7 @@ from swift.common.storage_policy import POLICIES from swift.container.reconciler import add_to_reconciler_queue """ -This tool is primarly for debugging and development but can be used an example +This tool is primarily for debugging and development but can be used an example of how an operator could enqueue objects manually if a problem is discovered - might be particularlly useful if you need to hack a fix into the reconciler and re-run it. diff --git a/swift/account/backend.py b/swift/account/backend.py index 89c6cfb65e..3ff42518d2 100644 --- a/swift/account/backend.py +++ b/swift/account/backend.py @@ -306,7 +306,7 @@ class AccountBroker(DatabaseBroker): :param do_migrations: boolean, if True the policy stat dicts will always include the 'container_count' key; - otherwise it may be ommited on legacy databases + otherwise it may be omitted on legacy databases until they are migrated. :returns: dict of policy stats where the key is the policy index and diff --git a/swift/container/replicator.py b/swift/container/replicator.py index 39cfc39c74..e93996e664 100644 --- a/swift/container/replicator.py +++ b/swift/container/replicator.py @@ -155,7 +155,7 @@ class ContainerReplicator(db_replicator.Replicator): :param broker: the container broker with misplaced objects :param point: the last verified ``reconciler_sync_point`` - :returns: the last successfull enqueued rowid + :returns: the last successful enqueued rowid """ max_sync = broker.get_max_row() misplaced = broker.get_misplaced_since(point, self.per_diff) diff --git a/test/unit/account/test_backend.py b/test/unit/account/test_backend.py index 40fac76731..82978a8301 100644 --- a/test/unit/account/test_backend.py +++ b/test/unit/account/test_backend.py @@ -1447,10 +1447,10 @@ class TestAccountBrokerBeforePerPolicyContainerTrack( # now create an impossible situation by adding a container for a # policy index that doesn't exist - non_existant_policy_index = int(policy) + 1 - self.broker.put_container('test-non-existant-policy', + non_existent_policy_index = int(policy) + 1 + self.broker.put_container('test-non-existent-policy', next(self.ts), 0, 0, 0, - non_existant_policy_index) + non_existent_policy_index) total_container_count = self.broker.get_info()['container_count']