[checkmk-commits] Make parsing of ps section deterministic between runs.

Module: check_mk Branch: master Commit: d1c429a26ea1f275b7bf2e02650fda53b28f4f0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1c429a26ea1f2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 19 09:40:44 2018 +0100 Make parsing of ps section deterministic between runs. Note: The hash value of None is based on the memory address of the singleton, so it varies between runs. Consequently, the hash value of tuples containing None varies between runs, too. CMK-1465 Change-Id: Ia70fef31e23ff69c011205a995d949c9c93d0aec --- checks/ps | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/checks/ps b/checks/ps index e9eb3cc..a0a09cb 100644 --- a/checks/ps +++ b/checks/ps @@ -173,7 +173,7 @@ def extract_wmic_info(info): # # Node, if "Name" in row and "ProcessId" in row: - wmic_info[(row["node"], row["Name"], row["ProcessId"])] = row + wmic_info.setdefault((row["node"], row["Name"]), []).append(row) else: ps_result.append(line) # plain list of process names @@ -181,20 +181,14 @@ def extract_wmic_info(info): def merge_wmic(ps_result, wmic_info, wmic_headers): - def get_ps_info(node, name, processId=0): - for key, value in wmic_info.items(): - if (not processId and key[0:2] == (node, name)) or key == (node, name, processId): - # each info is only returned once! - del wmic_info[key] - return value - info = [] seen_pids = set([]) # Remove duplicate entries cpu_cores = 1 for line in ps_result: - psinfo = get_ps_info(line[0], line[1]) - # Get number of CPU cores from system idle process - if psinfo: + psinfos = wmic_info.get((line[0], line[1]), []) + if psinfos: + psinfo = psinfos.pop() # each info is used only once! + # Get number of CPU cores from system idle process if "ThreadCount" in wmic_headers and psinfo["Name"].lower() == "system idle process": cpu_cores = int(psinfo["ThreadCount"]) pid = int(psinfo["ProcessId"])