From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 14 May 2010 23:53:12 +0000 (-0700)
Subject: mds: better printing on lock messages
X-Git-Tag: v0.22~346^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40bb86ab599c5ae0e8aa1c386f0b4aaec1e3bb07;p=ceph.git

mds: better printing on lock messages
---

diff --git a/src/include/ceph_strings.cc b/src/include/ceph_strings.cc
index 0f943a0a3b5e..c6179d3a26a2 100644
--- a/src/include/ceph_strings.cc
+++ b/src/include/ceph_strings.cc
@@ -130,6 +130,8 @@ const char *ceph_mds_op_name(int op)
 	case CEPH_MDS_OP_LSSNAP: return "lssnap";
 	case CEPH_MDS_OP_MKSNAP: return "mksnap";
 	case CEPH_MDS_OP_RMSNAP: return "rmsnap";
+	case CEPH_MDS_OP_SETFILELOCK: return "setfilelock";
+	case CEPH_MDS_OP_GETFILELOCK: return "getfilelock";
 	}
 	return "???";
 }
diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h
index 1a82d00fcd4e..d4ec62943c5e 100644
--- a/src/messages/MClientRequest.h
+++ b/src/messages/MClientRequest.h
@@ -178,6 +178,15 @@ public:
       if (head.args.setattr.mask & CEPH_SETATTR_ATIME)
 	out << " atime=" << utime_t(head.args.setattr.atime);
     }
+    if (head.op == CEPH_MDS_OP_SETFILELOCK ||
+	head.op == CEPH_MDS_OP_GETFILELOCK) {
+      out << "rule " << (int)head.args.filelock_change.rule
+	  << ", type " << (int)head.args.filelock_change.type
+	  << ", pid " << head.args.filelock_change.pid
+	  << ", start " << head.args.filelock_change.start
+	  << ", length " << head.args.filelock_change.length
+	  << ", wait " << (int)head.args.filelock_change.wait;
+    }
     //if (!get_filepath().empty()) 
     out << " " << get_filepath();
     if (!get_filepath2().empty())