From ea3129a4a639167a16f43e10fdb907062a153eb3 Mon Sep 17 00:00:00 2001 From: zhufl Date: Wed, 21 Nov 2018 15:02:59 +0800 Subject: [PATCH] Add missing ws separator between words This is to add missing ws separator between words. Change-Id: I6debb62be4577a45962f206448a62a14a4199488 --- trove/common/cfg.py | 6 +++--- trove/common/db/models.py | 2 +- trove/common/exception.py | 2 +- trove/guestagent/datastore/experimental/couchdb/service.py | 2 +- trove/guestagent/datastore/experimental/vertica/service.py | 2 +- .../strategies/replication/experimental/postgresql_impl.py | 2 +- trove/instance/models.py | 2 +- trove/taskmanager/models.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/trove/common/cfg.py b/trove/common/cfg.py index 7d8034ab4f..e6f8c834b4 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -168,9 +168,9 @@ common_opts = [ cfg.IntOpt('modules_page_size', default=20, help='Page size for listing modules.'), cfg.IntOpt('agent_call_low_timeout', default=15, - help="Maximum time (in seconds) to wait for Guest Agent 'quick'" - "requests (such as retrieving a list of users or " - "databases)."), + help="Maximum time (in seconds) to wait for Guest Agent " + "'quick' requests (such as retrieving a list of " + "users or databases)."), cfg.IntOpt('agent_call_high_timeout', default=60 * 10, help="Maximum time (in seconds) to wait for Guest Agent 'slow' " "requests (such as restarting the database)."), diff --git a/trove/common/db/models.py b/trove/common/db/models.py index ebea8e8902..952d0a5cb0 100644 --- a/trove/common/db/models.py +++ b/trove/common/db/models.py @@ -169,7 +169,7 @@ class DatastoreSchema(DatastoreModelsBase): :raises: ValueError if name is on the reserved list. """ if self.is_ignored(): - raise ValueError(_('Database name "%(name)s" is on the reserved' + raise ValueError(_('Database name "%(name)s" is on the reserved ' 'list: %(reserved)s.') % {'name': self.name, 'reserved': self.ignored_dbs}) diff --git a/trove/common/exception.py b/trove/common/exception.py index 663fa4af78..e0e0feea96 100644 --- a/trove/common/exception.py +++ b/trove/common/exception.py @@ -630,7 +630,7 @@ class ClusterNumInstancesNotLargeEnough(TroveError): class ClusterNumInstancesBelowSafetyThreshold(TroveError): message = _("The number of instances in your cluster cannot " - "safely be lowered below the current level based" + "safely be lowered below the current level based " "on your current fault-tolerance settings.") diff --git a/trove/guestagent/datastore/experimental/couchdb/service.py b/trove/guestagent/datastore/experimental/couchdb/service.py index 6d1f628684..cf74f22b7d 100644 --- a/trove/guestagent/datastore/experimental/couchdb/service.py +++ b/trove/guestagent/datastore/experimental/couchdb/service.py @@ -246,7 +246,7 @@ class CouchDBAdmin(object): 'username': user.name}, shell=True) except exception.ProcessExecutionError as pe: - LOG.debug("Error granting user: %(user)s access to" + LOG.debug("Error granting user: %(user)s access to " "database: %(db)s.", {'user': user.name, 'db': mydb.name}) LOG.debug(pe) diff --git a/trove/guestagent/datastore/experimental/vertica/service.py b/trove/guestagent/datastore/experimental/vertica/service.py index f316f6c238..7dc490740f 100644 --- a/trove/guestagent/datastore/experimental/vertica/service.py +++ b/trove/guestagent/datastore/experimental/vertica/service.py @@ -614,5 +614,5 @@ class VerticaApp(object): utils.poll_until(_wait_for_node_status, time_out=600, sleep_time=15) except exception.PollTimeOut: - raise RuntimeError(_("Timed out waiting for cluster to" + raise RuntimeError(_("Timed out waiting for cluster to " "change to status %s") % status) diff --git a/trove/guestagent/strategies/replication/experimental/postgresql_impl.py b/trove/guestagent/strategies/replication/experimental/postgresql_impl.py index f7d791b173..7ffcdb2e32 100644 --- a/trove/guestagent/strategies/replication/experimental/postgresql_impl.py +++ b/trove/guestagent/strategies/replication/experimental/postgresql_impl.py @@ -198,7 +198,7 @@ class PostgresqlReplicationStreaming(base.Replication): utils.poll_until(_wait_for_failover, time_out=120) except exception.PollTimeOut: - raise RuntimeError(_("Timeout occurred waiting for slave to exit" + raise RuntimeError(_("Timeout occurred waiting for slave to exit " "recovery mode")) def cleanup_source_on_replica_detach(self, admin_service, replica_info): diff --git a/trove/instance/models.py b/trove/instance/models.py index 902fd7cf4d..0a03d2d823 100644 --- a/trove/instance/models.py +++ b/trove/instance/models.py @@ -848,7 +848,7 @@ class Instance(BuiltInstance): remote_ds_ver.image) if local_image.checksum != remote_image.checksum: raise exception.TroveError( - "Images for Datastore %(ds)s do not match" + "Images for Datastore %(ds)s do not match " "between regions %(local)s and %(remote)s." % {'ds': datastore.name, 'local': CONF.os_region_name, 'remote': region_name}) diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index d97599fa8e..0cd297e76b 100755 --- a/trove/taskmanager/models.py +++ b/trove/taskmanager/models.py @@ -719,7 +719,7 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin): except AttributeError: pass server_message = "\nServer error: %s" % server_fault_message - raise TroveError(_("Server not active, status: %(status)s" + raise TroveError(_("Server not active, status: %(status)s " "%(srv_msg)s") % {'status': server_status, 'srv_msg': server_message})