Merge branch 'next' into fix_463

scylladb · Jun 1, 2023 · 024d4ce · 024d4ce
2 parents 9ed6793 + 8979dfa
commit 024d4ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/ccmlib/cmds/node_cmds.py b/ccmlib/cmds/node_cmds.py
@@ -929,13 +929,5 @@ def validate(self, parser, options, args):
         Cmd.validate(self, parser, options, args, node_name=True, load_cluster=True)
 
     def run(self):
-        version_from_nodetool = self.node.nodetool('version')[0].strip()
         version_from_build = common.get_version_from_build(self.node.get_install_dir())
-
-        if version_from_nodetool and (version_from_nodetool != version_from_build):
-            print('nodetool reports Cassandra version {ntv}; '
-                   'version from build.xml is {bv}'.format(ntv=version_from_nodetool,
-                                                           bv=version_from_build),
-                   file=sys.stderr)
-
         print(version_from_build)
diff --git a/ccmlib/scylla_node.py b/ccmlib/scylla_node.py
@@ -677,7 +677,9 @@ def process_opts(opts):
                      self.name, ip_addr, jmx_port)
             raise NodeError(e_msg, scylla_process)
 
-        self.is_running()
+        self._update_pid(scylla_process)
+        wait_for(func=lambda: self.is_running(), timeout=10, step=0.01, text="Waiting for scylla process to be running")
+
         if self.scylla_manager and self.scylla_manager.is_agent_available:
             self.start_scylla_manager_agent()
         return scylla_process