Make thinpool.sh work with loopback devices

Since both Getting Started and Quickstart docs write about
a loopback-based device mapper configuration, this script should
support that as well.

Signed-off-by: Kazuyoshi Kato <[email protected]>

Author: kzys

examples/Makefile

@@ -41,6 +41,7 @@ integ-test:
 		--volume $(CURDIR)/etc/containerd/firecracker-runtime.json:/etc/containerd/firecracker-runtime.json \
 		--volume $(CURDIR)/logs:/var/log/firecracker-containerd-test \
 		--volume $(CURDIR)/..:/src \
+		--env FICD_DM_VOLUME_GROUP=$(FICD_DM_VOLUME_GROUP) \
 		--env FICD_DM_POOL=$(TEST_POOL) \
 		--env EXTRAGOARGS="${EXTRAGOARGS}" \
 		--workdir="/src/examples" \
@@ -50,6 +51,7 @@ integ-test:
 TEST_GATEWAY?=172.16.0.1
 TEST_IP?=172.16.0.2
 TEST_SUBNET?=/24
+FICD_DM_VOLUME_GROUP?=
 TEST_POOL?=
 testtap:
 	ip link add br0 type bridge

runtime/Makefile

@@ -62,6 +62,7 @@ integ-test-%: logs
 		--volume $(CURDIR)/..:/src \
 		--volume $(GO_CACHE_VOLUME_NAME):/go \
 		--env ENABLE_ISOLATED_TESTS=1 \
+		--env FICD_DM_VOLUME_GROUP=$(FICD_DM_VOLUME_GROUP) \
 		--env FICD_DM_POOL=$(FICD_DM_POOL) \
 		--env GOPROXY=direct \
 		--env GOSUMDB=off \
@@ -80,6 +81,7 @@ PERF_RUNTIME_SECONDS?=600
 PERF_VM_MEMSIZE_MB?=1024
 PERF_TARGET_BANDWIDTH?=1G
 
+FICD_DM_VOLUME_GROUP?=
 FICD_DM_POOL?=
 
 tc-redirect-tap-perf:
@@ -107,6 +109,7 @@ perf-test:
 		--env PERF_RUNTIME_SECONDS=$(PERF_RUNTIME_SECONDS) \
 		--env PERF_VM_MEMSIZE_MB=$(PERF_VM_MEMSIZE_MB) \
 		--env PERF_TARGET_BANDWIDTH=$(PERF_TARGET_BANDWIDTH) \
+		--env FICD_DM_VOLUME_GROUP=$(FICD_DM_VOLUME_GROUP) \
 		--env FICD_DM_POOL=$(FICD_DM_POOL) \
 		--env GOPROXY=direct \
 		--env GOSUMDB=off \

tools/thinpool.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 #
 # Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
@@ -13,9 +13,9 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-set -eu
+FICD_DM_VOLUME_GROUP="$FICD_DM_VOLUME_GROUP"
 
-VOLUME_GROUP='fcci-vg'
+set -eu
 
 subcommand="$1"
 name="$2"
@@ -24,22 +24,51 @@ if [ -z "$name" ]; then
     exit 0
 fi
 
-dm_device="/dev/mapper/$(echo ${VOLUME_GROUP} | sed -e s/-/--/g)-$name"
+if [[ -z "$FICD_DM_VOLUME_GROUP" ]]; then
+    pool_create() {
+        echo
+    }
+
+    pool_remove() {
+        echo
+    }
+
+    pool_reset() {
+        local dev_no=1
+        while true; do
+            sudo dmsetup message "$name" 0 "delete $dev_no" || break
+            dev_no=$(($dev_no + 1))
+        done
+    }
+else
+    dm_device="/dev/mapper/$(echo ${FICD_DM_VOLUME_GROUP} | sed -e s/-/--/g)-$name"
 
-pool_create() {
-    sudo lvcreate --type thin-pool \
-         --poolmetadatasize 16GiB \
-         --size 1G \
-         -n "$name" "$VOLUME_GROUP"
-}
+    pool_create() {
+        echo sudo lvcreate --type thin-pool \
+             --poolmetadatasize 16GiB \
+             --size 1G \
+             -n "$name" "$FICD_DM_VOLUME_GROUP"
+        sudo lvcreate --type thin-pool \
+             --poolmetadatasize 16GiB \
+             --size 1G \
+             -n "$name" "$FICD_DM_VOLUME_GROUP"
+    }
 
-pool_remove() {
-    sudo dmsetup remove "${dm_device}-snap-"* || true
-    sudo dmsetup remove \
+    pool_remove() {
+        sudo dmsetup remove "${dm_device}-snap-"* || true
+        sudo dmsetup remove \
          "${dm_device}" \
          "${dm_device}_tdata" "${dm_device}_tmeta" || true
-    sudo lvremove -f "$dm_device"
-}
+        sudo lvremove -f "$dm_device"
+    }
+
+    pool_reset() {
+        if [ -e "${dm_device}" ]; then
+            pool_remove
+        fi
+        pool_create
+    }
+fi
 
 case "$subcommand" in
     'create')
@@ -49,10 +78,7 @@ case "$subcommand" in
         pool_remove
         ;;
     'reset')
-        if [ -e "${dm_device}" ]; then
-            pool_remove
-        fi
-        pool_create
+        pool_reset
         ;;
     *)
         echo "This script doesn't support $subcommand"