RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/ceph.py: add ceph logs directory in job's info.yaml

Browse Source 
This commit adds the file path of ceph log directories to the job's
info.yaml log file. The motivation behind this is, in case of job
timeout, the logs would still be tranferred to teuthology host
before nuking test machines using these ceph log directory paths in
job's info.yaml log file.

Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>
This commit is contained in:
Shraddha Agrawal 2020-07-21 02:33:12 +05:30
parent 31f49d3841
commit e991f04b59
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qa/tasks/ceph.py
View File

@ -17,6 +17,7 @@ import time
import gevent
import re
import socket
import yaml
from paramiko import SSHException
from tasks.ceph_manager import CephManager, write_conf
@ -75,8 +76,19 @@ def generate_caps(type_):
@contextlib.contextmanager
def ceph_crash(ctx, config):
"""
Gather crash dumps from /var/lib/crash
Gather crash dumps from /var/lib/ceph/crash
"""
# Add logs directory to job's info log file
with open(os.path.join(ctx.archive, 'info.yaml'), 'r+') as info_file:
info_yaml = yaml.safe_load(info_file)
info_file.seek(0)
if 'archive' not in info_yaml:
info_yaml['archive'] = {'crash': '/var/lib/ceph/crash'}
else:
info_yaml['archive']['crash'] = '/var/lib/ceph/crash'
yaml.safe_dump(info_yaml, info_file, default_flow_style=False)
try:
yield
@ -146,6 +158,16 @@ def ceph_log(ctx, config):
)
)
# Add logs directory to job's info log file
with open(os.path.join(ctx.archive, 'info.yaml'), 'r+') as info_file:
info_yaml = yaml.safe_load(info_file)
info_file.seek(0)
if 'archive' not in info_yaml:
info_yaml['archive'] = {'log': '/var/log/ceph'}
else:
info_yaml['archive']['log'] = '/var/log/ceph'
yaml.safe_dump(info_yaml, info_file, default_flow_style=False)
class Rotater(object):
stop_event = gevent.event.Event()
@ -1529,7 +1551,7 @@ def restart(ctx, config):
ctx.managers[cluster].mark_down_osd(id_)
ctx.daemons.get_daemon(type_, id_, cluster).restart()
clusters.add(cluster)
if config.get('wait-for-healthy', True):
for cluster in clusters:
healthy(ctx=ctx, config=dict(cluster=cluster))