RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36738 from ShraddhaAg/cephadm-archive-logs

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

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sebastian Wagner 2020-08-25 15:18:58 +02:00 committed by GitHub
commit f82058f06b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
qa/tasks/cephadm.py
View File

@ -10,6 +10,7 @@ import os
import json
import re
import uuid
import yaml
from io import BytesIO, StringIO
import toml
@ -158,6 +159,16 @@ def ceph_log(ctx, config):
cluster_name = config['cluster']
fsid = ctx.ceph[cluster_name].fsid
# 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)
try:
yield
@ -265,6 +276,16 @@ def ceph_crash(ctx, config):
cluster_name = config['cluster']
fsid = ctx.ceph[cluster_name].fsid
# 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/%s/crash' % fsid}
else:
info_yaml['archive']['crash'] = '/var/lib/ceph/%s/crash' % fsid
yaml.safe_dump(info_yaml, info_file, default_flow_style=False)
try:
yield
@ -307,7 +328,7 @@ def ceph_bootstrap(ctx, config, registry):
first_mon = ctx.ceph[cluster_name].first_mon
first_mon_role = ctx.ceph[cluster_name].first_mon_role
mons = ctx.ceph[cluster_name].mons
ctx.cluster.run(args=[
'sudo', 'mkdir', '-p', '/etc/ceph',
]);
@ -469,7 +490,7 @@ def ceph_bootstrap(ctx, config, registry):
ctx.daemons.get_daemon(type_, id_, cluster).stop()
except Exception:
log.exception(f'Failed to stop "{role}"')
raise
raise
# clean up /etc/ceph
ctx.cluster.run(args=[
@ -1128,7 +1149,7 @@ def task(ctx, config):
if cluster_name not in ctx.ceph:
ctx.ceph[cluster_name] = argparse.Namespace()
ctx.ceph[cluster_name].bootstrapped = False
# image
teuth_defaults = teuth_config.get('defaults', {})
cephadm_defaults = teuth_defaults.get('cephadm', {})
@ -1248,9 +1269,9 @@ def registries_add_mirror_to_docker_io(conf, mirror):
def add_mirror_to_cluster(ctx, mirror):
log.info('Adding local image mirror %s' % mirror)
registries_conf = '/etc/containers/registries.conf'
for remote in ctx.cluster.remotes.keys():
try:
config = teuthology.get_file(