c-any-nt command

eevans · eevans · commit 62a6c1648e95 · 2016-08-15T15:53:18.000-05:00
diff --git a/Makefile b/Makefile
@@ -14,6 +14,7 @@ install:
 	install -m 755 c-ls $(BINDIR)
 	install -m 755 c-foreach-nt $(BINDIR)
 	install -m 755 c-cqlsh $(BINDIR)
+	install -m 755 c-any-nt $(BINDIR)
 	install -m 755 streams $(BINDIR)/cassandra-streams
 	install -m 755 uyaml $(BINDIR)
 	install -m 644 functions $(SHAREDIR)
diff --git a/c-any-nt b/c-any-nt
@@ -0,0 +1,16 @@
+#!/usr/bin/python
+
+
+import random
+import sys
+
+from cassandra.tools import get_instances
+
+
+def main():
+    instance = random.choice(list(get_instances()))
+    instance.nodetool.run(*sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/cassandra/tools/instances.py b/cassandra/tools/instances.py
@@ -47,10 +47,10 @@ def __get(key):
     """
     def restart(self):
         self.__log_info("Disabling client ports...")
-        self.nodetool.disablebinary()
-        self.nodetool.disablethrift()
+        self.nodetool.run("disablebinary")
+        self.nodetool.run("disablethrift")
         self.__log_info("Draining...")
-        self.nodetool.drain()
+        self.nodetool.run("drain")
         self.__log_info("Restarting service %s", self.service_name)
         call("systemctl", "restart", self.service_name)
         listening = False
diff --git a/cassandra/tools/nodetool.py b/cassandra/tools/nodetool.py
@@ -1,4 +1,5 @@
 
+
 import logging
 
 from .commands import call
@@ -9,19 +10,7 @@ def __init__(self, host, port):
         self.host = host
         self.port = str(port)
 
-    def disablebinary(self):
-        logging.debug("Disabling binary protocol (%s:%s)", self.host, self.port)
-        self.__run("disablebinary")
-
-    def disablethrift(self):
-        logging.debug("Disabling thrift (%s:%s)", self.host, self.port)
-        self.__run("disablethrift")
-
-    def drain(self):
-        logging.debug("Performing drain (%s:%s)", self.host, self.port)
-        self.__run("drain")
-
-    def __run(self, *args):
+    def run(self, *args):
         command = ["nodetool", "--host", self.host, "--port", self.port] + list(args)
         retcode = call(*command)
         if retcode != 0:
