Skip to content

Revert statd fix that cause massive test regressions #1573

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

Merged
troglobit merged 1 commit into from
Aug 2, 2026
+4 −12
Merged

Revert statd fix that cause massive test regressions #1573

Show file tree
Hide file tree
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: 0 additions & 8 deletions doc/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ All notable changes to the project are documented in this file.

- Fix annoying "cannot deselect all services" or reset to YANG default in the
web interface's firewall configuration page
- Fix `statd` timeout warnings in the log. Updates to the mDNS neighbor
table, and status snapshots, could fail with:

statd[3658]: mdns: sr_apply_changes: Timeout expired
statd[3658]: Error, getting operational data: User callback failed

Such operations are now allowed up to 60 seconds to complete, same as for
other services in the system

[v26.06.0][] - 2026-07-01
-------------------------
Expand Down
6 changes: 3 additions & 3 deletions src/statd/avahi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ static void ds_push_resolver(struct mdns_ctx *ctx, struct avahi_service *svc,
return;
}

err = sr_apply_changes(ctx->sr_ses, SYSREPO_TIMEOUT);
err = sr_apply_changes(ctx->sr_ses, 0);
if (err)
ERROR("mdns: sr_apply_changes: %s", sr_strerror(err));
}
Expand Down Expand Up @@ -470,7 +470,7 @@ static void ds_delete_neighbor(struct mdns_ctx *ctx, const char *hostname)
static void ds_clear_all(struct mdns_ctx *ctx)
{
sr_delete_item(ctx->sr_ses, XPATH_BASE, 0);
sr_apply_changes(ctx->sr_ses, SYSREPO_TIMEOUT);
sr_apply_changes(ctx->sr_ses, 0);
}

/* --------------------------------------------------------------------------
Expand Down Expand Up @@ -641,7 +641,7 @@ static void service_browser_cb(AvahiServiceBrowser *b,
}
}

sr_apply_changes(ctx->sr_ses, SYSREPO_TIMEOUT);
sr_apply_changes(ctx->sr_ses, 0);
break;
}

Expand Down
2 changes: 1 addition & 1 deletion src/statd/journal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static void journal_timer_cb(struct ev_loop *, struct ev_timer *w, int)
* This triggers our own operational callbacks running in main thread
*/
DEBUG("Calling sr_get_data on session %p", jctx->sr_query_ses);
err = sr_get_data(jctx->sr_query_ses, "/*", 0, SYSREPO_TIMEOUT, 0, &sr_data);
err = sr_get_data(jctx->sr_query_ses, "/*", 0, 0, 0, &sr_data);
if (err != SR_ERR_OK) {
ERROR("Error, getting operational data: %s", sr_strerror(err));
sr_release_context(con);
Expand Down