Replace SimpleStrategy with NetworkTopologyStrategy in integration tests#830
Open
sylwiaszunejko wants to merge 3 commits intoscylladb:masterfrom
Open
Replace SimpleStrategy with NetworkTopologyStrategy in integration tests#830sylwiaszunejko wants to merge 3 commits intoscylladb:masterfrom
sylwiaszunejko wants to merge 3 commits intoscylladb:masterfrom
Conversation
sylwiaszunejko
force-pushed
the
remove-simple-strategy
branch
from
36291ce to
bb73387
Compare
dkropachev
reviewed
Apr 22, 2026
sylwiaszunejko
force-pushed
the
remove-simple-strategy
branch
3 times, most recently
from
e35fa7e to
20b5f60
Compare
dkropachev
requested changes
Apr 22, 2026
Collaborator
dkropachev
left a comment
dkropachev
left a comment
There was a problem hiding this comment.
I still see lot's of SimpleStrategy in the test code, is it intended to be that way ?
Collaborator
Author
For places where we won't tablets (like some places with test_metadata) disable I left SimpleStrategy, I can change it to NTS with tablets disabled if that is preferred. |
sylwiaszunejko
force-pushed
the
remove-simple-strategy
branch
2 times, most recently
from
19f2c23 to
be1c0c9
Compare
We should use NTS and avoid SS wherever possible. |
Collaborator
Author
I changed that |
dkropachev
requested changes
Apr 23, 2026
| ddl = ''' | ||
| CREATE KEYSPACE test1rf | ||
| WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}''' | ||
| WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'} AND tablets = {'enabled': false}''' |
| @classmethod | ||
| def create_keyspace(cls, rf): | ||
| ddl = "CREATE KEYSPACE {0} WITH replication = {{'class': 'SimpleStrategy', 'replication_factor': '{1}'}}".format(cls.ks_name, rf) | ||
| ddl = "CREATE KEYSPACE {0} WITH replication = {{'class': 'SimpleStrategy', 'replication_factor': '{1}'}} AND tablets = {{'enabled': false}}".format(cls.ks_name, rf) |
Collaborator
Author
There was a problem hiding this comment.
it's BasicKeyspaceUnitTestCase so unit test, I only changed code related to integration tests in this PR
Replace SimpleStrategy with NetworkTopologyStrategy across integration tests to align with ScyllaDB's tablet-based replication defaults. In the tablets test module, skip default keyspace creation (set_keyspace=False) to avoid RF=3 keyspaces that block node decommission when all nodes already hold replicas.
With tablets enabled, decommissioning a node from a 3-node cluster with RF=3 fails because there is no available node to receive tablet replicas. Bootstrap 3 replacement nodes instead of 2 so that each original node can be decommissioned while sufficient replicas remain.
LWT is not supported with tablets on ScyllaDB < 2025.4. Mark the affected SerialConsistencyTests and LightweightTransactionTests as xfail for those versions.
sylwiaszunejko
force-pushed
the
remove-simple-strategy
branch
from
be1c0c9 to
25d7927
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
In tests/integration/init.py, SimpleStrategy is kept but tablets are explicitly disabled to avoid decommission failures.
Pre-review checklist
./docs/source/.Fixes:annotations to PR description.