Skip to content

Commit 4d68751

Browse files
alexandraBaraalexandraBara
authored
Merge pull request #118 from amd/alex_dup_fix
Fix for duplicated message printing
2 parents 834d751 + d1c81bd commit 4d68751

12 files changed

Lines changed: 38 additions & 50 deletions

File tree

‎nodescraper/plugins/inband/bios/bios_analyzer.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,11 @@ def analyze_data(
8080
self.result.status = ExecutionStatus.OK
8181
return self.result
8282

83-
self.result.message = (
84-
f"Bios data mismatch! Expected {args.exp_bios_version}, actual: {data.bios_version}"
85-
)
83+
self.result.message = "Bios data mismatch!"
8684
self.result.status = ExecutionStatus.ERROR
8785
self._log_event(
8886
category=EventCategory.BIOS,
89-
description=f"{self.result.message}, Actual: {data.bios_version}",
87+
description=f"Bios data mismatch! Expected {args.exp_bios_version}, actual: {data.bios_version}",
9088
data={
9189
"actual_bios_version": data.bios_version,
9290
"expected_bios_version": args.exp_bios_version,

‎nodescraper/plugins/inband/cmdline/cmdline_analyzer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,11 @@ def analyze_data(
167167
self.result.status = ExecutionStatus.OK
168168
return self.result
169169

170-
self.result.message = f"Illegal kernel cmdline, found_banned: {found_banned}, missing required: {missing_required}"
170+
self.result.message = "Illegal kernel cmdline"
171171
self.result.status = ExecutionStatus.ERROR
172172
self._log_event(
173173
category=EventCategory.OS,
174-
description=self.result.message,
174+
description=f"Illegal kernel cmdline, found_banned: {found_banned}, missing required: {missing_required}",
175175
priority=EventPriority.CRITICAL,
176176
console_log=True,
177177
)

‎nodescraper/plugins/inband/device_enumeration/device_enumeration_analyzer.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,11 @@ def analyze_data(
6464
for check, accepted_counts in checks.items():
6565
actual_count = getattr(data, check)
6666
if actual_count not in accepted_counts:
67-
message = f"Expected {check} in {accepted_counts}, but got {actual_count}. "
68-
self.result.message += message
67+
self.result.message = "Device Enumeration mismatch"
6968
self.result.status = ExecutionStatus.ERROR
7069
self._log_event(
7170
category=EventCategory.PLATFORM,
72-
description=message,
71+
description=f"Expected {check} in {accepted_counts}, but got {actual_count}",
7372
data={check: actual_count},
7473
priority=EventPriority.CRITICAL,
7574
console_log=True,

‎nodescraper/plugins/inband/kernel/kernel_analyzer.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,11 @@ def analyze_data(
7777
self.result.status = ExecutionStatus.OK
7878
return self.result
7979

80-
self.result.message = (
81-
f"Kernel mismatch! Expected: {args.exp_kernel}, actual: {data.kernel_version}"
82-
)
80+
self.result.message = "Kernel mismatch!"
8381
self.result.status = ExecutionStatus.ERROR
8482
self._log_event(
8583
category=EventCategory.OS,
86-
description=f"{self.result.message}",
84+
description=f"Kernel mismatch! Expected: {args.exp_kernel}, actual: {data.kernel_version}",
8785
data={"expected": args.exp_kernel, "actual": data.kernel_version},
8886
priority=EventPriority.CRITICAL,
8987
console_log=True,

‎nodescraper/plugins/inband/kernel_module/kernel_module_analyzer.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,20 +146,18 @@ def analyze_data(
146146
except re.error:
147147
self._log_event(
148148
category=EventCategory.RUNTIME,
149-
description="KernelModule regex is invalid",
149+
description=f"KernelModule regex is invalid. Regex: {args.regex_filter}",
150150
data={"regex_filters": {args.regex_filter}},
151151
priority=EventPriority.ERROR,
152152
)
153-
self.result.message = (
154-
f"Kernel modules failed to match regex. Regex: {args.regex_filter}"
155-
)
153+
self.result.message = "Kernel modules failed to match regex"
156154
self.result.status = ExecutionStatus.ERROR
157155
return self.result
158156

159157
if unmatched_pattern:
160158
self._log_event(
161159
category=EventCategory.RUNTIME,
162-
description="KernelModules did not match all patterns",
160+
description=f"KernelModules did not match all patterns. Unmatched patterns: {unmatched_pattern}",
163161
data={"unmatched_pattern: ": unmatched_pattern},
164162
priority=EventPriority.INFO,
165163
)
@@ -184,23 +182,23 @@ def analyze_data(
184182
if not filtered_modules and not_matched:
185183
self._log_event(
186184
category=EventCategory.RUNTIME,
187-
description="KernelModules: no modules matched",
185+
description=f"KernelModules: no modules matched. Not matched: {not_matched}",
188186
data=args.kernel_modules,
189187
priority=EventPriority.ERROR,
190188
)
191-
self.result.message = f"Kernel modules not matched: {not_matched}"
189+
self.result.message = f"Kernel modules not matched. Not matched: {not_matched}"
192190
self.result.status = ExecutionStatus.ERROR
193191
return self.result
194192
# some modules matched
195193
elif filtered_modules and not_matched:
196194

197195
self._log_event(
198196
category=EventCategory.RUNTIME,
199-
description="KernelModules: not all modules matched",
197+
description=f"KernelModules: not all modules matched. Not matched: {not_matched}",
200198
data=not_matched,
201199
priority=EventPriority.ERROR,
202200
)
203-
self.result.message = f"Kernel modules not matched: {not_matched}"
201+
self.result.message = f"Kernel modules not matched. Not matched: {not_matched}"
204202
self.result.status = ExecutionStatus.ERROR
205203
return self.result
206204
else:

‎nodescraper/plugins/inband/memory/memory_analyzer.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,11 @@ def _bytes_to_gb(n: float) -> float:
8383
)
8484
self.result.status = ExecutionStatus.OK
8585
else:
86-
self.result.message = (
87-
f"Memory usage exceeded max allowed! Used {used_gb:.2f} GB, "
88-
f"max allowed {allowed_gb:.2f} GB "
89-
f"(base={base_source} {base_gb:.2f} GB × ratio={args.ratio:.2f})"
90-
)
86+
self.result.message = "Memory usage exceeded max allowed!"
9187
self.result.status = ExecutionStatus.ERROR
9288
self._log_event(
9389
category=EventCategory.OS,
94-
description=self.result.message,
90+
description=f"Memory usage exceeded max allowed! Used {used_gb:.2f} GB, max allowed {allowed_gb:.2f} GB (base={base_source} {base_gb:.2f} GB × ratio={args.ratio:.2f})",
9591
priority=EventPriority.CRITICAL,
9692
data={
9793
"used_memory": used_memory,

‎nodescraper/plugins/inband/os/os_analyzer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ def analyze_data(self, data: OsDataModel, args: Optional[OsAnalyzerArgs] = None)
6161
self.result.status = ExecutionStatus.OK
6262
return self.result
6363

64-
self.result.message = f"OS name mismatch! Expected: {args.exp_os}, actual: {data.os_name}"
64+
self.result.message = "OS name mismatch!"
6565
self.result.status = ExecutionStatus.ERROR
6666
self._log_event(
6767
category=EventCategory.OS,
68-
description=f"{self.result.message}",
68+
description=f"OS name mismatch! Expected: {args.exp_os}, actual: {data.os_name}",
6969
data={"expected": args.exp_os, "actual": data.os_name},
7070
priority=EventPriority.CRITICAL,
7171
console_log=True,

‎nodescraper/plugins/inband/package/package_analyzer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def analyze_data(
236236

237237
total_errors = len(not_found_keys) + len(regex_errors) + len(version_mismatches)
238238
if total_errors > 0:
239-
self.result.message = f"{'; '.join(error_parts)}"
239+
self.result.message = "Package version mismatch"
240240
self.result.status = ExecutionStatus.ERROR
241241
else:
242242
self.result.message = "All packages found and versions matched"
@@ -247,7 +247,7 @@ def analyze_data(
247247
data.version_info, args.exp_package_ver
248248
)
249249
if not_found_match or not_found_version:
250-
self.result.message = f"Package version missmatched. Missmatched versions: {not_found_match}, not found versions: {not_found_version}"
250+
self.result.message = "Package version mismatch"
251251
self.result.status = ExecutionStatus.ERROR
252252

253253
return self.result

‎nodescraper/plugins/inband/process/process_analyzer.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,12 @@ def analyze_data(
5555
if not args:
5656
args = ProcessAnalyzerArgs()
5757

58-
err_messages = []
58+
has_errors = False
5959
if data.kfd_process is not None and data.kfd_process > args.max_kfd_processes:
60-
err_messages.append(
61-
f"Kfd processes {data.kfd_process} exeed max limit {args.max_kfd_processes}"
62-
)
60+
has_errors = True
6361
self._log_event(
6462
category=EventCategory.OS,
65-
description="Kfd processes exceed maximum limit",
63+
description=f"Kfd processes {data.kfd_process} exeed max limit {args.max_kfd_processes}",
6664
data={
6765
"kfd_process": data.kfd_process,
6866
"kfd_process_limit": args.max_kfd_processes,
@@ -72,10 +70,10 @@ def analyze_data(
7270
)
7371

7472
if data.cpu_usage is not None and data.cpu_usage > args.max_cpu_usage:
75-
err_messages.append(f"CPU usage {data.cpu_usage} exceeds limit {args.max_cpu_usage}")
73+
has_errors = True
7674
self._log_event(
7775
category=EventCategory.OS,
78-
description="CPU usage exceeds maximum limit",
76+
description=f"CPU usage {data.cpu_usage} exceeds limit {args.max_cpu_usage}",
7977
data={
8078
"cpu_usage": data.cpu_usage,
8179
"cpu_usage_limit": args.max_cpu_usage,
@@ -84,8 +82,8 @@ def analyze_data(
8482
console_log=True,
8583
)
8684

87-
if err_messages:
85+
if has_errors:
8886
self.result.status = ExecutionStatus.ERROR
89-
self.result.message = ". ".join(err_messages)
87+
self.result.message = "Process limits exceeded"
9088

9189
return self.result

‎nodescraper/plugins/inband/rocm/rocm_analyzer.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,11 @@ def analyze_data(
6464
break
6565
else:
6666
# No matching version found
67-
self.result.message = (
68-
f"ROCm version mismatch! Expected: {args.exp_rocm}, actual: {data.rocm_version}"
69-
)
67+
self.result.message = "ROCm version mismatch!"
7068
self.result.status = ExecutionStatus.ERROR
7169
self._log_event(
7270
category=EventCategory.SW_DRIVER,
73-
description=f"{self.result.message}",
71+
description=f"ROCm version mismatch! Expected: {args.exp_rocm}, actual: {data.rocm_version}",
7472
data={"expected": args.exp_rocm, "actual": data.rocm_version},
7573
priority=EventPriority.CRITICAL,
7674
console_log=True,
@@ -80,11 +78,11 @@ def analyze_data(
8078
# validate rocm_latest if provided in args
8179
if args.exp_rocm_latest:
8280
if data.rocm_latest_versioned_path != args.exp_rocm_latest:
83-
self.result.message = f"ROCm latest path mismatch! Expected: {args.exp_rocm_latest}, actual: {data.rocm_latest_versioned_path}"
81+
self.result.message = "ROCm latest path mismatch!"
8482
self.result.status = ExecutionStatus.ERROR
8583
self._log_event(
8684
category=EventCategory.SW_DRIVER,
87-
description=f"{self.result.message}",
85+
description=f"ROCm latest path mismatch! Expected: {args.exp_rocm_latest}, actual: {data.rocm_latest_versioned_path}",
8886
data={
8987
"expected": args.exp_rocm_latest,
9088
"actual": data.rocm_latest_versioned_path,

0 commit comments

Comments
 (0)