Skip to content

Commit 592bc99

Browse files
authored
Do not use containers when attach logs (#13210)
1 parent 0859ec3 commit 592bc99

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,9 @@ def _attach_logs(cls, start_time, attach_name):
9696
hosts = [node.host for node in filter(lambda x: x.role == YdbCluster.Node.Role.STORAGE, YdbCluster.get_cluster_nodes())]
9797
tz = timezone('Europe/Moscow')
9898
start = datetime.fromtimestamp(start_time, tz).isoformat()
99-
cmd = f"ulimit -n 100500;unified_agent select -S '{start}' -s {{storage}} -m k8s_container:{{container}}"
99+
cmd = f"ulimit -n 100500;unified_agent select -S '{start}' -s {{storage}}{{container}}"
100100
exec_kikimr = {
101-
'ydb-dynamic': {},
102-
'ydb-storage': {},
101+
'': {},
103102
}
104103
exec_start = deepcopy(exec_kikimr)
105104
ssh_cmd = ['ssh', "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null"]
@@ -112,12 +111,18 @@ def _attach_logs(cls, start_time, attach_name):
112111
for host in hosts:
113112
for c in exec_kikimr.keys():
114113
try:
115-
exec_kikimr[c][host] = yatest.common.execute(ssh_cmd + [host, cmd.format(storage='kikimr', container=c)], wait=False)
114+
exec_kikimr[c][host] = yatest.common.execute(ssh_cmd + [host, cmd.format(
115+
storage='kikimr',
116+
container=f' -m k8s_container:{c}' if c else '')],
117+
wait=False)
116118
except BaseException as e:
117119
logging.error(e)
118120
for c in exec_start.keys():
119121
try:
120-
exec_start[c][host] = yatest.common.execute(ssh_cmd + [host, cmd.format(storage='kikimr-start', container=c)], wait=False)
122+
exec_start[c][host] = yatest.common.execute(ssh_cmd + [host, cmd.format(
123+
storage='kikimr-start',
124+
container=f' -m k8s_container:{c}' if c else '')],
125+
wait=False)
121126
except BaseException as e:
122127
logging.error(e)
123128

0 commit comments

Comments
 (0)