summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-05-18 17:02:57 +0200
committerGitHub <noreply@github.com>2026-05-18 17:02:57 +0200
commitedccb2fc91163a626ece24c8be14a8bf3d444d8f (patch)
tree0d2d243bf800a1f66d1b81b239c173c4eb29c78d /src
parent964a01697f3c2361ce4324fb8333f5fe4d2b0434 (diff)
parentabd22ba6c3852fbf1002204a416b9de83e405caa (diff)
downloadvyos-1x-edccb2fc91163a626ece24c8be14a8bf3d444d8f.tar.gz
vyos-1x-edccb2fc91163a626ece24c8be14a8bf3d444d8f.zip
Merge pull request #5200 from c-po/commit-in-progress
vyos.commit: T8781: move from O(n) to O(1) for commit_in_progress() checks
Diffstat (limited to 'src')
-rwxr-xr-xsrc/services/vyos-netlinkd6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/services/vyos-netlinkd b/src/services/vyos-netlinkd
index 368824bf9..addfc8ef9 100755
--- a/src/services/vyos-netlinkd
+++ b/src/services/vyos-netlinkd
@@ -29,7 +29,7 @@ from typing import Optional
from vyos.configquery import op_mode_config_dict
from vyos.ifconfig import Section
from vyos.utils.boot import boot_configuration_complete
-from vyos.utils.commit import commit_in_progress
+from vyos.utils.commit import commit_in_progress2
from vyos.utils.dict import dict_search
from vyos.utils.process import cmd
from vyos.utils.process import is_systemd_service_active
@@ -127,8 +127,8 @@ def main():
# Check if a config commit is in progress before processing any
# messages. This avoids blocking per-message and reduces unnecessary
- # commit_in_progress() calls.
- if commit_in_progress():
+ # calls to commit_in_progress2()
+ if commit_in_progress2():
syslog.syslog(syslog.LOG_DEBUG,
'Config commit in progress, skipping netlink events')
sleep(1)