From 07d7749cff47c142a48aaf892f115c3b11f1b383 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Tue, 30 Jul 2019 14:05:42 +0100 Subject: [PATCH] Implement a more complex nested-perfload topology This changes gabbits/nested-perfload.yaml to create a tree of providers based on one of the compute nodes in the NUMANetworkFixture used in the functional tests. For the time being only one type of compute node is created (of which there will be 1000 instances). Room is left for future expansion as requirements expand. The resulting hierarchy has 7 resource providers. The allocation candidates query is: GET /allocation_candidates? resources=DISK_GB:10& required=COMPUTE_VOLUME_MULTI_ATTACH& resources_COMPUTE=VCPU:1,MEMORY_MB:256& required_COMPUTE=CUSTOM_FOO& resources_FPGA=FPGA:1& group_policy=none& same_subtree=_COMPUTE,_FPGA This is a step in the right direction but is not yet a complete exercising of all the nested functionality. It is, however, more complex than prior, notably testing 'same_subtree'. We should continue to iterate to get it doing more. Change-Id: I67d8091b464cd7b875b37766f52818a5a2faa780 Story: 2005443 Task: 35669 --- gate/gabbits/nested-perfload.yaml | 160 ++++++++++++++++++++++++------ gate/perfload-nested-loader.sh | 8 +- gate/perfload-nested-runner.sh | 6 +- 3 files changed, 139 insertions(+), 35 deletions(-) diff --git a/gate/gabbits/nested-perfload.yaml b/gate/gabbits/nested-perfload.yaml index fee44fb77..727dacc3e 100644 --- a/gate/gabbits/nested-perfload.yaml +++ b/gate/gabbits/nested-perfload.yaml @@ -1,9 +1,38 @@ -# This is a single compute with two numa nodes, to show some nested. +# This is a nested topology to exercise a large section of the nested provider +# related code in placement. The structure here is based on some of the +# structures in the NUMANetworkFixture in +# placement.tests.functional.fixtures.gabbits. This version initially leaves +# out many of the resource providers created there, with the intent that we can +# add more as the need presents itself. # -# This should be updated to represent something closer to a real -# and expected nested topology. If changes are made here that impact -# the number of total resource providers, then $PROVIDER_TOPOLOGY_COUNT -# in gate/perfload-nested-runner.sh should be updated. +# For the time being only one compute node is created, with two numa nodes, +# each with two devices attached, either two FPGA or an FPGA and PGPU. +# +# Here's a graphical representation of what is created. Please keep this up to +# date as changes are made: +# +# +-----------------------------+ +# | compute node (cn1) | +# | COMPUTE_VOLUME_MULTI_ATTACH | +# | DISK_GB: 20480 | +# +---------------+-------------+ +# | +# +--------------------+ +# | | +# +---------+--------+ +---------+--------+ +# | numa0 | | numa1 | +# | HW_NUMA_ROOT | | HW_NUMA_ROOT | +# | | | CUSTOM_FOO | +# | VCPU: 4 (2 res.) | | VCPU: 4 | +# | MEMORY_MB: 2048 | | MEMORY_MB: 2048 | +# | min_unit: 512 | | min_unit: 256 | +# | step_size: 256 | | max_unit: 1024 | +# +---+----------+---+ +---+----------+---+ +# | | | | +# +---+---+ +---+---+ +---+---+ +---+---+ +# |fpga0 | |pgpu0 | |fpga1_0| |fpga1_1| +# |FPGA:1 | |VGPU:8 | |FPGA:1 | |FPGA:1 | +# +-------+ +-------+ +-------+ +-------+ defaults: request_headers: @@ -13,14 +42,19 @@ defaults: x-auth-token: $ENVIRON['TOKEN'] tests: - - name: create one compute node + - name: create FOO trait + PUT: /traits/CUSTOM_FOO + status: 201 || 204 + + - name: create cn1 POST: /resource_providers data: - uuid: $ENVIRON['CN_UUID'] - name: $ENVIRON['CN_UUID'] + uuid: $ENVIRON['CN1_UUID'] + name: $ENVIRON['CN1_UUID'] + status: 200 - - name: set compute node inventory - PUT: /resource_providers/$ENVIRON['CN_UUID']/inventories + - name: set cn1 inventory + PUT: /resource_providers/$ENVIRON['CN1_UUID']/inventories data: resource_provider_generation: 0 inventories: @@ -28,18 +62,75 @@ tests: total: 20480 - name: set compute node traits - PUT: /resource_providers/$ENVIRON['CN_UUID']/traits + PUT: /resource_providers/$ENVIRON['CN1_UUID']/traits data: resource_provider_generation: 1 traits: - COMPUTE_VOLUME_MULTI_ATTACH + - name: create numa 0 + POST: /resource_providers + data: + uuid: $ENVIRON['N0_UUID'] + name: numa 0-$ENVIRON['N0_UUID'] + parent_provider_uuid: $ENVIRON['CN1_UUID'] + + - name: set numa 0 inventory + PUT: /resource_providers/$ENVIRON['N0_UUID']/inventories + data: + resource_provider_generation: 0 + inventories: + VCPU: + total: 4 + reserved: 2 + MEMORY_MB: + total: 2048 + min_unit: 512 + step_size: 256 + + - name: set numa 0 traits + PUT: /resource_providers/$ENVIRON['N0_UUID']/traits + data: + resource_provider_generation: 1 + traits: + - HW_NUMA_ROOT + + - name: create fpga0_0 + POST: /resource_providers + data: + uuid: $ENVIRON['FPGA0_0_UUID'] + name: fpga0-0-$ENVIRON['FPGA0_0_UUID'] + parent_provider_uuid: $ENVIRON['N0_UUID'] + + - name: set fpga0_0 inventory + PUT: /resource_providers/$ENVIRON['FPGA0_0_UUID']/inventories + data: + resource_provider_generation: 0 + inventories: + FPGA: + total: 1 + + - name: create pgpu0_0 + POST: /resource_providers + data: + uuid: $ENVIRON['PGPU0_0_UUID'] + name: pgpu0-0-$ENVIRON['PGPU0_0_UUID'] + parent_provider_uuid: $ENVIRON['N0_UUID'] + + - name: set pgpu0_0 inventory + PUT: /resource_providers/$ENVIRON['PGPU0_0_UUID']/inventories + data: + resource_provider_generation: 0 + inventories: + VGPU: + total: 8 + - name: create numa 1 POST: /resource_providers data: uuid: $ENVIRON['N1_UUID'] name: numa 1-$ENVIRON['N1_UUID'] - parent_provider_uuid: $ENVIRON['CN_UUID'] + parent_provider_uuid: $ENVIRON['CN1_UUID'] - name: set numa 1 inventory PUT: /resource_providers/$ENVIRON['N1_UUID']/inventories @@ -47,37 +138,46 @@ tests: resource_provider_generation: 0 inventories: VCPU: - total: 16 + total: 4 MEMORY_MB: - total: 16777216 + total: 2048 + min_unit: 256 + max_unit: 1024 - name: set numa 1 traits PUT: /resource_providers/$ENVIRON['N1_UUID']/traits data: resource_provider_generation: 1 traits: - - HW_CPU_X86_AVX2 + - HW_NUMA_ROOT + - CUSTOM_FOO - - name: create numa 2 + - name: create fpga1_0 POST: /resource_providers data: - uuid: $ENVIRON['N2_UUID'] - name: numa 2-$ENVIRON['N2_UUID'] - parent_provider_uuid: $ENVIRON['CN_UUID'] + uuid: $ENVIRON['FPGA1_0_UUID'] + name: fpga1-0-$ENVIRON['FPGA1_0_UUID'] + parent_provider_uuid: $ENVIRON['N1_UUID'] - - name: set numa 2 inventory - PUT: /resource_providers/$ENVIRON['N2_UUID']/inventories + - name: set fpga1_0 inventory + PUT: /resource_providers/$ENVIRON['FPGA1_0_UUID']/inventories data: resource_provider_generation: 0 inventories: - VCPU: - total: 16 - MEMORY_MB: - total: 16777216 + FPGA: + total: 1 - - name: set numa 2 traits - PUT: /resource_providers/$ENVIRON['N2_UUID']/traits + - name: create fpga1_1 + POST: /resource_providers data: - resource_provider_generation: 1 - traits: - - HW_CPU_X86_SSE + uuid: $ENVIRON['FPGA1_1_UUID'] + name: fpga1-1-$ENVIRON['FPGA1_1_UUID'] + parent_provider_uuid: $ENVIRON['N1_UUID'] + + - name: set fpga1_1 inventory + PUT: /resource_providers/$ENVIRON['FPGA1_1_UUID']/inventories + data: + resource_provider_generation: 0 + inventories: + FPGA: + total: 1 diff --git a/gate/perfload-nested-loader.sh b/gate/perfload-nested-loader.sh index 0ef677235..b32a36e7b 100755 --- a/gate/perfload-nested-loader.sh +++ b/gate/perfload-nested-loader.sh @@ -12,9 +12,13 @@ TOKEN=${TOKEN:-admin} # that need to be set for each run a gabbi file. Values that are the same # for all the resource providers (for example, traits and inventory) should # be set in $GABBIT. -CN_UUID=$(uuidgen) +CN1_UUID=$(uuidgen) +N0_UUID=$(uuidgen) N1_UUID=$(uuidgen) -N2_UUID=$(uuidgen) +FPGA0_0_UUID=$(uuidgen) +FPGA1_0_UUID=$(uuidgen) +FPGA1_1_UUID=$(uuidgen) +PGPU0_0_UUID=$(uuidgen) # Run gabbi silently. gabbi-run -q $HOST -- $GABBIT diff --git a/gate/perfload-nested-runner.sh b/gate/perfload-nested-runner.sh index 3cb60ac3f..75990e6de 100755 --- a/gate/perfload-nested-runner.sh +++ b/gate/perfload-nested-runner.sh @@ -12,8 +12,8 @@ LOADER=gate/perfload-nested-loader.sh # The query to be used to get a list of allocation candidates. If # $GABBIT is changed, this may need to change. TRAIT="COMPUTE_VOLUME_MULTI_ATTACH" -TRAIT1="HW_CPU_X86_AVX2" -PLACEMENT_QUERY="resources=DISK_GB:10&resources1=VCPU:1,MEMORY_MB:256&required=${TRAIT}&required1=${TRAIT1}&group_policy=isolate" +TRAIT1="CUSTOM_FOO" +PLACEMENT_QUERY="resources=DISK_GB:10&required=${TRAIT}&resources_COMPUTE=VCPU:1,MEMORY_MB:256&required_COMPUTE=${TRAIT1}&resources_FPGA=FPGA:1&group_policy=none&same_subtree=_COMPUTE,_FPGA" # Number of nested trees to create. ITERATIONS=1000 @@ -24,7 +24,7 @@ ALLOCATIONS_TO_WRITE=10 # The number of providers in each nested tree. This will need to # change whenever the resource provider topology created in $GABBIT # is changed. -PROVIDER_TOPOLOGY_COUNT=3 +PROVIDER_TOPOLOGY_COUNT=7 # Expected total number of providers, used to check that creation # was a success. TOTAL_PROVIDER_COUNT=$((ITERATIONS * PROVIDER_TOPOLOGY_COUNT))