Merge pull request #65 from mmichal10/test-for-existing-metadata

Test for existing metadata

casadm/extended_err_msg.c

@@ -132,6 +132,12 @@ struct {
 		OCF_ERR_NO_METADATA,
 		"No metadata found on device"
 	},
+	{
+		OCF_ERR_METADATA_FOUND,
+		"Old metadata found on device.\nPlease load cache metadata using --load"
+		   " option or use --force to\n discard on-disk metadata and"
+		  " start fresh cache instance.\n"
+	},
 
 	/* CAS kernel error mappings*/
 	{

ocf

@@ -1 +1 @@
-Subproject commit 6c869d97fbf2f3fe862e106317fb1d22914723b6
+Subproject commit 999f3f724548cf69bb93b96cd17a5c122c178caf

test/smoke_test/basic/05

@@ -31,7 +31,7 @@ TARGET_DEVICE_OPTION="$CACHE_DEVICE" PARTITION_SIZE_OPTION="2000M" PARTITION_IDS
 # Try to start positive caches in loop and later stop them - if any of those operations fails, it
 # means the cache ID is invalid
 for ID in $POSITIVE_IDS ; do
-    CACHE_ID_OPTION="$ID" CACHE_DEVICE_OPTION="${CACHE_DEVICE}1" start_cache
+    CACHE_ID_OPTION="$ID" CACHE_DEVICE_OPTION="${CACHE_DEVICE}1" CACHE_FORCE_OPTION="yes" start_cache
     CACHE_ID_OPTION="$ID" stop_cache
 done
 
@@ -40,7 +40,8 @@ done
 # ID, because the framework will treat it as an undefined option and will fail the test
 # automatically.
 for ID in $NEGATIVE_IDS ; do
-    NEGATIVE_TEST_OPTION="1" CACHE_ID_OPTION="$ID" CACHE_DEVICE_OPTION="${CACHE_DEVICE}1" start_cache
+    NEGATIVE_TEST_OPTION="1" CACHE_ID_OPTION="$ID"
+        CACHE_DEVICE_OPTION="${CACHE_DEVICE}1" CACHE_FORCE_OPTION="yes" start_cache
 done
 
 # Always return 0 at the end of the test - if at any point something has failed

test/smoke_test/basic/08

@@ -42,7 +42,8 @@ do
     echo "------Start CAS Linux in $mode mode"
 
 # This is where the real test starts
-    CACHE_ID_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}"1 CACHE_MODE_OPTION="$mode" start_cache
+    CACHE_ID_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}"1 CACHE_MODE_OPTION="$mode"
+        CACHE_FORCE_OPTION="yes" start_cache
 
     CACHE_ID_OPTION="1" CORE_DEVICE_OPTION="${CORE_DEVICE}"1 add_core
     sleep 2
@@ -73,7 +74,8 @@ do
     echo "------Start CAS Linux in $mode mode"
 
 # This is where the real test starts
-    CACHE_ID_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}"1 CACHE_MODE_OPTION="$mode" start_cache
+    CACHE_ID_OPTION="1" CACHE_DEVICE_OPTION="${CACHE_DEVICE}"1 CACHE_MODE_OPTION="$mode"
+        CACHE_FORCE_OPTION="yes" start_cache
 
     CACHE_ID_OPTION="1" CORE_DEVICE_OPTION="${CORE_DEVICE}"1 add_core
     sleep 2

test/smoke_test/cas_ex.en.pws

@@ -49,3 +49,4 @@ sdb
 utf
 wa
 wb
+wo

test/smoke_test/cas_functions

@@ -151,7 +151,7 @@ get_stats_value() {
         CORE_ID_OPTION="--core-id $CORE_ID_OPTION"
     fi
 
-	if [ "$IO_CLASS_ID" = "all" ]; then
+    if [ "$IO_CLASS_ID" = "all" ]; then
         PART_ID_OPTION="--io-class-id"
     elif [ -n "$IO_CLASS_ID" ] ; then
         PART_ID_OPTION="--io-class-id $IO_CLASS_ID"
@@ -177,7 +177,7 @@ get_stats_value() {
     for (( i=0; i<$STATS_VALUES_OFFSET; i++ ))
     do
         echo "${STATS_ARRAY[$i]}" | grep -i "$STAT_NAME_OPTION" | grep -v "%" \
-			| grep -i "$STAT_UNIT_OPTION" &> /dev/null
+            | grep -i "$STAT_UNIT_OPTION" &> /dev/null
         if [ $? -eq 0 ]; then
             local value_id=$(( STATS_VALUES_OFFSET + i ))
             OUTPUT="${STATS_ARRAY[$value_id]}"
@@ -413,6 +413,8 @@ iteration() {
                         if [ "$load_metadata" == "on" ] ; then
                             CACHE_LOAD_METADATA_OPTION="$load_metadata"
                             echo "Load metadata option: on"
+                        else
+                            L_MAKE_PARTITIONS=1
                         fi
 
                         MAKE_PARTITIONS=${L_MAKE_PARTITIONS}
@@ -791,7 +793,7 @@ remove_caches() {
 
     if [ -n "$CACHE_IDS_TO_REMOVE" ] || [ -n "$CORE_DEVICES_TO_REMOVE" ] ; then
         warning "Had to remove some caches in cleanup - \
-			either the test failed or it doesn't clean up after itself!"
+            either the test failed or it doesn't clean up after itself!"
     fi
     clear_options
 }
@@ -884,19 +886,19 @@ check_fio_ver() {
 
     fio_ver="$(fio -v)"
     if [ -z $fio_ver ] ; then
-	echo_yellow "Fio is not installed, skipping test!"
-	return 1
+    echo_yellow "Fio is not installed, skipping test!"
+    return 1
     fi
 
     major=`echo $fio_ver | cut -d '.' -f 1 | cut -d '-' -f 2`
     minor=`echo $fio_ver | cut -d '.' -f 2`
     if [[ $major -lt $FIO_MAJOR_OPTION ]] ; then
-	echo_yellow "Invalid fio version, skipping test!"
-	return 1
+    echo_yellow "Invalid fio version, skipping test!"
+    return 1
     elif [[ $major -eq $FIO_MAJOR_OPTION ]] && \
-	    [[ $minor -lt $FIO_MINOR_OPTION ]] ; then
-	echo_yellow "Invalid fio minor revision, skipping test!"
-	return 1
+        [[ $minor -lt $FIO_MINOR_OPTION ]] ; then
+    echo_yellow "Invalid fio minor revision, skipping test!"
+    return 1
     fi
 
     clear_options
@@ -910,12 +912,12 @@ check_kernel_ver() {
     kernel_version=`echo ${kernel_ver} | cut  -d '.' -f 1`
     major=`echo ${kernel_ver} | cut  -d '.' -f 2`
     if [[ $kernel_version -lt $KERNEL_VER_OPTION ]] ; then
-	echo_yellow "Invalid kernel version, skipping test!"
-	return 1
+    echo_yellow "Invalid kernel version, skipping test!"
+    return 1
     elif [[ $kernel_version -eq $KERNEL_VER_OPTION ]] && \
-		[[ $major -lt $KERNEL_MAJOR_OPTION ]] ; then
-	echo_yellow "Invalid kernel major revision, skipping test!"
-	return 1
+        [[ $major -lt $KERNEL_MAJOR_OPTION ]] ; then
+    echo_yellow "Invalid kernel major revision, skipping test!"
+    return 1
     fi
 
     clear_options