openstack/swift
Code Issues Proposed changes

Add missing ws seperator between words

Browse Source 
This is to add missing ws seperator between words, usually
in log messages.

Change-Id: I6b88fab428b93def77632f9aed29fc2de4380b0d
This commit is contained in:
zhufl 2018-11-19 15:22:59 +08:00
parent 78da780722
commit 3465d639e3
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/container/backend.py
View File

@ -1310,7 +1310,7 @@ class ContainerBroker(DatabaseBroker):
if to_add: if to_add:
curs.executemany( curs.executemany(
'INSERT INTO object (name, created_at, size, content_type,' 'INSERT INTO object (name, created_at, size, content_type,'
'etag, deleted, storage_policy_index)' 'etag, deleted, storage_policy_index) '
'VALUES (?, ?, ?, ?, ?, ?, ?)', 'VALUES (?, ?, ?, ?, ?, ?, ?)',
((rec['name'], rec['created_at'], rec['size'], ((rec['name'], rec['created_at'], rec['size'],
rec['content_type'], rec['etag'], rec['deleted'], rec['content_type'], rec['etag'], rec['deleted'],

2
swift/container/sharder.py
View File

@ -603,7 +603,7 @@ class ContainerSharder(ContainerReplicator):
node = self.find_local_handoff_for_part(part) node = self.find_local_handoff_for_part(part)
if not node: if not node:
raise DeviceUnavailable( raise DeviceUnavailable(
'No mounted devices found suitable for creating shard broker' 'No mounted devices found suitable for creating shard broker '
'for %s in partition %s' % (shard_range.name, part)) 'for %s in partition %s' % (shard_range.name, part))
shard_broker = ContainerBroker.create_broker( shard_broker = ContainerBroker.create_broker(

2
swift/obj/diskfile.py
View File

@ -2925,7 +2925,7 @@ class ECDiskFileReader(BaseDiskFileReader):
# format so for safety, check the input chunk if it's binary to # format so for safety, check the input chunk if it's binary to
# avoid quarantining a valid fragment archive. # avoid quarantining a valid fragment archive.
self._diskfile._logger.warn( self._diskfile._logger.warn(
_('Unexpected fragment data type (not quarantined)' _('Unexpected fragment data type (not quarantined) '
'%(datadir)s: %(type)s at offset 0x%(offset)x'), '%(datadir)s: %(type)s at offset 0x%(offset)x'),
{'datadir': self._diskfile._datadir, {'datadir': self._diskfile._datadir,
'type': type(frag), 'type': type(frag),

2
swift/obj/reconstructor.py
View File

@ -1195,7 +1195,7 @@ class ObjectReconstructor(Daemon):
with Timeout(self.lockup_timeout): with Timeout(self.lockup_timeout):
self.run_pool.waitall() self.run_pool.waitall()
except (Exception, Timeout): except (Exception, Timeout):
self.logger.exception(_("Exception in top-level" self.logger.exception(_("Exception in top-level "
"reconstruction loop")) "reconstruction loop"))
self.kill_coros() self.kill_coros()
finally: finally:

2
test/functional/__init__.py
View File

@ -943,7 +943,7 @@ def setup_package():
global skip3 global skip3
skip3 = not all([not skip, swift_test_user[2], swift_test_key[2]]) skip3 = not all([not skip, swift_test_user[2], swift_test_key[2]])
if not skip and skip3: if not skip and skip3:
print('SKIPPING THIRD ACCOUNT FUNCTIONAL TESTS' print('SKIPPING THIRD ACCOUNT FUNCTIONAL TESTS '
'DUE TO NO CONFIG FOR THEM', file=sys.stderr) 'DUE TO NO CONFIG FOR THEM', file=sys.stderr)
global skip_if_not_v3 global skip_if_not_v3