From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 18 Dec 2014 00:16:14 +0000 (-0800)
Subject: worker: ignore 404 when removing op_state
X-Git-Tag: v1.2~4^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68924c9ae57c14669e46aadef4135c188c8fb5fb;p=radosgw-agent.git

worker: ignore 404 when removing op_state

It's fine if the gateway deleted it first.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py
index 40435ea..c259ffb 100644
--- a/radosgw_agent/worker.py
+++ b/radosgw_agent/worker.py
@@ -211,6 +211,8 @@ class DataWorker(Worker):
             if found:
                 client.remove_op_state(self.dest_conn, self.daemon_id,
                                        local_op_id, bucket, obj)
+        except client.NotFound:
+            log.debug('op state already gone')
         except Exception:
             log.exception('could not remove op state for daemon "%s" op_id %s',
                           self.daemon_id, local_op_id)