From: Yehuda Sadeh <yehuda@inktank.com>
Date: Tue, 25 Jun 2013 17:36:00 +0000 (-0700)
Subject: cls_ver: rename version xattr, add some more logging
X-Git-Tag: v0.67-rc1~128^2~45
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8db289f2e2ed0dccfa9c0d311e03eb729ceec406;p=ceph.git

cls_ver: rename version xattr, add some more logging

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/cls/version/cls_version.cc b/src/cls/version/cls_version.cc
index baecc248a22d..ea38072b19ba 100644
--- a/src/cls/version/cls_version.cc
+++ b/src/cls/version/cls_version.cc
@@ -27,7 +27,7 @@ cls_method_handle_t h_version_read;
 cls_method_handle_t h_version_check_conds;
 
 
-#define VERSION_ATTR "version"
+#define VERSION_ATTR "ceph.objclass.version"
 
 static int set_version(cls_method_context_t hctx, struct obj_version *objv)
 {
@@ -35,6 +35,8 @@ static int set_version(cls_method_context_t hctx, struct obj_version *objv)
 
   ::encode(*objv, bl);
 
+  CLS_LOG(20, "cls_version: set_version %s:%d", objv->tag.c_str(), (int)objv->ver);
+
   int ret = cls_cxx_setxattr(hctx, VERSION_ATTR, &bl);
   if (ret < 0)
     return ret;
@@ -54,6 +56,8 @@ static int init_version(cls_method_context_t hctx, struct obj_version *objv)
   objv->ver = 1;
   objv->tag = buf;
 
+  CLS_LOG(20, "cls_version: init_version %s:%d", objv->tag.c_str(), (int)objv->ver);
+
   return set_version(hctx, objv);
 }
 
@@ -194,8 +198,10 @@ static int cls_version_check(cls_method_context_t hctx, bufferlist *in, bufferli
   int ret = read_version(hctx, &objv, false);
   if (ret < 0)
     return ret;
+  CLS_LOG(20, "cls_version: read_version %s:%d", objv.tag.c_str(), (int)objv.ver);
   
   if (!check_conds(op.conds, objv)) {
+    CLS_LOG(20, "cls_version: failed condition check");
     return -ECANCELED;
   }
 
diff --git a/src/cls/version/cls_version_client.cc b/src/cls/version/cls_version_client.cc
index 70d5ebe67695..c1e364438323 100644
--- a/src/cls/version/cls_version_client.cc
+++ b/src/cls/version/cls_version_client.cc
@@ -13,6 +13,7 @@ void cls_version_set(librados::ObjectWriteOperation& op, obj_version& objv)
   bufferlist in;
   cls_version_set_op call;
   call.objv = objv;
+cout << __FILE__ << ":" << __LINE__ << "ZZZ setting objv=" << objv.tag << ":" << objv.ver << std::endl;
   ::encode(call, in);
   op.exec("version", "set", in);
 }