Skip to content

Commit b9da6dc

Browse files
committed
test(frontend): widen recovery hang guard for MSan
Signed-off-by: Pxx500 <pbartulik@gmail.com>
1 parent 358d6e7 commit b9da6dc

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

‎src/main.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3070,7 +3070,6 @@ int main(int argc, char **argv) {
30703070
cbm_daemon_bootstrap_result_t bootstrap_result;
30713071
cbm_daemon_bootstrap_status_t bootstrap_status =
30723072
main_client_bootstrap_with_upgrade(&bootstrap_config, &bootstrap_result, true);
3073-
cbm_daemon_ipc_endpoint_free(endpoint);
30743073
if (bootstrap_status != CBM_DAEMON_BOOTSTRAP_CONNECTED || !bootstrap_result.client) {
30753074
main_report_client_bootstrap_failure(role, &bootstrap_result);
30763075
cbm_daemon_ipc_endpoint_free(endpoint);

‎tests/test_daemon_frontend.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@ enum {
231231
* dev machine (see the index-supervisor calibration). */
232232
FRONTEND_EOF_TEST_REQUEST_TIMEOUT_MS = 30000,
233233
FRONTEND_EOF_TEST_CATASTROPHIC_TIMEOUT_S = 90,
234+
/* Recovery can spend most of the generic guard restarting an instrumented
235+
* daemon before the clean-EOF case enters its deliberate 15s drain. */
236+
FRONTEND_RECOVERY_TEST_CATASTROPHIC_TIMEOUT_S = 120,
234237
FRONTEND_BACKPRESSURE_MESSAGE_BYTES = 2 * 1024 * 1024,
235238
FRONTEND_BACKPRESSURE_FRONTEND_TIMEOUT_S = 90,
236239
FRONTEND_BACKPRESSURE_DAEMON_TIMEOUT_S = 90,
@@ -764,7 +767,7 @@ static bool frontend_eof_run_isolated(const char *tag, bool overflow) {
764767
}
765768

766769
static int frontend_recovery_child_run(const char *parent, frontend_recovery_mode_t recovery_mode) {
767-
(void)alarm(FRONTEND_EOF_TEST_CATASTROPHIC_TIMEOUT_S);
770+
(void)alarm(FRONTEND_RECOVERY_TEST_CATASTROPHIC_TIMEOUT_S);
768771
frontend_eof_fixture_t fixture;
769772
if (!frontend_eof_fixture_start(&fixture, parent)) {
770773
(void)frontend_eof_fixture_finish(&fixture);

0 commit comments

Comments
 (0)