From f79dcc176f7c7c405731426bc242b3cfe48e1055 Mon Sep 17 00:00:00 2001
From: ksingh <kirti.singh@windriver.com>
Date: Fri, 9 Dec 2022 10:57:50 -0500
Subject: [PATCH] Fixed the Unhandled python exception in collectd.log

UnboundLocalError due to uid referenced before assignment.
As a result, the top 10 memory rss processes were not reflected
in collectd log file.

The collectd memory.py plugin main memory data structure is made
consistent for all groupings.
This also addressed a few minor logic fixes.

Test Plan:

PASS: AIO-SX: Verify collectd memory logs for top rss processes.
PASS: AIO-SX: Verify collectd memory logs contain pods.
PASS: Storage: Verify collectd memory logs for top rss processes.

Closes-Bug: 1999433

Signed-off-by: ksingh <kirti.singh@windriver.com>

Change-Id: Ibf8cb4bc9dae9baa7652c3160e34b29d51ac5c60
---
 collectd-extensions/src/memory.py | 53 +++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/collectd-extensions/src/memory.py b/collectd-extensions/src/memory.py
index 848ac48..d64f8de 100755
--- a/collectd-extensions/src/memory.py
+++ b/collectd-extensions/src/memory.py
@@ -493,7 +493,35 @@ def get_platform_memory_per_process():
 
     Returns:
         memory: dict
-    """
+    {
+    "cgroup-processes": {
+    "pods": {
+      "3481f8f5-8c86-4c24-a1a5-48f5259d88af": {
+        "62939": {
+          "rss": 4.0,
+          "name": "dumb-init"
+        }
+      }
+    },
+    "platform": {
+      "57934": {
+        "rss": 5528.0,
+        "name": "guestServer"
+      },
+    },
+    "kube-system": {},
+    "kube-addon": {},
+    "overall": {
+      "3481f8f5-8c86-4c24-a1a5-48f5259d88af": {
+        "62939": {
+          "rss": 4.0,
+          "name": "dumb-init"
+           }
+         }
+       }
+     }
+   }
+"""
 
     platform_pids = []
     k8s_system_pids = []
@@ -507,7 +535,7 @@ def get_platform_memory_per_process():
             pc.GROUP_OVERALL: {}
         }
     }
-
+    pods_mem = {}
     platform = memory[pc.GROUP_PROCESSES][pc.GROUP_PLATFORM]
     k8s_system = memory[pc.GROUP_PROCESSES][pc.GROUP_K8S_SYSTEM]
     pod_group = memory[pc.GROUP_PROCESSES][pc.GROUP_PODS]
@@ -517,7 +545,7 @@ def get_platform_memory_per_process():
     for pid in pids:
         name = str(get_pid_name(pid))
         rss = get_pid_rss(pid)
-        if rss > 0 and not None:
+        if rss is not None and rss > 0:
             platform[int(pid)] = {'rss': float(rss),
                                   'name': str(name)}
 
@@ -551,7 +579,10 @@ def get_platform_memory_per_process():
                         for pid in pod_pids:
                             name = str(get_pid_name(pid))
                             rss = get_pid_rss(pid)
-                            if rss > 0 and not None:
+                            if rss is not None and rss > 0:
+                                pods_mem[int(pid)] = {
+                                    'rss': float(rss),
+                                    'name': str(name)}
                                 if uid not in pod_group:
                                     pod_group[uid] = {}
                                 if pid not in pod_group[uid]:
@@ -565,24 +596,20 @@ def get_platform_memory_per_process():
     for pid in platform_pids:
         name = str(get_pid_name(pid))
         rss = get_pid_rss(pid)
-        if rss > 0 and not None:
-            if name not in platform:
-                platform[int(pid)] = {}
+        if rss is not None and rss > 0:
             platform[int(pid)] = {'rss': float(rss),
                                   'name': str(name)}
 
     for pid in k8s_system_pids:
         name = str(get_pid_name(pid))
         rss = get_pid_rss(pid)
-        if rss > 0 and not None:
-            if pid not in k8s_system:
-                k8s_system[int(pid)] = {}
-                k8s_system[int(pid)] = {'rss': float(rss),
-                                        'name': str(name)}
+        if rss is not None and rss > 0:
+            k8s_system[int(pid)] = {'rss': float(rss),
+                                    'name': str(name)}
 
     # This returns the system overall process and stores it into a dict.
     memory[pc.GROUP_PROCESSES][pc.GROUP_OVERALL] = dict(itertools.chain(
-        platform.items(), k8s_system.items(), pod_group[uid].items()))
+        platform.items(), k8s_system.items(), pods_mem.items()))
 
     return memory