From 71f4d7c721d4b9ebfd005e8429f1d6f5c907a5ff Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Sun, 14 Jul 2024 16:29:18 -0500
Subject: configdep: T6559: drop global redundancy removal to fix error
 reporting

(cherry picked from commit 7249d10f1fbb3f90a4bdbcd0223926d0380ddd3a)
---
 src/services/vyos-configd | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/services/vyos-configd')

diff --git a/src/services/vyos-configd b/src/services/vyos-configd
index d92b539c8..cfbf7c03d 100755
--- a/src/services/vyos-configd
+++ b/src/services/vyos-configd
@@ -30,7 +30,6 @@ from vyos.defaults import directories
 from vyos.utils.boot import boot_configuration_complete
 from vyos.configsource import ConfigSourceString
 from vyos.configsource import ConfigSourceError
-from vyos.configdep import call_dependents
 from vyos.config import Config
 from vyos import ConfigError
 
@@ -134,7 +133,8 @@ def explicit_print(path, mode, msg):
     except OSError:
         logger.critical("error explicit_print")
 
-def run_script(script, config, args) -> int:
+def run_script(script_name, config, args) -> int:
+    script = conf_mode_scripts[script_name]
     script.argv = args
     config.set_level([])
     try:
@@ -143,8 +143,9 @@ def run_script(script, config, args) -> int:
         script.generate(c)
         script.apply(c)
     except ConfigError as e:
-        logger.critical(e)
-        explicit_print(session_out, session_mode, str(e))
+        s = f'{script_name}: {repr(e)}'
+        logger.error(s)
+        explicit_print(session_out, session_mode, s)
         return R_ERROR_COMMIT
     except Exception as e:
         logger.critical(e)
@@ -234,17 +235,10 @@ def process_node_data(config, data, last: bool = False) -> int:
     args.insert(0, f'{script_name}.py')
 
     if script_name not in include_set:
-        # call dependents now if last element of prio queue is run
-        # independent of configd
-        if last:
-            call_dependents(dependent_func=config.dependent_func)
         return R_PASS
 
     with stdout_redirected(session_out, session_mode):
-        result = run_script(conf_mode_scripts[script_name], config, args)
-
-    if last and result == R_SUCCESS:
-        call_dependents(dependent_func=config.dependent_func)
+        result = run_script(script_name, config, args)
 
     return result
 
-- 
cgit v1.2.3


From 70dbc0109282576875e20503a36c99da1073f3b4 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Sun, 14 Jul 2024 16:31:58 -0500
Subject: configdep: T6559: use single dependency list with reset under configd

(cherry picked from commit 52d08b1ec5b2943744daac7123e35fd415f85db2)
---
 python/vyos/config.py     |  1 +
 python/vyos/configdep.py  | 18 ++++++++----------
 src/services/vyos-configd |  1 +
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/services/vyos-configd')

diff --git a/python/vyos/config.py b/python/vyos/config.py
index cca65f0eb..b7ee606a9 100644
--- a/python/vyos/config.py
+++ b/python/vyos/config.py
@@ -140,6 +140,7 @@ class Config(object):
 
         self._level = []
         self._dict_cache = {}
+        self.dependency_list = []
         (self._running_config,
          self._session_config) = self._config_source.get_configtree_tuple()
 
diff --git a/python/vyos/configdep.py b/python/vyos/configdep.py
index 141c7baf7..e0fe1ddac 100644
--- a/python/vyos/configdep.py
+++ b/python/vyos/configdep.py
@@ -33,7 +33,7 @@ if typing.TYPE_CHECKING:
 dependency_dir = os.path.join(directories['data'],
                               'config-mode-dependencies')
 
-dependent_func: dict[str, list[typing.Callable]] = {}
+dependency_list: list[typing.Callable] = []
 
 DEBUG = False
 
@@ -122,26 +122,24 @@ def def_closure(target: str, config: 'Config',
 
 def set_dependents(case: str, config: 'Config',
                    tagnode: typing.Optional[str] = None):
-    global dependent_func
+    global dependency_list
+
+    dependency_list = config.dependency_list
 
     d = get_dependency_dict(config)
     k = caller_name()
-
-    if hasattr(config, 'dependent_func'):
-        dependent_func = getattr(config, 'dependent_func')
-
-    l = dependent_func.setdefault(k, [])
+    l = dependency_list
 
     for target in d[k][case]:
         func = def_closure(target, config, tagnode)
         append_uniq(l, func)
 
-    debug_print(f'set_dependents: caller {k}, dependents {names_of(l)}')
+    debug_print(f'set_dependents: caller {k}, current dependents {names_of(l)}')
 
 def call_dependents():
     k = caller_name()
-    l = dependent_func.get(k, [])
-    debug_print(f'call_dependents: caller {k}, dependents {names_of(l)}')
+    l = dependency_list
+    debug_print(f'call_dependents: caller {k}, remaining dependents {names_of(l)}')
     while l:
         f = l.pop(0)
         debug_print(f'calling: {f.__name__}')
diff --git a/src/services/vyos-configd b/src/services/vyos-configd
index cfbf7c03d..87f7c0e25 100755
--- a/src/services/vyos-configd
+++ b/src/services/vyos-configd
@@ -220,6 +220,7 @@ def process_node_data(config, data, last: bool = False) -> int:
 
     script_name = None
     args = []
+    config.dependency_list.clear()
 
     res = re.match(r'^(VYOS_TAGNODE_VALUE=[^/]+)?.*\/([^/]+).py(.*)', data)
     if res.group(1):
-- 
cgit v1.2.3