From: wangzhengyong <wangzhengyong@cmss.chinamobile.com>
Date: Tue, 14 Mar 2017 03:05:48 +0000 (+0800)
Subject: rgw: handle error return value in build_linked_oids_index
X-Git-Tag: v12.0.1~26^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3474f677c7bdb99bf64e38c26d1d2c02feb8da80;p=ceph.git

rgw: handle error return value in build_linked_oids_index

Signed-off-by: wangzhengyong@cmss.chinamobile.com
---

diff --git a/src/rgw/rgw_orphan.cc b/src/rgw/rgw_orphan.cc
index 5813cdc6b9e9..ece7efca30fc 100644
--- a/src/rgw/rgw_orphan.cc
+++ b/src/rgw/rgw_orphan.cc
@@ -589,6 +589,11 @@ int RGWOrphanSearch::build_linked_oids_index()
       for (map<string, bufferlist>::iterator eiter = entries.begin(); eiter != entries.end(); ++eiter) {
         ldout(store->ctx(), 20) << " indexed entry: " << eiter->first << dendl;
         ret = build_linked_oids_for_bucket(eiter->first, oids);
+        if (ret < 0) {
+          lderr(store->ctx()) << __func__ << ": ERROR: build_linked_oids_for_bucket() indexed entry=" << eiter->first
+                              << " returned ret=" << ret << dendl;
+          return ret;
+        }
       }
 
       search_stage.shard = iter->first;