peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-03 06:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1573 from kernelkit/revert-regression

Browse Source 
Revert statd fix that cause massive test regressions
This commit is contained in:
Joachim Wiberg
2026-08-02 11:26:23 +02:00
committed by GitHub
parent b923de50c7 e8e4f87db7
commit 58732bb7d9
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/ChangeLog.md
-8
View File
@@ -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 - Fix annoying "cannot deselect all services" or reset to YANG default in the
web interface's firewall configuration page 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 [v26.06.0][] - 2026-07-01
------------------------- -------------------------
src/statd/avahi.c
+3 -3
View File
@@ -441,7 +441,7 @@ static void ds_push_resolver(struct mdns_ctx *ctx, struct avahi_service *svc,
return; return;
} }
err = sr_apply_changes(ctx->sr_ses, SYSREPO_TIMEOUT); err = sr_apply_changes(ctx->sr_ses, 0);
if (err) if (err)
ERROR("mdns: sr_apply_changes: %s", sr_strerror(err)); ERROR("mdns: sr_apply_changes: %s", sr_strerror(err));
} }
@@ -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) static void ds_clear_all(struct mdns_ctx *ctx)
{ {
sr_delete_item(ctx->sr_ses, XPATH_BASE, 0); sr_delete_item(ctx->sr_ses, XPATH_BASE, 0);
sr_apply_changes(ctx->sr_ses, SYSREPO_TIMEOUT); sr_apply_changes(ctx->sr_ses, 0);
} }
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
@@ -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; break;
} }
src/statd/journal.c
+1 -1
View File
@@ -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 * This triggers our own operational callbacks running in main thread
*/ */
DEBUG("Calling sr_get_data on session %p", jctx->sr_query_ses); 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) { if (err != SR_ERR_OK) {
ERROR("Error, getting operational data: %s", sr_strerror(err)); ERROR("Error, getting operational data: %s", sr_strerror(err));
sr_release_context(con); sr_release_context(con);