Pin max size of logging to static value

Signed-off-by: Yevhen Fastiuk <yfastiuk@nvidia.com>
sonic-net · Apr 27, 2024 · 7f89174 · 7f89174
1 parent 4d9b427
commit 7f89174
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/files/image_config/logrotate/logrotate-config.sh b/files/image_config/logrotate/logrotate-config.sh
@@ -8,9 +8,9 @@ NUM_LOGS_TO_ROTATE=10
 
 # Detect common log files (auth, cron, teamd, telemetry, etc.) size. 720M is
 # required to hold extra space to rotate all files (16M each) two times.
-if [[ "$VAR_LOG_SIZE" < "737280" ]]; then
+if [[ "$VAR_LOG_SIZE" < "204800" ]]; then
     LOG_FILE_ROTATE_SIZE_MB=1
-elif [[ "$VAR_LOG_SIZE" < "1474560" ]]; then
+elif [[ "$VAR_LOG_SIZE" < "409600" ]]; then
     LOG_FILE_ROTATE_SIZE_MB=2
 else
     LOG_FILE_ROTATE_SIZE_MB=16

diff --git a/files/image_config/logrotate/templates/logrotate-debug.j2 b/files/image_config/logrotate/templates/logrotate-debug.j2
@@ -7,7 +7,7 @@
 {% set frequency = debug.frequency | d(def_logging.common.frequency) -%}
 {% set max_number = debug.max_number | d(def_logging.debug.max_number) -%}
 
-{% if debug.disk_percentage -%}
+{% if debug.disk_percentage and not debug.size -%}
     {% set size_mb = (max_logs_size_kb | int) * 
                      (debug.disk_percentage | float) / 100 / 1024 -%}
 {% else -%}

diff --git a/files/image_config/logrotate/templates/logrotate-syslog.j2 b/files/image_config/logrotate/templates/logrotate-syslog.j2
@@ -7,7 +7,7 @@
 {% set frequency = syslog.frequency | d(def_logging.common.frequency) -%}
 {% set max_number = syslog.max_number | d(def_logging.syslog.max_number) -%}
 
-{% if syslog.disk_percentage -%}
+{% if syslog.disk_percentage and not syslog.size -%}
     {% set size_mb = (max_logs_size_kb | int) * 
                      (syslog.disk_percentage | float) / 100 / 1024 -%}
 {% else -%}

diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -2643,6 +2643,8 @@
             },
             "dpu1": {
                 "midplane_interface": "dpu1"
+            }
+        },
         "LOGGING": {
             "debug": {
                 "disk_percentage": "46.0",