openstack/devstack
Code Issues Proposed changes

Poll resource tracker for ironic cpus as well as count

Browse Source 
When ironic nodes are enrolled, their resources are not available
to the nova scheduler until after a round of ironic and nova periodic
tasks have run  In addition to waiting for ironic nodes to show up in
the resource tracker, also wait for associated CPU resources.  In
the worst case, this means waiting for 3 total rounds of periodic
tasks.

Change-Id: Idbbc43bf74ff5fff3d50f3494148454bb51e378f
Closes-bug: #1398128
This commit is contained in:
Adam Gandelman
2014-12-09 14:44:24 -08:00
parent 614de25756
commit 0c99e2f65b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/ironic
View File

@@ -501,18 +501,20 @@ function create_bridge_and_vms {
} }
function wait_for_nova_resources { function wait_for_nova_resources {
# After nodes have been enrolled, we need to wait for n-cpu's periodic # After nodes have been enrolled, we need to wait for both ironic and
# task populate the resource tracker with available nodes. Wait for 2 # nova's periodic tasks to populate the resource tracker with available
# minutes before timing out. # nodes and resources. Wait up to 2 minutes for a given resource before
local expected_count=$1 # timing out.
echo_summary "Waiting 2 minutes for Nova resource tracker to pick up $expected_count Ironic nodes" local resource=$1
local expected_count=$2
echo_summary "Waiting 2 minutes for Nova resource tracker to pick up $resource >= $expected_count"
for i in $(seq 1 120); do for i in $(seq 1 120); do
if [ $(nova hypervisor-stats | grep " count " | get_field 2) -ge $expected_count ]; then if [ $(nova hypervisor-stats | grep " $resource " | get_field 2) -ge $expected_count ]; then
return 0 return 0
fi fi
sleep 1 sleep 1
done done
die $LINENO "Nova hypervisor-stats did not register at least $expected_count nodes" die $LINENO "Timed out waiting for Nova hypervisor-stats $resource >= $expected_count"
} }
function enroll_nodes { function enroll_nodes {
@@ -551,6 +553,7 @@ function enroll_nodes {
fi fi
local total_nodes=0 local total_nodes=0
local total_cpus=0
while read hardware_info; do while read hardware_info; do
if ! is_ironic_hardware; then if ! is_ironic_hardware; then
local mac_address=$hardware_info local mac_address=$hardware_info
@@ -582,6 +585,7 @@ function enroll_nodes {
ironic port-create --address $mac_address --node_uuid $node_id ironic port-create --address $mac_address --node_uuid $node_id
total_nodes=$((total_nodes+1)) total_nodes=$((total_nodes+1))
total_cpus=$((total_cpus+$ironic_node_cpu))
done < $ironic_hwinfo_file done < $ironic_hwinfo_file
# create the nova flavor # create the nova flavor
@@ -598,7 +602,8 @@ function enroll_nodes {
nova flavor-key baremetal set "cpu_arch"="x86_64" "baremetal:deploy_kernel_id"="$IRONIC_DEPLOY_KERNEL_ID" "baremetal:deploy_ramdisk_id"="$IRONIC_DEPLOY_RAMDISK_ID" nova flavor-key baremetal set "cpu_arch"="x86_64" "baremetal:deploy_kernel_id"="$IRONIC_DEPLOY_KERNEL_ID" "baremetal:deploy_ramdisk_id"="$IRONIC_DEPLOY_RAMDISK_ID"
if [ "$VIRT_DRIVER" == "ironic" ]; then if [ "$VIRT_DRIVER" == "ironic" ]; then
wait_for_nova_resources $total_nodes wait_for_nova_resources "count" $total_nodes
wait_for_nova_resources "vcpus" $total_cpus
fi fi
} }