From 67c0033716c5739268db36d948768457bd9f5917 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Mon, 18 Jan 2016 16:22:30 +0800 Subject: [PATCH 1/2] suites/fs: cephfs_journal_tool: wait for health after restart Fixes: #14395 Signed-off-by: Yan, Zheng --- suites/fs/basic/tasks/cephfs_journal_tool.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/suites/fs/basic/tasks/cephfs_journal_tool.yaml b/suites/fs/basic/tasks/cephfs_journal_tool.yaml index f24890857..1f143cae9 100644 --- a/suites/fs/basic/tasks/cephfs_journal_tool.yaml +++ b/suites/fs/basic/tasks/cephfs_journal_tool.yaml @@ -12,6 +12,7 @@ tasks: clients: client.0: [suites/cephfs_journal_tool_smoke.sh] - ceph.restart: [mds.*] + wait-for-healthy: true - ceph-fuse: client.0: mounted: true From d26f2ed164edf821db74fa5d9a8900a974078595 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Mon, 18 Jan 2016 17:56:10 -0800 Subject: [PATCH 2/2] suites/fs: fix ceph.restart syntax Signed-off-by: Greg Farnum --- suites/fs/basic/tasks/cephfs_journal_tool.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/suites/fs/basic/tasks/cephfs_journal_tool.yaml b/suites/fs/basic/tasks/cephfs_journal_tool.yaml index 1f143cae9..622fe8f41 100644 --- a/suites/fs/basic/tasks/cephfs_journal_tool.yaml +++ b/suites/fs/basic/tasks/cephfs_journal_tool.yaml @@ -11,7 +11,8 @@ tasks: - workunit: clients: client.0: [suites/cephfs_journal_tool_smoke.sh] -- ceph.restart: [mds.*] +- ceph.restart: + daemons: [mds.*] wait-for-healthy: true - ceph-fuse: client.0: