From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 15 Feb 2016 23:40:37 +0000 (-0800)
Subject: rgw: set quota when converting regionmap
X-Git-Tag: v10.1.0~354^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=288501429e5cb67235e1eb4756cc05b9f9846b26;p=ceph.git

rgw: set quota when converting regionmap

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index bc2b21668e0..2df09d776f4 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3253,7 +3253,8 @@ int RGWRados::convert_regionmap()
     }
   }
 
-  #warning need to update quota
+  current_period.set_user_quota(zonegroupmap.user_quota);
+  current_period.set_bucket_quota(zonegroupmap.bucket_quota);
 
   return 0;
 }
diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index fe88933da68..f2773838adf 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -1409,6 +1409,14 @@ public:
   const string& get_latest_epoch_oid();
   const string& get_info_oid_prefix();
 
+  void set_user_quota(RGWQuotaInfo& user_quota) {
+    period_config.user_quota = user_quota;
+  }
+
+  void set_bucket_quota(RGWQuotaInfo& bucket_quota) {
+    period_config.bucket_quota = bucket_quota;
+  }
+
   void set_id(const string& id) {
     this->id = id;
     period_map.id = id;