fix(reliability): probe section existence via uci show, not an option key

This commit is contained in:
2026-08-22 18:59:57 -06:00
parent 1133068a09
commit 55d4beb9d4
3 changed files with 12 additions and 8 deletions
@@ -34,9 +34,10 @@ def _pool_size():
def _ensure_pineapd_section():
"""Stock daemon rewrites and profile restores can drop the whole
`config pineapd` section; every @pineapd[0] option write fails with
'Invalid argument' until it exists again."""
rc, out, err = device_run(['uci', '-q', 'get',
'pineapd.@pineapd[0].logrecon'])
'Invalid argument' until it exists again. Probes SECTION existence
(`uci -q show @pineapd[0]`) — never an option, which may legitimately
be absent from a rewritten section."""
rc, out, err = device_run(['uci', '-q', 'show', 'pineapd.@pineapd[0]'])
if rc == 0:
return False
device_run(['uci', 'add', 'pineapd', 'pineapd'])
@@ -4643,12 +4643,16 @@ PINEAPD_RUNTIME_UCI.add('pineapd.@ssidpool[0].disable')
def _apply_uci_wanted(wanted):
"""Idempotently apply a wanted UCI key/value set. Returns changed keys."""
"""Idempotently apply a wanted UCI key/value set. Returns changed keys.
A failed `uci set` (e.g. missing anchor section) is NOT reported as
applied."""
actions = []
for key, value in wanted.items():
rc, out, err = device_run(['uci', 'get', key])
if rc != 0 or out.strip() != value:
device_run(['uci', 'set', '%s=%s' % (key, value)])
src_rc, s_out, s_err = device_run(
['uci', 'set', '%s=%s' % (key, value)])
if src_rc == 0:
actions.append(key)
return actions
+1 -2
View File
@@ -109,8 +109,7 @@ class SectionRecreateTest(unittest.TestCase):
def fake_run(args, timeout=20, input_data=None):
a = list(args)
self.calls.append(a)
if a[:4] == ['uci', '-q', 'get',
'pineapd.@pineapd[0].logrecon']:
if a[:3] == ['uci', '-q', 'show']:
return (1, '', '') # section missing
if a[:2] == ['uci', 'get']:
got = self.uci.get(a[2])