From 5263b544f0f3a4d87f09b7c201c87b21cea6b9e0 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Tue, 18 Aug 2020 18:25:08 -0700
Subject: [PATCH] [config] Reduce Calls to SONiC Cfggen (#1052)

* [config] Reduce Calls to SONiC Cfggen

Calls to sonic-cfggen is CPU expensive. This PR reduces calls to
sonic-cfggen during config-setup when configuring buffer/qos.

singed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>

* review comment, apply both buffer and qos configs or none
---
 config/main.py | 54 ++++++++++++--------------------------------------
 1 file changed, 13 insertions(+), 41 deletions(-)

diff --git a/config/main.py b/config/main.py
index 8b9443b20b..b605d37166 100755
--- a/config/main.py
+++ b/config/main.py
@@ -1562,63 +1562,35 @@ def reload():
                 click.secho(
                     "Command 'qos reload' failed with invalid namespace '{}'".
                         format(ns),
-                    fg='yellow'
+                    fg="yellow"
                 )
                 raise click.Abort()
             asic_id_suffix = str(asic_id)
 
-        buffer_template_file = os.path.join(
-            hwsku_path,
-            asic_id_suffix,
-            'buffers.json.j2'
-        )
-        buffer_output_file = "/tmp/buffers{}.json".format(asic_id_suffix)
-        qos_output_file = "/tmp/qos{}.json".format(asic_id_suffix)
-
-        cmd_ns = "" if ns is DEFAULT_NAMESPACE else "-n {}".format(ns)
+        buffer_template_file = os.path.join(hwsku_path, asic_id_suffix, "buffers.json.j2")
         if os.path.isfile(buffer_template_file):
-            command = "{} {} -d -t {} > {}".format(
-                SONIC_CFGGEN_PATH,
-                cmd_ns,
-                buffer_template_file,
-                buffer_output_file
-            )
-            clicommon.run_command(command, display_cmd=True)
-            qos_template_file = os.path.join(
-                hwsku_path,
-                asic_id_suffix,
-                'qos.json.j2'
-            )
-            sonic_version_file = os.path.join(
-                '/etc/sonic/', 'sonic_version.yml'
-            )
+            qos_template_file = os.path.join(hwsku_path, asic_id_suffix, "qos.json.j2")
             if os.path.isfile(qos_template_file):
-                command = "{} {} -d -t {} -y {} > {}".format(
+                cmd_ns = "" if ns is DEFAULT_NAMESPACE else "-n {}".format(ns)
+                sonic_version_file = os.path.join('/', "etc", "sonic", "sonic_version.yml")
+                command = "{} {} -d -t {},config-db -t {},config-db -y {} --write-to-db".format(
                     SONIC_CFGGEN_PATH,
                     cmd_ns,
+                    buffer_template_file,
                     qos_template_file,
-                    sonic_version_file,
-                    qos_output_file
+                    sonic_version_file
                 )
-                clicommon.run_command(command, display_cmd=True)
                 # Apply the configurations only when both buffer and qos
-                # configuration files are presented
-                command = "{} {} -j {} --write-to-db".format(
-                    SONIC_CFGGEN_PATH, cmd_ns, buffer_output_file
-                )
-                clicommon.run_command(command, display_cmd=True)
-                command = "{} {} -j {} --write-to-db".format(
-                    SONIC_CFGGEN_PATH, cmd_ns, qos_output_file
-                )
+                # configuration files are present
                 clicommon.run_command(command, display_cmd=True)
             else:
-                click.secho('QoS definition template not found at {}'.format(
+                click.secho("QoS definition template not found at {}".format(
                     qos_template_file
-                ), fg='yellow')
+                ), fg="yellow")
         else:
-            click.secho('Buffer definition template not found at {}'.format(
+            click.secho("Buffer definition template not found at {}".format(
                 buffer_template_file
-            ), fg='yellow')
+            ), fg="yellow")
 
 #
 # 'warm_restart' group ('config warm_restart ...')