openstack/trove
Code Issues Proposed changes

Merge "Add missing ws separator between words"

Browse Source
This commit is contained in:
Zuul 2018-12-04 12:05:56 +00:00 committed by Gerrit Code Review
commit c63c5888c2
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trove/common/cfg.py
View File

@ -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)."),

2
trove/common/db/models.py
View File

@ -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})

2
trove/common/exception.py
View File

@ -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.")

2
trove/guestagent/datastore/experimental/couchdb/service.py
View File

@ -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)

2
trove/guestagent/datastore/experimental/vertica/service.py
View File

@ -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)

2
trove/guestagent/strategies/replication/experimental/postgresql_impl.py
View File

@ -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):

2
trove/instance/models.py
View File

@ -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})

2
trove/taskmanager/models.py
View File

@ -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})