RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 14:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ceph log handling into a separate subtask.

Browse Source
This commit is contained in:
Tommi Virtanen 2011-06-16 13:13:32 -07:00
parent 9353fcc931
commit 594a3d3f04
1 changed files with 45 additions and 23 deletions

68
teuthology/task/ceph.py
View File

@ -14,6 +14,50 @@ from orchestra import run
log = logging.getLogger(__name__)
@contextlib.contextmanager
def ceph_log(ctx, config):
log.info('Creating log directories...')
run.wait(
ctx.cluster.run(
args=[
'install', '-d', '-m0755', '--',
'/tmp/cephtest/archive/log',
'/tmp/cephtest/archive/profiling-logger',
],
wait=False,
)
)
try:
yield
finally:
if ctx.archive is not None:
log.info('Compressing logs...')
run.wait(
ctx.cluster.run(
args=[
'find',
'/tmp/cephtest/archive/log',
'-name',
'*.log',
'-print0',
run.Raw('|'),
'xargs',
'-0',
'--no-run-if-empty',
'--',
'bzip2',
'-9',
'--',
],
wait=False,
),
)
# log file transfer is done by the generic archive data
# handling
@contextlib.contextmanager
def ship_utilities(ctx, config):
assert config is None
@ -584,8 +628,6 @@ def task(ctx, config):
args=[
'install', '-d', '-m0755', '--',
'/tmp/cephtest/archive',
'/tmp/cephtest/archive/log',
'/tmp/cephtest/archive/profiling-logger',
'/tmp/cephtest/data',
coverage_dir,
],
@ -594,6 +636,7 @@ def task(ctx, config):
)
with contextutil.nested(
lambda: ceph_log(ctx=ctx, config=None),
lambda: ship_utilities(ctx=ctx, config=None),
lambda: binaries(ctx=ctx, config=dict(
branch=config.get('branch'),
@ -616,27 +659,6 @@ def task(ctx, config):
yield
if ctx.archive is not None:
log.info('Compressing logs...')
run.wait(
ctx.cluster.run(
args=[
'find',
'/tmp/cephtest/archive/log',
'-name',
'*.log',
'-print0',
run.Raw('|'),
'xargs',
'-0',
'--no-run-if-empty',
'--',
'bzip2',
'-9',
'--',
],
wait=False,
),
)
log.info('Transferring archived files...')
logdir = os.path.join(ctx.archive, 'remote')