-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve Manager snapshot preparer helper #9837
Open
mikliapko
wants to merge
4
commits into
scylladb:master
Choose a base branch
from
mikliapko:improve-snapshot-preparer-test
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2881037
feature(manager): enhance backup snapshots preparation procedure
mikliapko b377c75
fix(manager): rework snapshot preparation helper test
mikliapko 1550cd2
feature(manager): support cloud clusters in prepare snapshot helper
mikliapko 58b8047
fix(manager): send snapshot details to Argus Results instead of logging
mikliapko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,164 @@ | ||
| bucket: "manager-backup-tests-permanent-snapshots-us-east-1" | ||
| cs_read_cmd_template: "cassandra-stress read cl=ONE n={num_of_rows} -schema 'keyspace={keyspace_name} replication(strategy=NetworkTopologyStrategy,replication_factor=3)' -mode cql3 native -rate threads=500 -col 'size=FIXED(1024) n=FIXED(1)' -pop seq={sequence_start}..{sequence_end}" | ||
| cs_read_cmd_template: "cassandra-stress read cl={cl} n={num_of_rows} -schema 'keyspace={keyspace_name} replication(strategy={replication},replication_factor={rf}) compaction(strategy={compaction})' -mode cql3 native -rate threads=500 -col 'size=FIXED({col_size}) n=FIXED({col_n})' -pop seq={sequence_start}..{sequence_end}" | ||
| sizes: # size of backed up dataset in GB | ||
| 1gb_1t_ics: | ||
| tag: "sm_20240812100424UTC" | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 1 | ||
| number_of_rows: 1073760 | ||
| exp_timeout: 1200 # 20 minutes (timeout for restore data operation) | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 3 | ||
| compaction_strategy: "IncrementalCompactionStrategy" | ||
| prohibit_verification_read: false | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 1 | ||
| num_of_rows: 1073760 | ||
| compaction: "IncrementalCompactionStrategy" | ||
| cl: "ONE" | ||
| col_size: 1024 | ||
| col_n: 1 | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| 500gb_1t_ics: | ||
| tag: "sm_20240813112034UTC" | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 500 | ||
| number_of_rows: 524288000 | ||
| exp_timeout: 14400 # 4 hours | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 3 | ||
| compaction_strategy: "IncrementalCompactionStrategy" | ||
| prohibit_verification_read: false | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 500 | ||
| num_of_rows: 524288000 | ||
| compaction: "IncrementalCompactionStrategy" | ||
| cl: "ONE" | ||
| col_size: 1024 | ||
| col_n: 1 | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| 500gb_1t_ics_tablets: | ||
| tag: "sm_20240813114617UTC" | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 500 | ||
| number_of_rows: 524288000 | ||
| exp_timeout: 14400 # 4 hours | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 3 | ||
| compaction_strategy: "IncrementalCompactionStrategy" | ||
| prohibit_verification_read: false | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 500 | ||
| num_of_rows: 524288000 | ||
| compaction: "IncrementalCompactionStrategy" | ||
| cl: "ONE" | ||
| col_size: 1024 | ||
| col_n: 1 | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| 500gb_2t_ics: | ||
| tag: "sm_20240819203428UTC" | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 250 | ||
| keyspace2: | ||
| - standard1: 250 | ||
| number_of_rows: 524288000 | ||
| exp_timeout: 14400 # 4 hours | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 3 | ||
| compaction_strategy: "IncrementalCompactionStrategy" | ||
| prohibit_verification_read: true | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 250 | ||
| keyspace2: | ||
| - standard1: 250 | ||
| num_of_rows: 524288000 | ||
| compaction: "IncrementalCompactionStrategy" | ||
| cl: "ONE" | ||
| col_size: 1024 | ||
| col_n: 1 | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| 1tb_1t_ics: | ||
| tag: "sm_20240814180009UTC" | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 1024 | ||
| number_of_rows: 1073741824 | ||
| exp_timeout: 28800 # 8 hours | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 3 | ||
| compaction_strategy: "IncrementalCompactionStrategy" | ||
| prohibit_verification_read: false | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 1024 | ||
| num_of_rows: 1073741824 | ||
| compaction: "IncrementalCompactionStrategy" | ||
| cl: "ONE" | ||
| col_size: 1024 | ||
| col_n: 1 | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| 1tb_4t_twcs: | ||
| tag: "sm_20240821145503UTC" | ||
| schema: | ||
| keyspace1: | ||
| - t_10gb: 10 | ||
| - t_90gb: 90 | ||
| - t_300gb: 300 | ||
| - t_600gb: 600 | ||
| number_of_rows: 428571429 | ||
| exp_timeout: 28800 # 8 hours | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 3 | ||
| compaction_strategy: "TimeWindowCompactionStrategy" | ||
| prohibit_verification_read: true | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - t_10gb: 10 | ||
| - t_90gb: 90 | ||
| - t_300gb: 300 | ||
| - t_600gb: 600 | ||
| num_of_rows: 428571429 | ||
| compaction: "TimeWindowCompactionStrategy" | ||
| cl: | ||
| col_size: | ||
| col_n: | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| 1tb_2t_twcs: | ||
| tag: "sm_20240827191125UTC" | ||
| schema: | ||
| keyspace1: | ||
| - t_300gb: 300 | ||
| - t_700gb: 700 | ||
| number_of_rows: 428571429 | ||
| exp_timeout: 28800 # 8 hours | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 9 | ||
| compaction_strategy: "TimeWindowCompactionStrategy" | ||
| prohibit_verification_read: true | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - t_300gb: 300 | ||
| - t_700gb: 700 | ||
| num_of_rows: 428571429 | ||
| compaction: "TimeWindowCompactionStrategy" | ||
| cl: | ||
| col_size: | ||
| col_n: | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| 1.5tb_2t_ics: | ||
| tag: "sm_20240820180152UTC" | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 500 | ||
| keyspace2: | ||
| - standard1: 1024 | ||
| number_of_rows: 1598029824 | ||
| exp_timeout: 43200 # 12 hours | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 3 | ||
| compaction_strategy: "IncrementalCompactionStrategy" | ||
| prohibit_verification_read: true | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 500 | ||
| keyspace2: | ||
| - standard1: 1024 | ||
| num_of_rows: 1598029824 | ||
| compaction: "IncrementalCompactionStrategy" | ||
| cl: "ONE" | ||
| col_size: 1024 | ||
| col_n: 1 | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| 2tb_1t_ics: | ||
| tag: "sm_20240816185129UTC" | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 2048 | ||
| number_of_rows: 2147483648 | ||
| exp_timeout: 57600 # 16 hours | ||
| scylla_version: "2024.2.0-rc1" | ||
| number_of_nodes: 3 | ||
| compaction_strategy: "IncrementalCompactionStrategy" | ||
| prohibit_verification_read: false | ||
| dataset: | ||
| schema: | ||
| keyspace1: | ||
| - standard1: 2048 | ||
| num_of_rows: 2147483648 | ||
| compaction: "IncrementalCompactionStrategy" | ||
| cl: "ONE" | ||
| col_size: 1024 | ||
| col_n: 1 | ||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # Description: This file contains C-S command template and the default values of parameters used in this command. | ||
| # Parameter values (all expect cs_cmd_template) can be overwritten, otherwise, default values defined here will be used. | ||
| # Such a configuration is used by Manager backup snapshots prepare test. | ||
|
|
||
| cs_cmd_template: "cassandra-stress {operation} cl={cl} n={num_of_rows} -schema 'keyspace={ks_name} replication(strategy={replication},replication_factor={rf}) compaction(strategy={compaction})' -mode cql3 native -rate threads={threads_num} -col 'size=FIXED({col_size}) n=FIXED({col_n})' -pop seq={sequence_start}..{sequence_end}" | ||
|
|
||
| operation: "write" | ||
| cl: "QUORUM" | ||
|
|
||
| replication: "NetworkTopologyStrategy" | ||
| rf: 3 | ||
| compaction: "IncrementalCompactionStrategy" | ||
|
|
||
| threads_num: 500 | ||
|
|
||
| col_size: 1024 | ||
| col_n: 1 | ||
|
|
||
| # Defined in a runtime based on backup size, number of loaders, scylla version, etc | ||
| ks_name: '' | ||
| num_of_rows: '' | ||
| sequence_start: '' | ||
| sequence_end: '' |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why threads=500?
The number of threads must be dependent on the loader CPU cores.
Assuming common loader has 8 CPU cores and using 500 threads I expect it to be not efficient enough due to context switches.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What approximations/rules can be used to define the optimal number of threads depending on loader CPU cores?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In common case (not related to C-S) it should be like we do it for scylla ->
n_cpus - 1per each 8 CPU cores.Having 1-to-1 relationship between CPU core and thread allows to avoid context switches (heavy ops).
Having 1-to-many relationship between CPU core and thread guarantees CPU context switches.
It is pretty possible that some app may perform faster using single thread than 2 multi-threads.
So, it is matter of implementation and measurement to answer your question.
Probably, @roydahan or @soyacz may advice something here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@roydahan @soyacz do you have any advice?