scylla-node: start: do not preserve smp and memory passed via env or cmd_line

If a test wants to preserve memory and/or smp across node restarts,
it should use the methods that were intended for this: set_smp and
set_mem_mb_per_cpu.

Preserving those implicitly when passed to start was not intended.

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>

Author: bhalevy

ccmlib/scylla_node.py

@@ -688,22 +688,23 @@ def start(self, join_ring=True, no_wait=False, verbose=False,
         # Lets search for default overrides in SCYLLA_EXT_OPTS
         env_args = process_opts(os.getenv('SCYLLA_EXT_OPTS', "").split())
 
+        smp = self._smp
+        memory_in_mb = None
+
         # precalculate self._mem_mb_per_cpu if --memory is given in SCYLLA_EXT_OPTS
         # and it wasn't set explicitly by the test
         if not self._mem_mb_set_during_test and '--memory' in env_args:
-            memory = self.parse_size(env_args['--memory'][0])
-            smp = int(env_args['--smp'][0]) if '--smp' in env_args else self._smp
-            self._mem_mb_per_cpu = int((memory / smp) // MB)
+            memory_in_mb = self.parse_size(env_args['--memory'][0]) // MB
 
         cmd_args = process_opts(jvm_args)
 
         # use '--memory' in jmv_args if mem_mb_per_cpu was not set by the test
         if not self._mem_mb_set_during_test and '--memory' in cmd_args:
-            self._memory = self.parse_size(cmd_args['--memory'][0])
+            memory_in_mb = self.parse_size(cmd_args['--memory'][0]) // MB
 
         # use '--smp' in jvm_args if was not set by the test
         if not self._smp_set_during_test and '--smp' in cmd_args:
-            self._smp = int(cmd_args['--smp'][0])
+            smp = int(cmd_args['--smp'][0])
 
         ext_args = env_args
         ext_args.update(cmd_args)
@@ -721,12 +722,12 @@ def start(self, join_ring=True, no_wait=False, verbose=False,
 
         # calculate memory from smp * mem_mb_per_cpu
         # if not given in jvm_args
-        if not self._memory:
-            self._memory = int(self._smp * self._mem_mb_per_cpu * MB)
+        if not memory_in_mb:
+            memory_in_mb = smp * self._mem_mb_per_cpu
 
         assert '--smp' not in args and '--memory' not in args, args
-        args += ['--smp', str(self._smp)]
-        args += ['--memory', f"{int(self._memory // MB)}M"]
+        args += ['--smp', str(smp)]
+        args += ['--memory', f"{memory_in_mb}M"]
 
         if '--developer-mode' not in args:
             args += ['--developer-mode', 'true']