openstack/swift
Code Issues Proposed changes

Removed needless continuation markers.

Browse Source
This commit is contained in:
Monty Taylor 2010-07-26 08:18:32 -07:00
parent ffadcb78c7
commit bba02ae8b3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swift/obj/replicator.py
View File

@ -410,7 +410,7 @@ class ObjectReplicator(object):
if self.replication_count: if self.replication_count:
rate = self.replication_count / (time.time() - self.start) rate = self.replication_count / (time.time() - self.start)
left = int((self.job_count - self.replication_count) / rate) left = int((self.job_count - self.replication_count) / rate)
self.logger.info("%d/%d (%.2f%%) partitions replicated in %.2f "\ self.logger.info("%d/%d (%.2f%%) partitions replicated in %.2f "
"seconds (%.2f/sec, %s remaining)" "seconds (%.2f/sec, %s remaining)"
% (self.replication_count, self.job_count, % (self.replication_count, self.job_count,
self.replication_count * 100.0 / self.job_count, self.replication_count * 100.0 / self.job_count,
@ -418,13 +418,13 @@ class ObjectReplicator(object):
'%d%s' % compute_eta(self.start, '%d%s' % compute_eta(self.start,
self.replication_count, self.job_count))) self.replication_count, self.job_count)))
if self.suffix_count: if self.suffix_count:
self.logger.info("%d suffixes checked - %.2f%% hashed, "\ self.logger.info("%d suffixes checked - %.2f%% hashed, "
"%.2f%% synced" % "%.2f%% synced" %
(self.suffix_count, (self.suffix_count,
(self.suffix_hash * 100.0) / self.suffix_count, (self.suffix_hash * 100.0) / self.suffix_count,
(self.suffix_sync * 100.0) / self.suffix_count)) (self.suffix_sync * 100.0) / self.suffix_count))
self.partition_times.sort() self.partition_times.sort()
self.logger.info("Partition times: max %.4fs, min %.4fs, "\ self.logger.info("Partition times: max %.4fs, min %.4fs, "
"med %.4fs" "med %.4fs"
% (self.partition_times[-1], self.partition_times[0], % (self.partition_times[-1], self.partition_times[0],
self.partition_times[len(self.partition_times) // 2])) self.partition_times[len(self.partition_times) // 2]))

2
swift/proxy/server.py
View File

@ -755,7 +755,7 @@ class ObjectController(Controller):
_, dest_container, dest_object = dest.split('/', 3) _, dest_container, dest_object = dest.split('/', 3)
except ValueError: except ValueError:
return HTTPPreconditionFailed(request=req, return HTTPPreconditionFailed(request=req,
body='Destination header must be of the form ' + body='Destination header must be of the form '
'container/object') 'container/object')
new_source = '/' + self.container_name + '/' + self.object_name new_source = '/' + self.container_name + '/' + self.object_name
self.container_name = dest_container self.container_name = dest_container