@@ -32,7 +32,7 @@ class SstableLoadUtils:
3232
3333 @staticmethod
3434 def calculate_columns_count_in_table (
35- target_node , keyspace_name : str = "keyspace1 " , table_name : str = "standard1"
35+ target_node , keyspace_name : str = "keyspace_refresh " , table_name : str = "standard1"
3636 ) -> int :
3737 query_cmd = f"SELECT * FROM { keyspace_name } .{ table_name } LIMIT 1"
3838 result = target_node .run_cqlsh (query_cmd )
@@ -67,7 +67,7 @@ def distribute_test_files_to_cluster_nodes(cls, nodes, test_data: List[TestDataI
6767 def upload_sstables (
6868 node ,
6969 test_data : TestDataInventory ,
70- keyspace_name : str = "keyspace1 " ,
70+ keyspace_name : str = "keyspace_refresh " ,
7171 table_name = None ,
7272 create_schema : bool = False ,
7373 is_cloud_cluster = False ,
@@ -129,7 +129,12 @@ def upload_sstables(
129129
130130 @classmethod
131131 def run_load_and_stream (
132- cls , node , keyspace_name : str = "keyspace1" , table_name : str = "standard1" , start_timeout = 60 , end_timeout = 600
132+ cls ,
133+ node ,
134+ keyspace_name : str = "keyspace_refresh" ,
135+ table_name : str = "standard1" ,
136+ start_timeout = 60 ,
137+ end_timeout = 600 ,
133138 ):
134139 """runs load and stream using API request and waits for it to finish"""
135140 with wait_for_log_lines (
@@ -155,7 +160,7 @@ def run_refresh(node, test_data: namedtuple) -> Iterable[str]:
155160 # Find the compaction output that reported about the resharding
156161
157162 system_log_follower = node .follow_system_log (patterns = [r"Resharded.*" ])
158- node .run_nodetool (sub_cmd = "refresh" , args = "-- keyspace1 standard1" )
163+ node .run_nodetool (sub_cmd = "refresh" , args = "-- keyspace_refresh standard1" )
159164 return system_log_follower
160165
161166 @staticmethod
@@ -169,24 +174,24 @@ def validate_resharding_after_refresh(node, system_log_follower):
169174 # Validate that files after resharding were saved in the "upload" folder.
170175 # Example of compaction output:
171176
172- # scylla[6653]: [shard 0] compaction - [Reshard keyspace1 .standard1 3cad4140-f8c3-11ea-acb1-000000000002]
177+ # scylla[6653]: [shard 0] compaction - [Reshard keyspace_refresh .standard1 3cad4140-f8c3-11ea-acb1-000000000002]
173178 # Resharded 1 sstables to [
174- # /var/lib/scylla/data/keyspace1 /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-9-big-Data.db:level=0,
175- # /var/lib/scylla/data/keyspace1 /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-10-big-Data.db:level=0,
176- # /var/lib/scylla/data/keyspace1 /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-11-big-Data.db:level=0,
177- # /var/lib/scylla/data/keyspace1 /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-12-big-Data.db:level=0,
178- # /var/lib/scylla/data/keyspace1 /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-13-big-Data.db:level=0,
179- # /var/lib/scylla/data/keyspace1 /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-22-big-Data.db:level=0,
180- # /var/lib/scylla/data/keyspace1 /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-15-big-Data.db:level=0,
181- # /var/lib/scylla/data/keyspace1 /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-16-big-Data.db:level=0,
179+ # /var/lib/scylla/data/keyspace_refresh /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-9-big-Data.db:level=0,
180+ # /var/lib/scylla/data/keyspace_refresh /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-10-big-Data.db:level=0,
181+ # /var/lib/scylla/data/keyspace_refresh /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-11-big-Data.db:level=0,
182+ # /var/lib/scylla/data/keyspace_refresh /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-12-big-Data.db:level=0,
183+ # /var/lib/scylla/data/keyspace_refresh /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-13-big-Data.db:level=0,
184+ # /var/lib/scylla/data/keyspace_refresh /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-22-big-Data.db:level=0,
185+ # /var/lib/scylla/data/keyspace_refresh /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-15-big-Data.db:level=0,
186+ # /var/lib/scylla/data/keyspace_refresh /standard1-9fbed8d0f8c211ea9bb1000000000000/upload/md-16-big-Data.db:level=0,
182187 # ]. 91MB to 92MB (~100% of original) in 5009ms = 18MB/s. ~370176 total partitions merged to 370150
183188
184189 Starting with Scylla 4.7 messages have changed to the following:
185- [shard 1] sstables_loader - Loading new SSTables for keyspace=keyspace1 , table=standard1, ...
186- [shard 1] database - Resharding 223kB for keyspace1 .standard1
187- [shard 1] database - Resharded 223kB for keyspace1 .standard1 in 0.14 seconds, 1MB/s
188- [shard 1] database - Loaded 16 SSTables into /var/lib/scylla/data/keyspace1 /standard1-eb0401905d8311ecb391aa52ebf0b3e1
189- [shard 1] sstables_loader - Done loading new SSTables for keyspace=keyspace1 , table=standard1, ...
190+ [shard 1] sstables_loader - Loading new SSTables for keyspace=keyspace_refresh , table=standard1, ...
191+ [shard 1] database - Resharding 223kB for keyspace_refresh .standard1
192+ [shard 1] database - Resharded 223kB for keyspace_refresh .standard1 in 0.14 seconds, 1MB/s
193+ [shard 1] database - Loaded 16 SSTables into /var/lib/scylla/data/keyspace_refresh /standard1-eb0401905d8311ecb391aa52ebf0b3e1
194+ [shard 1] sstables_loader - Done loading new SSTables for keyspace=keyspace_refresh , table=standard1, ...
190195
191196 So, there is no per-file paths anymore for resharding log messages, only root dir path.
192197 """
@@ -230,7 +235,7 @@ def get_load_test_data_inventory(
230235 def create_keyspace (
231236 cls ,
232237 node ,
233- keyspace_name : str = "keyspace1 " ,
238+ keyspace_name : str = "keyspace_refresh " ,
234239 strategy : str = "NetworkTopologyStrategy" ,
235240 replication_factor : int = 1 ,
236241 ):
@@ -245,7 +250,9 @@ def create_table_for_load(cls, node, schema_file_and_path: str, session):
245250 session .execute (schema .replace ("\n " , "" ))
246251
247252 @classmethod
248- def validate_data_count_after_upload (cls , node , keyspace_name : str = "keyspace1" , table_name : str = "standard1" ):
253+ def validate_data_count_after_upload (
254+ cls , node , keyspace_name : str = "keyspace_refresh" , table_name : str = "standard2"
255+ ):
249256 result = node .run_cqlsh (f"consistency QUORUM;SELECT COUNT(*) FROM { keyspace_name } .{ table_name } " )
250257
251258 next_line_is_result = False
0 commit comments