Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions configurations/hytrust-kmip-ear.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@

scylla_encryption_options: "{ 'cipher_algorithm' : 'AES/ECB/PKCS5Padding', 'secret_key_strength' : 128, 'key_provider': 'KmipKeyProviderFactory', 'kmip_host': 'kmip_test'}"

# enable system_info_encryption, config kmip_hosts
append_scylla_yaml:
system_key_directory: '/etc/encrypt_conf/'
system_info_encryption:
enabled: true # system_info_encryption
key_provider: 'LocalFileSystemKeyProviderFactory' # system_info_encryption
enabled: true
key_provider: 'LocalFileSystemKeyProviderFactory'
secret_key_file: '/etc/scylla/encrypt_conf/system_info_encryption_keyfile'
kmip_hosts:
kmip_test:
hosts: '52.21.171.245'
certificate: '/etc/encrypt_conf/hytrust-kmip-scylla.pem'
keyfile: '/etc/encrypt_conf/hytrust-kmip-scylla.pem'
truststore: '/etc/encrypt_conf/hytrust-kmip-cacert.pem'
priority_string: 'SECURE128:+RSA:-VERS-TLS1.0:-ECDHE-ECDSA'
hosts: '' # host is dinamically added by `proposed_scylla_yaml` function
certificate: '/etc/encrypt_conf/scylla_node.pem'
keyfile: '/etc/encrypt_conf/scylla_node.key'
truststore: '/etc/encrypt_conf/trust.pem'
priority_string: 'NORMAL:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA256:-VERS-TLS-ALL:+VERS-TLS1.2'
max_command_retries: 3
key_cache_expiry: 1200
key_cache_refresh: 300
52 changes: 52 additions & 0 deletions data_dir/encrypt_conf/scylla_node.key
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this file is being added into the source ?

Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
-----BEGIN PRIVATE KEY-----
MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCpWME5PsBWdNdO
ovSBboq9OEZoDmosk5K5pYXtvGkigvpDoWudbkAh6hcIDMsRE2m4zFq49ArqPJUN
TRktliKMDlYoqOOQQ60fvRqFMWyHFYzoblfFKlT4hnCjFkZ9P8u1+6I145rNUKK4
widuLBl+uQyloaGOBokPU8km2P0oiH7g5nNU/xrTQRRsDiBJSNgZhrBA1IijBXLr
3FK9/gQlAbRIad2Pfo30IJhYInknN+FafkOF8Zcqa0+AlIAVFjillqZ4WGhRqu1d
DcElFuDWg5XSh/YAEQ8DrETAwOVNMBmLiYd5vmAkKEDYZpULa/8QJ8R4XBaYh9s3
i3cYEb1+nK5H8PmRyVC+x6PkTLybPpJ+cUAw871AedLL+0Ffj0K32EU2zQwQekoJ
pwKr3/5EO7pjoxjjIWWIgoJmBdNXa3V+OLKNghfwA6ilkQdBUpqGgdg6TkYFcPss
I+z+Ksi+MqgFbyfTIHCbdfYmKoXSvhmB8//Wc/xng0vvl+VKX51AU0rcaprYGRym
Mj7RT/B0tiDpcgi0ElrXooSFsXSalYDJqdIgo0SpYcdS1+lyjrHNJGUhJwNT51XR
+JWAMLF7P0lEVarJ/Q04vUDKzOTm5wU9UDNl4ICr8qpXogYUGqGyhz9hZBMImmcw
+DoYfa4GiHqIIclZOhY5qG/cIp7l1QIDAQABAoICAAb73s4cUSTPoUCANmqvEyAu
FbM9YvIPLPYkhiMxiblvYuBOpChEL3dmlsgRdP9xiELjhJtLjzatRG1dwFvRrP+P
KMz4+BePPvDH5PPYv7PLdvnv8QUz03jDXJpRNRt9uco5xC0KQ6xTdr59XVBtF6kS
+xtKkOXRTa4445sLSFd3V5oxTtDSy3mqXav+IiU7kJPu6s5lpXPpqd1hwvTMaMHY
8eUpnoZILxUCEh5SX6I3Kv9HJUQ9HCGW9tqj5StZdQEZNyjP5o91p9/WTSCZMrEO
EKvzyPikO3UIkfZMDjjScr8/Lvvdlsvu8AusoVls/QIezbqz+4eTVL5T7VesBZ9F
rMmZmp/LpWkfdz8k1r9DtlQfwT2OmYXDZ1+hRQekvNTswsnPRRiUIRMLdQ53HH1R
/tHIcP/PJAVKAPHa+Aes05iRT2UaEN2kASOw+v4osIENkzZ1Or3E1iUFkPnnPbTi
RVtC0yBFH6reCrbiJhzeVq5F3iAUhGFyYqNXrY7CU5yjCy8ft5K2MYfkYwiUtkRu
Xxpjrb3WLVIqI3KXJJhrluX7hWFUheL7zGqWbACMCPVTj8Fa3p3uUeBlQJF9m009
mgkogtKo/iOFpQma0ixywlOo1b0td5Eefq+HJNjggjIG13A5mMrT/lErWGMDrF2e
kFLbhk85sXnmTlWlyczxAoIBAQDR6LoRszb048wey12pHDB0cl3VUeIFbmRDTgMc
bi0HNUnELjEzT88ESOL559s5l1o68j4b/51SPne1Ds5+SRvEpVCiddJEzLvlSDuj
vPwZX5mc3i1BaCxvZOhROXoClRp1dp+Ms9H/uvZggGT8SZebAS2B6lKaHtJU/lN4
RRWiwkcF2QXXj4NJ6R2n/fG2OOThIkSWXUVx80TIAKO4EgsYCH4d/A4mUfnz/kJ4
x6RPkP56FmXKlXUji5j8xRT8FViEob01Mt41uRU/s4WHvzsYWwELTlB1NtbvZhGk
JHKittFZucjnSaBtNp7MeuTiW4mwcfD3PHY7SLncbc+jqBnFAoIBAQDOh/YSl0cI
H0z8NdY32PRG7oi+d/OvViSPorxy4NhVkebiCOb0IRkEwRTRm+xpB1+Y6PCsgmj1
ykWhH/gOPYVtV0GnAYRgpoQk7toDxK4/ugOwvPRboTRUu/PcXNoR1njnoLBjF2Jz
baLWjyt9wG63QOf3AdedrP7ikVv4I0E6UnDYlEau00/n+IoWRyC+UP3z3qDOTU3o
uxU2ql0xs33IsYWXsGNvH0wHMPUDaZrn3k3w755vuw+TDUlVhA2DMsy12E6NRyYG
MX522Emd61Ki5xmEDtRgHLbc4HxIDsMVWzBDnkNzYmJZE/NcNrO7NNAnxKM1thbU
Za3ZxHBdZCzRAoIBAEqoGE2lTP2Ka5XkRLqZ4Q35gzAUwGuoGJbrjyW0deVjaYoR
18PlNb7TYY76jLkOALSIZdi1cDHJL/BAhObbf7nQBj7R4ug/XPCuYS/aTluD6fGl
/7iMoYk4/XuuEpwKhe+TMinr5tuqlmg6IjCsx/QEVjgnrBtOrQY3sl5LS+eoa3RD
/NTvIQXPmJGgOzDRSW5dLsHACKv/ls3/lDsqh7GTi6+Eb0/nxhumqeOlNeZqrmej
wa5su83Zn57/RXhm6yW5FL9wCSJYYptWcT6XoCAIdfWcc/dMeuOIjOuxXuhKV2kv
L6o7QIi3bYFSkEeFwRH1ZHu6kF6Dfj9M+xW8+vUCggEAKYAWiTvOsSog/RkQV56H
z20FG0jdNaFYrWgk9+yIbAFqZIcnaWzxKwxlU41CXwR1SDOekPuPfbxMa4kR/kKM
eiErdxSN9iHfsdAxDMrLvNBzB2OgsnzdGB3AbcpWo3j2SIz4hKDhTpJ8QyL3uUge
t0Iamn7LRcrKWNqeoWjsJX0FYe/BmEWr68/8Z2eZg8Sgkw1sQKg1/IsDQz3Ohjss
DlTlpEp0YJLoYxWKVko1L1xzSvPLYWY0RfdIgh+L244spmm1txvR3zK418a0XEA6
FbPcY7XbJQkAEbgmIRCeUL9HHn9BzIC7hGzG3QO87+Q345XWuedCBSH9YiHf9lQ3
0QKCAQEA0Pkqk2epcmAL4J5pDGknjG7kMEipavsh/dviy2wq/ZhgeOZ2HzucT3Ee
koSp74HW4j30kICiaBzY2GxaIw4xDnMHYtmmQTMQ2UuRJVB9eTL02t4UJVznidf4
RnaEHtPyIkf0t+AK60oi1dujE87crJLpfLLOaYIJCdeZx3Npmuf1riv5k5LPytuy
/jvXl3wZns9NDZmUqr4YLED5nn2a1FDBy/MuXP18xlQ7eGcjnObLkG+pIdyQigtM
lXw3X7dEsca6Csa1UgTuppx5Hkh8viTteeE5hfr3NrX/gpfr3nTaEwHzwY6+srDj
ZmghOfEJCwu7k/uxpRyFyiUAmS4UFQ==
-----END PRIVATE KEY-----
35 changes: 35 additions & 0 deletions data_dir/encrypt_conf/scylla_node.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
-----BEGIN CERTIFICATE-----
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
fR8=
-----END CERTIFICATE-----
33 changes: 33 additions & 0 deletions data_dir/encrypt_conf/trust.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
-----BEGIN CERTIFICATE-----
MIIFtTCCA52gAwIBAgIUJ7H59wPlDRgAcPA+MFLZTNPVXW8wDQYJKoZIhvcNAQEL
BQAwajELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0V4YW1wbGUxEDAOBgNVBAcMB0V4
YW1wbGUxEzARBgNVBAoMCkV4YW1wbGVPcmcxCzAJBgNVBAsMAkNBMRUwEwYDVQQD
DAxTY3lsbGFUZXN0Q0EwHhcNMjUwODI3MDkyMDA5WhcNMzUwODI1MDkyMDA5WjBq
MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHRXhhbXBsZTEQMA4GA1UEBwwHRXhhbXBs
ZTETMBEGA1UECgwKRXhhbXBsZU9yZzELMAkGA1UECwwCQ0ExFTATBgNVBAMMDFNj
eWxsYVRlc3RDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALriFT5J
DGudgVYadiIMDUM2/mizEn8EAHNr74JU0RFBFNYYYdn8mRYGIJ9Xd9otaWERfIvy
+qDaYPde3pBjw+R6F6JRGGTyOJQluIGGKFDT/zfNZCGN+Gkq5ONWQndhOvAz/YkL
TYYHvmVnOXXLu6H32qoPVTqTFnPubNrnjQ8gtFSTgFqhtDVkgi5LjAx6USdVoSXL
39vTHlS5zyB+EMiDW9uU9P/8eYHOjHsyLL0jkdYvnepclxyeqeeTQBJP59nOHOhG
baNS08Lrl+kMsXjoc7+oP76/QId9FNg3rjcOx+Rv5GXGp4z0CuqDV9FnzRZZL6xI
woG3I+igtLBpJjfYZZIkVOGjTzzsF21bx5sMNbdOpowPFxhVUaKnLGmgcsyCrKyb
XmEXKCPIBg3CUJ8rAwwYAb84nPq3UkS9UqyXcVBDZD2iPsySZjvbybW7ElRz9mRG
ai3dDJYO/BIvOHDakzMvWbWbUIQ00TMTZtXOSLoNYRSIE3TIYmvz5ZkgRHdqRlu0
QHrfFm30IDzUtnjjhJYY2cqK6bexmmI5Vo/S3blJGFTlBlpKnIQVdwJ5TzGsEaOX
OkjlKdHDU+JYv8E7g3juB3Zasp4Bb8P48tz8wDMrgRYAmvRacXhp8k+h+udt+okZ
j2vfSBJmHIlOP7DQN3G8b0Q+qVR8KUhQH5HxAgMBAAGjUzBRMB0GA1UdDgQWBBSg
KgYjLQDBFtDGiq52SzH5jPFAUTAfBgNVHSMEGDAWgBSgKgYjLQDBFtDGiq52SzH5
jPFAUTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQB34x0uXEJo
kkbEnzz8ur1gx1o71ABllQE4Rvf+u74qP5SNVGsyy61tX7I2r1+qpmldikeX7Wz/
XCw3pyoyRAte9GFIGpyrhv1DKk0qZJOEYD0p8yGx2TRvNUjv0wgz3gA9QISGha2D
AUzDoRkHk1kJofRzK2Evwbr1/VZEhPh+u3F6TDVMeEpDyAwBqQPOfFjjg3AdGGoi
DcrQMr6RhdhJ0dGJ9Mfwv64LRGEocOhIKX+H59Ba2IRZYyHvVZq5h4b6tW/s+euO
EXVrQJ3CRMHd3iCY4s+qS79s+K9LnODuFStwYqhdkrybf2RXQahfD2Dq0kHJ8wvV
KUT6FA05fDCzKa6ribNTMaDOtqku07LSPSzLpi6jw3k6ViQHNlYqwszHGKSL9coX
IT/4j87GaeSzaUWPsNRn4UTavCjHdHoXmoPmvgoM2er34pEvlf/Swv18ymG+Xm1x
6iWJ0THAiHmh4iZLEGNrPH1XQ5AfLPmhf7yzdbu1zPMHDgDOUA5hjwlL3wwgUl41
lja6okD+fjKXW+4KApLCkqU74GZqw0TonZLE+19Dl7KEsyBeZopcV82IgAF4HLl6
uPAId5X8py5rqr+e0hVn8mm2YUaxnKDteRfOlSPjA15GEPILt1GaIhACiYs8WQgM
qPPkNkNqG/+Zs0A24Glg54yo1o3Ij7+oww==
-----END CERTIFICATE-----
10 changes: 5 additions & 5 deletions defaults/manager_persistent_snapshots.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ aws:
number_of_nodes: 3
cluster_id: "947e78ed-e988-41d6-92b5-faaf8ad7bbc0"
eu-west-1:
sm_20241203091417UTC:
keyspace_name: "10gb_sizetiered_2024_2"
scylla_version: "2024.2.0"
sm_20250910103721UTC:
keyspace_name: "10gb_sizetiered_2025_3"
scylla_version: "2025.3"
scylla_product: "enterprise"
number_of_nodes: 3
cluster_id: "5c17bec0-ee5c-4fc3-93cd-1e5916a8da57"
number_of_nodes: 6
cluster_id: "31f826ae-ac9a-4215-87e5-87bfa9576bcd"
sm_20241203091651UTC:
keyspace_name: "10gb_sizetiered_6_1"
scylla_version: "6.1.4"
Expand Down
31 changes: 29 additions & 2 deletions sdcm/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,13 @@ def proposed_scylla_yaml(self) -> ScyllaYaml:
for kms_host_name, kms_host_data in append_scylla_yaml.get("kms_hosts", {}).items():
if kms_host_data["aws_region"] == "auto":
append_scylla_yaml["kms_hosts"][kms_host_name]["aws_region"] = self.vm_region
if "kmip_hosts" in append_scylla_yaml:
monitor_ip = self.test_config.tester_obj().monitors.nodes[0].private_ip_address
for kmip_host_name in append_scylla_yaml["kmip_hosts"]:
# Take first KMIP host and update with monitor node IP
append_scylla_yaml["kmip_hosts"][kmip_host_name]["hosts"] = f"{monitor_ip}:5696"
break # Only update the first one

