From 54d6b2d4c974e9790b98812fcdba3eef3358e71f Mon Sep 17 00:00:00 2001
From: gholt <gholt@rackspace.com>
Date: Thu, 16 Jun 2011 01:37:43 +0000
Subject: [PATCH] consync: Minor change to ignore 404 is there is some other
 error from another node

---
 swift/container/sync.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/swift/container/sync.py b/swift/container/sync.py
index a26f9ff9f4..ae638b7b0b 100644
--- a/swift/container/sync.py
+++ b/swift/container/sync.py
@@ -371,7 +371,12 @@ class ContainerSync(Daemon):
                             headers = these_headers
                             body = this_body
                     except ClientException, err:
-                        exc = err
+                        # If any errors are not 404, make sure we report the
+                        # non-404 one. We don't want to mistankely assume the
+                        # object no longer exists just because one says so and
+                        # the others errored for some other reason.
+                        if not exc or exc.http_status == 404:
+                            exc = err
                 if timestamp < looking_for_timestamp:
                     if exc:
                         raise exc