Skip to content

Commit 73bc542

Browse files
authored
Fix OOM matching (#17514)
1 parent c45eac2 commit 73bc542

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ydb/tests/olap/load/lib/conftest.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def __get_hosts_with_omms(cls, hosts: set[str], start_time: float, end_time: flo
184184
tz = timezone('Europe/Moscow')
185185
start = datetime.fromtimestamp(start_time, tz).strftime("%Y-%m-%d %H:%M:%S")
186186
end = datetime.fromtimestamp(end_time, tz).strftime("%Y-%m-%d %H:%M:%S")
187-
oom_cmd = f'sudo journalctl -k -q --no-pager -S {start} -U {end} --grep "Out of memory: Kill process"'
187+
oom_cmd = f'sudo journalctl -k -q --no-pager -S {start} -U {end} --grep "Out of memory: Kill" --case-sensitive=false'
188188
ooms = set()
189189
for h in hosts:
190190
exec = cls.__execute_ssh(h, oom_cmd)
@@ -287,18 +287,18 @@ def _attach_plans(plan: YdbCliHelper.QueryPlan, name: str) -> None:
287287

288288
if result.stderr is not None:
289289
allure.attach(result.stderr, 'Stderr', attachment_type=allure.attachment_type.TEXT)
290+
end_time = time()
291+
allure_test_description(
292+
cls.suite(), test, refference_set=cls.refference,
293+
start_time=result.start_time, end_time=end_time, node_errors=cls.check_nodes(result, end_time)
294+
)
290295
stats = result.get_stats(test)
291296
for p in ['Mean']:
292297
if p in stats:
293298
allure.dynamic.parameter(p, _duration_text(stats[p] / 1000.))
294-
end_time = time()
295299
if os.getenv('NO_KUBER_LOGS') is None and not result.success:
296300
cls.__attach_logs(start_time=result.start_time, attach_name='kikimr')
297301
allure.attach(json.dumps(stats, indent=2), 'Stats', attachment_type=allure.attachment_type.JSON)
298-
allure_test_description(
299-
cls.suite(), test, refference_set=cls.refference,
300-
start_time=result.start_time, end_time=end_time, node_errors=cls.check_nodes(result, end_time)
301-
)
302302
if upload:
303303
ResultsProcessor.upload_results(
304304
kind='Load',

0 commit comments

Comments
 (0)