From 775d429f5fe5bed1e8998ede1c92b1226d2d649e Mon Sep 17 00:00:00 2001 From: Jan Michalski Date: Tue, 27 Jun 2023 17:33:36 -0400 Subject: [PATCH] test: cleanup pmempool_check from deprecated tests Signed-off-by: Jan Michalski --- ChangeLog | 1 + src/test/pmempool_check/TEST0 | 28 +++------ src/test/pmempool_check/TEST1 | 30 +++------ src/test/pmempool_check/TEST13 | 37 ----------- src/test/pmempool_check/TEST14 | 11 +--- src/test/pmempool_check/TEST15 | 84 +++++++++++-------------- src/test/pmempool_check/TEST16 | 8 +-- src/test/pmempool_check/TEST17 | 8 +-- src/test/pmempool_check/TEST18 | 8 +-- src/test/pmempool_check/TEST19 | 13 ++-- src/test/pmempool_check/TEST2 | 28 --------- src/test/pmempool_check/TEST22 | 39 ------------ src/test/pmempool_check/TEST23 | 15 +---- src/test/pmempool_check/TEST25 | 15 +---- src/test/pmempool_check/TEST27 | 11 +--- src/test/pmempool_check/TEST3 | 31 --------- src/test/pmempool_check/TEST4 | 33 ---------- src/test/pmempool_check/TEST5 | 39 ------------ src/test/pmempool_check/TEST6 | 24 +------ src/test/pmempool_check/TEST7 | 20 +++--- src/test/pmempool_check/TEST8 | 10 +-- src/test/pmempool_check/out0.log.match | 15 +---- src/test/pmempool_check/out1.log.match | 69 ++------------------ src/test/pmempool_check/out13.log.match | 11 ---- src/test/pmempool_check/out14.log.match | 20 +----- src/test/pmempool_check/out15.log.match | 78 ----------------------- src/test/pmempool_check/out16.log.match | 14 +---- src/test/pmempool_check/out17.log.match | 21 ++----- src/test/pmempool_check/out18.log.match | 13 +--- src/test/pmempool_check/out19.log.match | 25 ++------ src/test/pmempool_check/out22.log.match | 11 ---- src/test/pmempool_check/out23.log.match | 20 +----- src/test/pmempool_check/out25.log.match | 24 +------ src/test/pmempool_check/out27.log.match | 20 +----- src/test/pmempool_check/out3.log.match | 21 ------- src/test/pmempool_check/out4.log.match | 21 ------- src/test/pmempool_check/out5.log.match | 30 --------- src/test/pmempool_check/out6.log.match | 13 +--- src/test/pmempool_check/out7.log.match | 77 +++++------------------ src/test/pmempool_check/out8.log.match | 25 ++------ 40 files changed, 143 insertions(+), 878 deletions(-) delete mode 100755 src/test/pmempool_check/TEST13 delete mode 100755 src/test/pmempool_check/TEST2 delete mode 100755 src/test/pmempool_check/TEST22 delete mode 100755 src/test/pmempool_check/TEST3 delete mode 100755 src/test/pmempool_check/TEST4 delete mode 100755 src/test/pmempool_check/TEST5 delete mode 100644 src/test/pmempool_check/out13.log.match delete mode 100644 src/test/pmempool_check/out22.log.match delete mode 100644 src/test/pmempool_check/out3.log.match delete mode 100644 src/test/pmempool_check/out4.log.match delete mode 100644 src/test/pmempool_check/out5.log.match diff --git a/ChangeLog b/ChangeLog index 16ce20dc93d..9a30a8c4c8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ This release: - removes libpmempool API tests that use log/blk/btt pool types (partially) + - removes pmempool check tests that use log/blk/btt pool types - ... Wed May 31 2023 Oksana Sałyk diff --git a/src/test/pmempool_check/TEST0 b/src/test/pmempool_check/TEST0 index 27f1982c481..837fdd4f480 100755 --- a/src/test/pmempool_check/TEST0 +++ b/src/test/pmempool_check/TEST0 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # # pmempool_check/TEST0 -- test for checking pools @@ -18,39 +18,25 @@ POOL=$DIR/file.pool LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG -echo "PMEMLOG: consistent" >> $LOG +echo "PMEMOBJ: consistent" >> $LOG rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOL +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL check_file $POOL expect_normal_exit $PMEMWRITE$EXESUFFIX $POOL TEST expect_normal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG -echo "PMEMBLK: consistent" >> $LOG +echo "PMEMOBJ: consistent" >> $LOG rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOL +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL check_file $POOL expect_normal_exit $PMEMWRITE$EXESUFFIX $POOL 0:w:TEST0 expect_normal_exit $PMEMWRITE$EXESUFFIX $POOL 1:w:TEST0 expect_normal_exit $PMEMWRITE$EXESUFFIX $POOL 2:w:TEST0 expect_normal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG -echo "PMEMLOG: pool_hdr" >> $LOG +echo "PMEMOBJ: pool_hdr" >> $LOG rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOL -check_file $POOL -$PMEMSPOIL -v $POOL pool_hdr.signature=ERROR >> $LOG -expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG - -echo "PMEMLOG: pmemlog" >> $LOG -rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOL -check_file $POOL -$PMEMSPOIL -v $POOL pmemlog.start_offset=0 pmemlog.end_offset=0 >> $LOG -expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG - -echo "PMEMBLK: pool_hdr" >> $LOG -rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOL +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL check_file $POOL $PMEMSPOIL -v $POOL pool_hdr.signature=ERROR >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG diff --git a/src/test/pmempool_check/TEST1 b/src/test/pmempool_check/TEST1 index 8d23ce4ceaf..04c0bb29bc1 100755 --- a/src/test/pmempool_check/TEST1 +++ b/src/test/pmempool_check/TEST1 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2019, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # # pmempool_check/TEST1 -- test for checking pools @@ -18,8 +18,8 @@ POOL=$DIR/file.pool LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG -echo "PMEMLOG: pool_hdr" >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOL +echo "PMEMOBJ: pool_hdr" >> $LOG +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL check_file $POOL $PMEMSPOIL -v $POOL pool_hdr.major=0x0\ pool_hdr.features.compat=0xfe\ @@ -29,19 +29,11 @@ $PMEMSPOIL -v $POOL pool_hdr.major=0x0\ pool_hdr.shutdown_state.uuid=0\ 'pool_hdr.shutdown_state.f:checksum_gen'\ pool_hdr.unused=ERROR >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG -echo "PMEMLOG: pmemlog" >> $LOG +echo "PMEMOBJ: pool_hdr" >> $LOG rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOL -check_file $POOL -$PMEMSPOIL -v $POOL pmemlog.start_offset=0\ - pmemlog.end_offset=0 >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG - -echo "PMEMBLK: pool_hdr" >> $LOG -rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create -w blk 512 $POOL +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL check_file $POOL $PMEMSPOIL -v $POOL pool_hdr.signature=ERROR\ pool_hdr.major=0xff\ @@ -49,15 +41,7 @@ $PMEMSPOIL -v $POOL pool_hdr.signature=ERROR\ pool_hdr.features.incompat=0xfb\ pool_hdr.features.ro_compat=0xff\ pool_hdr.unused=ERROR >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG - -echo "PMEMBLK: pmemblk" >> $LOG -rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create -w blk 512 $POOL -check_file $POOL -$PMEMSPOIL -v $POOL pool_hdr.signature=ERROR\ - pmemblk.bsize=0 >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG check diff --git a/src/test/pmempool_check/TEST13 b/src/test/pmempool_check/TEST13 deleted file mode 100755 index 29bcfd99e10..00000000000 --- a/src/test/pmempool_check/TEST13 +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2018, Intel Corporation -# -# -# pmempool_check/TEST13 -- test for checking pools with device dax -# - -. ../unittest/unittest.sh - -require_test_type medium - -require_dax_devices 1 -require_fs_type any -# covered by TEST22 -configure_valgrind memcheck force-disable $PMEMPOOL$EXESUFFIX - -setup - -dax_device_zero - -LOG=out${UNITTEST_NUM}.log -rm -f $LOG && touch $LOG - -HDR_MAJOR_OFFSET=8 - -POOLSET=$DEVICE_DAX_PATH - -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOLSET -expect_normal_exit $DDMAP$EXESUFFIX -o $POOLSET -s $HDR_MAJOR_OFFSET -d "0" - -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - -check - -pass diff --git a/src/test/pmempool_check/TEST14 b/src/test/pmempool_check/TEST14 index ec5b03b1e92..b32aa211468 100755 --- a/src/test/pmempool_check/TEST14 +++ b/src/test/pmempool_check/TEST14 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2023, Intel Corporation # # # pmempool_check/TEST14 -- test for checking pools with device dax @@ -28,20 +28,11 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null -expect_normal_exit $PMEMPOOL$EXESUFFIX rm $DEVICE_DAX_PATH -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - #remove the pools in the poolset while preserving the file itself expect_normal_exit $PMEMPOOL$EXESUFFIX rm -s $POOLSET #verify that the poolset still exists check_files $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX create -w blk 512 $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - check pass diff --git a/src/test/pmempool_check/TEST15 b/src/test/pmempool_check/TEST15 index e1b578c29fe..e8de9115258 100755 --- a/src/test/pmempool_check/TEST15 +++ b/src/test/pmempool_check/TEST15 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2023, Intel Corporation # # # pmempool_check/TEST15 -- test for checking poolset with valid parts but with @@ -27,61 +27,53 @@ PARTS="$PART1 $PART2 $PART3 $PART4" LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG -for args in "log" "blk 512" "obj" ; do - echo "Arguments: create $args" >> $LOG +echo "Arguments: create obj" >> $LOG +input_types=`seq 2` +output_types=`seq 3` - if [ "$args" == "obj" ]; then - input_types=`seq 2` - output_types=`seq 3` - else - input_types=1 - output_types=1 - fi +for input_type in $input_types; do - for input_type in $input_types; do + case "$input_type" in + 1) + echo "Input: two parts per poolset" >> $LOG + create_poolset $POOLSET1 32M:$PART1 32M:$PART2 + create_poolset $POOLSET2 32M:$PART3 32M:$PART4 + ;; + 2) + echo "Input: two replicas per poolset" >> $LOG + create_poolset $POOLSET1 32M:$PART1 R 32M:$PART2 + create_poolset $POOLSET2 32M:$PART3 R 32M:$PART4 + ;; + esac - case "$input_type" in + for output_type in $output_types; do + + case "$output_type" in 1) - echo "Input: two parts per poolset" >> $LOG - create_poolset $POOLSET1 32M:$PART1 32M:$PART2 - create_poolset $POOLSET2 32M:$PART3 32M:$PART4 + echo "Output: four parts in poolset" >> $LOG + create_poolset $POOLSET 32M:$PART1 32M:$PART2 \ + 32M:$PART3 32M:$PART4 ;; 2) - echo "Input: two replicas per poolset" >> $LOG - create_poolset $POOLSET1 32M:$PART1 R 32M:$PART2 - create_poolset $POOLSET2 32M:$PART3 R 32M:$PART4 + echo "Output: two replicas with two parts each in poolset" >> $LOG + create_poolset $POOLSET 32M:$PART1 32M:$PART2 \ + R 32M:$PART3 32M:$PART4 + ;; + 3) + echo "Output: four replicas in poolset" >> $LOG + create_poolset $POOLSET 32M:$PART1 R 32M:$PART2 \ + R 32M:$PART3 R 32M:$PART4 ;; esac - for output_type in $output_types; do - - case "$output_type" in - 1) - echo "Output: four parts in poolset" >> $LOG - create_poolset $POOLSET 32M:$PART1 32M:$PART2 \ - 32M:$PART3 32M:$PART4 - ;; - 2) - echo "Output: two replicas with two parts each in poolset" >> $LOG - create_poolset $POOLSET 32M:$PART1 32M:$PART2 \ - R 32M:$PART3 32M:$PART4 - ;; - 3) - echo "Output: four replicas in poolset" >> $LOG - create_poolset $POOLSET 32M:$PART1 R 32M:$PART2 \ - R 32M:$PART3 R 32M:$PART4 - ;; - esac - - rm -f $PARTS - expect_normal_exit $PMEMPOOL$EXESUFFIX create $args $POOLSET1 - expect_normal_exit $PMEMPOOL$EXESUFFIX create $args $POOLSET2 - check_files $PARTS + rm -f $PARTS + expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET1 + expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET2 + check_files $PARTS - expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG - expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG - expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vary $POOLSET >> $LOG - done + expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG + expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG + expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vary $POOLSET >> $LOG done done diff --git a/src/test/pmempool_check/TEST16 b/src/test/pmempool_check/TEST16 index 95fbba35302..ce277886cfb 100755 --- a/src/test/pmempool_check/TEST16 +++ b/src/test/pmempool_check/TEST16 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2018, Intel Corporation +# Copyright 2016-2023, Intel Corporation # # # pmempool_check/TEST16 -- test for checking and fixing pool files crtime @@ -21,7 +21,7 @@ LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG create_poolset $POOLSET 20M:$POOL_P1:z 20M:$POOL_P2:z -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET TIME=$($DATE +"%s") let "FUTURE_TIME=$TIME+60*60" @@ -32,8 +32,8 @@ touch -mt $PAST_TIME $POOL_P1 expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vrya $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vrya $POOLSET >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null check diff --git a/src/test/pmempool_check/TEST17 b/src/test/pmempool_check/TEST17 index fae2a4da018..db99d970065 100755 --- a/src/test/pmempool_check/TEST17 +++ b/src/test/pmempool_check/TEST17 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # # pmempool_check/TEST17 -- test for limit checksum generation to check run with @@ -22,7 +22,7 @@ LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG create_poolset $POOLSET 20M:$POOL_P1:z 20M:$POOL_P2:z -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET $PMEMSPOIL -v $POOL_P1 pool_hdr.checksum=0x0 >> $LOG @@ -33,8 +33,8 @@ $PMEMSPOIL -v $POOL_P1 pool_hdr.uuid=ERROR >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null -expect_normal_exit $PMEMPOOL$EXESUFFIX check -avry $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -avry $POOLSET >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null check diff --git a/src/test/pmempool_check/TEST18 b/src/test/pmempool_check/TEST18 index 7d7e6742c64..4dac3392fe1 100755 --- a/src/test/pmempool_check/TEST18 +++ b/src/test/pmempool_check/TEST18 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # # pmempool_check/TEST18 -- test for fixing various fields repairability without @@ -23,7 +23,7 @@ rm -f $LOG && touch $LOG create_poolset $POOLSET 20M:$POOL_P1:z 50M:$POOL_P2:z -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET $PMEMSPOIL -v $POOL_P1\ pool_hdr.major=0x0\ @@ -31,8 +31,8 @@ $PMEMSPOIL -v $POOL_P1\ pool_hdr.uuid=0x0\ >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -rvy $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -rvy $POOLSET >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null check diff --git a/src/test/pmempool_check/TEST19 b/src/test/pmempool_check/TEST19 index e99908b1e62..75311ef2645 100755 --- a/src/test/pmempool_check/TEST19 +++ b/src/test/pmempool_check/TEST19 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017-2018, Intel Corporation +# Copyright 2017-2023, Intel Corporation # # # pmempool_check/TEST19 -- test for checking and fixing pool files arch_flags @@ -21,16 +21,15 @@ LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG create_poolset $POOLSET 20M:$POOL_P1:z 20M:$POOL_P2:z -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET INVALID_ARCH_FLAGS="FFFFFFFF" -# If valid part exists it can be used to check and fix invalid arch_flags +# If valid part exists it can be used to check invalid arch_flags $PMEMSPOIL -v $POOL_P1 pool_hdr.arch_flags=$INVALID_ARCH_FLAGS >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG -# pmempool info should exit normally -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null # if valid part does not exist it is impossible to check arch_flags $PMEMSPOIL -v $POOL_P1 pool_hdr.arch_flags=$INVALID_ARCH_FLAGS >> $LOG @@ -39,7 +38,7 @@ expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG # pmempool check would fix checksum but pmempool info should fail # because arch_flags is still invalid -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vrya $POOLSET >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vrya $POOLSET >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX info $POOLSET >> $LOG 2> /dev/null check diff --git a/src/test/pmempool_check/TEST2 b/src/test/pmempool_check/TEST2 deleted file mode 100755 index f7753af1af0..00000000000 --- a/src/test/pmempool_check/TEST2 +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation -# -# -# pmempool_check/TEST2 -- test for checking pools -# - -. ../unittest/unittest.sh - -require_test_type medium - -require_fs_type pmem non-pmem - -setup - -POOL=$DIR/file.pool -POOL_BACKUP=$DIR/file.pool.backup -LOG=out${UNITTEST_NUM}.log -rm -f $LOG && touch $LOG - -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOL -check_file $POOL -$PMEMSPOIL $POOL pool_hdr.signature=ERROR -expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -b $POOL_BACKUP -r $POOL &>/dev/null -check_file ${POOL_BACKUP} - -pass diff --git a/src/test/pmempool_check/TEST22 b/src/test/pmempool_check/TEST22 deleted file mode 100755 index f793cf93dea..00000000000 --- a/src/test/pmempool_check/TEST22 +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017-2018, Intel Corporation -# -# -# pmempool_check/TEST22 -- test for checking pools with device dax under -# valgrind -# - -. ../unittest/unittest.sh - -require_test_type medium - -require_dax_devices 1 -require_fs_type any - -configure_valgrind memcheck force-enable $PMEMPOOL$EXESUFFIX -require_valgrind 3.11 - -setup - -dax_device_zero - -LOG=out${UNITTEST_NUM}.log -rm -f $LOG && touch $LOG - -HDR_MAJOR_OFFSET=8 - -POOLSET=$DEVICE_DAX_PATH - -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOLSET -expect_normal_exit $DDMAP$EXESUFFIX -o $POOLSET -s $HDR_MAJOR_OFFSET -d "0" - -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vry $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - -check - -pass diff --git a/src/test/pmempool_check/TEST23 b/src/test/pmempool_check/TEST23 index e96c1d0be05..6899f6bb4a9 100755 --- a/src/test/pmempool_check/TEST23 +++ b/src/test/pmempool_check/TEST23 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017-2018, Intel Corporation +# Copyright 2017-2023, Intel Corporation # # # pmempool_check/TEST23 -- test for checking pools with device dax under @@ -30,20 +30,11 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null -expect_normal_exit $PMEMPOOL$EXESUFFIX rm $DEVICE_DAX_PATH -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - -#remove the pools in the poolset while preserving the file itself +# remove the pools in the poolset while preserving the file itself expect_normal_exit $PMEMPOOL$EXESUFFIX rm -s $POOLSET -#verify that the poolset still exists +# verify that the poolset still exists check_files $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX create -w blk 512 $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - check pass diff --git a/src/test/pmempool_check/TEST25 b/src/test/pmempool_check/TEST25 index 2edeb183d39..60abf209dfd 100755 --- a/src/test/pmempool_check/TEST25 +++ b/src/test/pmempool_check/TEST25 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017-2018, Intel Corporation +# Copyright 2017-2023, Intel Corporation # # # pmempool_check/TEST25 -- test for checking pools with device dax @@ -32,20 +32,11 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null -expect_normal_exit $PMEMPOOL$EXESUFFIX rm $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - -#remove the pools in the poolset while preserving the file itself +# remove the pools in the poolset while preserving the file itself expect_normal_exit $PMEMPOOL$EXESUFFIX rm -s $POOLSET -#verify that the poolset still exists +# verify that the poolset still exists check_files $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX create -w blk 512 $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - check pass diff --git a/src/test/pmempool_check/TEST27 b/src/test/pmempool_check/TEST27 index a4c2d2150d7..08d9ddd11d6 100755 --- a/src/test/pmempool_check/TEST27 +++ b/src/test/pmempool_check/TEST27 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2017-2018, Intel Corporation +# Copyright 2017-2023, Intel Corporation # # # pmempool_check/TEST27 -- test for checking pools with device dax @@ -33,20 +33,11 @@ expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null -expect_normal_exit $PMEMPOOL$EXESUFFIX rm $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - #remove the pools in the poolset while preserving the file itself expect_normal_exit $PMEMPOOL$EXESUFFIX rm -s $POOLSET #verify that the poolset still exists check_files $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX create -w blk 512 $POOLSET -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET &> /dev/null - check pass diff --git a/src/test/pmempool_check/TEST3 b/src/test/pmempool_check/TEST3 deleted file mode 100755 index 41f6ed6a067..00000000000 --- a/src/test/pmempool_check/TEST3 +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation -# -# -# pmempool_check/TEST3 -- test for checking pools -# - -. ../unittest/unittest.sh - -require_test_type medium - -require_fs_type pmem non-pmem - -setup - -POOL=$DIR/file.pool -LOG=out${UNITTEST_NUM}.log -rm -f $LOG && touch $LOG - -expect_normal_exit $PMEMPOOL$EXESUFFIX create -w blk 512 $POOL -check_file $POOL -$PMEMSPOIL $POOL pool_hdr.signature=ERROR\ - "pmemblk.arena.btt_map(0)=0xc0000001"\ - "pmemblk.arena.btt_flog(0).seq=5" - -expect_normal_exit $PMEMPOOL$EXESUFFIX check -avry $POOL >> $LOG - -check - -pass diff --git a/src/test/pmempool_check/TEST4 b/src/test/pmempool_check/TEST4 deleted file mode 100755 index 9d16563e074..00000000000 --- a/src/test/pmempool_check/TEST4 +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation -# -# -# pmempool_check/TEST4 -- test for checking pools -# - -. ../unittest/unittest.sh - -require_test_type medium - -require_fs_type pmem non-pmem - -setup - -POOL=$DIR/file.pool -LOG=out${UNITTEST_NUM}.log -rm -f $LOG && touch $LOG - -expect_normal_exit $PMEMPOOL$EXESUFFIX create -w blk 512 $POOL -check_file $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOL > /dev/null -$PMEMSPOIL -v $POOL pool_hdr.checksum=0x0 >> $LOG - -expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -avry $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOL &> /dev/null - -check - -pass diff --git a/src/test/pmempool_check/TEST5 b/src/test/pmempool_check/TEST5 deleted file mode 100755 index 1ae501408fb..00000000000 --- a/src/test/pmempool_check/TEST5 +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2021, Intel Corporation -# -# -# pmempool_check/TEST5 -- test for checking pools -# - -. ../unittest/unittest.sh - -require_test_type medium -require_fs_type pmem non-pmem -require_unlimited_vm - -# Valgrind cannot trace more than 32G which is required for this test -configure_valgrind force-disable - -setup - -POOL=$DIR/file.pool -LOG=out${UNITTEST_NUM}.log -rm -f $LOG && touch $LOG - -truncate -s2T $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create -v -w blk 512M $POOL > /dev/null -check_file $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOL > /dev/null -$PMEMSPOIL $POOL pool_hdr.checksum=0x0\ - "pmemblk.arena(1).btt_info.sig=ERROR"\ - "pmemblk.arena(1).btt_info_backup.sig=ERROR" - -expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vry $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -avry $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOL > /dev/null - -check - -pass diff --git a/src/test/pmempool_check/TEST6 b/src/test/pmempool_check/TEST6 index 5b3d8378b65..70553075b99 100755 --- a/src/test/pmempool_check/TEST6 +++ b/src/test/pmempool_check/TEST6 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # # pmempool_check/TEST6 -- test for checking pools @@ -25,26 +25,8 @@ rm -f $LOG && touch $LOG create_poolset $POOLSET 32M:$DIR/pool.part1:z 32M:$DIR/pool.part2 check_file $POOLSET -echo "PMEMLOG: pool_hdr" >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET -check_files $POOLS -$PMEMSPOIL -v $POOLSET pool_hdr.signature=ERROR >> $LOG -expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOLSET >> $LOG -expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOL_PART1 >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check $POOL_PART2 >> $LOG - -echo "PMEMLOG: pmemlog" >> $LOG -rm -f $POOLS -expect_normal_exit $PMEMPOOL$EXESUFFIX create log $POOLSET -check_files $POOLS -$PMEMSPOIL -v $POOLSET pmemlog.start_offset=0 pmemlog.end_offset=0 >> $LOG -expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check $POOL_PART1 >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check $POOL_PART2 >> $LOG - -echo "PMEMBLK: pool_hdr" >> $LOG -rm -f $POOLS -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOLSET +echo "PMEMOBJ: pool_hdr" >> $LOG +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET check_files $POOLS $PMEMSPOIL -v $POOLSET pool_hdr.signature=ERROR >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOLSET >> $LOG diff --git a/src/test/pmempool_check/TEST7 b/src/test/pmempool_check/TEST7 index 0c12e647579..7638e8390b5 100755 --- a/src/test/pmempool_check/TEST7 +++ b/src/test/pmempool_check/TEST7 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # # pmempool_check/TEST7 -- test for checking pools @@ -19,15 +19,15 @@ LOG=out${UNITTEST_NUM}.log rm -f $LOG && touch $LOG rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOL +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL check_file $POOL $PMEMSPOIL -v $POOL pool_hdr.uuid=ERROR >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vyr $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOL >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vyr $POOL >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -v $POOL >> $LOG rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOL +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL check_file $POOL $PMEMSPOIL -v $POOL\ pool_hdr.prev_part_uuid=ERROR_PREV\ @@ -35,11 +35,11 @@ $PMEMSPOIL -v $POOL\ >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vyr $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -avyr $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOL >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -avyr $POOL >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -v $POOL >> $LOG rm -f $POOL -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOL +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOL check_file $POOL $PMEMSPOIL -v $POOL\ pool_hdr.prev_part_uuid=ERROR_PREV\ @@ -49,8 +49,8 @@ $PMEMSPOIL -v $POOL\ >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOL >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vyr $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -avyr $POOL >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -v $POOL >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -avyr $POOL >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -v $POOL >> $LOG check diff --git a/src/test/pmempool_check/TEST8 b/src/test/pmempool_check/TEST8 index f60efa196be..53603ee4664 100755 --- a/src/test/pmempool_check/TEST8 +++ b/src/test/pmempool_check/TEST8 @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2018, Intel Corporation +# Copyright 2014-2023, Intel Corporation # # # pmempool_check/TEST8 -- test for checking pools @@ -33,7 +33,7 @@ create_poolset $POOLSET\ check_file $POOLSET rm -f $POOLS -expect_normal_exit $PMEMPOOL$EXESUFFIX create blk 512 $POOLSET +expect_normal_exit $PMEMPOOL$EXESUFFIX create obj $POOLSET expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET > /dev/null check_files $POOLS $PMEMSPOIL -v $POOL_P1\ @@ -45,9 +45,9 @@ $PMEMSPOIL -v $POOL_P1\ >> $LOG expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check -vyr $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX check $POOLSET >> $LOG -expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOLSET > /dev/null +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check -vyr $POOLSET >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX check $POOLSET >> $LOG +expect_abnormal_exit $PMEMPOOL$EXESUFFIX info $POOLSET > /dev/null check diff --git a/src/test/pmempool_check/out0.log.match b/src/test/pmempool_check/out0.log.match index 42fd3ccdca9..cb1597131db 100644 --- a/src/test/pmempool_check/out0.log.match +++ b/src/test/pmempool_check/out0.log.match @@ -1,15 +1,6 @@ -PMEMLOG: consistent -PMEMBLK: consistent -PMEMLOG: pool_hdr -$(nW): spoil: pool_hdr.signature=$(*) -incorrect pool header -$(nW): not consistent -PMEMLOG: pmemlog -$(nW): spoil: pmemlog.start_offset=$(*) -$(nW): spoil: pmemlog.end_offset=$(*) -invalid pmemlog.start_offset: 0x0 -$(nW): not consistent -PMEMBLK: pool_hdr +PMEMOBJ: consistent +PMEMOBJ: consistent +PMEMOBJ: pool_hdr $(nW): spoil: pool_hdr.signature=$(*) incorrect pool header $(nW): not consistent diff --git a/src/test/pmempool_check/out1.log.match b/src/test/pmempool_check/out1.log.match index 70a8708f78d..6f32fd3cf35 100644 --- a/src/test/pmempool_check/out1.log.match +++ b/src/test/pmempool_check/out1.log.match @@ -1,4 +1,4 @@ -PMEMLOG: pool_hdr +PMEMOBJ: pool_hdr $(nW): spoil: pool_hdr.major=$(*) $(nW): spoil: pool_hdr.features.compat=$(*) $(nW): spoil: pool_hdr.features.incompat=$(*) @@ -11,34 +11,9 @@ checking shutdown state shutdown state correct checking pool header incorrect pool header -pool_hdr.major is not valid -pool_hdr.features.compat is not valid -pool_hdr.features.incompat is not valid -pool_hdr.features.ro_compat is not valid -unused area is not filled by zeros -setting pool_hdr.major to 0x1 -setting pool_hdr.features.compat to 0x$(X) -setting pool_hdr.features.incompat to 0x$(X) -setting pool_hdr.features.ro_compat to 0x$(X) -setting pool_hdr.unused to zeros -checking pmemlog header -pmemlog header correct -$(nW): repaired -PMEMLOG: pmemlog -$(nW): spoil: pmemlog.start_offset=$(*) -$(nW): spoil: pmemlog.end_offset=$(*) -checking shutdown state -shutdown state correct -checking pool header -pool header correct -checking pmemlog header -invalid pmemlog.start_offset: 0x0 -invalid pmemlog.end_offset: 0x0 -$(OPT)setting pmemlog.start_offset to 0x2000 -$(OPX)setting pmemlog.start_offset to 0x20000 -setting pmemlog.end_offset to 0x200000 -$(nW): repaired -PMEMBLK: pool_hdr +the repair of pmemobj pools is not supported +$(nW): cannot repair +PMEMOBJ: pool_hdr $(nW): spoil: pool_hdr.signature=$(*) $(nW): spoil: pool_hdr.major=$(*) $(nW): spoil: pool_hdr.features.compat=$(*) @@ -47,37 +22,5 @@ $(nW): spoil: pool_hdr.features.ro_compat=$(*) $(nW): spoil: pool_hdr.unused=$(*) checking pool header incorrect pool header -pool_hdr.signature is not valid -pool_hdr.major is not valid -pool_hdr.features.compat is not valid -pool_hdr.features.incompat is not valid -pool_hdr.features.ro_compat is not valid -unused area is not filled by zeros -setting pool_hdr.signature to PMEMBLK -setting pool_hdr.major to 0x1 -setting pool_hdr.features.compat to 0x$(X) -setting pool_hdr.features.incompat to 0x$(X) -setting pool_hdr.features.ro_compat to 0x$(X) -setting pool_hdr.unused to zeros -checking pmemblk header -pmemblk header correct -checking BTT Info headers -arena 0: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -$(nW): repaired -PMEMBLK: pmemblk -$(nW): spoil: pool_hdr.signature=$(*) -$(nW): spoil: pmemblk.bsize=$(*) -checking pool header -incorrect pool header -pool_hdr.signature is not valid -setting pool_hdr.signature to PMEMBLK -checking pmemblk header -invalid pmemblk.bsize -setting pmemblk.b_size to 0x200 -checking BTT Info headers -arena 0: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -$(nW): repaired +cannot determine pool type +$(nW): cannot repair diff --git a/src/test/pmempool_check/out13.log.match b/src/test/pmempool_check/out13.log.match deleted file mode 100644 index d451d3ed685..00000000000 --- a/src/test/pmempool_check/out13.log.match +++ /dev/null @@ -1,11 +0,0 @@ -checking shutdown state -shutdown state correct -checking pool header -incorrect pool header -pool_hdr.major is not valid -setting pool_hdr.major to $(nW) -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)dax$(N).$(N): repaired diff --git a/src/test/pmempool_check/out14.log.match b/src/test/pmempool_check/out14.log.match index 7d715345582..792a834a742 100644 --- a/src/test/pmempool_check/out14.log.match +++ b/src/test/pmempool_check/out14.log.match @@ -2,22 +2,4 @@ checking shutdown state shutdown state correct checking pool header pool header correct -$(nW) consistent -checking shutdown state -shutdown state correct -checking pool header -pool header correct -checking pmemlog header -pmemlog header correct -$(nW) consistent -checking shutdown state -shutdown state correct -checking pool header -pool header correct -checking pmemblk header -pmemblk header correct -checking BTT Info headers -arena 0: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -$(nW) consistent +$(nW): consistent diff --git a/src/test/pmempool_check/out15.log.match b/src/test/pmempool_check/out15.log.match index 0dbfd0aacb3..fa5a57ddb8e 100644 --- a/src/test/pmempool_check/out15.log.match +++ b/src/test/pmempool_check/out15.log.match @@ -1,81 +1,3 @@ -Arguments: create log -Input: two parts per poolset -Output: four parts in poolset -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 2: checking pool header -replica 0 part 2: pool header correct -replica 0 part 3: checking pool header -replica 0 part 3: pool header correct -the poolset contains part files from various poolsets -$(nW)pool.set: not consistent -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 2: checking pool header -replica 0 part 2: pool header correct -replica 0 part 3: checking pool header -replica 0 part 3: pool header correct -the poolset contains part files from various poolsets -$(nW)pool.set: not consistent -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 2: checking pool header -replica 0 part 2: pool header correct -replica 0 part 3: checking pool header -replica 0 part 3: pool header correct -the poolset contains part files from various poolsets -$(nW)pool.set: not consistent -Arguments: create blk 512 -Input: two parts per poolset -Output: four parts in poolset -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 2: checking pool header -replica 0 part 2: pool header correct -replica 0 part 3: checking pool header -replica 0 part 3: pool header correct -the poolset contains part files from various poolsets -$(nW)pool.set: not consistent -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 2: checking pool header -replica 0 part 2: pool header correct -replica 0 part 3: checking pool header -replica 0 part 3: pool header correct -the poolset contains part files from various poolsets -$(nW)pool.set: not consistent -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 2: checking pool header -replica 0 part 2: pool header correct -replica 0 part 3: checking pool header -replica 0 part 3: pool header correct -the poolset contains part files from various poolsets -$(nW)pool.set: not consistent Arguments: create obj Input: two parts per poolset Output: four parts in poolset diff --git a/src/test/pmempool_check/out16.log.match b/src/test/pmempool_check/out16.log.match index 69ad39713c6..1e4b9b2f70c 100644 --- a/src/test/pmempool_check/out16.log.match +++ b/src/test/pmempool_check/out16.log.match @@ -8,19 +8,11 @@ checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag -replica 0 part 0: pool_hdr.crtime is not valid +the repair of pmemobj pools is not supported $(nW)pool.set: cannot repair checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 0: pool_hdr.crtime is not valid -replica 0 part 0: setting pool_hdr.crtime to file's modtime: $(*) -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 0: invalid pool_hdr.checksum -replica 0 part 0: setting pool_hdr.checksum to $(nW) -checking pmemlog header -pmemlog header correct -$(nW)pool.set: repaired +the repair of pmemobj pools is not supported +$(nW)pool.set: cannot repair diff --git a/src/test/pmempool_check/out17.log.match b/src/test/pmempool_check/out17.log.match index aec35d6c45d..71e0aec7449 100644 --- a/src/test/pmempool_check/out17.log.match +++ b/src/test/pmempool_check/out17.log.match @@ -3,31 +3,18 @@ checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag -replica 0 part 0: invalid pool_hdr.checksum +the repair of pmemobj pools is not supported $(nW)pool.set: cannot repair $(nW)pool.p1: spoil: pool_hdr.uuid=$(nW) checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 0: invalid pool_hdr.uuid -replica 0 part 0: setting pool_hdr.uuid to $(nW) -replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag -replica 0 part 0: invalid pool_hdr.checksum +the repair of pmemobj pools is not supported $(nW)pool.set: cannot repair checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 0: invalid pool_hdr.checksum -replica 0 part 0: setting pool_hdr.checksum to $(nW) -checking pmemlog header -pmemlog header correct -$(nW)pool.set: repaired +the repair of pmemobj pools is not supported +$(nW)pool.set: cannot repair diff --git a/src/test/pmempool_check/out18.log.match b/src/test/pmempool_check/out18.log.match index 1cfa675e129..7cb5e5d98c7 100644 --- a/src/test/pmempool_check/out18.log.match +++ b/src/test/pmempool_check/out18.log.match @@ -5,14 +5,5 @@ checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 0: pool_hdr.major is not valid -replica 0 part 0: setting pool_hdr.major to 0x1 -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 0: invalid pool_hdr.poolset_uuid -replica 0 part 0: setting pool_hdr.poolset_uuid to $(nW) -replica 0 part 0: invalid pool_hdr.uuid -replica 0 part 0: setting pool_hdr.uuid to $(nW) -checking pmemlog header -pmemlog header correct -$(nW)pool.set: repaired +the repair of pmemobj pools is not supported +$(nW)pool.set: cannot repair diff --git a/src/test/pmempool_check/out19.log.match b/src/test/pmempool_check/out19.log.match index fbd8e914c65..8cef39693e8 100644 --- a/src/test/pmempool_check/out19.log.match +++ b/src/test/pmempool_check/out19.log.match @@ -8,13 +8,8 @@ checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 0: pool_hdr.arch_flags is not valid -replica 0 part 0: setting pool_hdr.arch_flags to $(nW) -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -checking pmemlog header -pmemlog header correct -$(nW)pool.set: repaired +the repair of pmemobj pools is not supported +$(nW)pool.set: cannot repair $(nW)pool.p1: spoil: pool_hdr.arch_flags=$(nW) $(nW)pool.p2: spoil: pool_hdr.arch_flags=$(nW) checking shutdown state @@ -26,21 +21,11 @@ checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 1: checking pool header -replica 0 part 1: incorrect pool header -replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag -replica 0 part 0: invalid pool_hdr.checksum +the repair of pmemobj pools is not supported $(nW)pool.set: cannot repair checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 1: checking pool header -replica 0 part 1: incorrect pool header -replica 0 part 0: invalid pool_hdr.checksum -replica 0 part 0: setting pool_hdr.checksum to $(nW) -replica 0 part 1: invalid pool_hdr.checksum -replica 0 part 1: setting pool_hdr.checksum to $(nW) -checking pmemlog header -pmemlog header correct -$(nW)pool.set: repaired +the repair of pmemobj pools is not supported +$(nW)pool.set: cannot repair diff --git a/src/test/pmempool_check/out22.log.match b/src/test/pmempool_check/out22.log.match deleted file mode 100644 index d451d3ed685..00000000000 --- a/src/test/pmempool_check/out22.log.match +++ /dev/null @@ -1,11 +0,0 @@ -checking shutdown state -shutdown state correct -checking pool header -incorrect pool header -pool_hdr.major is not valid -setting pool_hdr.major to $(nW) -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)dax$(N).$(N): repaired diff --git a/src/test/pmempool_check/out23.log.match b/src/test/pmempool_check/out23.log.match index 7d715345582..792a834a742 100644 --- a/src/test/pmempool_check/out23.log.match +++ b/src/test/pmempool_check/out23.log.match @@ -2,22 +2,4 @@ checking shutdown state shutdown state correct checking pool header pool header correct -$(nW) consistent -checking shutdown state -shutdown state correct -checking pool header -pool header correct -checking pmemlog header -pmemlog header correct -$(nW) consistent -checking shutdown state -shutdown state correct -checking pool header -pool header correct -checking pmemblk header -pmemblk header correct -checking BTT Info headers -arena 0: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -$(nW) consistent +$(nW): consistent diff --git a/src/test/pmempool_check/out25.log.match b/src/test/pmempool_check/out25.log.match index 90e9d57ca67..d0c8daf6c8f 100644 --- a/src/test/pmempool_check/out25.log.match +++ b/src/test/pmempool_check/out25.log.match @@ -4,26 +4,4 @@ replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header replica 0 part 1: pool header correct -$(nW) consistent -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -checking pmemlog header -pmemlog header correct -$(nW) consistent -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -checking pmemblk header -pmemblk header correct -checking BTT Info headers -arena 0: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -$(nW) consistent +$(nW): consistent diff --git a/src/test/pmempool_check/out27.log.match b/src/test/pmempool_check/out27.log.match index 9fe38c512ed..1d5319f7e44 100644 --- a/src/test/pmempool_check/out27.log.match +++ b/src/test/pmempool_check/out27.log.match @@ -2,22 +2,4 @@ checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct -$(nW) consistent -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -checking pmemlog header -pmemlog header correct -$(nW) consistent -checking shutdown state -shutdown state correct -replica 0 part 0: checking pool header -replica 0 part 0: pool header correct -checking pmemblk header -pmemblk header correct -checking BTT Info headers -arena 0: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -$(nW) consistent +$(nW): consistent diff --git a/src/test/pmempool_check/out3.log.match b/src/test/pmempool_check/out3.log.match deleted file mode 100644 index f041e054d6e..00000000000 --- a/src/test/pmempool_check/out3.log.match +++ /dev/null @@ -1,21 +0,0 @@ -checking pool header -incorrect pool header -pool_hdr.signature is not valid -setting pool_hdr.signature to PMEMBLK -checking pmemblk header -pmemblk header correct -checking BTT Info headers -arena 0: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -arena 0: BTT Map entry 1 duplicated at 1 -arena 0: invalid BTT Flog entry at 0 -arena 0: unmapped block 0 -arena 0: unmapped block $(*) -arena 0: number of unmapped blocks: 2 -arena 0: number of invalid BTT Map entries: 1 -arena 0: number of invalid BTT Flog entries: 1 -arena 0: storing $(*) at $(*) BTT Map entry -arena 0: storing $(*) at $(*) BTT Map entry -arena 0: repairing BTT Flog at $(*) with free block entry $(*) -$(nW): repaired diff --git a/src/test/pmempool_check/out4.log.match b/src/test/pmempool_check/out4.log.match deleted file mode 100644 index 841153b7750..00000000000 --- a/src/test/pmempool_check/out4.log.match +++ /dev/null @@ -1,21 +0,0 @@ -$(nW): spoil: pool_hdr.checksum=$(nW) -checking shutdown state -shutdown state correct -checking pool header -incorrect pool header -the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag -invalid pool_hdr.checksum -$(nW)file.pool: cannot repair -checking shutdown state -shutdown state correct -checking pool header -incorrect pool header -invalid pool_hdr.checksum -setting pool_hdr.checksum to $(nW) -checking pmemblk header -pmemblk header correct -checking BTT Info headers -arena 0: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -$(nW)file.pool: repaired diff --git a/src/test/pmempool_check/out5.log.match b/src/test/pmempool_check/out5.log.match deleted file mode 100644 index 53848539c53..00000000000 --- a/src/test/pmempool_check/out5.log.match +++ /dev/null @@ -1,30 +0,0 @@ -checking shutdown state -shutdown state correct -checking pool header -incorrect pool header -the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag -invalid pool_hdr.checksum -$(nW)file.pool: cannot repair -checking shutdown state -shutdown state correct -checking pool header -incorrect pool header -invalid pool_hdr.checksum -setting pool_hdr.checksum to $(nW) -checking pmemblk header -pmemblk header correct -checking BTT Info headers -arena 0: BTT Info header checksum correct -arena 1: BTT Info header checksum incorrect -arena 1: regenerating BTT Info header -arena 1: BTT Info header checksum correct -arena 1: BTT Info backup checksum incorrect -arena 1: restoring BTT Info backup from header -arena 2: BTT Info header checksum correct -arena 3: BTT Info header checksum correct -checking BTT Map and Flog -arena 0: checking BTT Map and Flog -arena 1: checking BTT Map and Flog -arena 2: checking BTT Map and Flog -arena 3: checking BTT Map and Flog -$(nW)file.pool: repaired diff --git a/src/test/pmempool_check/out6.log.match b/src/test/pmempool_check/out6.log.match index f6a915fe675..f4eb3caeccb 100644 --- a/src/test/pmempool_check/out6.log.match +++ b/src/test/pmempool_check/out6.log.match @@ -1,15 +1,4 @@ -PMEMLOG: pool_hdr -$(nW)pool.set: spoil: pool_hdr.signature=ERROR -replica 0 part 0: incorrect pool header -$(nW)pool.set: not consistent -incorrect pool header -$(nW)pool.part1: not consistent -PMEMLOG: pmemlog -$(nW)pool.set: spoil: pmemlog.start_offset=0 -$(nW)pool.set: spoil: pmemlog.end_offset=0 -invalid pmemlog.start_offset: 0x0 -$(nW)pool.set: not consistent -PMEMBLK: pool_hdr +PMEMOBJ: pool_hdr $(nW)pool.set: spoil: pool_hdr.signature=ERROR replica 0 part 0: incorrect pool header $(nW)pool.set: not consistent diff --git a/src/test/pmempool_check/out7.log.match b/src/test/pmempool_check/out7.log.match index ff51dde7800..6764daee7df 100644 --- a/src/test/pmempool_check/out7.log.match +++ b/src/test/pmempool_check/out7.log.match @@ -5,22 +5,13 @@ checking shutdown state shutdown state correct checking pool header incorrect pool header -invalid pool_hdr.uuid -setting pool_hdr.uuid to $(nW) -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)file.pool: repaired +the repair of pmemobj pools is not supported +$(nW)file.pool: cannot repair checking shutdown state shutdown state correct checking pool header -pool header correct -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)file.pool: consistent +incorrect pool header +$(nW)file.pool: not consistent $(nW)file.pool: spoil: pool_hdr.prev_part_uuid=ERROR_PREV $(nW)file.pool: spoil: pool_hdr.next_part_uuid=ERROR_NEXT incorrect pool header @@ -29,39 +20,19 @@ checking shutdown state shutdown state correct checking pool header incorrect pool header -the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag -invalid pool_hdr.uuid +the repair of pmemobj pools is not supported $(nW)file.pool: cannot repair checking shutdown state shutdown state correct checking pool header incorrect pool header -invalid pool_hdr.uuid -setting pool_hdr.uuid to $(*) -invalid pool_hdr.next_part_uuid -invalid pool_hdr.prev_part_uuid -invalid pool_hdr.next_repl_uuid -invalid pool_hdr.prev_repl_uuid -setting pool_hdr.next_part_uuid to $(*) -setting pool_hdr.prev_part_uuid to $(*) -setting pool_hdr.next_repl_uuid to $(*) -setting pool_hdr.prev_repl_uuid to $(*) -invalid pool_hdr.checksum -setting pool_hdr.checksum to $(*) -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)file.pool: repaired +the repair of pmemobj pools is not supported +$(nW)file.pool: cannot repair checking shutdown state shutdown state correct checking pool header -pool header correct -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)file.pool: consistent +incorrect pool header +$(nW)file.pool: not consistent $(nW)file.pool: spoil: pool_hdr.prev_part_uuid=ERROR_PREV $(nW)file.pool: spoil: pool_hdr.next_part_uuid=ERROR_NEXT $(nW)file.pool: spoil: pool_hdr.prev_repl_uuid=ERROR_RPREV @@ -72,36 +43,16 @@ checking shutdown state shutdown state correct checking pool header incorrect pool header -the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag -invalid pool_hdr.uuid +the repair of pmemobj pools is not supported $(nW)file.pool: cannot repair checking shutdown state shutdown state correct checking pool header incorrect pool header -invalid pool_hdr.uuid -setting pool_hdr.uuid to $(*) -invalid pool_hdr.next_part_uuid -invalid pool_hdr.prev_part_uuid -invalid pool_hdr.next_repl_uuid -invalid pool_hdr.prev_repl_uuid -setting pool_hdr.next_part_uuid to $(*) -setting pool_hdr.prev_part_uuid to $(*) -setting pool_hdr.next_repl_uuid to $(*) -setting pool_hdr.prev_repl_uuid to $(*) -invalid pool_hdr.checksum -setting pool_hdr.checksum to $(*) -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)file.pool: repaired +the repair of pmemobj pools is not supported +$(nW)file.pool: cannot repair checking shutdown state shutdown state correct checking pool header -pool header correct -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)file.pool: consistent +incorrect pool header +$(nW)file.pool: not consistent diff --git a/src/test/pmempool_check/out8.log.match b/src/test/pmempool_check/out8.log.match index 3184d01d28e..201b49b9396 100644 --- a/src/test/pmempool_check/out8.log.match +++ b/src/test/pmempool_check/out8.log.match @@ -9,24 +9,7 @@ checking shutdown state shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header -replica 0 part 1: checking pool header -replica 0 part 1: pool header correct -replica 0 part 2: checking pool header -replica 0 part 2: pool header correct -replica 0 part 3: checking pool header -replica 0 part 3: pool header correct -replica 0 part 0: invalid pool_hdr.poolset_uuid -replica 0 part 0: setting pool_hdr.poolset_uuid to $(nW) -replica 0 part 0: invalid pool_hdr.next_part_uuid -replica 0 part 0: invalid pool_hdr.prev_part_uuid -replica 0 part 0: invalid pool_hdr.next_repl_uuid -replica 0 part 0: invalid pool_hdr.prev_repl_uuid -replica 0 part 0: setting pool_hdr.next_part_uuid to $(nW) -replica 0 part 0: setting pool_hdr.prev_part_uuid to $(nW) -replica 0 part 0: setting pool_hdr.next_repl_uuid to $(nW) -replica 0 part 0: setting pool_hdr.prev_repl_uuid to $(nW) -checking pmemblk header -pmemblk header correct -checking BTT Info headers -BTT Layout not written -$(nW)pool.set: repaired +the repair of pmemobj pools is not supported +$(nW)pool.set: cannot repair +replica 0 part 0: incorrect pool header +$(nW)pool.set: not consistent