From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 18 Aug 2016 12:15:07 +0000 (+0200)
Subject: krbd: enable exclusive-lock feature
X-Git-Tag: v11.1.1~58^2^2~108^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9173938ba19961e8a02883bf4f184c5b5d91a9e;p=ceph.git

krbd: enable exclusive-lock feature

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/suites/krbd/rbd-nomount/conf.yaml b/suites/krbd/rbd-nomount/conf.yaml
index 3ee426ba1d4e..8279674dfa7c 100644
--- a/suites/krbd/rbd-nomount/conf.yaml
+++ b/suites/krbd/rbd-nomount/conf.yaml
@@ -4,4 +4,4 @@ overrides:
       global:
         ms die on skipped message: false
       client:
-        rbd default features: 1
+        rbd default features: 5
diff --git a/suites/krbd/rbd/conf.yaml b/suites/krbd/rbd/conf.yaml
index 3ee426ba1d4e..8279674dfa7c 100644
--- a/suites/krbd/rbd/conf.yaml
+++ b/suites/krbd/rbd/conf.yaml
@@ -4,4 +4,4 @@ overrides:
       global:
         ms die on skipped message: false
       client:
-        rbd default features: 1
+        rbd default features: 5
diff --git a/suites/krbd/rbd/tasks/rbd_fio.yaml b/suites/krbd/rbd/tasks/rbd_fio.yaml
index 548403c8b78e..01088fa46060 100644
--- a/suites/krbd/rbd/tasks/rbd_fio.yaml
+++ b/suites/krbd/rbd/tasks/rbd_fio.yaml
@@ -5,7 +5,7 @@ tasks:
     client.0:
        fio-io-size: 90%
        formats: [2]
-       features: [[layering]]
+       features: [[layering,exclusive-lock]]
        io-engine: sync
        rw: randrw
        runtime: 900
diff --git a/suites/krbd/singleton/conf.yaml b/suites/krbd/singleton/conf.yaml
index 3ee426ba1d4e..8279674dfa7c 100644
--- a/suites/krbd/singleton/conf.yaml
+++ b/suites/krbd/singleton/conf.yaml
@@ -4,4 +4,4 @@ overrides:
       global:
         ms die on skipped message: false
       client:
-        rbd default features: 1
+        rbd default features: 5
diff --git a/suites/krbd/thrash/conf.yaml b/suites/krbd/thrash/conf.yaml
index 3ee426ba1d4e..8279674dfa7c 100644
--- a/suites/krbd/thrash/conf.yaml
+++ b/suites/krbd/thrash/conf.yaml
@@ -4,4 +4,4 @@ overrides:
       global:
         ms die on skipped message: false
       client:
-        rbd default features: 1
+        rbd default features: 5
diff --git a/suites/krbd/thrash/workloads/rbd_fio.yaml b/suites/krbd/thrash/workloads/rbd_fio.yaml
index f219ae190e3e..191928e5ba12 100644
--- a/suites/krbd/thrash/workloads/rbd_fio.yaml
+++ b/suites/krbd/thrash/workloads/rbd_fio.yaml
@@ -3,7 +3,7 @@ tasks:
     client.0:
        fio-io-size: 90%
        formats: [2]
-       features: [[layering]]
+       features: [[layering,exclusive-lock]]
        io-engine: sync
        rw: randrw
        runtime: 1200
diff --git a/suites/krbd/unmap/conf.yaml b/suites/krbd/unmap/conf.yaml
index 429b8e145a05..8984e8dc832d 100644
--- a/suites/krbd/unmap/conf.yaml
+++ b/suites/krbd/unmap/conf.yaml
@@ -2,4 +2,4 @@ overrides:
   ceph:
     conf:
       client:
-        rbd default features: 1
+        rbd default features: 1 # pre-single-major is v3.13, so layering only