Skip to content

Commit f6fb104

Browse files
mikliapkovponomaryov
authored andcommitted
fix(manager): retrieve scylla_version from node object property
Since _build_ks_name method is used when Scylla cluster is deployed, there is no need to get scylla_version from configuration. Instead of this, it can be retrieved directly from Scylla node using node object property `scylla_version`. It makes the method universal - supports both basic and cloud created clusters. The previous approach with getting version from config does not work for Cloud cluster (Siren clusters).
1 parent 950da82 commit f6fb104

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mgmt_cli_test.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -510,14 +510,14 @@ def _build_ks_name(self, backup_size: int, cs_cmd_params: dict) -> str:
510510
The name should include all the parameters important for c-s read verification and can be used to
511511
recreate such a command based on ks_name.
512512
"""
513-
_scylla_version = re.sub(r"[.]", "_", self.params.get_version_based_on_conf()[0].split("-")[0])
513+
scylla_version = re.sub(r"[.]", "_", self.db_cluster.nodes[0].scylla_version)
514514
ks_name = self.ks_name_template.format(
515515
size=backup_size,
516516
compaction=self._abbreviate_compaction_strategy_name(cs_cmd_params.get("compaction")),
517517
cl=cs_cmd_params.get("cl").lower(),
518518
col_size=cs_cmd_params.get("col_size"),
519519
col_n=cs_cmd_params.get("col_n"),
520-
scylla_version=_scylla_version,
520+
scylla_version=scylla_version,
521521
)
522522
return ks_name
523523

0 commit comments

Comments
 (0)