openstack
/
freezer
Code Issues Proposed changes

Add missing ws seperator between words 

This is to add missing ws seperator between words.

Change-Id: I55731b70dec4ecb19bf1f3ac2307091ba6a625ba
This commit is contained in:
zhufl 2019-01-24 11:43:41 +08:00
parent 71c8115098
commit 8d2cbeff00
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freezer/common/config.py
View File

@ -50,7 +50,7 @@ _DEFAULT_LOG_LEVELS = ['amqp=WARN', 'amqplib=WARN', 'boto=WARN',
_DEFAULT_LOGGING_CONTEXT_FORMAT = ( _DEFAULT_LOGGING_CONTEXT_FORMAT = (
'%(asctime)s.%(msecs)03d %(process)d ' '%(asctime)s.%(msecs)03d %(process)d '
'%(levelname)s %(name)s [%(request_id)s ' '%(levelname)s %(name)s [%(request_id)s '
'%(user_identity)s] %(instance)s' '%(user_identity)s] %(instance)s '
'%(message)s') '%(message)s')
DEFAULT_PARAMS = { DEFAULT_PARAMS = {
@ -122,7 +122,7 @@ _COMMON = [
"(filesystem),mongo (MongoDB), mysql (MySQL), " "(filesystem),mongo (MongoDB), mysql (MySQL), "
"sqlserver(SQL Server), " "sqlserver(SQL Server), "
"cinder(OpenStack Volume backup by freezer), " "cinder(OpenStack Volume backup by freezer), "
"cindernative(OpenStack native cinder-volume backup)" "cindernative(OpenStack native cinder-volume backup), "
"nova(OpenStack Instance). Default set to fs"), "nova(OpenStack Instance). Default set to fs"),
cfg.StrOpt('engine', cfg.StrOpt('engine',
short='e', short='e',
@ -519,7 +519,7 @@ _COMMON = [
default=DEFAULT_PARAMS['incremental'], default=DEFAULT_PARAMS['incremental'],
help="When the option is set, freezer will perform a " help="When the option is set, freezer will perform a "
"cindernative incremental backup instead of the default " "cindernative incremental backup instead of the default "
"full backup. And if True, but volume do not have a base" "full backup. And if True, but volume do not have a base "
"full backup, freezer will do a full backup first"), "full backup, freezer will do a full backup first"),
cfg.StrOpt('nova-restore-network', cfg.StrOpt('nova-restore-network',
dest='nova_restore_network', dest='nova_restore_network',

2
freezer/openstack/admin.py
View File

@ -67,7 +67,7 @@ class AdminOs(object):
% (backup_id, del_backup[0].status)) % (backup_id, del_backup[0].status))
if (del_backup[0].status == 'deleting') and (int(time.time()) - if (del_backup[0].status == 'deleting') and (int(time.time()) -
start_time > timeout): start_time > timeout):
LOG.error("Delete backup %s failed, In a state of" LOG.error("Delete backup %s failed, In a state of "
"deleting over 120s") "deleting over 120s")
raise Exception( raise Exception(
"Delete backup %s failed due to timeout over 120s, " "Delete backup %s failed due to timeout over 120s, "

2
freezer/storage/ssh.py
View File

@ -70,7 +70,7 @@ class SshStorage(fslike.FsLikeStorage):
'it exists and ensure backup node can ' 'it exists and ensure backup node can '
'login to {1} as user {2} ' 'login to {1} as user {2} '
'without password.\n' 'without password.\n'
'2. --ssh-password argument is required and' '2. --ssh-password argument is required and '
'ensure backup node can login to {1} ' 'ensure backup node can login to {1} '
'as user {2} with password.' 'as user {2} with password.'
.format(self.ssh_key_path, self.remote_ip, .format(self.ssh_key_path, self.remote_ip,