From 8d87465876fe92c6f03392e7101751bc5d238c8f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 2 Mar 2026 15:48:43 +0100 Subject: [PATCH] board/common: fix race between confd bootstrap and test_reset RPC netopeer2 and rousette were starting as soon as confd had a PID, while confd was still loading the startup config via sr_replace_config(). This held a write lock on the running datastore. A test calling test/reset shortly after the NETCONF port opened would have its own sr_replace_config() block on that lock for up to 60 s, at which point sysrepo timed out the whole RPC with "SHM event 'rpc' processing timed out". Fix by adding the usr/bootstrap condition to both management servers so they don't accept connections until confd signals that bootstrap is complete. Signed-off-by: Joachim Wiberg --- board/common/rootfs/etc/finit.d/available/netconf.conf | 2 +- board/common/rootfs/etc/finit.d/available/restconf.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/common/rootfs/etc/finit.d/available/netconf.conf b/board/common/rootfs/etc/finit.d/available/netconf.conf index a591fb16..a01ffb64 100644 --- a/board/common/rootfs/etc/finit.d/available/netconf.conf +++ b/board/common/rootfs/etc/finit.d/available/netconf.conf @@ -1,3 +1,3 @@ service name:netopeer notify:none log:null env:/etc/default/confd \ - [12345] netopeer2-server -F -t $CONFD_TIMEOUT -v 1 \ + [12345] netopeer2-server -F -t $CONFD_TIMEOUT -v 1 \ -- NETCONF server diff --git a/board/common/rootfs/etc/finit.d/available/restconf.conf b/board/common/rootfs/etc/finit.d/available/restconf.conf index 1ac89a1f..bfe5a050 100644 --- a/board/common/rootfs/etc/finit.d/available/restconf.conf +++ b/board/common/rootfs/etc/finit.d/available/restconf.conf @@ -1,3 +1,3 @@ -service notify:none log:null env:/etc/default/confd \ +service notify:none log:null env:/etc/default/confd \ [12345] rousette --syslog -t $CONFD_TIMEOUT \ -- RESTCONF server