From 84447a42e82a21e08f71ea6113216d9a2cb2ab09 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 9 Mar 2017 15:24:08 -0500 Subject: [PATCH] rgw: clear old zone short ids on period update the short ids of old, removed zones were being kept in the period to guard against hash collisions with new zones but for a hash collision to cause a wrong object to sync, that object would have to be uploaded simultaneously to two different zones that had the same short id to avoid this, we just have to prevent the period from containing two colliding zones at the same time - we don't have to remember old zone short ids forever Fixes: http://tracker.ceph.com/issues/15618 Signed-off-by: Casey Bodley (cherry picked from commit 9c45633c836c966ab1f75ea2b1ad3fa0a4886600) --- src/rgw/rgw_rados.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 4f7af0f4785..3d3712c4b27 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -1220,6 +1220,10 @@ int RGWPeriod::update() return ret; } + // clear zone short ids of removed zones. period_map.update() will add the + // remaining zones back + period_map.short_zone_ids.clear(); + for (auto& iter : zonegroups) { RGWZoneGroup zg(string(), iter); ret = zg.init(cct, store); -- 2.47.3