export -A: fix the number of snapshots to 1

Author: pizzamig

CHANGELOG.md

@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - start: overwrite /etc/hosts of a pot, adding all pots on the same bridge and custom entries added via set-hosts
 - flavorable commands: extend support to set-cmd and set-env
 - pot-rdr anchor: the name of the anchor is now a truncated pot name (the last 54 characters)
-- export: it's executed only if one snapshot is available. -F force execution, -A call purge-snapshots to reduce the number of shapshot to 1
+- export: it's executed only if one snapshot is available. -F force execution, -A fix the number of snapshots, via purge-snapshots or taking a shapshot automagically
 - start: using exec.start instead of command (it seems more predictable)
 
 ### Deprecated

share/pot/export.sh

@@ -17,7 +17,7 @@ export-help() {
 	echo '  -D directory : where to store the compressed file with the pot'
 	echo '  -l compression-level : from 0 (fast) to 9 (best). Defaul level 6. (man xz for more information)'
 	echo '  -F : force exports of multiple snapshot (only 1 snapshot should be allowed)'
-	echo '  -A : auto-purge older snapshots (only 1 snapshot should be allowed)'
+	echo '  -A : auto-fix snapshots number (exactly 1 snapshot is allowed)'
 }
 
 # $1 : pot name
@@ -131,8 +131,19 @@ pot-export()
 	else
 		_snap="$(_zfs_last_snap "${POT_ZFS_ROOT}/jails/$_pname" )"
 		if [ -z "$_snap" ]; then
-			_error "pot $_pname has no snapshots - please use pot snapshot for that"
-			${EXIT} 1
+			if [ "$_auto_purge" = "YES" ]; then
+				_info "Taking a snapshot of $_pname"
+				if ! pot-cmd snapshot -p "$_pname" ; then
+					_error "Failed to take a snapshot of pot $_pname"
+					${EXIT} 1
+				else
+					_snap="$(_zfs_last_snap "${POT_ZFS_ROOT}/jails/$_pname" )"
+					_debug "A snapshot of $_pname has been automatically taken (@$_snap)"
+				fi
+			else
+				_error "Pot $_pname has no snapshots - please use pot snapshot for that"
+				${EXIT} 1
+			fi
 		fi
 	fi
 	if [ "$( _zfs_count_snap "${POT_ZFS_ROOT}/jails/$_pname" )" -gt 1 ]; then

tests/common-stub.sh

@@ -16,6 +16,7 @@ EXIT="return"
 # test-pot-single			no		single	0		10.1.2.3	yes		public-bridge
 # test-pot-single-run		yes		single	0		undef		yes		public-bridge
 # test-pot-single-2			no		single	0		10.1.2.3	yes		public-bridge
+# test-pot-single-0			no		single	0		10.1.2.3	yes		public-bridge
 # test-pot-3				no		multi	1		10.1.2.3	no		alias
 
 # test-pot-multi-inherit	no		multi	1					no		inherit
@@ -70,7 +71,7 @@ _is_pot()
 		test-pot|test-pot-run|\
 		test-pot-2|test-pot-run-2|\
 		test-pot-0|test-pot-nosnap|test-pot-3|\
-		test-pot-single|test-pot-single-run|test-pot-single-2|\
+		test-pot-single|test-pot-single-run|test-pot-single-2|test-pot-single-0|\
 		test-pot-multi-inherit|test-pot-multi-private|\
 		${POT_DNS_NAME})
 			return 0 # true
@@ -137,7 +138,8 @@ _get_conf_var()
 		test-pot-2|test-pot-run-2)
 			echo "2"
 			;;
-		test-pot-0|test-pot-single|test-pot-single-run|test-pot-single-2)
+		test-pot-0|test-pot-single|test-pot-single-run|\
+		test-pot-single-2|test-pot-single-0)
 			echo "0"
 			;;
 		esac
@@ -158,7 +160,7 @@ _get_conf_var()
 			echo ""
 			;;
 		test-pot-2|test-pot-3|\
-		test-pot-single|test-pot-single-2)
+		test-pot-single|test-pot-single-2|test-pot-single-0)
 			echo "10.1.2.3"
 			;;
 		test-pot-multi-private)
@@ -176,7 +178,7 @@ _get_conf_var()
 			echo "alias"
 			;;
 		test-pot-2|test-pot-single-run|\
