krdb_data_pool python3 syntax and adding the image-feautre

diff --git a/qa/workunits/rbd/krbd_data_pool.sh b/qa/workunits/rbd/krbd_data_pool.sh
index e8fc8348c60155ec82846457fb21385a50896157..2422fee87a164e2833bafab05e75fa1e5952a8a6 100755 (executable)
--- a/qa/workunits/rbd/krbd_data_pool.sh
+++ b/qa/workunits/rbd/krbd_data_pool.sh
@@ -98,7 +98,7 @@ function get_num_clones() {
     local pool=$1
 
     rados -p $pool --format=json df |
-        python -c 'import sys, json; print json.load(sys.stdin)["pools"][0]["num_object_clones"]'
+        python3 -c 'import sys, json; print( json.load(sys.stdin)["pools"][0]["num_object_clones"])'
 }
 
 ceph osd pool create repdata 24 24
@@ -113,14 +113,14 @@ ceph osd pool create clonesonly 24 24
 rbd pool init clonesonly
 
 for pool in rbd rbdnonzero; do
-    rbd create --size 200 --image-format 1 $pool/img0
-    rbd create --size 200 $pool/img1
-    rbd create --size 200 --data-pool repdata $pool/img2
-    rbd create --size 200 --data-pool ecdata $pool/img3
+    rbd create --size 200 --image-format 1 $pool/img0 --image-feature layering
+    rbd create --size 200 $pool/img1 --image-feature layering
+    rbd create --size 200 --data-pool repdata $pool/img2 --image-feature layering
+    rbd create --size 200 --data-pool ecdata $pool/img3 --image-feature layering
 done
 
-IMAGE_SIZE=$(rbd info --format=json img1 | python -c 'import sys, json; print json.load(sys.stdin)["size"]')
-OBJECT_SIZE=$(rbd info --format=json img1 | python -c 'import sys, json; print json.load(sys.stdin)["object_size"]')
+IMAGE_SIZE=$(rbd info --format=json img1 | python3 -c 'import sys, json; print( json.load(sys.stdin)["size"])')
+OBJECT_SIZE=$(rbd info --format=json img1 | python3 -c 'import sys, json; print( json.load(sys.stdin)["object_size"])')
 NUM_OBJECTS=$((IMAGE_SIZE / OBJECT_SIZE))
 [[ $((IMAGE_SIZE % OBJECT_SIZE)) -eq 0 ]]