rgw structures rework

qa/tasks/radosgw_admin.py

@@ -277,12 +277,6 @@ def task(ctx, config):
                 'bucket.instance:{bucket_name}:{bucket_instance}'.format(
                 bucket_name=bucket_name2,bucket_instance=dest_bucket_id)],
                 check_status=True)
-            del out1['data']['bucket_info']['bucket']['pool']
-            del out1['data']['bucket_info']['bucket']['index_pool']
-            del out1['data']['bucket_info']['bucket']['data_extra_pool']
-            del out2['data']['bucket_info']['bucket']['pool']
-            del out2['data']['bucket_info']['bucket']['index_pool']
-            del out2['data']['bucket_info']['bucket']['data_extra_pool']
             assert out1 == out2
 
         same_region = 0

src/cls/rgw/cls_rgw_types.h

@@ -239,6 +239,10 @@ struct cls_rgw_obj_key {
   cls_rgw_obj_key(const string &_name) : name(_name) {}
   cls_rgw_obj_key(const string& n, const string& i) : name(n), instance(i) {}
 
+  void set(const string& _name) {
+    name = _name;
+  }
+
   bool operator==(const cls_rgw_obj_key& k) const {
     return (name.compare(k.name) == 0) &&
            (instance.compare(k.instance) == 0);
@@ -250,6 +254,12 @@ struct cls_rgw_obj_key {
     }
     return (r < 0);
   }
+  bool operator<=(const cls_rgw_obj_key& k) const {
+    return !(k < *this);
+  }
+  bool empty() {
+    return name.empty();
+  }
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
     ::encode(name, bl);
@@ -872,7 +882,7 @@ struct cls_rgw_obj_chain {
 
   cls_rgw_obj_chain() {}
 
-  void push_obj(string& pool, cls_rgw_obj_key& key, string& loc) {
+  void push_obj(const string& pool, const cls_rgw_obj_key& key, const string& loc) {
     cls_rgw_obj obj;
     obj.pool = pool;
     obj.key = key;

src/cls/user/cls_user_types.cc

@@ -11,18 +11,13 @@ void cls_user_gen_test_bucket(cls_user_bucket *bucket, int i)
   snprintf(buf, sizeof(buf), ".%d", i);
 
   bucket->name = string("buck") + buf;
-  bucket->data_pool = string(".data.pool") + buf;
-  bucket->index_pool = string(".index.pool") + buf;
   bucket->marker = string("mark") + buf;
   bucket->bucket_id = string("bucket.id") + buf;
 }
 
 void cls_user_bucket::dump(Formatter *f) const
 {
   encode_json("name", name, f);
-  encode_json("data_pool", data_pool,f);
-  encode_json("data_extra_pool", data_extra_pool,f);
-  encode_json("index_pool", index_pool,f);
   encode_json("marker", marker,f);
   encode_json("bucket_id", bucket_id,f);
 }

src/cls/user/cls_user_types.h

@@ -14,26 +14,34 @@
  */
 struct cls_user_bucket {
   std::string name;
-  std::string data_pool;
-  std::string index_pool;
   std::string marker;
   std::string bucket_id;
-  std::string data_extra_pool;
+  std::string placement_id;
+  struct {
+    std::string data_pool;
+    std::string index_pool;
+    std::string data_extra_pool;
+  } explicit_placement;
 
   void encode(bufferlist& bl) const {
-     ENCODE_START(7, 3, bl);
+     ENCODE_START(8, 8, bl);
     ::encode(name, bl);
-    ::encode(data_pool, bl);
     ::encode(marker, bl);
     ::encode(bucket_id, bl);
-    ::encode(index_pool, bl);
-    ::encode(data_extra_pool, bl);
+    ::encode(placement_id, bl);
+    if (placement_id.empty()) {
+      ::encode(explicit_placement.data_pool, bl);
+      ::encode(explicit_placement.index_pool, bl);
+      ::encode(explicit_placement.data_extra_pool, bl);
+    }
     ENCODE_FINISH(bl);
   }
   void decode(bufferlist::iterator& bl) {
-    DECODE_START_LEGACY_COMPAT_LEN(7, 3, 3, bl);
+    DECODE_START_LEGACY_COMPAT_LEN(8, 3, 3, bl);
     ::decode(name, bl);
-    ::decode(data_pool, bl);
+    if (struct_v < 8) {
+      ::decode(explicit_placement.data_pool, bl);
+    }
     if (struct_v >= 2) {
       ::decode(marker, bl);
       if (struct_v <= 3) {
@@ -46,13 +54,22 @@ struct cls_user_bucket {
         ::decode(bucket_id, bl);
       }
     }
-    if (struct_v >= 5) {
-      ::decode(index_pool, bl);
+    if (struct_v < 8) {
+      if (struct_v >= 5) {
+        ::decode(explicit_placement.index_pool, bl);
+      } else {
+        explicit_placement.index_pool = explicit_placement.data_pool;
+      }
+      if (struct_v >= 7) {
+        ::decode(explicit_placement.data_extra_pool, bl);
+      }
     } else {
-      index_pool = data_pool;
-    }
-    if (struct_v >= 7) {
-      ::decode(data_extra_pool, bl);
+      ::decode(placement_id, bl);
+      if (placement_id.empty()) {
+        ::decode(explicit_placement.data_pool, bl);
+        ::decode(explicit_placement.index_pool, bl);
+        ::decode(explicit_placement.data_extra_pool, bl);
+      }
     }
     DECODE_FINISH(bl);
   }

src/cls/version/cls_version.cc

@@ -109,6 +109,7 @@ static bool check_conds(list<obj_version_cond>& conds, obj_version& objv)
   for (list<obj_version_cond>::iterator iter = conds.begin(); iter != conds.end(); ++iter) {
     obj_version_cond& cond = *iter;
     obj_version& v = cond.ver;
+    CLS_LOG(20, "cls_version: check_version %s:%d (cond=%d)", v.tag.c_str(), (int)v.ver, (int)cond.cond);
 
     switch (cond.cond) {
       case VER_COND_NONE:

src/cls/version/cls_version_types.h

@@ -31,6 +31,11 @@ struct obj_version {
     ver++;
   }
 
+  void clear() {
+    ver = 0;
+    tag.clear();
+  }
+
   bool empty() {
     return tag.empty();
   }

src/mrgw.sh

@@ -6,8 +6,8 @@ script_root=`dirname $0`
 script_root=`(cd $script_root;pwd)`
 if [ -e CMakeCache.txt ]; then
     script_root=$PWD
-elif [ -e $root_path/../build/CMakeCache.txt ]; then
-    cd $root_path/../build
+elif [ -e $script_root/../build/CMakeCache.txt ]; then
+    cd $script_root/../build
     script_root=$PWD
 fi
 vstart_path=`dirname $0`