Bug in exception handling with obj replicator

[gholt]

Jul 21 19:27:23 storage2-Z1 object-replicator Error syncing partition: Traceback (most recent call last): File "/usr/lib/pymodules/python2.6/swift/obj/replicator.py", line 399, in update self.suffix_count += len(local_hash) TypeError: object of type 'LockTimeout' has no len()

The except block just above line 399 needs to clear local_hash and 399 need to len(local_hash) if local_hash else 0 or something.

[Marcelo Martins (btorch)]

Update:

Nov 22 15:55:25 172.24.9.210 object-replicator Error syncing partition: Traceback (most recent call last): File "/usr/lib/pymodules/python2.6/swift/obj/replicator.py", line 444, in update self.suffix_count += len(local_hash) TypeError: object of type 'LockTimeout' has no len()

[Openstack Gerrit (openstack-gerrit)]

Reviewed: https://review.openstack.org/1922
Committed: http://github.com/openstack/swift/commit/2b3aab86bb45905170fb50ee245d32aa6403f9cd
Submitter: Jenkins
Branch: master

 status fixcommitted
 done

commit 2b3aab86bb45905170fb50ee245d32aa6403f9cd
Author: David Goetz <email address hidden>
Date: Mon Nov 28 09:13:41 2011 -0800

    Fix object replicator to handle Timeouts fixes: lp 814263

    Change-Id: I4c8b73d4cb0540fa105f240b2a9d481cf9c1e55c