From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Oct 2014 01:11:44 +0000 (-0700)
Subject: librados: define CEPH_OSD_WATCH_OP_*
X-Git-Tag: v0.91~148
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d6aa20d4fb04c552e660576606c9250808a4d5d;p=ceph.git

librados: define CEPH_OSD_WATCH_OP_*

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index 88567e4494af..172c4b6307a6 100644
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -42,6 +42,18 @@ const char *ceph_osd_state_name(int s)
 	}	
 }
 
+const char *ceph_osd_watch_op_name(int o)
+{
+	switch (o) {
+	case CEPH_OSD_WATCH_OP_UNWATCH:
+		return "unwatch";
+	case CEPH_OSD_WATCH_OP_WATCH:
+		return "watch";
+	default:
+		return "???";
+	}
+}
+
 const char *ceph_mds_state_name(int s)
 {
 	switch (s) {
diff --git a/src/include/rados.h b/src/include/rados.h
index 21e994db0366..9153f887dd01 100644
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -446,6 +446,13 @@ enum {
 	CEPH_OSD_TMAP2OMAP_NULLOK = 1,
 };
 
+enum {
+	CEPH_OSD_WATCH_OP_UNWATCH = 0,
+	CEPH_OSD_WATCH_OP_WATCH = 1,
+};
+
+const char *ceph_osd_watch_op_name(int o);
+
 /*
  * an individual object operation.  each may be accompanied by some data
  * payload
diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 8f1b9eae27d3..b88ef20066cf 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4554,8 +4554,8 @@ ostream& operator<<(ostream& out, const OSDOp& op)
       out << " " << snapid_t(op.op.snap.snapid);
       break;
     case CEPH_OSD_OP_WATCH:
-      out << (op.op.watch.flag ? " add":" remove")
-	  << " cookie " << op.op.watch.cookie << " ver " << op.op.watch.ver;
+      out << " " << ceph_osd_watch_op_name(op.op.watch.op)
+	  << " cookie " << op.op.watch.cookie;
       break;
     case CEPH_OSD_OP_COPY_GET:
     case CEPH_OSD_OP_COPY_GET_CLASSIC: