[sheepdog] [PATCH] tests/func: patch test cases since recently update
Ruoyu
liangry at ucweb.com
Tue Jun 24 14:19:36 CEST 2014
In face, outputs of tc 011 and tc 064 are also changed in my computer.
But I don't know whether and when the vnodes algorithm has been modified.
Could you please check it?
$ git diff
diff --git a/tests/functional/011.out b/tests/functional/011.out
index 77a1056..3c5b0b9 100644
--- a/tests/functional/011.out
+++ b/tests/functional/011.out
@@ -3,12 +3,12 @@ check the number of vnodes
Id Host:Port V-Nodes Zone
0 127.0.0.1:7000 55 0
1 127.0.0.1:7001 110 1
- 2 127.0.0.1:7002 219 2
+ 2 127.0.0.1:7002 220 2
Id Host:Port V-Nodes Zone
0 127.0.0.1:7000 55 0
1 127.0.0.1:7001 110 1
- 2 127.0.0.1:7002 219 2
+ 2 127.0.0.1:7002 220 2
Id Host:Port V-Nodes Zone
0 127.0.0.1:7000 55 0
1 127.0.0.1:7001 110 1
- 2 127.0.0.1:7002 219 2
+ 2 127.0.0.1:7002 220 2
diff --git a/tests/functional/064.out b/tests/functional/064.out
index c0977cc..b00005b 100644
--- a/tests/functional/064.out
+++ b/tests/functional/064.out
@@ -6,18 +6,18 @@ STORE DATA VDI VMSTATE ATTR LEDGER STALE
2 22 1 0 0 0 0
3 0 0 0 0 0 0
Id Host:Port V-Nodes Zone
- 0 127.0.0.1:7000 96 0
- 1 127.0.0.1:7001 96 1
- 2 127.0.0.1:7002 192 2
+ 0 127.0.0.1:7000 95 0
+ 1 127.0.0.1:7001 95 1
+ 2 127.0.0.1:7002 193 2
STORE DATA VDI VMSTATE ATTR LEDGER STALE
0 9 0 0 0 0 0
1 16 1 0 0 0 0
2 22 1 0 0 0 0
3 3 0 0 0 0 0
Id Host:Port V-Nodes Zone
- 0 127.0.0.1:7000 96 0
- 1 127.0.0.1:7001 96 1
- 2 127.0.0.1:7002 192 2
+ 0 127.0.0.1:7000 95 0
+ 1 127.0.0.1:7001 95 1
+ 2 127.0.0.1:7002 193 2
STORE DATA VDI VMSTATE ATTR LEDGER STALE
0 17 0 0 0 0 0
1 25 1 0 0 0 0
@@ -32,8 +32,8 @@ STORE DATA VDI VMSTATE ATTR LEDGER STALE
3 3 0 0 0 0 0
Id Host:Port V-Nodes Zone
0 127.0.0.1:7000 153 0
- 1 127.0.0.1:7001 77 1
- 2 127.0.0.1:7002 154 2
+ 1 127.0.0.1:7001 76 1
+ 2 127.0.0.1:7002 155 2
Cluster status: running, auto-recovery enabled
Cluster created at DATE
On 2014年06月24日 17:40, Liu Yuan wrote:
> On Tue, Jun 24, 2014 at 09:42:11AM +0800, Ruoyu wrote:
>> As titled.
>> Test case 028 and 035 are correlated with dog vdi object location.
>> Test case 030 is correlated with dog cluster info -v.
>>
>> Signed-off-by: Ruoyu <liangry at ucweb.com>
>> ---
>> tests/functional/028.out | 78 ++++++++++++++++++++++++++++++++++++++++++++++++
>> tests/functional/030 | 2 +-
>> tests/functional/030.out | 2 +-
>> tests/functional/035.out | 30 +++++++++++++++++++
>> 4 files changed, 110 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/functional/028.out b/tests/functional/028.out
>> index ae78e8f..5774519 100644
>> --- a/tests/functional/028.out
>> +++ b/tests/functional/028.out
>> @@ -8,103 +8,181 @@ Looking for the inode object 0x7c2b25 with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000000 (vid 0x7c2b25 idx 0, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000001 (vid 0x7c2b25 idx 1, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000002 (vid 0x7c2b25 idx 2, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000003 (vid 0x7c2b25 idx 3, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000004 (vid 0x7c2b25 idx 4, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000005 (vid 0x7c2b25 idx 5, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000006 (vid 0x7c2b25 idx 6, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000007 (vid 0x7c2b25 idx 7, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000008 (vid 0x7c2b25 idx 8, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000009 (vid 0x7c2b25 idx 9, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b250000000a (vid 0x7c2b25 idx 10, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b250000000b (vid 0x7c2b25 idx 11, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b250000000c (vid 0x7c2b25 idx 12, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b250000000d (vid 0x7c2b25 idx 13, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b250000000e (vid 0x7c2b25 idx 14, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b250000000f (vid 0x7c2b25 idx 15, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000010 (vid 0x7c2b25 idx 16, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000011 (vid 0x7c2b25 idx 17, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000012 (vid 0x7c2b25 idx 18, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000013 (vid 0x7c2b25 idx 19, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000014 (vid 0x7c2b25 idx 20, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000015 (vid 0x7c2b25 idx 21, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000016 (vid 0x7c2b25 idx 22, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7001
>> Looking for the object 0x7c2b2500000017 (vid 0x7c2b25 idx 23, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000018 (vid 0x7c2b25 idx 24, 2 copies) with 2 nodes
>>
>> 127.0.0.1:7000 has the object
>> 127.0.0.1:7001 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7001 127.0.0.1:7000
>> diff --git a/tests/functional/030 b/tests/functional/030
>> index cd226d1..463b911 100755
>> --- a/tests/functional/030
>> +++ b/tests/functional/030
>> @@ -84,6 +84,6 @@ $DOG vdi read -s 1 test2 | md5sum > $STORE/csum.21.new
>> diff -u $STORE/csum.11.org $STORE/csum.11.new
>> diff -u $STORE/csum.21.org $STORE/csum.21.new
>>
>> -$DOG cluster info -s | _filter_cluster_info
>> +$DOG cluster info -v | _filter_cluster_info
>> _vdi_create test3 10M
>> _vdi_list
>> diff --git a/tests/functional/030.out b/tests/functional/030.out
>> index 2712d77..6811919 100644
>> --- a/tests/functional/030.out
>> +++ b/tests/functional/030.out
>> @@ -37,7 +37,7 @@ s test2 2 10 MB 12 MB 0.0 MB DATE fd3816 3
>> test2 0 10 MB 0.0 MB 12 MB DATE fd3817 3
>> Cluster status: running, auto-recovery enabled
>> Cluster store: plain with 6 redundancy policy
>> -
>> +Cluster vnode mode: node
>> Cluster created at DATE
>>
>> Epoch Time Version
>> diff --git a/tests/functional/035.out b/tests/functional/035.out
>> index f43de72..f732db8 100644
>> --- a/tests/functional/035.out
>> +++ b/tests/functional/035.out
>> @@ -8,6 +8,9 @@ Looking for the object 0x7c2b2500000000 (vid 0x7c2b25 idx 0, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7008 127.0.0.1:7009 127.0.0.1:7006 127.0.0.1:7007 127.0.0.1:7000 127.0.0.1:7005
>> Looking for the object 0x7c2b2500000001 (vid 0x7c2b25 idx 1, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -16,6 +19,9 @@ Looking for the object 0x7c2b2500000001 (vid 0x7c2b25 idx 1, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7007 127.0.0.1:7000 127.0.0.1:7006 127.0.0.1:7005 127.0.0.1:7008 127.0.0.1:7009
>> Looking for the object 0x7c2b2500000002 (vid 0x7c2b25 idx 2, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -24,6 +30,9 @@ Looking for the object 0x7c2b2500000002 (vid 0x7c2b25 idx 2, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7006 127.0.0.1:7000 127.0.0.1:7005 127.0.0.1:7009 127.0.0.1:7007 127.0.0.1:7008
>> Looking for the object 0x7c2b2500000003 (vid 0x7c2b25 idx 3, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -32,6 +41,9 @@ Looking for the object 0x7c2b2500000003 (vid 0x7c2b25 idx 3, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7006 127.0.0.1:7008 127.0.0.1:7005 127.0.0.1:7007 127.0.0.1:7009 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000004 (vid 0x7c2b25 idx 4, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -40,6 +52,9 @@ Looking for the object 0x7c2b2500000004 (vid 0x7c2b25 idx 4, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7005 127.0.0.1:7006 127.0.0.1:7000 127.0.0.1:7008 127.0.0.1:7009 127.0.0.1:7007
>> Looking for the object 0x7c2b2500000005 (vid 0x7c2b25 idx 5, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -48,6 +63,9 @@ Looking for the object 0x7c2b2500000005 (vid 0x7c2b25 idx 5, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7009 127.0.0.1:7007 127.0.0.1:7005 127.0.0.1:7006 127.0.0.1:7008 127.0.0.1:7000
>> Looking for the object 0x7c2b2500000006 (vid 0x7c2b25 idx 6, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -56,6 +74,9 @@ Looking for the object 0x7c2b2500000006 (vid 0x7c2b25 idx 6, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7000 127.0.0.1:7007 127.0.0.1:7005 127.0.0.1:7006 127.0.0.1:7008 127.0.0.1:7009
>> Looking for the object 0x7c2b2500000007 (vid 0x7c2b25 idx 7, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -64,6 +85,9 @@ Looking for the object 0x7c2b2500000007 (vid 0x7c2b25 idx 7, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7008 127.0.0.1:7006 127.0.0.1:7005 127.0.0.1:7000 127.0.0.1:7009 127.0.0.1:7007
>> Looking for the object 0x7c2b2500000008 (vid 0x7c2b25 idx 8, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -72,6 +96,9 @@ Looking for the object 0x7c2b2500000008 (vid 0x7c2b25 idx 8, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7006 127.0.0.1:7005 127.0.0.1:7000 127.0.0.1:7008 127.0.0.1:7009 127.0.0.1:7007
>> Looking for the object 0x7c2b2500000009 (vid 0x7c2b25 idx 9, 6 copies) with 6 nodes
>>
>> 127.0.0.1:7000 has the object
>> @@ -80,3 +107,6 @@ Looking for the object 0x7c2b2500000009 (vid 0x7c2b25 idx 9, 6 copies) with 6 no
>> 127.0.0.1:7007 has the object
>> 127.0.0.1:7008 has the object
>> 127.0.0.1:7009 has the object
>> +
>> +According to sheepdog algorithm, the object should be located at:
>> +127.0.0.1:7008 127.0.0.1:7005 127.0.0.1:7006 127.0.0.1:7007 127.0.0.1:7009 127.0.0.1:7000
>> --
>> 1.8.3.2
>>
>>
>> --
>> sheepdog mailing list
>> sheepdog at lists.wpkg.org
>> http://lists.wpkg.org/mailman/listinfo/sheepdog
> Applied thanks
>
> Yuan
More information about the sheepdog
mailing list