Revision 8abeb641
| b/Makefile.am | ||
|---|---|---|
| 1003 | 1003 |
test/data/htools/hail-reloc-drbd.json \ |
| 1004 | 1004 |
test/data/htools/hbal-excl-tags.data \ |
| 1005 | 1005 |
test/data/htools/hbal-split-insts.data \ |
| 1006 |
test/data/htools/hspace-tiered-dualspec.data \ |
|
| 1007 |
test/data/htools/hspace-tiered.data \ |
|
| 1006 | 1008 |
test/data/htools/invalid-node.data \ |
| 1007 | 1009 |
test/data/htools/missing-resources.data \ |
| 1008 | 1010 |
test/data/htools/multiple-master.data \ |
| b/test/data/htools/hspace-tiered-dualspec.data | ||
|---|---|---|
| 1 |
group-01|fake-uuid-01|preferred| |
|
| 2 |
|
|
| 3 |
node-01-001|262144|65536|196608|2097152|2097152|8|N|fake-uuid-01|1 |
|
| 4 |
node-01-002|262144|65536|196608|2097152|2097152|8|N|fake-uuid-01|1 |
|
| 5 |
node-01-003|262144|1024|261120|2097152|2097152|8|N|fake-uuid-01|1 |
|
| 6 |
node-01-004|262144|1024|261120|2097152|2097152|8|N|fake-uuid-01|1 |
|
| 7 |
|
|
| 8 |
|
|
| 9 |
|
|
| 10 |
|63488,2,522240,1,1,1|129024,4,1047552,1,1,1;131072,4,1048576,16,8,12;63488,2,522240,1,1,1;65536,2,524288,16,8,12|plain,diskless,file,sharedfile,blockdev,drbd,rbd,ext|4.0|32.0 |
|
| 11 |
group-01|63488,2,522240,1,1,1|129024,4,1047552,1,1,1;131072,4,1048576,16,8,12;63488,2,522240,1,1,1;65536,2,524288,16,8,12|plain,diskless,file,sharedfile,blockdev,drbd,rbd,ext|4.0|32.0 |
|
| b/test/data/htools/hspace-tiered.data | ||
|---|---|---|
| 1 |
group-01|fake-uuid-01|preferred| |
|
| 2 |
|
|
| 3 |
node-01-001|262144|65536|196608|2097152|2097152|8|N|fake-uuid-01|1 |
|
| 4 |
node-01-002|262144|65536|196608|2097152|2097152|8|N|fake-uuid-01|1 |
|
| 5 |
node-01-003|262144|1024|261120|2097152|2097152|8|N|fake-uuid-01|1 |
|
| 6 |
node-01-004|262144|1024|261120|2097152|2097152|8|N|fake-uuid-01|1 |
|
| 7 |
|
|
| 8 |
|
|
| 9 |
|
|
| 10 |
|129024,4,1047552,1,1,1|129024,4,1047552,1,1,1;131072,4,1048576,16,8,12|plain,diskless,file,sharedfile,blockdev,drbd,rbd,ext|4.0|32.0 |
|
| 11 |
group-01|129024,4,1047552,1,1,1|129024,4,1047552,1,1,1;131072,4,1048576,16,8,12|plain,diskless,file,sharedfile,blockdev,drbd,rbd,ext|4.0|32.0 |
|
| b/test/hs/shelltests/htools-hspace.test | ||
|---|---|---|
| 6 | 6 |
# test again via a file and shell parsing |
| 7 | 7 |
./test/hs/hspace --simu p,4,8T,64g,16 --machine-readable --disk-template drbd -l 8 > $T/capacity && sh -c ". $T/capacity && test x\$HTS_OK = x1" |
| 8 | 8 |
>>>= 0 |
| 9 |
|
|
| 10 |
# standard & tiered allocation, using shell parsing to do multiple checks |
|
| 11 |
./test/hs/hspace --machine-readable -t $TESTDATA_DIR/hspace-tiered.data > $T/capacity && sh -c ". $T/capacity && test \"\${HTS_TSPEC}\" = '131072,1048576,4=4 129984,1048320,4=2' && test \"\${HTS_ALLOC_INSTANCES}\" = 6"
|
|
| 12 |
>>>=0 |
|
| 13 |
|
|
| 14 |
# again, but with a policy containing two min/max specs pairs |
|
| 15 |
./test/hs/hspace --machine-readable -t $TESTDATA_DIR/hspace-tiered-dualspec.data > $T/capacity && sh -c ". $T/capacity && test \"\${HTS_TSPEC}\" = '131072,1048576,4=4 129984,1048320,4=2 65472,524288,2=2' && test \"\${HTS_ALLOC_INSTANCES}\" = 14"
|
|
| 16 |
>>>2 |
|
| 17 |
>>>=0 |
|
Also available in: Unified diff