From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Jun 2013 23:41:30 +0000 (-0700)
Subject: rados: don't use ceph-fuse for workunits
X-Git-Tag: v0.94.10~27^2^2~691
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d64f264c8909ab342f4f6ea9c4441da564a2f484;p=ceph.git

rados: don't use ceph-fuse for workunits

They can run on the local mount/dir.
---

diff --git a/suites/rados/basic/tasks/rados_api_tests.yaml b/suites/rados/basic/tasks/rados_api_tests.yaml
index f43e7f64186d..1636c7f7b205 100644
--- a/suites/rados/basic/tasks/rados_api_tests.yaml
+++ b/suites/rados/basic/tasks/rados_api_tests.yaml
@@ -5,7 +5,6 @@ overrides:
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       client.0:
diff --git a/suites/rados/basic/tasks/rados_cls_all.yaml b/suites/rados/basic/tasks/rados_cls_all.yaml
index 80be56276dbb..34f7cbbb4a05 100644
--- a/suites/rados/basic/tasks/rados_cls_all.yaml
+++ b/suites/rados/basic/tasks/rados_cls_all.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       client.0:
diff --git a/suites/rados/basic/tasks/rados_python.yaml b/suites/rados/basic/tasks/rados_python.yaml
index b9ac20e57f0e..4faf10e39e08 100644
--- a/suites/rados/basic/tasks/rados_python.yaml
+++ b/suites/rados/basic/tasks/rados_python.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       client.0:
diff --git a/suites/rados/basic/tasks/rados_stress_watch.yaml b/suites/rados/basic/tasks/rados_stress_watch.yaml
index 53c656654ae5..ae2e5fd00832 100644
--- a/suites/rados/basic/tasks/rados_stress_watch.yaml
+++ b/suites/rados/basic/tasks/rados_stress_watch.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       client.0:
diff --git a/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml b/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
index 6c5cbbde65fb..3a21727825b2 100644
--- a/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
+++ b/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       all:
diff --git a/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml b/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
index 716deac21567..642148d602ac 100644
--- a/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
+++ b/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       all:
diff --git a/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml b/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
index 446eff51a159..87d8d28c47e0 100644
--- a/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
+++ b/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
@@ -1,7 +1,6 @@
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       all:
diff --git a/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml b/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml
index 2c5a768cf53e..bc5a2838ef90 100644
--- a/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml
+++ b/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml
@@ -3,7 +3,6 @@ roles:
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       all:
diff --git a/suites/rados/singleton/all/mon-config-keys.yaml b/suites/rados/singleton/all/mon-config-keys.yaml
index 5f6bf3347e29..524c6b6f570a 100644
--- a/suites/rados/singleton/all/mon-config-keys.yaml
+++ b/suites/rados/singleton/all/mon-config-keys.yaml
@@ -10,7 +10,6 @@ roles:
 tasks:
 - install:
 - ceph:
-- ceph-fuse:
 - workunit:
     clients:
       all:
diff --git a/suites/rados/singleton/all/mon-thrasher.yaml b/suites/rados/singleton/all/mon-thrasher.yaml
index 05a704f1f90b..4e4e8571b356 100644
--- a/suites/rados/singleton/all/mon-thrasher.yaml
+++ b/suites/rados/singleton/all/mon-thrasher.yaml
@@ -12,7 +12,6 @@ tasks:
 - mon_thrash:
     revive_delay: 20
     thrash_delay: 1
-- ceph-fuse:
 - workunit:
     clients:
       all:
diff --git a/suites/rados/singleton/all/thrash-rados.yaml b/suites/rados/singleton/all/thrash-rados.yaml
index 3282adfae638..4bdcf226546e 100644
--- a/suites/rados/singleton/all/thrash-rados.yaml
+++ b/suites/rados/singleton/all/thrash-rados.yaml
@@ -17,7 +17,6 @@ tasks:
     op_delay: 30
     clean_interval: 120
     chance_down: .5
-- ceph-fuse:
 - workunit:
     clients:
       all:
diff --git a/suites/rados/thrash/workloads/rados_api_tests.yaml b/suites/rados/thrash/workloads/rados_api_tests.yaml
index b4708ebd7c0a..cd11ae6ca0c1 100644
--- a/suites/rados/thrash/workloads/rados_api_tests.yaml
+++ b/suites/rados/thrash/workloads/rados_api_tests.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       client.0: