From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Mon, 26 Sep 2011 22:11:25 +0000 (-0700)
Subject: rgw: get bucket markers from the same object at all times
X-Git-Tag: v0.37~103^2~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c780494d8d5f0f0f3ad372a07227b631879cf2a9;p=ceph.git

rgw: get bucket markers from the same object at all times

We use an object in the control pool here, rather than an object
local to each pool. This gives us a single value which can be used
for tracking data at all times.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index dc0524c028847..1736536002c26 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -309,7 +309,7 @@ int RGWRados::create_bucket(std::string& id, rgw_bucket& bucket, map<std::string
   }
 
   if (assign_marker) {
-    librados::IoCtx io_ctx;
+    librados::IoCtx io_ctx; // context for new bucket
 
     int r = open_bucket_ctx(bucket, io_ctx);
     if (r < 0)
@@ -319,11 +319,11 @@ int RGWRados::create_bucket(std::string& id, rgw_bucket& bucket, map<std::string
     uint32_t nop = 0;
     ::encode(nop, bl);
 
-    r = io_ctx.write(bucket_marker_ver_oid, bl, bl.length(), 0);
+    r = control_pool_ctx.write(bucket_marker_ver_oid, bl, bl.length(), 0);
     if (r < 0)
       return r;
 
-    uint64_t ver = io_ctx.get_last_version();
+    uint64_t ver = control_pool_ctx.get_last_version();
     RGW_LOG(0) << "got obj version=" << ver << dendl;
     char buf[32];
     snprintf(buf, sizeof(buf), "%llu", (unsigned long long)ver);