From 1855e094e58468cb6baf545e1092ff6c4fc7a7df Mon Sep 17 00:00:00 2001
From: John Spray <jspray@redhat.com>
Date: Wed, 20 Aug 2014 12:57:23 +0100
Subject: [PATCH] suites/fs: add client recovery

Signed-off-by: John Spray <john.spray@redhat.com>
---
 suites/fs/recovery/%                              |  0
 suites/fs/recovery/clusters/2-remote-clients.yaml |  3 +++
 suites/fs/recovery/mounts/ceph-fuse.yaml          |  8 ++++++++
 suites/fs/recovery/tasks/client-recovery.yaml     | 11 +++++++++++
 tasks/mds_client_recovery.py                      |  2 +-
 5 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 suites/fs/recovery/%
 create mode 100644 suites/fs/recovery/clusters/2-remote-clients.yaml
 create mode 100644 suites/fs/recovery/mounts/ceph-fuse.yaml
 create mode 100644 suites/fs/recovery/tasks/client-recovery.yaml

diff --git a/suites/fs/recovery/% b/suites/fs/recovery/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/suites/fs/recovery/clusters/2-remote-clients.yaml b/suites/fs/recovery/clusters/2-remote-clients.yaml
new file mode 100644
index 00000000000..d8af6b6ae12
--- /dev/null
+++ b/suites/fs/recovery/clusters/2-remote-clients.yaml
@@ -0,0 +1,3 @@
+roles:
+- [mon.a, osd.0, mds.a]
+- [client.0, client.1, osd.1, osd.2]
diff --git a/suites/fs/recovery/mounts/ceph-fuse.yaml b/suites/fs/recovery/mounts/ceph-fuse.yaml
new file mode 100644
index 00000000000..8092598f404
--- /dev/null
+++ b/suites/fs/recovery/mounts/ceph-fuse.yaml
@@ -0,0 +1,8 @@
+tasks:
+- install:
+- ceph:
+- ceph-fuse:
+    client.0:
+        mounted: false
+    client.1:
+        mounted: false
diff --git a/suites/fs/recovery/tasks/client-recovery.yaml b/suites/fs/recovery/tasks/client-recovery.yaml
new file mode 100644
index 00000000000..2cd39510f35
--- /dev/null
+++ b/suites/fs/recovery/tasks/client-recovery.yaml
@@ -0,0 +1,11 @@
+
+# The task interferes with the network, so we need
+# to permit OSDs to complain about that.
+overrides:
+  ceph:
+      log-whitelist:
+      - wrongly marked me down
+      - slow request
+
+tasks:
+- mds_client_recovery:
diff --git a/tasks/mds_client_recovery.py b/tasks/mds_client_recovery.py
index aebc979fb67..31872d566ec 100644
--- a/tasks/mds_client_recovery.py
+++ b/tasks/mds_client_recovery.py
@@ -385,7 +385,7 @@ def task(ctx, config):
 
     # Execute test suite
     # ==================
-    if 'test_name' in config:
+    if config and 'test_name' in config:
         suite = unittest.TestLoader().loadTestsFromName(
             "teuthology.task.mds_client_recovery.{0}".format(config['test_name']))
     else: