From: Dan Mick <dan.mick@inktank.com>
Date: Thu, 13 Jun 2013 22:48:32 +0000 (-0700)
Subject: ceph.in: refuse 'ceph <type> tell' commands; suggest 'ceph tell <type>'
X-Git-Tag: v0.65~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4f9dce7a5d1055115a065c3b2677cc65fcef6de;p=ceph.git

ceph.in: refuse 'ceph <type> tell' commands; suggest 'ceph tell <type>'

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index dcb120931ca6..a65040068703 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -1,4 +1,4 @@
-#
+#&
 # Processed in Makefile to add python #! line and version variable
 #
 #
@@ -1454,6 +1454,14 @@ def main():
     if '--' in childargs:
         childargs.remove('--')
 
+    # special deprecation warning for 'ceph <type> tell'
+    # someday 'mds' will be here too
+    if len(childargs) >= 2 and \
+        childargs[0] in ['mon', 'osd'] and \
+        childargs[1] == 'tell':
+        print >> sys.stderr, '"{0} tell" is deprecated; try "tell {0}.<id>" instead (id can be "*") '.format(childargs[0])
+        return 1
+
     try:
         cluster_handle.connect()
     except KeyboardInterrupt: