OSD: rename CEPH_OSD_OP_COPY_GET -> CEPH_OSD_OP_COPY_GET_CLASSIC

In order to introduce versioning of copy-get, we need to make it a
different op that has the versioning infrastructure from the start.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index 221fb059740a5a76dbcdc15ecfce9633bdfb9024..8ffdc4143f28514a46d27c15d85a441ceaea9b8f 100644 (file)
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -48,7 +48,7 @@ const char *ceph_osd_op_name(int op)
        case CEPH_OSD_OP_TMAPPUT: return "tmapput";
        case CEPH_OSD_OP_WATCH: return "watch";
 
-       case CEPH_OSD_OP_COPY_GET: return "copy-get";
+       case CEPH_OSD_OP_COPY_GET_CLASSIC: return "copy-get-classic";
        case CEPH_OSD_OP_COPY_FROM: return "copy-from";
        case CEPH_OSD_OP_UNDIRTY: return "undirty";
        case CEPH_OSD_OP_ISDIRTY: return "isdirty";

diff --git a/src/include/rados.h b/src/include/rados.h
index e7a32b5afefe7bc39eed49ecee80caadba897efa..48374cd1af99e559556737d280b9fea63c7c4164 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -218,7 +218,7 @@ enum {
        CEPH_OSD_OP_OMAP_CMP      = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 25,
 
        CEPH_OSD_OP_COPY_FROM = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 26,
-       CEPH_OSD_OP_COPY_GET = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 27,
+       CEPH_OSD_OP_COPY_GET_CLASSIC = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 27,
        CEPH_OSD_OP_UNDIRTY   = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_DATA | 28,
        CEPH_OSD_OP_ISDIRTY   = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_DATA | 29,
 

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 7ecebfa5ef2bede6d104fc69d919cd76bc667eb4..ebc033daf7ea5d7e6bc5861c5b1dc6e50db5a6ab 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3611,9 +3611,9 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
       }
       break;
 
-    case CEPH_OSD_OP_COPY_GET:
+    case CEPH_OSD_OP_COPY_GET_CLASSIC:
       ++ctx->num_read;
-      result = fill_in_copy_get(bp, osd_op, oi);
+      result = fill_in_copy_get(bp, osd_op, oi, true);
       if (result == -EINVAL)
        goto fail;
       break;
@@ -4252,8 +4252,9 @@ struct C_Copyfrom : public Context {
 };
 
 int ReplicatedPG::fill_in_copy_get(bufferlist::iterator& bp, OSDOp& osd_op,
-                                   object_info_t& oi)
+                                   object_info_t& oi, bool classic)
 {
+  assert(classic);
   hobject_t& soid = oi.soid;
   int result = 0;
   object_copy_cursor_t cursor;

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index bb2f52d875be8ae1d636a2575576fc825f6f7081..fa93c8d0dfce5df94c0ccf3e937cb12c2fa85d54 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -987,7 +987,8 @@ protected:
   // -- copyfrom --
   map<hobject_t, CopyOpRef> copy_ops;
 
-  int fill_in_copy_get(bufferlist::iterator& bp, OSDOp& op, object_info_t& oi);
+  int fill_in_copy_get(bufferlist::iterator& bp, OSDOp& op,
+                       object_info_t& oi, bool classic);
   /**
    * To copy an object, call start_copy.
    *

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 7801665cfec37728c2b39147c633af7b30f8e742..93ce65e81eebb01fbaa8b874356c47a6d8124319 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -3607,7 +3607,7 @@ ostream& operator<<(ostream& out, const OSDOp& op)
       out << (op.op.watch.flag ? " add":" remove")
          << " cookie " << op.op.watch.cookie << " ver " << op.op.watch.ver;
       break;
-    case CEPH_OSD_OP_COPY_GET:
+    case CEPH_OSD_OP_COPY_GET_CLASSIC:
       out << " max " << op.op.copy_get.max;
     case CEPH_OSD_OP_COPY_FROM:
       out << " ver " << op.op.copy_from.src_version;

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 9b89f9586f4c926b0d07243d84bb30833fe876d3..713c2a0bfd8d6d0e5df4b3dd5473a28ca7b64e01 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -616,7 +616,7 @@ struct ObjectOperation {
                bufferlist *out_data,
                std::map<std::string,bufferlist> *out_omap,
                int *prval) {
-    OSDOp& osd_op = add_op(CEPH_OSD_OP_COPY_GET);
+    OSDOp& osd_op = add_op(CEPH_OSD_OP_COPY_GET_CLASSIC);
     osd_op.op.copy_get.max = max;
     ::encode(*cursor, osd_op.indata);
     ::encode(max, osd_op.indata);