OpenStack Object Storage (swift)

Merge lp:~gholt/swift/lp767809 into lp:~hudson-openstack/swift/trunk

  1. lp767809
  2. Merge into trunk
Proposed by gholt
Status: Merged
Approved by: David Goetz
Approved revision: 284
Merged at revision: 284
Proposed branch: lp:~gholt/swift/lp767809
Merge into: lp:~hudson-openstack/swift/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
swift/obj/replicator.py (+1/-0)
To merge this branch: bzr merge lp:~gholt/swift/lp767809
Reviewer Review Type Date Requested Status
Swift Core security contacts Pending
Review via email: mp+58591@code.launchpad.net

Description of the change

Fix for Object replicator breaks when running object replicator with no objects on the server

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'swift/obj/replicator.py'
--- swift/obj/replicator.py 2011-04-14 20:55:03 +0000
+++ swift/obj/replicator.py 2011-04-20 22:45:16 +0000
@@ -509,6 +509,7 @@
509 self.partition_times = []509 self.partition_times = []
510 stats = eventlet.spawn(self.heartbeat)510 stats = eventlet.spawn(self.heartbeat)
511 lockup_detector = eventlet.spawn(self.detect_lockups)511 lockup_detector = eventlet.spawn(self.detect_lockups)
512 eventlet.sleep() # Give spawns a cycle
512 try:513 try:
513 self.run_pool = GreenPool(size=self.concurrency)514 self.run_pool = GreenPool(size=self.concurrency)
514 jobs = self.collect_jobs()515 jobs = self.collect_jobs()