scylla_yml.update(append_scylla_yaml)
if self.parent_cluster.node_type == "oracle-db":
scylla_yml.experimental_features = [] # Oracle Scylla does not use experimental features
Expand Down Expand Up @@ -4103,6 +4110,7 @@ def node_setup(_node: BaseNode, task_queue: queue.Queue):
@raise_event_on_failure
def node_startup(_node: BaseNode, task_queue: queue.Queue):
exception_details = None
node.remoter
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

???

try:
cl_inst.node_startup(_node, **setup_kwargs)
except Exception as ex: # noqa: BLE001
Expand Down Expand Up @@ -4152,8 +4160,6 @@ def critical_node_setup_events():

add_severity_limit_rules([f'{e["rule_pattern"]}={e["default_severity"]}' for e in critical_events])

start_time = time.perf_counter()

if isinstance(cl_inst, BaseScyllaCluster):
# Update installed scylla before node setup, scylla server will be start at the end of node_setup
cl_inst.update_db_binary(node_list, start_service=False)
Expand Down Expand Up @@ -5040,6 +5046,18 @@ def node_startup(self, node: BaseNode, verbose: bool = False, timeout: int = 360
if not self.test_config.REUSE_CLUSTER:
node.log.debug('io.conf before reboot: %s', node.remoter.sudo(
f'cat {node.add_install_prefix("/etc/scylla.d/io.conf")}').stdout)

if self.params.get('kmip_host'):
text = "Waiting for PyKMIP server to be up"
wait.wait_for(
func=lambda: node.remoter.run(
f"nc -z {self.scylla_manager_node.private_ip_address} 5696").exit_status == 0,
step=10,
text=text,
timeout=300,
throw_exc=True,
)

node.start_scylla_server(verify_up=False)
if self.params.get("jmx_heap_memory"):
node.restart_scylla_jmx()
Expand Down Expand Up @@ -5731,6 +5749,15 @@ def node_setup(self, node, **kwargs):
node.start_alert_manager_thread() # remove when start task threads will be started after node setup
if self.params.get("use_mgmt"):
self.install_scylla_manager(node)
self.install_pykmip(node)

def install_pykmip(self, node):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one doesn't just install, but also run it

I'm not sure it is wise to set it up on the monitor node, I would suggest putting it on the test node (i.e. the SCT runner)

we already have one example of docker-compose based setup running (kafka-stack-docker-compose)
I would suggest align it with that implementation

install_encryption_at_rest_files(node.remoter)
node.remoter.run("mkdir -p /home/ubuntu/pykmip/data/logs")
node.remoter.run("cd /home/ubuntu/pykmip && "
"curl -O https://raw.githubusercontent.com/jsmolar/PyKMIP/master/docker-compose.yaml")
node.remoter.sudo("chmod 777 /home/ubuntu/pykmip/data/logs")
node.remoter.run("cd /home/ubuntu/pykmip && docker compose up -d --scale pykmip=10")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

10 ? do we really need that many instances ?


def node_startup(self, node, **kwargs):
pass
Expand Down
5 changes: 3 additions & 2 deletions sdcm/nemesis.py
Original file line number Diff line number Diff line change
Expand Up @@ -3009,7 +3009,7 @@ def choose_snapshot(snapshots_dict, region: str):
all_snapshots_per_region = snapshot_groups_by_size[chosen_snapshot_size]["snapshots"][region]

if self.cluster.nodes[0].is_enterprise:
snapshot_tag = random.choice(list(all_snapshots_per_region.keys()))
snapshot_tag = "sm_20250910103721UTC"
else:
oss_snapshots = [snapshot_key for snapshot_key, snapshot_value in all_snapshots_per_region.items() if
snapshot_value['scylla_product'] == "oss"]
Expand Down Expand Up @@ -3120,7 +3120,8 @@ def _restore_schema(locations: list, cluster_id: str, tag: str) -> None:
try:
restore_task = mgr_cluster.create_restore_task(restore_data=True,
location_list=location_list,
snapshot_tag=chosen_snapshot_tag)
snapshot_tag=chosen_snapshot_tag,
dc_mapping="eu-west-1=eu-west-1")
restore_task.wait_and_get_final_status(step=30, timeout=chosen_snapshot_info["expected_timeout"])
assert restore_task.status == TaskStatus.DONE, f'Data restoration of {chosen_snapshot_tag} has failed!'

