Skip to content
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.

Sign up for GitHub

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

Reflect node.max_local_storage_nodes setting removal #214

Merged
merged 1 commit into from
May 18, 2022
Merged

Reflect node.max_local_storage_nodes setting removal #214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions src/crate/qa/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,7 @@ def _new_cluster(self, version, num_nodes, settings=None, env=None):
s = {
'cluster.name': gen_id(),
'gateway.recover_after_nodes': num_nodes,
'gateway.expected_nodes': num_nodes,
'node.max_local_storage_nodes': num_nodes,
'gateway.expected_nodes': num_nodes
}
s.update(settings)
nodes = []
Expand All @@ -208,8 +207,7 @@ def _new_heterogeneous_cluster(self, versions, settings=None):
s = {
'cluster.name': gen_id(),
'gateway.recover_after_nodes': num_nodes,
'gateway.expected_nodes': num_nodes,
'node.max_local_storage_nodes': num_nodes,
'gateway.expected_nodes': num_nodes
}
s.update(settings)
nodes = []
Expand All @@ -226,11 +224,11 @@ def upgrade_node(self, old_node, new_version):
return new_node

def setUp(self):
self._path_data = self.mkdtemp()
Copy link
Member

Choose a reason for hiding this comment

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

Looks like this property is accessed in some other test cases:

tests/restart/test_blob.py
65:            filepath = Path(self._path_data).glob(f'**/{digest}')

tests/bwc/test_upgrade.py
382:        data_path_incl_cluster_id = os.path.join(self._path_data, self.CLUSTER_ID)
385:            target_path_nodes = os.path.join(self._path_data, 'nodes')

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thx for the hint!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I now keep this variable, just moved it below to the new_node. checked locally 4.8->nightly by replacing nightly to branch:master

self._on_stop = []
self._log_consumers = []

def new_node(version, settings=None, env=None):
self._path_data = self.mkdtemp()
crate_dir = get_crate(version)
version_tuple = _extract_version(crate_dir)
v = version_tuple_to_strict_version(version_tuple)
Expand Down