]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: user info json encoding preserves storage_class state
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 16 Jan 2019 03:28:11 +0000 (19:28 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 16 Jan 2019 03:28:11 +0000 (19:28 -0800)
This is needed for meta sync. Otherwise one zone would have storage_class
not set, and the other zone would have it set.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_json_enc.cc

index 34ca5dd609468a304bf48bfcce8860bc69cf3fca..e9030ad8308a3f05ebb7658a805f9897810514e8 100644 (file)
@@ -484,7 +484,7 @@ void RGWUserInfo::dump(Formatter *f) const
     encode_json("system", (bool)system, f);
   }
   encode_json("default_placement", default_placement.name, f);
-  encode_json("default_storage_class", default_placement.get_storage_class(), f);
+  encode_json("default_storage_class", default_placement.storage_class, f);
   encode_json("placement_tags", placement_tags, f);
   encode_json("bucket_quota", bucket_quota, f);
   encode_json("user_quota", user_quota, f);