Expand Down
2 changes: 1 addition & 1 deletion sdcm/utils/loader_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def run_prepare_write_cmd(self):
if keyspace_num > 1 and self.params.get('round_robin'):
self.log.debug("Using round_robin for multiple Keyspaces...")
for i in range(1, keyspace_num + 1):
keyspace_name = self._get_keyspace_name(i)
keyspace_name = "10gb_sizetiered_2025_3"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this for testing only, I guess ?, please remove (or put on it's own commit)

self._run_all_stress_cmds(
write_queue,
params={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ stress_read_cmd: ["cassandra-stress read cl=ONE duration=360m -schema 'replicati
run_fullscan: ['{"mode": "table_and_aggregate", "ks_cf": "keyspace1.standard1", "interval": 5}']
n_db_nodes: 6
n_loaders: 2
instance_type_monitor: 'm6i.xlarge'

instance_type_db: 'i4i.2xlarge'
instance_type_db: 'i4i.xlarge'

nemesis_class_name: 'SisyphusMonkey'
nemesis_selector: 'limited'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ test_duration: 720
round_robin: true

# 1GB dataset
prepare_write_cmd: ["cassandra-stress write cl=ONE n=1048576 -schema 'replication(strategy=NetworkTopologyStrategy,replication_factor=3) compaction(strategy=LeveledCompactionStrategy)' -mode cql3 native -rate threads=50 -col 'size=FIXED(1024) n=FIXED(1)' -pop seq=1..1048576"]
prepare_write_cmd: ["cassandra-stress write cl=ONE n=1048576 -schema 'keyspace=10gb_sizetiered_2025_3 replication(strategy=NetworkTopologyStrategy,replication_factor=3) compaction(strategy=LeveledCompactionStrategy)' -mode cql3 native -rate threads=50 -col 'size=FIXED(1024) n=FIXED(1)' -pop seq=1..1048576"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please avoid hardcoding the keyspace name in yaml test-case which is supposed to be used across several tests.
Also, there some issues with current implementation:

  • C-S operation will write 1Gb of data only, not 10Gb as mentioned in keyspace name
  • consecutive C-S read would fail as it doesn't expect 10gb_sizetiered_2025_3 keyspace

If your idea was to prepare some backup snapshot for later utilization, please, take a look at the test cases yamls from here https://github.com/scylladb/scylla-cluster-tests/tree/master/test-cases/manager/prepare_snapshot

stress_read_cmd: ["cassandra-stress read cl=ONE n=1048576 -schema 'replication(strategy=NetworkTopologyStrategy,replication_factor=3) compaction(strategy=LeveledCompactionStrategy)' -mode cql3 native -rate threads=50 -col 'size=FIXED(1024) n=FIXED(1)' -pop seq=1..1048576"]

instance_type_db: 'i4i.xlarge'
Expand Down
Loading