275 Added JMX_PORT env var to client commands

ccmlib/cmds/node_cmds.py

@@ -40,6 +40,7 @@ def node_cmds():
         "nodetool",
         "dsetool",
         "setworkload",
+        "dse",
         "hadoop",
         "hive",
         "pig",
@@ -621,6 +622,22 @@ def run(self):
             print_(str(e), file=sys.stderr)
             exit(1)
 
+class NodeDseCmd(Cmd):
+    def description(self):
+        return "Launch a dse client application connected to this node"
+
+    def get_parser(self):
+        usage = "usage: ccm node_name dse [dse_options]"
+        parser = self._get_default_parser(usage, self.description(), ignore_unknown_options=True)
+        return parser
+
+    def validate(self, parser, options, args):
+        Cmd.validate(self, parser, options, args, node_name=True, load_cluster=True)
+        self.dse_options = args[1:] + parser.get_ignored()
+
+    def run(self):
+        self.node.dse(self.dse_options)
+
 class NodeHadoopCmd(Cmd):
     def description(self):
         return "Launch a hadoop session connected to this node"
@@ -648,7 +665,7 @@ def get_parser(self):
 
     def validate(self, parser, options, args):
         Cmd.validate(self, parser, options, args, node_name=True, load_cluster=True)
-        self.hive_options = parser.get_ignored() + args[1:]
+        self.hive_options = args[1:] + parser.get_ignored()
 
     def run(self):
         self.node.hive(self.hive_options)

ccmlib/dse_node.py

@@ -197,8 +197,18 @@ def dsetool(self, cmd):
         p = subprocess.Popen(args, env=env)
         p.wait()
 
+    def dse(self, dse_options=[]):
+        env = common.make_dse_env(self.get_install_dir(), self.get_path())
+        env['JMX_PORT'] = self.jmx_port
+        dse = common.join_bin(self.get_install_dir(), 'bin', 'dse')
+        args = [dse]
+        args += dse_options
+        p = subprocess.Popen(args, env=env)
+        p.wait()
+
     def hadoop(self, hadoop_options=[]):
         env = common.make_dse_env(self.get_install_dir(), self.get_path())
+        env['JMX_PORT'] = self.jmx_port
         dse = common.join_bin(self.get_install_dir(), 'bin', 'dse')
         args = [dse, 'hadoop']
         args += hadoop_options
@@ -207,6 +217,7 @@ def hadoop(self, hadoop_options=[]):
 
     def hive(self, hive_options=[]):
         env = common.make_dse_env(self.get_install_dir(), self.get_path())
+        env['JMX_PORT'] = self.jmx_port
         dse = common.join_bin(self.get_install_dir(), 'bin', 'dse')
         args = [dse, 'hive']
         args += hive_options
@@ -215,6 +226,7 @@ def hive(self, hive_options=[]):
 
     def pig(self, pig_options=[]):
         env = common.make_dse_env(self.get_install_dir(), self.get_path())
+        env['JMX_PORT'] = self.jmx_port
         dse = common.join_bin(self.get_install_dir(), 'bin', 'dse')
         args = [dse, 'pig']
         args += pig_options
@@ -223,6 +235,7 @@ def pig(self, pig_options=[]):
 
     def sqoop(self, sqoop_options=[]):
         env = common.make_dse_env(self.get_install_dir(), self.get_path())
+        env['JMX_PORT'] = self.jmx_port
         dse = common.join_bin(self.get_install_dir(), 'bin', 'dse')
         args = [dse, 'sqoop']
         args += sqoop_options
@@ -231,6 +244,7 @@ def sqoop(self, sqoop_options=[]):
 
     def spark(self, spark_options=[]):
         env = common.make_dse_env(self.get_install_dir(), self.get_path())
+        env['JMX_PORT'] = self.jmx_port
         dse = common.join_bin(self.get_install_dir(), 'bin', 'dse')
         args = [dse, 'spark']
         args += spark_options

ccmlib/node.py

@@ -600,6 +600,9 @@ def nodetool(self, cmd, capture_output=False):
     def dsetool(self, cmd):
         raise common.ArgumentError('Cassandra nodes do not support dsetool')
 
+    def dse(self, dse_options=[]):
+        raise common.ArgumentError('Cassandra nodes do not support dse')
+
     def hadoop(self, hadoop_options=[]):
         raise common.ArgumentError('Cassandra nodes do not support hadoop')