Add rack support when adding a node

ccm add --data-center DC1 --rack r1 ....

Author: vroyer

ccmlib/cluster.py

@@ -215,14 +215,15 @@ def version(self):
     def cassandra_version(self):
         return self.version()
 
-    def add(self, node, is_seed, data_center=None):
+    def add(self, node, is_seed, data_center=None, rack=None):
         if node.name in self.nodes:
             raise common.ArgumentError('Cannot create existing node %s' % node.name)
         self.nodes[node.name] = node
         if is_seed:
             self.seeds.append(node)
         self._update_config()
         node.data_center = data_center
+        node.rack = rack
         node.set_log_level(self.__log_level)
 
         for debug_class in self._debug:
@@ -620,17 +621,9 @@ def __update_pids(self, started):
             node._update_pid(p)
 
     def __update_topology_files(self):
-        dcs = [('default', 'dc1')]
         for node in self.nodelist():
-            if node.data_center is not None:
-                dcs.append((node.address(), node.data_center))
-
-        content = ""
-        for k, v in dcs:
-            content = "%s%s=%s:r1\n" % (content, k, v)
-
-        for node in self.nodelist():
-            topology_file = os.path.join(node.get_conf_dir(), 'cassandra-topology.properties')
+            content = "dc=%s\nrack=%s\n" % (node.data_center, node.rack)
+            topology_file = os.path.join(node.get_conf_dir(), 'cassandra-rackdc.properties')
             with open(topology_file, 'w') as f:
                 f.write(content)
 

ccmlib/cmds/cluster_cmds.py

@@ -204,6 +204,7 @@ class ClusterAddCmd(Cmd):
         (['-r', '--remote-debug-port'], {'type': "string", 'dest': "remote_debug_port", 'help': "Remote Debugging Port for the node", 'default': "2000"}),
         (['-n', '--token'], {'type': "string", 'dest': "initial_token", 'help': "Initial token for the node", 'default': None}),
         (['-d', '--data-center'], {'type': "string", 'dest': "data_center", 'help': "Datacenter name this node is part of", 'default': None}),
+        (['-k', '--rack'], {'type': "string", 'dest': "rack", 'help': "Rack name this node is part of", 'default': 'r1'}),
         (['--dse'], {'action': "store_true", 'dest': "dse_node", 'help': "Add node to DSE Cluster", 'default': False}),
     ]
     descr_text = "Add a new node to the current cluster"
@@ -253,7 +254,7 @@ def run(self):
                 node = DseNode(self.name, self.cluster, self.options.bootstrap, self.thrift, self.storage, self.jmx_port, self.remote_debug_port, self.initial_token, binary_interface=self.binary)
             else:
                 node = Node(self.name, self.cluster, self.options.bootstrap, self.thrift, self.storage, self.jmx_port, self.remote_debug_port, self.initial_token, binary_interface=self.binary)
-            self.cluster.add(node, self.options.is_seed, self.options.data_center)
+            self.cluster.add(node, self.options.is_seed, self.options.data_center, self.options.rack)
         except common.ArgumentError as e:
             print_(str(e), file=sys.stderr)
             exit(1)
@@ -867,4 +868,3 @@ def run(self):
         except Exception as e:
             print_(str(e), file=sys.stderr)
             exit(1)
-

ccmlib/node.py

@@ -123,6 +123,7 @@ def __init__(self,
         self.initial_token = initial_token
         self.pid = None
         self.data_center = None
+        self.rack = 'r1'
         self.workloads = []
         self._dse_config_options = {}
         self.__config_options = {}
@@ -190,6 +191,8 @@ def load(path, name, cluster):
                 node.__environment_variables = data['environment_variables']
             if 'data_center' in data:
                 node.data_center = data['data_center']
+            if 'rack' in data:
+                node.rack = data['rack']
             if 'workloads' in data:
                 node.workloads = data['workloads']
             return node
@@ -1542,6 +1545,8 @@ def _update_config(self):
             values['byteman_port'] = self.byteman_port
         if self.data_center:
             values['data_center'] = self.data_center
+        if self.rack:
+            values['rack'] = self.rack
         if self.workloads is not None:
             values['workloads'] = self.workloads
         with open(filename, 'w') as f: