[sheepdog] [PATCH] func/test: change functional test output for __vdi_list (2/2)
Hitoshi Mitake
mitake.hitoshi at lab.ntt.co.jp
Wed Dec 17 02:30:06 CET 2014
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 8.0 MB 8.0 MB 0.0 MB DATE 7c2b25 1
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 8.0 MB 8.0 MB 0.0 MB DATE 7c2b25 1
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 8.0 MB 8.0 MB 0.0 MB DATE 7c2b25 1
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 8.0 MB 8.0 MB 0.0 MB DATE 7c2b25 1 22
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 8.0 MB 8.0 MB 0.0 MB DATE 7c2b25 1 22
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 8.0 MB 8.0 MB 0.0 MB DATE 7c2b25 1 22
> finish check&repair test
> diff --git a/tests/functional/076.out b/tests/functional/076.out
> index b179a24..c21daeb 100644
> --- a/tests/functional/076.out
> +++ b/tests/functional/076.out
> @@ -1,7 +1,7 @@
> QA output created by 076
> using backend plain store
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 40 MB 0.0 MB 0.0 MB DATE 7c2b25 16:15
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 40 MB 0.0 MB 0.0 MB DATE 7c2b25 16:15 22
> using backend plain store
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 40 MB 0.0 MB 0.0 MB DATE 7c2b25 2:1
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 40 MB 0.0 MB 0.0 MB DATE 7c2b25 2:1 22
> diff --git a/tests/functional/077.out b/tests/functional/077.out
> index 191d39f..0657acc 100644
> --- a/tests/functional/077.out
> +++ b/tests/functional/077.out
> @@ -1,7 +1,7 @@
> QA output created by 077
> using backend plain store
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 0.0 MB 0.0 MB DATE 7c2b25 3
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 0.0 MB 0.0 MB DATE 7c2b25 3 22
> [127.0.0.1:7000] oid 007c2b2500000000 is missing.
> test lost 1 object(s).
> fixed missing 7c2b2500000000
> diff --git a/tests/functional/078.out b/tests/functional/078.out
> index e98c1d2..4ee8002 100644
> --- a/tests/functional/078.out
> +++ b/tests/functional/078.out
> @@ -1,11 +1,11 @@
> QA output created by 078
> using backend plain store
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test1 0 20 MB 0.0 MB 0.0 MB DATE fd32fc 4:2
> - test3 0 20 MB 0.0 MB 0.0 MB DATE fd3662 2:1
> - test2 0 20 MB 0.0 MB 0.0 MB DATE fd3815 2
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test4 0 20 MB 0.0 MB 0.0 MB DATE fd2de3 4:2
> - test1 0 20 MB 0.0 MB 0.0 MB DATE fd32fc 4:2
> - test3 0 20 MB 0.0 MB 0.0 MB DATE fd3662 2:1
> - test2 0 20 MB 0.0 MB 0.0 MB DATE fd3815 2
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test1 0 20 MB 0.0 MB 0.0 MB DATE fd32fc 4:2 22
> + test3 0 20 MB 0.0 MB 0.0 MB DATE fd3662 2:1 22
> + test2 0 20 MB 0.0 MB 0.0 MB DATE fd3815 2 22
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test4 0 20 MB 0.0 MB 0.0 MB DATE fd2de3 4:2 22
> + test1 0 20 MB 0.0 MB 0.0 MB DATE fd32fc 4:2 22
> + test3 0 20 MB 0.0 MB 0.0 MB DATE fd3662 2:1 22
> + test2 0 20 MB 0.0 MB 0.0 MB DATE fd3815 2 22
> diff --git a/tests/functional/079.out b/tests/functional/079.out
> index 7f0949d..021ccfe 100644
> --- a/tests/functional/079.out
> +++ b/tests/functional/079.out
> @@ -1,11 +1,11 @@
> QA output created by 079
> using backend plain store
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 16 PB 0.0 MB 0.0 MB DATE 7c2b25 3
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 16 PB 64 MB 0.0 MB DATE 7c2b25 3
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 16 PB 0.0 MB 0.0 MB DATE 7c2b25 3 22
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 16 PB 64 MB 0.0 MB DATE 7c2b25 3 22
> using backend plain store
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 16 PB 0.0 MB 0.0 MB DATE 7c2b25 3
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 16 PB 4.0 MB 0.0 MB DATE 7c2b25 3
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 16 PB 0.0 MB 0.0 MB DATE 7c2b25 3 22
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 16 PB 4.0 MB 0.0 MB DATE 7c2b25 3 22
> diff --git a/tests/functional/080.out b/tests/functional/080.out
> index 3b58081..6756b2f 100644
> --- a/tests/functional/080.out
> +++ b/tests/functional/080.out
> @@ -2,13 +2,13 @@ QA output created by 080
> using backend plain store
> Failed to write object 7c2b2500000000: IO has halted as there are not enough living nodes
> Failed to write VDI
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 10 MB 0.0 MB 0.0 MB DATE 7c2b25 4:2
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 10 MB 0.0 MB 0.0 MB DATE 7c2b25 4:2 22
> Failed to create VDI test1: Failed to write to requested VDI
> Failed to write object 7c2b2500000000: IO has halted as there are not enough living nodes
> Failed to write VDI
> Failed to create VDI test1: Failed to write to requested VDI
> Failed to write object 7c2b2500000000: IO has halted as there are not enough living nodes
> Failed to write VDI
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 10 MB 0.0 MB 0.0 MB DATE 7c2b25 4:2
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 10 MB 0.0 MB 0.0 MB DATE 7c2b25 4:2 22
> diff --git a/tests/functional/083.out b/tests/functional/083.out
> index 90b4cba..3170904 100644
> --- a/tests/functional/083.out
> +++ b/tests/functional/083.out
> @@ -4,8 +4,8 @@ QA output created by 083
> 1 127.0.0.1:7001 128 0
> 2 127.0.0.1:7002 128 1
> using backend plain store
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 0.0 MB 0.0 MB DATE 7c2b25 3
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 0.0 MB 0.0 MB DATE 7c2b25 3 22
> [127.0.0.1:7001] oid 007c2b2500000000 is missing.
> test lost 1 object(s).
> fixed missing 7c2b2500000000
> diff --git a/tests/functional/088.out b/tests/functional/088.out
> index 4e778bf..45f330b 100644
> --- a/tests/functional/088.out
> +++ b/tests/functional/088.out
> @@ -11,8 +11,8 @@ Epoch Time Version
> DATE 1 [IP:7000]
> ----- vdi create -----
> ----- vdi list -----
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 40 MB 40 MB 0.0 MB DATE 7c2b25 1
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 40 MB 40 MB 0.0 MB DATE 7c2b25 1 22
> ----- cluster shutdown -----
> 2. start sheep with default
> ----- cluster info -----
> @@ -36,6 +36,6 @@ Cluster created at DATE
> Epoch Time Version
> DATE 1 [IP:7000]
> ----- vdi list -----
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 40 MB 40 MB 0.0 MB DATE 7c2b25 1
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 40 MB 40 MB 0.0 MB DATE 7c2b25 1 22
> ----- cluster shutdown -----
> diff --git a/tests/functional/091.out b/tests/functional/091.out
> index d548965..49d41cf 100644
> --- a/tests/functional/091.out
> +++ b/tests/functional/091.out
> @@ -1,6 +1,6 @@
> QA output created by 091
> using backend plain store
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 100 MB 100 MB 0.0 MB DATE 7c2b25 8:4
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 100 MB 100 MB 0.0 MB DATE 7c2b25 8:4
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 100 MB 100 MB 0.0 MB DATE 7c2b25 8:4 22
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 100 MB 100 MB 0.0 MB DATE 7c2b25 8:4 22
> diff --git a/tests/functional/092.out b/tests/functional/092.out
> index a3e5f4b..82e28ba 100644
> --- a/tests/functional/092.out
> +++ b/tests/functional/092.out
> @@ -8,19 +8,19 @@ STORE DATA VDI VMSTATE ATTR LEDGER STALE
> 0 5 1 0 0 2 0
> 1 4 2 0 0 0 0
> 2 3 3 0 0 2 0
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> -c test_cloned 0 16 MB 8.0 MB 8.0 MB DATE 34f19d 2
> -s test 1 16 MB 16 MB 0.0 MB DATE 7c2b25 2
> - test 0 16 MB 0.0 MB 16 MB DATE 7c2b26 2
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> +c test_cloned 0 16 MB 8.0 MB 8.0 MB DATE 34f19d 2 22
> +s test 1 16 MB 16 MB 0.0 MB DATE 7c2b25 2 22
> + test 0 16 MB 0.0 MB 16 MB DATE 7c2b26 2 22
> STORE DATA VDI VMSTATE ATTR LEDGER STALE
> 0 5 2 0 0 2 0
> 1 6 3 0 0 0 0
> 2 5 3 0 0 2 0
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> -c test_cloned 0 16 MB 8.0 MB 8.0 MB DATE 34f19d 2
> -s test 1 16 MB 16 MB 0.0 MB DATE 7c2b25 2
> - test 0 16 MB 0.0 MB 16 MB DATE 7c2b26 2
> -c test_cloned2 0 16 MB 8.0 MB 8.0 MB DATE f6ac5d 2
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> +c test_cloned 0 16 MB 8.0 MB 8.0 MB DATE 34f19d 2 22
> +s test 1 16 MB 16 MB 0.0 MB DATE 7c2b25 2 22
> + test 0 16 MB 0.0 MB 16 MB DATE 7c2b26 2 22
> +c test_cloned2 0 16 MB 8.0 MB 8.0 MB DATE f6ac5d 2 22
> STORE DATA VDI VMSTATE ATTR LEDGER STALE
> 0 5 2 0 0 4 0
> 1 6 3 0 0 2 0
> @@ -39,4 +39,4 @@ STORE DATA VDI VMSTATE ATTR LEDGER STALE
> 1 0 3 0 0 0 0
> 2 0 3 0 0 0 0
> there should be no vdi
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> diff --git a/tests/functional/096.out b/tests/functional/096.out
> index 9ac87b9..b1e0e3d 100644
> --- a/tests/functional/096.out
> +++ b/tests/functional/096.out
> @@ -89,8 +89,8 @@ DATE 1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003, 127
> $ ../../dog/dog vdi create test 12M -P
>
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 2
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 2 22
>
> #### VDI OBJECT LIST
>
> @@ -153,8 +153,8 @@ test's redundancy level is set to 3, the old one was 2.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 3
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 3 22
>
> #### VDI OBJECT LIST
>
> @@ -184,8 +184,8 @@ test's redundancy level is set to 4, the old one was 3.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 4
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 4 22
>
> #### VDI OBJECT LIST
>
> @@ -219,8 +219,8 @@ test's redundancy level is set to 5, the old one was 4.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 5
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 5 22
>
> #### VDI OBJECT LIST
>
> @@ -258,8 +258,8 @@ test's redundancy level is set to 6, the old one was 5.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 6
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 6 22
>
> #### VDI OBJECT LIST
>
> @@ -305,8 +305,8 @@ test's redundancy level is set to 5, the old one was 6.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 5
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 5 22
>
> #### VDI OBJECT LIST
>
> @@ -344,8 +344,8 @@ test's redundancy level is set to 4, the old one was 5.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 4
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 4 22
>
> #### VDI OBJECT LIST
>
> @@ -379,8 +379,8 @@ test's redundancy level is set to 3, the old one was 4.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 3
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 3 22
>
> #### VDI OBJECT LIST
>
> @@ -410,8 +410,8 @@ test's redundancy level is set to 2, the old one was 3.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 2
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 2 22
>
> #### VDI OBJECT LIST
>
> @@ -437,8 +437,8 @@ test's redundancy level is set to 1, the old one was 2.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> - test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 1
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> + test 0 12 MB 12 MB 0.0 MB DATE 7c2b25 1 22
>
> #### VDI OBJECT LIST
>
> @@ -465,10 +465,10 @@ Only standalone vdi supports changing redundancy level.
> Please clone test with -n (--no-share) option first.
>
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> -s test 1 12 MB 12 MB 0.0 MB DATE 7c2b25 1 s1
> - test 0 12 MB 0.0 MB 12 MB DATE 7c2b26 1
> -c clone1 0 12 MB 0.0 MB 12 MB DATE c8f989 1
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> +s test 1 12 MB 12 MB 0.0 MB DATE 7c2b25 1 s1 22
> + test 0 12 MB 0.0 MB 12 MB DATE 7c2b26 1 22
> +c clone1 0 12 MB 0.0 MB 12 MB DATE c8f989 1 22
>
> #### VDI OBJECT LIST
>
> @@ -489,10 +489,10 @@ Only standalone vdi supports changing redundancy level.
> Please clone clone1 with -n (--no-share) option first.
>
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> -s test 1 12 MB 12 MB 0.0 MB DATE 7c2b25 1 s1
> - test 0 12 MB 0.0 MB 12 MB DATE 7c2b26 1
> -c clone1 0 12 MB 0.0 MB 12 MB DATE c8f989 1
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> +s test 1 12 MB 12 MB 0.0 MB DATE 7c2b25 1 s1 22
> + test 0 12 MB 0.0 MB 12 MB DATE 7c2b26 1 22
> +c clone1 0 12 MB 0.0 MB 12 MB DATE c8f989 1 22
>
> #### VDI OBJECT LIST
>
> @@ -522,11 +522,11 @@ clone2's redundancy level is set to 2, the old one was 1.
> / | the VDI itself only and trigger recovery.
> (/_)_|_ Are you sure you want to continue? [yes/no]:
> $ ../../dog/dog vdi list
> - Name Id Size Used Shared Creation time VDI id Copies Tag
> -s test 1 12 MB 12 MB 0.0 MB DATE 7c2b25 1 s1
> - test 0 12 MB 0.0 MB 12 MB DATE 7c2b26 1
> - clone2 0 12 MB 12 MB 0.0 MB DATE c8f470 2
> -c clone1 0 12 MB 0.0 MB 12 MB DATE c8f989 1
> + Name Id Size Used Shared Creation time VDI id Copies Tag Block Size Shift
> +s test 1 12 MB 12 MB 0.0 MB DATE 7c2b25 1 s1 22
> + test 0 12 MB 0.0 MB 12 MB DATE 7c2b26 1 22
> + clone2 0 12 MB 12 MB 0.0 MB DATE c8f470 2 22
> +c clone1 0 12 MB 0.0 MB 12 MB DATE c8f989 1 22
>
> #### VDI OBJECT LIST
>
> --
> 1.7.1
>
> --
> sheepdog mailing list
> sheepdog at lists.wpkg.org
> http://lists.wpkg.org/mailman/listinfo/sheepdog
More information about the sheepdog
mailing list