From 26b83cfc79c7a5fd231b590d4dc93efd0e8583d8 Mon Sep 17 00:00:00 2001 From: Jaydeepkumar Chovatia Date: Sun, 6 Oct 2024 21:55:03 -0700 Subject: [PATCH 1/3] Fix test failures due to cep-37 --- cqlsh_tests/test_cqlsh.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py index 3619aa7619..1e35de705f 100644 --- a/cqlsh_tests/test_cqlsh.py +++ b/cqlsh_tests/test_cqlsh.py @@ -1201,7 +1201,9 @@ def get_test_table_output(self, has_val=True, has_val_idx=True): AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair = 'BLOCKING' - AND speculative_retry = '99p'; + AND speculative_retry = '99p' + AND repair_full = {'enabled': 'true'} + AND repair_incremental = {'enabled': 'true'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): create_table += """ @@ -1222,7 +1224,9 @@ def get_test_table_output(self, has_val=True, has_val_idx=True): AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair = 'BLOCKING' - AND speculative_retry = '99p'; + AND speculative_retry = '99p' + AND repair_full = {'enabled': 'true'} + AND repair_incremental = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('4.0'): create_table += """ @@ -1334,7 +1338,9 @@ def get_users_table_output(self): AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair = 'BLOCKING' - AND speculative_retry = '99p'; + AND speculative_retry = '99p' + AND repair_full = {'enabled': 'true'} + AND repair_incremental = {'enabled': 'true'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): create_table = """ @@ -1359,7 +1365,9 @@ def get_users_table_output(self): AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair = 'BLOCKING' - AND speculative_retry = '99p'; + AND speculative_retry = '99p' + AND repair_full = {'enabled': 'true'} + AND repair_incremental = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('4.0'): create_table = """ @@ -1383,7 +1391,9 @@ def get_users_table_output(self): AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair = 'BLOCKING' - AND speculative_retry = '99p'; + AND speculative_retry = '99p' + AND repair_full = {'enabled': 'true'} + AND repair_incremental = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('3.9'): create_table = """ @@ -1405,7 +1415,9 @@ def get_users_table_output(self): AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair_chance = 0.0 - AND speculative_retry = '99PERCENTILE'; + AND speculative_retry = '99p' + AND repair_full = {'enabled': 'true'} + AND repair_incremental = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('3.0'): create_table = """ @@ -1497,7 +1509,9 @@ def get_users_by_state_mv_output(self): AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair = 'BLOCKING' - AND speculative_retry = '99p'; + AND speculative_retry = '99p' + AND repair_full = {'enabled': 'true'} + AND repair_incremental = {'enabled': 'true'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): return """ @@ -1522,7 +1536,9 @@ def get_users_by_state_mv_output(self): AND memtable_flush_period_in_ms = 0 AND min_index_interval = 128 AND read_repair = 'BLOCKING' - AND speculative_retry = '99p'; + AND speculative_retry = '99p' + AND repair_full = {'enabled': 'true'} + AND repair_incremental = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('4.0'): return """ From c22bf05bcc9d22463d335600aedc194e5885eca1 Mon Sep 17 00:00:00 2001 From: Jaydeepkumar Chovatia Date: Fri, 6 Dec 2024 16:57:58 -0800 Subject: [PATCH 2/3] Support for Preview Repair --- cqlsh_tests/test_cqlsh.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py index 1e35de705f..607e972dec 100644 --- a/cqlsh_tests/test_cqlsh.py +++ b/cqlsh_tests/test_cqlsh.py @@ -1203,7 +1203,8 @@ def get_test_table_output(self, has_val=True, has_val_idx=True): AND read_repair = 'BLOCKING' AND speculative_retry = '99p' AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'}; + AND repair_incremental = {'enabled': 'true'} + AND repair_preview_repaired = {'enabled': 'true'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): create_table += """ @@ -1226,7 +1227,8 @@ def get_test_table_output(self, has_val=True, has_val_idx=True): AND read_repair = 'BLOCKING' AND speculative_retry = '99p' AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'}; + AND repair_incremental = {'enabled': 'true'} + AND repair_preview_repaired = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('4.0'): create_table += """ @@ -1340,7 +1342,8 @@ def get_users_table_output(self): AND read_repair = 'BLOCKING' AND speculative_retry = '99p' AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'}; + AND repair_incremental = {'enabled': 'true'} + AND repair_preview_repaired = {'enabled': 'true'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): create_table = """ @@ -1367,7 +1370,8 @@ def get_users_table_output(self): AND read_repair = 'BLOCKING' AND speculative_retry = '99p' AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'}; + AND repair_incremental = {'enabled': 'true'} + AND repair_preview_repaired = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('4.0'): create_table = """ @@ -1393,7 +1397,8 @@ def get_users_table_output(self): AND read_repair = 'BLOCKING' AND speculative_retry = '99p' AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'}; + AND repair_incremental = {'enabled': 'true'} + AND repair_preview_repaired = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('3.9'): create_table = """ @@ -1417,7 +1422,8 @@ def get_users_table_output(self): AND read_repair_chance = 0.0 AND speculative_retry = '99p' AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'}; + AND repair_incremental = {'enabled': 'true'} + AND repair_preview_repaired = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('3.0'): create_table = """ @@ -1511,7 +1517,8 @@ def get_users_by_state_mv_output(self): AND read_repair = 'BLOCKING' AND speculative_retry = '99p' AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'}; + AND repair_incremental = {'enabled': 'true'} + AND repair_preview_repaired = {'enabled': 'true'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): return """ @@ -1538,7 +1545,8 @@ def get_users_by_state_mv_output(self): AND read_repair = 'BLOCKING' AND speculative_retry = '99p' AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'}; + AND repair_incremental = {'enabled': 'true'} + AND repair_preview_repaired = {'enabled': 'true'}; """ elif self.cluster.version() >= LooseVersion('4.0'): return """ From 7c90ec14d6aa599e64fecbaf2c34b7747cd54336 Mon Sep 17 00:00:00 2001 From: Jaydeepkumar Chovatia Date: Thu, 12 Dec 2024 11:49:36 -0800 Subject: [PATCH 3/3] Adjust as per the new table-property format --- cqlsh_tests/test_cqlsh.py | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/cqlsh_tests/test_cqlsh.py b/cqlsh_tests/test_cqlsh.py index 607e972dec..70a462945e 100644 --- a/cqlsh_tests/test_cqlsh.py +++ b/cqlsh_tests/test_cqlsh.py @@ -1202,9 +1202,7 @@ def get_test_table_output(self, has_val=True, has_val_idx=True): AND min_index_interval = 128 AND read_repair = 'BLOCKING' AND speculative_retry = '99p' - AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'} - AND repair_preview_repaired = {'enabled': 'true'}; + AND auto_repair = {'full_enabled': 'true', 'incremental_enabled': 'true', 'preview_repaired_enabled': 'true', 'priority': '0'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): create_table += """ @@ -1226,9 +1224,7 @@ def get_test_table_output(self, has_val=True, has_val_idx=True): AND min_index_interval = 128 AND read_repair = 'BLOCKING' AND speculative_retry = '99p' - AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'} - AND repair_preview_repaired = {'enabled': 'true'}; + AND auto_repair = {'full_enabled': 'true', 'incremental_enabled': 'true', 'preview_repaired_enabled': 'true', 'priority': '0'}; """ elif self.cluster.version() >= LooseVersion('4.0'): create_table += """ @@ -1341,9 +1337,7 @@ def get_users_table_output(self): AND min_index_interval = 128 AND read_repair = 'BLOCKING' AND speculative_retry = '99p' - AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'} - AND repair_preview_repaired = {'enabled': 'true'}; + AND auto_repair = {'full_enabled': 'true', 'incremental_enabled': 'true', 'preview_repaired_enabled': 'true', 'priority': '0'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): create_table = """ @@ -1369,9 +1363,7 @@ def get_users_table_output(self): AND min_index_interval = 128 AND read_repair = 'BLOCKING' AND speculative_retry = '99p' - AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'} - AND repair_preview_repaired = {'enabled': 'true'}; + AND auto_repair = {'full_enabled': 'true', 'incremental_enabled': 'true', 'preview_repaired_enabled': 'true', 'priority': '0'}; """ elif self.cluster.version() >= LooseVersion('4.0'): create_table = """ @@ -1396,9 +1388,7 @@ def get_users_table_output(self): AND min_index_interval = 128 AND read_repair = 'BLOCKING' AND speculative_retry = '99p' - AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'} - AND repair_preview_repaired = {'enabled': 'true'}; + AND auto_repair = {'full_enabled': 'true', 'incremental_enabled': 'true', 'preview_repaired_enabled': 'true', 'priority': '0'}; """ elif self.cluster.version() >= LooseVersion('3.9'): create_table = """ @@ -1421,9 +1411,7 @@ def get_users_table_output(self): AND min_index_interval = 128 AND read_repair_chance = 0.0 AND speculative_retry = '99p' - AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'} - AND repair_preview_repaired = {'enabled': 'true'}; + AND auto_repair = {'full_enabled': 'true', 'incremental_enabled': 'true', 'preview_repaired_enabled': 'true', 'priority': '0'}; """ elif self.cluster.version() >= LooseVersion('3.0'): create_table = """ @@ -1516,9 +1504,7 @@ def get_users_by_state_mv_output(self): AND min_index_interval = 128 AND read_repair = 'BLOCKING' AND speculative_retry = '99p' - AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'} - AND repair_preview_repaired = {'enabled': 'true'}; + AND auto_repair = {'full_enabled': 'true', 'incremental_enabled': 'true', 'preview_repaired_enabled': 'true', 'priority': '0'}; """ % self.get_compaction() elif self.cluster.version() >= LooseVersion('4.1'): return """ @@ -1544,9 +1530,7 @@ def get_users_by_state_mv_output(self): AND min_index_interval = 128 AND read_repair = 'BLOCKING' AND speculative_retry = '99p' - AND repair_full = {'enabled': 'true'} - AND repair_incremental = {'enabled': 'true'} - AND repair_preview_repaired = {'enabled': 'true'}; + AND auto_repair = {'full_enabled': 'true', 'incremental_enabled': 'true', 'preview_repaired_enabled': 'true', 'priority': '0'}; """ elif self.cluster.version() >= LooseVersion('4.0'): return """