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.

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

Tests: fix upgrade_test #5440

Merged
merged 2 commits into from
Jul 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion tests/rptest/services/redpanda.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ class RedpandaService(Service):
'default_topic_partitions': 4,
'enable_metrics_reporter': False,
'superusers': [SUPERUSER_CREDENTIALS[0]],
'partition_autobalancing_mode': 'node_add_remove'
}

logs = {
Expand Down
6 changes: 3 additions & 3 deletions tests/rptest/tests/partition_balancer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def all_partitions_ready():

partitions = wait_until_result(
all_partitions_ready,
timeout_sec=30,
timeout_sec=120,
backoff_sec=1,
err_msg="failed to wait until all partitions have leaders")

Expand All @@ -61,7 +61,7 @@ def all_partitions_ready():

return ret

def wait_until_status(self, predicate, timeout_sec=60):
def wait_until_status(self, predicate, timeout_sec=120):
admin = Admin(self.redpanda)
start = time.time()

Expand All @@ -82,7 +82,7 @@ def check():
backoff_sec=2,
err_msg="failed to wait until status condition")

def wait_until_ready(self, timeout_sec=60):
def wait_until_ready(self, timeout_sec=120):
return self.wait_until_status(
lambda status: status['status'] == 'ready',
timeout_sec=timeout_sec)
Expand Down
10 changes: 8 additions & 2 deletions tests/rptest/tests/scaling_up_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@ class ScalingUpTest(EndToEndTest):
"""
@cluster(num_nodes=5)
def test_adding_nodes_to_cluster(self):
self.redpanda = RedpandaService(
self.test_context, 3, extra_rp_conf={"group_topic_partitions": 1})
self.redpanda = RedpandaService(self.test_context,
3,
extra_rp_conf={
"group_topic_partitions":
1,
"partition_autobalancing_mode":
"node_add_remove"
})
# start single node cluster
self.redpanda.start(nodes=[self.redpanda.nodes[0]])
# create some topics
Expand Down