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

Revert #1723: Removed code that was force setting the data_connection… #1733

Merged
merged 1 commit into from
Jan 31, 2025
Merged
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
4 changes: 0 additions & 4 deletions src/dispatch.c
Original file line number Diff line number Diff line change
@@ -247,10 +247,6 @@ qd_error_t qd_dispatch_configure_router(qd_dispatch_t *qd, qd_entity_t *entity)
qd_log(LOG_ROUTER, QD_LOG_INFO, "Inter-router data connections calculated at %d ", qd->data_connection_count);
} else if (1 == sscanf(data_conn_count_str, "%u", &qd->data_connection_count)) {
// The user has requested a specific number of connections.
if (qd->data_connection_count == 0) {
// Force data_connection_count to 1 if set to 0.
qd->data_connection_count = 1;
}
qd_log(LOG_ROUTER, QD_LOG_INFO, "Inter-router data connections set to %d ", qd->data_connection_count);
} else {
// The user has entered a non-numeric value that is not 'auto'.
5 changes: 1 addition & 4 deletions tests/system_tests_one_router.py
Original file line number Diff line number Diff line change
@@ -3588,10 +3588,7 @@ def test_60_threads_vs_data_connection_count(self):
expected_result = int((int(worker_threads) + 1) / 2)
msg = "Inter-router data connections calculated at " + str(expected_result)
else:
if con_count == '0':
expected_result = '1'
else:
expected_result = con_count
expected_result = con_count
msg = "Inter-router data connections set to " + str(expected_result)

print("worker threads:", worker_threads, ", requested connections:", con_count, ", expected result:", expected_result, end=" ")