From 4fa03dd41773b85d02fe6279d4480feec0b1b883 Mon Sep 17 00:00:00 2001 From: zhufl Date: Mon, 6 Jan 2020 10:53:18 +0800 Subject: [PATCH] Fix duplicated words issue like " should should " This is to fix duplicated words issue like "Your new function should should then be added". Change-Id: Id7928f96b76724d708a38d0c59b4302fb4478116 --- cinder/api/validation/parameter_types.py | 2 +- cinder/db/sqlalchemy/api.py | 4 ++-- cinder/volume/drivers/dell_emc/sc/storagecenter_api.py | 4 ++-- cinder/volume/drivers/hedvig/hedvig_cinder.py | 2 +- .../drivers/netapp/dataontap/client/client_cmode.py | 2 +- cinder/volume/drivers/remotefs.py | 2 +- doc/source/cli/cinder-status.rst | 2 +- .../configuration/block-storage/policy-config-HOWTO.rst | 2 +- doc/source/contributor/rolling.upgrades.rst | 9 ++++----- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/cinder/api/validation/parameter_types.py b/cinder/api/validation/parameter_types.py index 49468f7bb37..f174b58a7b0 100644 --- a/cinder/api/validation/parameter_types.py +++ b/cinder/api/validation/parameter_types.py @@ -67,7 +67,7 @@ def _build_regex_range(ws=True, invert=False, exclude=None): The inversion is useful when we want to generate a set of ranges which is everything that's not a certain class. For instance, - produce all all the non printable characters as a set of ranges. + produce all the non printable characters as a set of ranges. """ if exclude is None: exclude = [] diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py index c74fe513502..6fe19594142 100644 --- a/cinder/db/sqlalchemy/api.py +++ b/cinder/db/sqlalchemy/api.py @@ -1720,7 +1720,7 @@ def _include_in_cluster(context, cluster, model, partial_rename, filters): value = filters.pop(field) # We do a special backend filter query = query.filter(_filter_host(getattr(model, field), value)) - # If we want do do a partial rename and we haven't set the cluster + # If we want to do a partial rename and we haven't set the cluster # already, the value we want to set is a SQL replace of existing field # value. if partial_rename and isinstance(cluster, six.string_types): @@ -5083,7 +5083,7 @@ def volume_glance_metadata_copy_from_volume_to_volume(context, volume_id): """Update the Glance metadata for a volume. - This copies all all of the key:value pairs from the originating volume, + This copies all of the key:value pairs from the originating volume, to ensure that a volume created from the volume (clone) will retain the original metadata. """ diff --git a/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py b/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py index 5946dc20a13..1b2200a87ff 100644 --- a/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py +++ b/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py @@ -1760,7 +1760,7 @@ class SCApi(object): return self._find_domains(self._get_id(mapping.get('controllerPort'))) def _get_iqn(self, mapping): - # Get our iqn from the controller port listed in our our mapping. + # Get our iqn from the controller port listed in our mapping. iqn = None cportid = self._get_id(mapping.get('controllerPort')) controllerport = self._find_controller_port(cportid) @@ -3000,7 +3000,7 @@ class SCApi(object): def unmanage(self, scvolume): """Unmanage our volume. - We simply rename with with a prefix of `Unmanaged_` That's it. + We simply rename with a prefix of `Unmanaged_` That's it. :param scvolume: The Dell SC volume object. :return: Nothing. diff --git a/cinder/volume/drivers/hedvig/hedvig_cinder.py b/cinder/volume/drivers/hedvig/hedvig_cinder.py index 89098392de8..74cebecedeb 100644 --- a/cinder/volume/drivers/hedvig/hedvig_cinder.py +++ b/cinder/volume/drivers/hedvig/hedvig_cinder.py @@ -90,7 +90,7 @@ class HedvigISCSIDriver(driver.ISCSIDriver, san.SanDriver): self.san_clustername) def get_volume_stats(self, refresh=False): - # we need to get get stats for server. + # we need to get stats for server. if refresh is True: total_capacity, free_capacity = self.update_volume_stats() stats = dict() diff --git a/cinder/volume/drivers/netapp/dataontap/client/client_cmode.py b/cinder/volume/drivers/netapp/dataontap/client/client_cmode.py index 4fd7919783c..530ba163e40 100644 --- a/cinder/volume/drivers/netapp/dataontap/client/client_cmode.py +++ b/cinder/volume/drivers/netapp/dataontap/client/client_cmode.py @@ -1590,7 +1590,7 @@ class Client(client_base.Client): def get_performance_counters(self, object_name, instance_uuids, counter_names): - """Gets or or more cDOT performance counters.""" + """Gets more cDOT performance counters.""" api_args = { 'objectname': object_name, diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py index 531db027574..b7ee250a6ba 100644 --- a/cinder/volume/drivers/remotefs.py +++ b/cinder/volume/drivers/remotefs.py @@ -141,7 +141,7 @@ class BackingFileTemplate(string.Template): """Custom Template for substitutions in backing files regex strings Changes the default delimiter from '$' to '#' in order to prevent - clashing with the the regex end of line marker '$'. + clashing with the regex end of line marker '$'. """ delimiter = '#' idpattern = r'[a-z][_a-z0-9]*' diff --git a/doc/source/cli/cinder-status.rst b/doc/source/cli/cinder-status.rst index 46ccafcd034..6d14316d46c 100644 --- a/doc/source/cli/cinder-status.rst +++ b/doc/source/cli/cinder-status.rst @@ -101,7 +101,7 @@ Upgrade * Check added to make operators aware of new finer-grained configuration options affecting the periodicity of various Cinder tasks. Triggered - when the the ``periodic_interval`` option is not set to its default value. + when the ``periodic_interval`` option is not set to its default value. * Added check for use of deprecated ``cinder.quota.NestedDbQuotaDriver``. See Also diff --git a/doc/source/configuration/block-storage/policy-config-HOWTO.rst b/doc/source/configuration/block-storage/policy-config-HOWTO.rst index c8401f7a17c..972b765cf79 100644 --- a/doc/source/configuration/block-storage/policy-config-HOWTO.rst +++ b/doc/source/configuration/block-storage/policy-config-HOWTO.rst @@ -383,7 +383,7 @@ Immediately following it, introduce a new rule:: or To construct the strict version, we need to make sure that the - ``not cinder:reader-admin`` part applies only the the left-hand side (the + ``not cinder:reader-admin`` part applies only the left-hand side (the ). The easiest way to do that is to structure the new rule as follows:: diff --git a/doc/source/contributor/rolling.upgrades.rst b/doc/source/contributor/rolling.upgrades.rst index 265ddef3068..5c994358829 100644 --- a/doc/source/contributor/rolling.upgrades.rst +++ b/doc/source/contributor/rolling.upgrades.rst @@ -436,11 +436,10 @@ to return either a `uc.Result` where the result can be one of: * FAILURE, * WARNING, -Your new function should should then be added to the `_upgrade_checks` -tuple. For your check give the name of the Upgrade Check to be displayed -to end users upon success or failure as well as the name of the -function used to implement your check. Upgrade Checks should be submitted -with Unit Tests. +Your new function should then be added to the `_upgrade_checks` tuple. +For your check give the name of the Upgrade Check to be displayed to end +users upon success or failure as well as the name of the function used to +implement your check. Upgrade Checks should be submitted with Unit Tests. The `doc/source/cli/cinder-status.rst` documentation should be updated to indicate the release for which your Upgrade Check was released and to