Skip to content

Commit

Permalink
Merge pull request #673 from SteVwonder/unbalanced-tiered-storage
Browse files Browse the repository at this point in the history 
t: add storage-constrained tests for tiered storage systems
  • Loading branch information
@mergify
mergify[bot] authored Jul 14, 2020
2 parents a44efb6 + fd805d0 commit 9d60c75
Show file tree
Hide file tree
Showing 42 changed files with 4,651 additions and 1 deletion.
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([config])
AC_CONFIG_SRCDIR([NEWS])

AM_INIT_AUTOMAKE([subdir-objects])
AM_INIT_AUTOMAKE([subdir-objects tar-ustar filename-length-max=256])
AM_SILENT_RULES([yes])
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE([enable])
Expand Down
13 changes: 13 additions & 0 deletions t/data/resource/commands/mt-storage/L0/cmds-ssd-constrained-alloc-orelse.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# 8x node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# ->ssd[2048]
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
quit
11 changes: 11 additions & 0 deletions t/data/resource/commands/mt-storage/L0/cmds-ssd-constrained-alloc.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 5x node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# ->ssd[2048]
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
# this must fail to match
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L0/storage-constrained.yaml
quit
13 changes: 13 additions & 0 deletions t/data/resource/commands/mt-storage/L1/cmds-ssd-constrained-alloc-orelse.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# 8x node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl1unit[1]->ssd[2048]
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
quit
11 changes: 11 additions & 0 deletions t/data/resource/commands/mt-storage/L1/cmds-ssd-constrained-alloc.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 5x node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl1unit[1]->ssd[2048]
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
# this must fail to match
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained.yaml
quit
13 changes: 13 additions & 0 deletions t/data/resource/commands/mt-storage/L1/cmds-ssd-constrained-same-rack-alloc-orelse.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# 8x rack[1]->node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl1unit[1]->ssd[2048]
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
quit
11 changes: 11 additions & 0 deletions t/data/resource/commands/mt-storage/L1/cmds-ssd-constrained-same-rack-alloc.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 5x rack[1]->node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl1unit[1]->ssd[2048]
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
# this must fail to match
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L1/storage-constrained-same-rack.yaml
quit
13 changes: 13 additions & 0 deletions t/data/resource/commands/mt-storage/L2/cmds-ssd-constrained-alloc-orelse.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# 8x rack[1]->node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl2unit[1]->ssd[2048]
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate_orelse_reserve @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
quit
11 changes: 11 additions & 0 deletions t/data/resource/commands/mt-storage/L2/cmds-ssd-constrained-alloc.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 5x rack[1]->node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl2unit[1]->ssd[2048]
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
# this must fail to match
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L2/storage-constrained.yaml
quit
11 changes: 11 additions & 0 deletions t/data/resource/commands/mt-storage/L3/storage-constrained-global.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 5x rack[1]->node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl2unit[1]->ssd[2048]
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-global.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-global.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-global.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-global.yaml
# this must fail to match
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-global.yaml
quit
16 changes: 16 additions & 0 deletions t/data/resource/commands/mt-storage/L3/storage-constrained-mix.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# 3x rack[1]->node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl1unit[1]->ssd[2048]
#
# 2x rack[1]->node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl2unit[1]->ssd[2048]
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-same-rack.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-global.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-same-rack.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-global.yaml
# this must fail to match
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-same-rack.yaml
quit
11 changes: 11 additions & 0 deletions t/data/resource/commands/mt-storage/L3/storage-constrained-same-rack.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# 5x rack[1]->node[1]->slot[1]->socket[1]->core[18]
# ->gpu[2]
# ->memory[128]
# mtl1unit[1]->ssd[2048]
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-same-rack.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-same-rack.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-same-rack.yaml
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-same-rack.yaml
# this must fail to match
match allocate @TEST_SRCDIR@/data/resource/jobspecs/mt-storage/L3/storage-constrained-same-rack.yaml
quit
2 changes: 2 additions & 0 deletions t/data/resource/expected/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# override ignore of *.out in top-level .gitignore
!*.out
152 changes: 152 additions & 0 deletions t/data/resource/expected/mt-storage/L0/005.R.out
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
---------------core18[1:x]
---------------core19[1:x]
---------------core20[1:x]
---------------core21[1:x]
---------------core22[1:x]
---------------core23[1:x]
---------------core24[1:x]
---------------core25[1:x]
---------------core26[1:x]
---------------core27[1:x]
---------------core28[1:x]
---------------core29[1:x]
---------------core30[1:x]
---------------core31[1:x]
---------------core32[1:x]
---------------core33[1:x]
---------------core34[1:x]
---------------core35[1:x]
---------------gpu2[1:x]
---------------gpu3[1:x]
---------------memory4[32:x]
---------------memory5[32:x]
---------------memory6[32:x]
---------------memory7[32:x]
------------socket1[1:x]
------------ssd4[512:x]
------------ssd5[512:x]
------------ssd6[512:x]
------------ssd7[512:x]
---------node3[1:s]
------rack1[1:s]
---mtl0-test0[1:s]
INFO: =============================
INFO: JOBID=1
INFO: RESOURCES=ALLOCATED
INFO: SCHEDULED AT=Now
INFO: =============================
---------------core18[1:x]
---------------core19[1:x]
---------------core20[1:x]
---------------core21[1:x]
---------------core22[1:x]
---------------core23[1:x]
---------------core24[1:x]
---------------core25[1:x]
---------------core26[1:x]
---------------core27[1:x]
---------------core28[1:x]
---------------core29[1:x]
---------------core30[1:x]
---------------core31[1:x]
---------------core32[1:x]
---------------core33[1:x]
---------------core34[1:x]
---------------core35[1:x]
---------------gpu2[1:x]
---------------gpu3[1:x]
---------------memory4[32:x]
---------------memory5[32:x]
---------------memory6[32:x]
---------------memory7[32:x]
------------socket1[1:x]
------------ssd0[512:x]
------------ssd1[512:x]
------------ssd2[512:x]
------------ssd3[512:x]
---------node2[1:s]
------rack1[1:s]
---mtl0-test0[1:s]
INFO: =============================
INFO: JOBID=2
INFO: RESOURCES=ALLOCATED
INFO: SCHEDULED AT=Now
INFO: =============================
---------------core18[1:x]
---------------core19[1:x]
---------------core20[1:x]
---------------core21[1:x]
---------------core22[1:x]
---------------core23[1:x]
---------------core24[1:x]
---------------core25[1:x]
---------------core26[1:x]
---------------core27[1:x]
---------------core28[1:x]
---------------core29[1:x]
---------------core30[1:x]
---------------core31[1:x]
---------------core32[1:x]
---------------core33[1:x]
---------------core34[1:x]
---------------core35[1:x]
---------------gpu2[1:x]
---------------gpu3[1:x]
---------------memory4[32:x]
---------------memory5[32:x]
---------------memory6[32:x]
---------------memory7[32:x]
------------socket1[1:x]
------------ssd4[512:x]
------------ssd5[512:x]
------------ssd6[512:x]
------------ssd7[512:x]
---------node1[1:s]
------rack0[1:s]
---mtl0-test0[1:s]
INFO: =============================
INFO: JOBID=3
INFO: RESOURCES=ALLOCATED
INFO: SCHEDULED AT=Now
INFO: =============================
---------------core18[1:x]
---------------core19[1:x]
---------------core20[1:x]
---------------core21[1:x]
---------------core22[1:x]
---------------core23[1:x]
---------------core24[1:x]
---------------core25[1:x]
---------------core26[1:x]
---------------core27[1:x]
---------------core28[1:x]
---------------core29[1:x]
---------------core30[1:x]
---------------core31[1:x]
---------------core32[1:x]
---------------core33[1:x]
---------------core34[1:x]
---------------core35[1:x]
---------------gpu2[1:x]
---------------gpu3[1:x]
---------------memory4[32:x]
---------------memory5[32:x]
---------------memory6[32:x]
---------------memory7[32:x]
------------socket1[1:x]
------------ssd0[512:x]
------------ssd1[512:x]
------------ssd2[512:x]
------------ssd3[512:x]
---------node0[1:s]
------rack0[1:s]
---mtl0-test0[1:s]
INFO: =============================
INFO: JOBID=4
INFO: RESOURCES=ALLOCATED
INFO: SCHEDULED AT=Now
INFO: =============================
INFO: =============================
INFO: No matching resources found
INFO: JOBID=5
INFO: =============================
Loading

0 comments on commit 9d60c75

Please sign in to comment.