-		test-pot-single|test-pot-single-2)
+		test-pot-single|test-pot-single-2|test-pot-single-0)
 			echo "public-bridge"
 			;;
 		test-pot-multi-private)
@@ -192,14 +194,14 @@ _get_conf_var()
 		test-pot-multi-inherit|test-pot-multi-private)
 			echo "multi"
 			;;
-		test-pot-single|test-pot-single-run|test-pot-single-2)
+		test-pot-single|test-pot-single-run|test-pot-single-2|test-pot-single-0)
 			echo "single"
 		esac
 		;;
 	"vnet")
 		case $1 in
 		test-pot-2|test-pot-single|test-pot-single-run|\
-		test-pot-multi-private|test-pot-single-2)
+		test-pot-multi-private|test-pot-single-2|test-pot-single-0)
 			echo "true"
 			;;
 		test-pot-3|test-pot-multi-inherit)

tests/export1.sh

@@ -26,6 +26,13 @@ _zfs_last_snap()
 		echo 1234321
 	elif [ "$1" = "/jails/test-pot-single-2" ]; then
 		echo 4321234
+	elif [ "$1" = "/jails/test-pot-single-0" ]; then
+		if [ -e /tmp/pot_test_last_snap ]; then
+			echo 123123123
+			rm -f /tmp/pot_test_last_snap
+		else
+			touch /tmp/pot_test_last_snap
+		fi
 	fi
 }
 
@@ -184,6 +191,15 @@ test_pot_export_031()
 	assertEquals "_export calls" "0" "$EXPORTS_CALLS"
 }
 
+test_pot_export_032()
+{
+	# no snapshosts available
+	pot-export -p test-pot-single-0
+	assertEquals "Exit rc" "1" "$?"
+	assertEquals "Error calls" "1" "$ERROR_CALLS"
+	assertEquals "_export calls" "0" "$EXPORTS_CALLS"
+}
+
 test_pot_export_040()
 {
 	pot-export -p test-pot-single
@@ -282,12 +298,30 @@ test_pot_export_051()
 	assertEquals "Error calls" "0" "$ERROR_CALLS"
 	assertEquals "_is_zfs_pot_snap calls" "0" "$ISZFSSNAP_CALLS"
 	assertEquals "pot-cmd calls" "1" "$POTCMD_CALLS"
+	assertEquals "pot-cmd arg1" "purge-snapshots" "$POTCMD_CALL1_ARG1"
 	assertEquals "_export calls" "1" "$EXPORTS_CALLS"
 	assertEquals "_export arg1" "test-pot-single-2" "$EXPORTS_CALL1_ARG1"
 	assertEquals "_export arg2" "4321234" "$EXPORTS_CALL1_ARG2"
 	assertEquals "_export arg3" "1.0" "$EXPORTS_CALL1_ARG3"
 	assertEquals "_export arg4" "." "$EXPORTS_CALL1_ARG4"
 }
+
+test_pot_export_052()
+{
+	pot-export -p test-pot-single-0 -t 1.0 -A
+	assertEquals "Exit rc" "0" "$?"
+	assertEquals "Help calls" "0" "$HELP_CALLS"
+	assertEquals "Error calls" "0" "$ERROR_CALLS"
+	assertEquals "_is_zfs_pot_snap calls" "0" "$ISZFSSNAP_CALLS"
+	assertEquals "pot-cmd calls" "1" "$POTCMD_CALLS"
+	assertEquals "pot-cmd arg1" "snapshot" "$POTCMD_CALL1_ARG1"
+	assertEquals "_export calls" "1" "$EXPORTS_CALLS"
+	assertEquals "_export arg1" "test-pot-single-0" "$EXPORTS_CALL1_ARG1"
+	assertEquals "_export arg2" "123123123" "$EXPORTS_CALL1_ARG2"
+	assertEquals "_export arg3" "1.0" "$EXPORTS_CALL1_ARG3"
+	assertEquals "_export arg4" "." "$EXPORTS_CALL1_ARG4"
+}
+
 setUp()
 {
 	common_setUp
@@ -301,4 +335,9 @@ setUp()
 	POTCMD_CALLS=0
 }
 
+tearDown()
+{
+	rm -f /tmp/pot_test_last_snap
+}
+
 . shunit/shunit2