diff --git a/REVIEW_GUIDELINES.rst b/REVIEW_GUIDELINES.rst index ba535681bb..a61a298698 100644 --- a/REVIEW_GUIDELINES.rst +++ b/REVIEW_GUIDELINES.rst @@ -42,8 +42,8 @@ don't work - or at least fail in frequently common enough scenarios to be considered "horribly broken". A comment in our review that says roughly "I ran this on my machine and observed ``description of behavior change is supposed to achieve``" is the most powerful defense -we have against the terrible terrible scorn from our fellow Swift -developers and operators when we accidentally merge bad code. +we have against the terrible scorn from our fellow Swift developers +and operators when we accidentally merge bad code. If you're doing a fair amount of reviews - you will participate in merging a change that will break my clusters - it's cool - I'll do it diff --git a/doc/manpages/account-server.conf.5 b/doc/manpages/account-server.conf.5 index f48d231a22..d64db70965 100644 --- a/doc/manpages/account-server.conf.5 +++ b/doc/manpages/account-server.conf.5 @@ -394,7 +394,7 @@ reclaim_age. This ensures that once the account-reaper has deleted a container there is sufficient time for the container-updater to report to the account before the account DB is removed. .IP \fBreap_warn_after\fR -If the account fails to be be reaped due to a persistent error, the +If the account fails to be reaped due to a persistent error, the account reaper will log a message such as: Account has not been reaped since You can search logs for this message if space is not being reclaimed diff --git a/doc/source/cors.rst b/doc/source/cors.rst index 67feca5c9d..4b60d68ac7 100644 --- a/doc/source/cors.rst +++ b/doc/source/cors.rst @@ -28,7 +28,7 @@ The supported headers are, | | Space separated. | +------------------------------------------------+------------------------------+ -In addition the the values set in container metadata, some cluster-wide values +In addition the values set in container metadata, some cluster-wide values may also be configured using the ``strict_cors_mode``, ``cors_allow_origin`` and ``cors_expose_headers`` in ``proxy-server.conf``. See ``proxy-server.conf-sample`` for more information. diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst index 6c132dd1e0..44e19f022b 100644 --- a/doc/source/deployment_guide.rst +++ b/doc/source/deployment_guide.rst @@ -1748,7 +1748,7 @@ delay_reaping 0 Normally, the reaper begins deleting time for the container-updater to report to the account before the account DB is removed. -reap_warn_after 2892000 If the account fails to be be reaped due +reap_warn_after 2892000 If the account fails to be reaped due to a persistent error, the account reaper will log a message such as: Account has not been reaped since diff --git a/doc/source/overview_container_sharding.rst b/doc/source/overview_container_sharding.rst index 346767536f..cadf99f57a 100644 --- a/doc/source/overview_container_sharding.rst +++ b/doc/source/overview_container_sharding.rst @@ -404,7 +404,7 @@ In summary, the DB states that any container replica may be in are: more shard ranges in addition to its own shard range. The retiring database has been unlinked. - COLLAPSED - There is only one database, the fresh database, which has only - its its own shard range and store object records. + its own shard range and store object records. .. note:: diff --git a/swift/common/db_replicator.py b/swift/common/db_replicator.py index 92f3149d6d..30ffffcb69 100644 --- a/swift/common/db_replicator.py +++ b/swift/common/db_replicator.py @@ -428,7 +428,7 @@ class Replicator(Daemon): Make an http_connection using ReplConnection :param node: node dictionary from the ring - :param partition: partition partition to send in the url + :param partition: partition to send in the url :param db_file: DB file :returns: ReplConnection object diff --git a/swift/container/backend.py b/swift/container/backend.py index 48e298232b..f6ca5130a7 100644 --- a/swift/container/backend.py +++ b/swift/container/backend.py @@ -1989,7 +1989,7 @@ class ContainerBroker(DatabaseBroker): def set_sharding_sysmeta(self, key, value): """ - Updates the broker's metadata metadata stored under the given key + Updates the broker's metadata stored under the given key prefixed with a sharding specific namespace. :param key: metadata key in the sharding metadata namespace. diff --git a/swift/obj/diskfile.py b/swift/obj/diskfile.py index d55c3e9d3f..ed9bac5e6d 100644 --- a/swift/obj/diskfile.py +++ b/swift/obj/diskfile.py @@ -3317,7 +3317,7 @@ class ECDiskFileManager(BaseDiskFileManager): """ Returns timestamp(s) and other info extracted from a policy specific file name. For EC policy the data file name includes a fragment index - and possibly a durable marker, both of which which must be stripped off + and possibly a durable marker, both of which must be stripped off to retrieve the timestamp. :param filename: the file name including extension diff --git a/swift/obj/reconstructor.py b/swift/obj/reconstructor.py index 02f3bb7bf8..6169cc7ec0 100644 --- a/swift/obj/reconstructor.py +++ b/swift/obj/reconstructor.py @@ -688,7 +688,7 @@ class ObjectReconstructor(Daemon): handoffs. To avoid conflicts placing frags we'll skip through the handoffs and - only yield back those that are offset equal to to the given primary + only yield back those that are offset equal to the given primary node index. Nodes returned from this iterator will have 'backend_index' set.