From 3b4d752982fb60d05005ddf5f1dd56ad8f33aa4d Mon Sep 17 00:00:00 2001 From: "Lucas A. M. Magalhaes" <lamm@linux.ibm.com> Date: Tue, 4 Aug 2020 17:06:55 -0300 Subject: [PATCH] test: add SDS not supported optional line on pmempool check tests Signed-off-by: Lucas A. M. Magalhaes <lamm@linux.ibm.com> --- src/test/libpmempool_api/out0.log.match | 3 +- src/test/libpmempool_api/out1.log.match | 3 +- src/test/libpmempool_api/out10.log.match | 6 +- src/test/libpmempool_api/out13.log.match | 3 +- src/test/libpmempool_api/out9.log.match | 6 +- src/test/libpmempool_backup/out0.log.match | 9 +- src/test/libpmempool_backup/out6.log.match | 18 ++- src/test/libpmempool_backup/out7.log.match | 9 +- src/test/pmempool_check/out1.log.match | 6 +- src/test/pmempool_check/out10.log.match | 7 +- src/test/pmempool_check/out13.log.match | 3 +- src/test/pmempool_check/out14.log.match | 9 +- src/test/pmempool_check/out15.log.match | 168 ++++++++++++--------- src/test/pmempool_check/out16.log.match | 9 +- src/test/pmempool_check/out17.log.match | 9 +- src/test/pmempool_check/out18.log.match | 3 +- src/test/pmempool_check/out19.log.match | 15 +- src/test/pmempool_check/out20.log.match | 9 +- src/test/pmempool_check/out22.log.match | 3 +- src/test/pmempool_check/out23.log.match | 9 +- src/test/pmempool_check/out25.log.match | 9 +- src/test/pmempool_check/out27.log.match | 9 +- src/test/pmempool_check/out4.log.match | 6 +- src/test/pmempool_check/out5.log.match | 6 +- src/test/pmempool_check/out7.log.match | 24 ++- src/test/pmempool_check/out8.log.match | 3 +- src/test/pmempool_check/out9.log.match | 6 +- src/test/pmempool_sync/out27.log.match | 7 +- src/test/pmempool_sync/out28.log.match | 7 +- src/test/pmempool_sync/out29.log.match | 14 +- src/test/pmempool_sync/out30.log.match | 7 +- src/test/pmempool_sync/out31.log.match | 7 +- src/test/pmempool_sync/out38.log.match | 7 +- src/test/pmempool_sync/out39.log.match | 7 +- src/test/pmempool_sync/out40.log.match | 7 +- src/test/pmempool_sync/out41.log.match | 7 +- src/test/pmempool_sync/out42.log.match | 7 +- src/test/pmempool_sync/out44.log.match | 11 +- src/test/pmempool_sync/out45.log.match | 11 +- src/test/pmempool_sync/out46.log.match | 11 +- src/test/pmempool_sync/out47.log.match | 11 +- src/test/pmempool_sync/out48.log.match | 11 +- src/test/pmempool_sync/out49.log.match | 11 +- src/test/pmempool_sync/out50.log.match | 11 +- src/test/pmempool_sync/out51.log.match | 11 +- src/test/pmempool_sync/out52.log.match | 11 +- src/test/pmempool_sync/out53.log.match | 11 +- 47 files changed, 334 insertions(+), 223 deletions(-) diff --git a/src/test/libpmempool_api/out0.log.match b/src/test/libpmempool_api/out0.log.match index d2561a339..c8deb1909 100644 --- a/src/test/libpmempool_api/out0.log.match +++ b/src/test/libpmempool_api/out0.log.match @@ -1,7 +1,8 @@ libpmempool_api$(nW)TEST0: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -d 1 -a 0 -r 1 $(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemlog header diff --git a/src/test/libpmempool_api/out1.log.match b/src/test/libpmempool_api/out1.log.match index 100b0c9d8..2a70b5a03 100644 --- a/src/test/libpmempool_api/out1.log.match +++ b/src/test/libpmempool_api/out1.log.match @@ -1,7 +1,8 @@ libpmempool_api$(nW)TEST1: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -d 0 -a 1 -r 1 $(*) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemlog header diff --git a/src/test/libpmempool_api/out10.log.match b/src/test/libpmempool_api/out10.log.match index 7fdeff216..6e76c1ce2 100644 --- a/src/test/libpmempool_api/out10.log.match +++ b/src/test/libpmempool_api/out10.log.match @@ -1,7 +1,8 @@ libpmempool_api$(nW)TEST10: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -d 0 -r 0 -y 0 $(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header status = not consistent @@ -9,7 +10,8 @@ libpmempool_api$(nW)TEST10: DONE libpmempool_api$(nW)TEST10: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -d 0 -r 1 -y 1 $(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header pool_hdr.major is not valid diff --git a/src/test/libpmempool_api/out13.log.match b/src/test/libpmempool_api/out13.log.match index cc449af26..5829456fd 100644 --- a/src/test/libpmempool_api/out13.log.match +++ b/src/test/libpmempool_api/out13.log.match @@ -5,7 +5,8 @@ libpmempool_api$(nW)TEST13: DONE libpmempool_api$(nW)TEST13: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -s 999999 $(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemlog header diff --git a/src/test/libpmempool_api/out9.log.match b/src/test/libpmempool_api/out9.log.match index e5824c147..3590d89b8 100644 --- a/src/test/libpmempool_api/out9.log.match +++ b/src/test/libpmempool_api/out9.log.match @@ -2,7 +2,8 @@ Pool type: log Params: log libpmempool_api$(nW)TEST9: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -d 1 -r 1 -y 1 -t log $(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header pool_hdr.major is not valid @@ -15,7 +16,8 @@ Pool type: blk Params: blk 512 libpmempool_api$(nW)TEST9: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -d 1 -r 1 -y 1 -t blk $(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header pool_hdr.major is not valid diff --git a/src/test/libpmempool_backup/out0.log.match b/src/test/libpmempool_backup/out0.log.match index d918f4b77..8b7304afa 100644 --- a/src/test/libpmempool_backup/out0.log.match +++ b/src/test/libpmempool_backup/out0.log.match @@ -5,7 +5,8 @@ creating backup file: $(nW)pool.part2_backup creating backup file: $(nW)pool.part3_backup creating backup file: $(nW)pool.part4_backup checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -29,7 +30,8 @@ creating backup file: $(nW)pool.part2_backup creating backup file: $(nW)pool.part3_backup creating backup file: $(nW)pool.part4_backup checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -49,7 +51,8 @@ creating backup file: $(nW)pool.part2_backup creating backup file: $(nW)pool.part3_backup creating backup file: $(nW)pool.part4_backup checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/libpmempool_backup/out6.log.match b/src/test/libpmempool_backup/out6.log.match index 05610fa1b..34102e991 100644 --- a/src/test/libpmempool_backup/out6.log.match +++ b/src/test/libpmempool_backup/out6.log.match @@ -2,7 +2,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t blk -r 1 $(nW)pool.set part files of the destination poolset of the backup already exist. Do you want to overwrite them? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -29,7 +30,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t blk -r 1 $(nW)pool.set part files of the destination poolset of the backup already exist. Do you want to overwrite them? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -50,7 +52,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t log -r 1 $(nW)pool.set part files of the destination poolset of the backup already exist. Do you want to overwrite them? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -73,7 +76,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t log -r 1 $(nW)pool.set part files of the destination poolset of the backup already exist. Do you want to overwrite them? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -90,7 +94,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t obj -r 1 $(nW)pool.set part files of the destination poolset of the backup already exist. Do you want to overwrite them? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -111,7 +116,8 @@ libpmempool_backup/TEST6: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.set_backup -t obj -r 1 $(nW)pool.set part files of the destination poolset of the backup already exist. Do you want to overwrite them? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/libpmempool_backup/out7.log.match b/src/test/libpmempool_backup/out7.log.match index 51f16ea87..d59d40b99 100644 --- a/src/test/libpmempool_backup/out7.log.match +++ b/src/test/libpmempool_backup/out7.log.match @@ -2,7 +2,8 @@ libpmempool_backup/TEST7: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.blk_backup -t blk -r 1 $(nW)pool.blk destination of the backup already exists. Do you want to overwrite it? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemblk header @@ -22,7 +23,8 @@ libpmempool_backup/TEST7: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.log_backup -t log -r 1 $(nW)pool.log destination of the backup already exists. Do you want to overwrite it? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemlog header @@ -38,7 +40,8 @@ libpmempool_backup/TEST7: START: libpmempool_test$(nW) $(nW)libpmempool_test$(nW) -b $(nW)pool.obj_backup -t obj -r 1 $(nW)pool.obj destination of the backup already exists. Do you want to overwrite it? checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct status = consistent diff --git a/src/test/pmempool_check/out1.log.match b/src/test/pmempool_check/out1.log.match index 70a8708f7..154046c35 100644 --- a/src/test/pmempool_check/out1.log.match +++ b/src/test/pmempool_check/out1.log.match @@ -8,7 +8,8 @@ $(nW): spoil: pool_hdr.shutdown_state.uuid=0 $(nW): spoil: pool_hdr.shutdown_state.f:checksum_gen $(nW): spoil: pool_hdr.unused=$(*) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header pool_hdr.major is not valid @@ -28,7 +29,8 @@ PMEMLOG: pmemlog $(nW): spoil: pmemlog.start_offset=$(*) $(nW): spoil: pmemlog.end_offset=$(*) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemlog header diff --git a/src/test/pmempool_check/out10.log.match b/src/test/pmempool_check/out10.log.match index 82019390e..299c687e4 100644 --- a/src/test/pmempool_check/out10.log.match +++ b/src/test/pmempool_check/out10.log.match @@ -1,8 +1,9 @@ $(nW)pool.replica2.part1: spoil: pool_hdr.uuid=ERROR replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_check/out13.log.match b/src/test/pmempool_check/out13.log.match index d451d3ed6..d06f451f1 100644 --- a/src/test/pmempool_check/out13.log.match +++ b/src/test/pmempool_check/out13.log.match @@ -1,5 +1,6 @@ checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header pool_hdr.major is not valid diff --git a/src/test/pmempool_check/out14.log.match b/src/test/pmempool_check/out14.log.match index 7d7153455..3171e9181 100644 --- a/src/test/pmempool_check/out14.log.match +++ b/src/test/pmempool_check/out14.log.match @@ -1,17 +1,20 @@ checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct $(nW) consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemlog header pmemlog header correct $(nW) consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemblk header diff --git a/src/test/pmempool_check/out15.log.match b/src/test/pmempool_check/out15.log.match index 0dbfd0aac..62ab867b7 100644 --- a/src/test/pmempool_check/out15.log.match +++ b/src/test/pmempool_check/out15.log.match @@ -2,7 +2,8 @@ Arguments: create log Input: two parts per poolset Output: four parts in poolset checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -14,7 +15,8 @@ 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -26,7 +28,8 @@ 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -41,7 +44,8 @@ Arguments: create blk 512 Input: two parts per poolset Output: four parts in poolset checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -53,7 +57,8 @@ 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -65,7 +70,8 @@ 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -80,7 +86,8 @@ Arguments: create obj Input: two parts per poolset Output: four parts in poolset checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -92,7 +99,8 @@ 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -104,7 +112,8 @@ 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -117,9 +126,10 @@ the poolset contains part files from various poolsets $(nW)pool.set: not consistent Output: two replicas with two parts each in poolset replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -131,9 +141,10 @@ replica 1 part 1: pool header correct the poolset contains part files from various poolsets $(nW)pool.set: not consistent replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -145,9 +156,10 @@ replica 1 part 1: pool header correct the poolset contains part files from various poolsets $(nW)pool.set: not consistent replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -160,13 +172,14 @@ the poolset contains part files from various poolsets $(nW)pool.set: not consistent Output: four replicas in poolset replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct -replica 3: checking shutdown state -replica 3: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct +$(OPT)replica 3: checking shutdown state +$(OPT)replica 3: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 1 part 0: checking pool header @@ -178,13 +191,14 @@ replica 3 part 0: pool header correct the poolset contains part files from various poolsets $(nW)pool.set: not consistent replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct -replica 3: checking shutdown state -replica 3: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct +$(OPT)replica 3: checking shutdown state +$(OPT)replica 3: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 1 part 0: checking pool header @@ -196,13 +210,14 @@ replica 3 part 0: pool header correct the poolset contains part files from various poolsets $(nW)pool.set: not consistent replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct -replica 3: checking shutdown state -replica 3: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct +$(OPT)replica 3: checking shutdown state +$(OPT)replica 3: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 1 part 0: checking pool header @@ -216,7 +231,8 @@ $(nW)pool.set: not consistent Input: two replicas per poolset Output: four parts in poolset checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -228,7 +244,8 @@ 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -240,7 +257,8 @@ 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -253,9 +271,10 @@ the poolset contains part files from various poolsets $(nW)pool.set: not consistent Output: two replicas with two parts each in poolset replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -267,9 +286,10 @@ replica 1 part 1: pool header correct the poolset contains part files from various poolsets $(nW)pool.set: not consistent replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -281,9 +301,10 @@ replica 1 part 1: pool header correct the poolset contains part files from various poolsets $(nW)pool.set: not consistent replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -296,13 +317,14 @@ the poolset contains part files from various poolsets $(nW)pool.set: not consistent Output: four replicas in poolset replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct -replica 3: checking shutdown state -replica 3: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct +$(OPT)replica 3: checking shutdown state +$(OPT)replica 3: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 1 part 0: checking pool header @@ -314,13 +336,14 @@ replica 3 part 0: pool header correct the poolset contains part files from various poolsets $(nW)pool.set: not consistent replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct -replica 3: checking shutdown state -replica 3: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct +$(OPT)replica 3: checking shutdown state +$(OPT)replica 3: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 1 part 0: checking pool header @@ -332,13 +355,14 @@ replica 3 part 0: pool header correct the poolset contains part files from various poolsets $(nW)pool.set: not consistent replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct -replica 3: checking shutdown state -replica 3: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct +$(OPT)replica 3: checking shutdown state +$(OPT)replica 3: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 1 part 0: checking pool header diff --git a/src/test/pmempool_check/out16.log.match b/src/test/pmempool_check/out16.log.match index 69ad39713..9ae7ea815 100644 --- a/src/test/pmempool_check/out16.log.match +++ b/src/test/pmempool_check/out16.log.match @@ -1,18 +1,21 @@ $(nW)pool.p1: spoil: pool_hdr.crtime=$(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header $(nW)pool.set: not consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported 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 $(nW)pool.set: cannot repair checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header replica 0 part 0: pool_hdr.crtime is not valid diff --git a/src/test/pmempool_check/out17.log.match b/src/test/pmempool_check/out17.log.match index aec35d6c4..5103f3ba6 100644 --- a/src/test/pmempool_check/out17.log.match +++ b/src/test/pmempool_check/out17.log.match @@ -1,6 +1,7 @@ $(nW)pool.p1: spoil: pool_hdr.checksum=$(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header replica 0 part 1: checking pool header @@ -10,7 +11,8 @@ replica 0 part 0: invalid pool_hdr.checksum $(nW)pool.set: cannot repair $(nW)pool.p1: spoil: pool_hdr.uuid=$(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header replica 0 part 1: checking pool header @@ -21,7 +23,8 @@ replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED replica 0 part 0: invalid pool_hdr.checksum $(nW)pool.set: cannot repair checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header replica 0 part 1: checking pool header diff --git a/src/test/pmempool_check/out18.log.match b/src/test/pmempool_check/out18.log.match index 1cfa675e1..0ac6f3187 100644 --- a/src/test/pmempool_check/out18.log.match +++ b/src/test/pmempool_check/out18.log.match @@ -2,7 +2,8 @@ $(nW)pool.p1: spoil: pool_hdr.major=$(nW) $(nW)pool.p1: spoil: pool_hdr.poolset_uuid=$(nW) $(nW)pool.p1: spoil: pool_hdr.uuid=$(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header replica 0 part 0: pool_hdr.major is not valid diff --git a/src/test/pmempool_check/out19.log.match b/src/test/pmempool_check/out19.log.match index fbd8e914c..43c7ca68e 100644 --- a/src/test/pmempool_check/out19.log.match +++ b/src/test/pmempool_check/out19.log.match @@ -1,11 +1,13 @@ $(nW)pool.p1: spoil: pool_hdr.arch_flags=$(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header $(nW)pool.set: not consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported 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 @@ -18,12 +20,14 @@ $(nW)pool.set: repaired $(nW)pool.p1: spoil: pool_hdr.arch_flags=$(nW) $(nW)pool.p2: spoil: pool_hdr.arch_flags=$(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header $(nW)pool.set: not consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header replica 0 part 1: checking pool header @@ -32,7 +36,8 @@ replica 0 part 0: the following error can be fixed using PMEMPOOL_CHECK_ADVANCED replica 0 part 0: invalid pool_hdr.checksum $(nW)pool.set: cannot repair checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header replica 0 part 1: checking pool header diff --git a/src/test/pmempool_check/out20.log.match b/src/test/pmempool_check/out20.log.match index f8fd6192a..6adb515d9 100644 --- a/src/test/pmempool_check/out20.log.match +++ b/src/test/pmempool_check/out20.log.match @@ -6,7 +6,8 @@ $(nW)file.pool: cannot repair $(nW)file.pool: spoil: pool_hdr.features.compat=0x00 $(nW)file.pool: spoil: pool_hdr.f:checksum_gen checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemlog header @@ -20,7 +21,8 @@ $(nW)file.pool: cannot repair $(nW)file.pool: spoil: pool_hdr.features.compat=0x00 $(nW)file.pool: spoil: pool_hdr.f:checksum_gen checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemblk header @@ -38,7 +40,8 @@ $(nW)file.pool: cannot repair $(nW)file.pool: spoil: pool_hdr.features.compat=0x00 $(nW)file.pool: spoil: pool_hdr.f:checksum_gen checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct $(nW)file.pool: consistent diff --git a/src/test/pmempool_check/out22.log.match b/src/test/pmempool_check/out22.log.match index d451d3ed6..d06f451f1 100644 --- a/src/test/pmempool_check/out22.log.match +++ b/src/test/pmempool_check/out22.log.match @@ -1,5 +1,6 @@ checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header pool_hdr.major is not valid diff --git a/src/test/pmempool_check/out23.log.match b/src/test/pmempool_check/out23.log.match index 7d7153455..3171e9181 100644 --- a/src/test/pmempool_check/out23.log.match +++ b/src/test/pmempool_check/out23.log.match @@ -1,17 +1,20 @@ checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct $(nW) consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemlog header pmemlog header correct $(nW) consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemblk header diff --git a/src/test/pmempool_check/out25.log.match b/src/test/pmempool_check/out25.log.match index 90e9d57ca..66fcfceb0 100644 --- a/src/test/pmempool_check/out25.log.match +++ b/src/test/pmempool_check/out25.log.match @@ -1,12 +1,14 @@ checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -15,7 +17,8 @@ checking pmemlog header pmemlog header correct $(nW) consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_check/out27.log.match b/src/test/pmempool_check/out27.log.match index 9fe38c512..2ccbb2239 100644 --- a/src/test/pmempool_check/out27.log.match +++ b/src/test/pmempool_check/out27.log.match @@ -1,17 +1,20 @@ checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct $(nW) consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: pool header correct checking pmemblk header diff --git a/src/test/pmempool_check/out4.log.match b/src/test/pmempool_check/out4.log.match index 841153b77..03a317dc8 100644 --- a/src/test/pmempool_check/out4.log.match +++ b/src/test/pmempool_check/out4.log.match @@ -1,13 +1,15 @@ $(nW): spoil: pool_hdr.checksum=$(nW) checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header invalid pool_hdr.checksum diff --git a/src/test/pmempool_check/out5.log.match b/src/test/pmempool_check/out5.log.match index 53848539c..98a94eaf4 100644 --- a/src/test/pmempool_check/out5.log.match +++ b/src/test/pmempool_check/out5.log.match @@ -1,12 +1,14 @@ checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported 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 +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header invalid pool_hdr.checksum diff --git a/src/test/pmempool_check/out7.log.match b/src/test/pmempool_check/out7.log.match index ff51dde78..673f17ca8 100644 --- a/src/test/pmempool_check/out7.log.match +++ b/src/test/pmempool_check/out7.log.match @@ -2,7 +2,8 @@ $(nW)file.pool: spoil: pool_hdr.uuid=ERROR incorrect pool header $(nW)file.pool: not consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header invalid pool_hdr.uuid @@ -13,7 +14,8 @@ checking BTT Info headers BTT Layout not written $(nW)file.pool: repaired checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemblk header @@ -26,14 +28,16 @@ $(nW)file.pool: spoil: pool_hdr.next_part_uuid=ERROR_NEXT incorrect pool header $(nW)file.pool: not consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag invalid pool_hdr.uuid $(nW)file.pool: cannot repair checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header invalid pool_hdr.uuid @@ -54,7 +58,8 @@ checking BTT Info headers BTT Layout not written $(nW)file.pool: repaired checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemblk header @@ -69,14 +74,16 @@ $(nW)file.pool: spoil: pool_hdr.next_repl_uuid=ERROR_RNEXT incorrect pool header $(nW)file.pool: not consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header the following error can be fixed using PMEMPOOL_CHECK_ADVANCED flag invalid pool_hdr.uuid $(nW)file.pool: cannot repair checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header invalid pool_hdr.uuid @@ -97,7 +104,8 @@ checking BTT Info headers BTT Layout not written $(nW)file.pool: repaired checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct checking pmemblk header diff --git a/src/test/pmempool_check/out8.log.match b/src/test/pmempool_check/out8.log.match index 3184d01d2..3ee0d7314 100644 --- a/src/test/pmempool_check/out8.log.match +++ b/src/test/pmempool_check/out8.log.match @@ -6,7 +6,8 @@ $(nW)pool.p1: spoil: pool_hdr.poolset_uuid=ERROR replica 0 part 0: incorrect pool header $(nW)pool.set: not consistent checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported replica 0 part 0: checking pool header replica 0 part 0: incorrect pool header replica 0 part 1: checking pool header diff --git a/src/test/pmempool_check/out9.log.match b/src/test/pmempool_check/out9.log.match index d180c92cf..be170dbb5 100644 --- a/src/test/pmempool_check/out9.log.match +++ b/src/test/pmempool_check/out9.log.match @@ -1,5 +1,6 @@ checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header pool header correct $(nW)file.pool: consistent @@ -13,7 +14,8 @@ $(nW): spoil: pool_hdr.shutdown_state.uuid=0 $(nW): spoil: pool_hdr.shutdown_state.f:checksum_gen $(nW)file.pool: spoil: pool_hdr.unused=ERROR checking shutdown state -shutdown state correct +$(OPT)shutdown state correct +$(OPX)shutdown state not supported checking pool header incorrect pool header the repair of pmemobj pools is not supported diff --git a/src/test/pmempool_sync/out27.log.match b/src/test/pmempool_sync/out27.log.match index fcf7fa64a..92889289b 100644 --- a/src/test/pmempool_sync/out27.log.match +++ b/src/test/pmempool_sync/out27.log.match @@ -9,9 +9,10 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( "length":16, $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out28.log.match b/src/test/pmempool_sync/out28.log.match index 40196c454..d169a0c89 100644 --- a/src/test/pmempool_sync/out28.log.match +++ b/src/test/pmempool_sync/out28.log.match @@ -10,9 +10,10 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)/testset1: synchronized No bad blocks found replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 1 part 0: checking pool header diff --git a/src/test/pmempool_sync/out29.log.match b/src/test/pmempool_sync/out29.log.match index beaeacfe4..77f0c1420 100644 --- a/src/test/pmempool_sync/out29.log.match +++ b/src/test/pmempool_sync/out29.log.match @@ -2,9 +2,10 @@ create($(nW)/testset1): allocating records in the pool ... create($(nW)/testset1): allocated $(N) records (of size $(N)) verify($(nW)/testset1): pool file successfully verified ($(N) records of size $(N)) replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header @@ -12,9 +13,10 @@ replica 0 part 1: empty pool hdr $(nW)/testset1: not consistent $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out30.log.match b/src/test/pmempool_sync/out30.log.match index cf8e313bf..a795dd78c 100644 --- a/src/test/pmempool_sync/out30.log.match +++ b/src/test/pmempool_sync/out30.log.match @@ -64,9 +64,10 @@ Root offset : $(nW) "length":8, $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out31.log.match b/src/test/pmempool_sync/out31.log.match index a930f6272..dbe3e2839 100644 --- a/src/test/pmempool_sync/out31.log.match +++ b/src/test/pmempool_sync/out31.log.match @@ -58,9 +58,10 @@ Root offset : $(nW) $(nW)/testset1: synchronized No bad blocks found replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 1 part 0: checking pool header diff --git a/src/test/pmempool_sync/out38.log.match b/src/test/pmempool_sync/out38.log.match index f0ed872d3..1ec8253b9 100644 --- a/src/test/pmempool_sync/out38.log.match +++ b/src/test/pmempool_sync/out38.log.match @@ -65,9 +65,10 @@ Root offset : $(nW) $(nW)/testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out39.log.match b/src/test/pmempool_sync/out39.log.match index 7438695b9..a2152758f 100644 --- a/src/test/pmempool_sync/out39.log.match +++ b/src/test/pmempool_sync/out39.log.match @@ -65,9 +65,10 @@ Root offset : $(nW) $(nW)/testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out40.log.match b/src/test/pmempool_sync/out40.log.match index da9b663d0..11a231ae2 100644 --- a/src/test/pmempool_sync/out40.log.match +++ b/src/test/pmempool_sync/out40.log.match @@ -65,9 +65,10 @@ Root offset : $(nW) $(nW)/testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out41.log.match b/src/test/pmempool_sync/out41.log.match index 7438695b9..a2152758f 100644 --- a/src/test/pmempool_sync/out41.log.match +++ b/src/test/pmempool_sync/out41.log.match @@ -65,9 +65,10 @@ Root offset : $(nW) $(nW)/testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out42.log.match b/src/test/pmempool_sync/out42.log.match index 6887b88d6..3acf449bd 100644 --- a/src/test/pmempool_sync/out42.log.match +++ b/src/test/pmempool_sync/out42.log.match @@ -6,9 +6,10 @@ verify($(nW)/testset1): incorrect number of records (is: $(N), should be: $(N)) verify($(nW)/testset1): pool file contains error $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out44.log.match b/src/test/pmempool_sync/out44.log.match index 48d3b9a1c..e0266c716 100644 --- a/src/test/pmempool_sync/out44.log.match +++ b/src/test/pmempool_sync/out44.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out45.log.match b/src/test/pmempool_sync/out45.log.match index 48d3b9a1c..e0266c716 100644 --- a/src/test/pmempool_sync/out45.log.match +++ b/src/test/pmempool_sync/out45.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out46.log.match b/src/test/pmempool_sync/out46.log.match index 48d3b9a1c..e0266c716 100644 --- a/src/test/pmempool_sync/out46.log.match +++ b/src/test/pmempool_sync/out46.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out47.log.match b/src/test/pmempool_sync/out47.log.match index d74b615aa..a3feea855 100644 --- a/src/test/pmempool_sync/out47.log.match +++ b/src/test/pmempool_sync/out47.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out48.log.match b/src/test/pmempool_sync/out48.log.match index d74b615aa..a3feea855 100644 --- a/src/test/pmempool_sync/out48.log.match +++ b/src/test/pmempool_sync/out48.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out49.log.match b/src/test/pmempool_sync/out49.log.match index d74b615aa..a3feea855 100644 --- a/src/test/pmempool_sync/out49.log.match +++ b/src/test/pmempool_sync/out49.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out50.log.match b/src/test/pmempool_sync/out50.log.match index d74b615aa..a3feea855 100644 --- a/src/test/pmempool_sync/out50.log.match +++ b/src/test/pmempool_sync/out50.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out51.log.match b/src/test/pmempool_sync/out51.log.match index d74b615aa..a3feea855 100644 --- a/src/test/pmempool_sync/out51.log.match +++ b/src/test/pmempool_sync/out51.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out52.log.match b/src/test/pmempool_sync/out52.log.match index d74b615aa..a3feea855 100644 --- a/src/test/pmempool_sync/out52.log.match +++ b/src/test/pmempool_sync/out52.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header diff --git a/src/test/pmempool_sync/out53.log.match b/src/test/pmempool_sync/out53.log.match index d74b615aa..a3feea855 100644 --- a/src/test/pmempool_sync/out53.log.match +++ b/src/test/pmempool_sync/out53.log.match @@ -4,11 +4,12 @@ verify($(nW)/testset1): pool file successfully verified ($(N) records of size $( $(nW)testset1: pmemobj_open: error: a bad block recovery file exists, run 'pmempool sync --bad-blocks' utility to try to recover the pool: Invalid argument $(nW)/testset1: synchronized replica 0: checking shutdown state -replica 0: shutdown state correct -replica 1: checking shutdown state -replica 1: shutdown state correct -replica 2: checking shutdown state -replica 2: shutdown state correct +$(OPT)replica 0: shutdown state correct +$(OPX)replica 0: shutdown state not supported +$(OPT)replica 1: checking shutdown state +$(OPT)replica 1: shutdown state correct +$(OPT)replica 2: checking shutdown state +$(OPT)replica 2: shutdown state correct replica 0 part 0: checking pool header replica 0 part 0: pool header correct replica 0 part 1: checking pool header -- GitLab