rados: Adds CEPH_OSD_OP_SCRUB_MAP sub op

Previously, maps were requested with a sub_op and sent with a
sub_op_reply.  As maps will now be requested using a different message,
replicas will transmit scrub maps requested via MOSDRepScrub messages by
sending a sub_op of type CEPH_OSD_OP_SCRUB_MAP.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/include/ceph_strings.cc b/src/include/ceph_strings.cc
index 54b975044b9abaadcacfc43724f0292b37e5f3a7..2e99851f1fa1007828555a0c58449d1a7952a1f8 100644 (file)
--- a/src/include/ceph_strings.cc
+++ b/src/include/ceph_strings.cc
@@ -57,6 +57,7 @@ const char *ceph_osd_op_name(int op)
        case CEPH_OSD_OP_SCRUB_RESERVE: return "scrub-reserve";
        case CEPH_OSD_OP_SCRUB_UNRESERVE: return "scrub-unreserve";
        case CEPH_OSD_OP_SCRUB_STOP: return "scrub-stop";
+       case CEPH_OSD_OP_SCRUB_MAP: return "scrub-map";
 
        case CEPH_OSD_OP_WRLOCK: return "wrlock";
        case CEPH_OSD_OP_WRUNLOCK: return "wrunlock";

diff --git a/src/include/rados.h b/src/include/rados.h
index 10fee294f24032ab0dd00a3b7fbbcb1b37ac8d3e..d39b57975e9a0098e9c377acb3ef188229b02135 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -228,6 +228,7 @@ enum {
        CEPH_OSD_OP_SCRUB_RESERVE   = CEPH_OSD_OP_MODE_SUB | 6,
        CEPH_OSD_OP_SCRUB_UNRESERVE = CEPH_OSD_OP_MODE_SUB | 7,
        CEPH_OSD_OP_SCRUB_STOP      = CEPH_OSD_OP_MODE_SUB | 8,
+       CEPH_OSD_OP_SCRUB_MAP     = CEPH_OSD_OP_MODE_SUB | 9,
 
        /** lock **/
        CEPH_OSD_OP_WRLOCK    = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_LOCK | 1,