update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / qa / workunits / rbd / krbd_data_pool.sh

diff --git a/ceph/qa/workunits/rbd/krbd_data_pool.sh b/ceph/qa/workunits/rbd/krbd_data_pool.sh
index 7d72882133988b322086e6b926253e70cfda69d9..e8fc8348c60155ec82846457fb21385a50896157 100755 (executable)
--- a/ceph/qa/workunits/rbd/krbd_data_pool.sh
+++ b/ceph/qa/workunits/rbd/krbd_data_pool.sh
@@ -1,7 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 
+export RBD_FORCE_ALLOW_V1=1
+
 function fill_image() {
     local spec=$1
 
@@ -61,7 +63,8 @@ function mkfs_and_mount() {
 
     local dev
     dev=$(sudo rbd map $spec)
-    mkfs.ext4 -q -E discard $dev
+    blkdiscard $dev
+    mkfs.ext4 -q -E nodiscard $dev
     sudo mount $dev /mnt
     sudo umount /mnt
     sudo rbd unmap $dev
@@ -187,7 +190,7 @@ for pool in rbd rbdnonzero; do
     done
 done
 
-# mkfs should discard some objects everywhere but in clonesonly
+# mkfs_and_mount should discard some objects everywhere but in clonesonly
 [[ $(list_HEADs rbd | wc -l) -lt $((NUM_META_RBDS + 5 * NUM_OBJECTS)) ]]
 [[ $(list_HEADs repdata | wc -l) -lt $((1 + 14 * NUM_OBJECTS)) ]]
 [[ $(list_HEADs ecdata | wc -l) -lt $((1 + 14 * NUM_OBJECTS)) ]]