Merge pull request #11866 from dachary/wip-17709-jewel

jewel: rgw: multisite: coroutine deadlock assertion on error in FetchAllMetaCR Reviewed-by: Nathan Cutler <ncutler@suse.com>
ceph · Feb 1, 2017 · a695e8d · a695e8d
2 parents 4395560 + 0b7577e
commit a695e8d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
@@ -812,6 +812,7 @@ class RGWFetchAllMetaCR : public RGWCoroutine {
       }
       if (get_ret_status() < 0) {
         ldout(cct, 0) << "ERROR: failed to fetch metadata sections" << dendl;
+        yield entries_index->finish();
         yield lease_cr->go_down();
         drain_all();
 	return set_cr_error(get_ret_status());
@@ -827,6 +828,7 @@ class RGWFetchAllMetaCR : public RGWCoroutine {
 	}
         if (get_ret_status() < 0) {
           ldout(cct, 0) << "ERROR: failed to fetch metadata section: " << *sections_iter << dendl;
+          yield entries_index->finish();
           yield lease_cr->go_down();
           drain_all();
           return set_cr_error(get_ret_status());