]> git-server-git.apps.pok.os.sepia.ceph.com Git - radosgw-agent.git/commitdiff
worker: don't try to remove opstate for deletes
authorJosh Durgin <josh.durgin@inktank.com>
Fri, 1 Nov 2013 21:15:37 +0000 (14:15 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Fri, 1 Nov 2013 21:15:41 +0000 (14:15 -0700)
Only the copy operation creates an op state. If the object does not
exist, there is no op state to delete.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
radosgw_agent/worker.py

index d81f4ead7dc2e035d8602a45a145a2e80373d56f..661f912d25fd04a66ac9800a6f67af05c157c216 100644 (file)
@@ -201,8 +201,9 @@ class DataWorker(Worker):
                 self.wait_for_object(bucket, obj, until, local_op_id)
         # TODO: clean up old op states
         try:
-            client.remove_op_state(self.dest_conn, self.daemon_id, local_op_id,
-                                   bucket, obj)
+            if found:
+                client.remove_op_state(self.dest_conn, self.daemon_id,
+                                       local_op_id, bucket, obj)
         except Exception:
             log.exception('could not remove op state for daemon "%s" op_id %s',
                           self.daemon_id, local_op_id)