From be3727294085203930db84ac67a337842de07545 Mon Sep 17 00:00:00 2001 From: Boris Parak Date: Tue, 15 Aug 2017 11:06:50 +0200 Subject: [PATCH] Longer timeout for stlinks in ONe --- app/lib/backends/opennebula/constants/storagelink.rb | 3 +++ app/lib/backends/opennebula/storagelink.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/lib/backends/opennebula/constants/storagelink.rb b/app/lib/backends/opennebula/constants/storagelink.rb index a8f9d9a8..340b7a70 100644 --- a/app/lib/backends/opennebula/constants/storagelink.rb +++ b/app/lib/backends/opennebula/constants/storagelink.rb @@ -5,6 +5,9 @@ module Storagelink # Pattern for matching IDs ID_PATTERN = /^compute_(?\d+)_disk_(?\d+)$/ + # Attach timeout + ATTACH_TIMEOUT = 120 + # Attribute mapping hash for Core ATTRIBUTES_CORE = { 'occi.core.id' => ->(ary) { "compute_#{ary.last['ID']}_disk_#{ary.first['DISK_ID']}" }, diff --git a/app/lib/backends/opennebula/storagelink.rb b/app/lib/backends/opennebula/storagelink.rb index 781830d4..ee6eda9b 100644 --- a/app/lib/backends/opennebula/storagelink.rb +++ b/app/lib/backends/opennebula/storagelink.rb @@ -62,7 +62,7 @@ def create(instance) disks = Backends::Opennebula::Helpers::Counter.xml_elements(vm, 'TEMPLATE/DISK') client(Errors::Backend::EntityCreateError) { vm.disk_attach disk_from(instance) } - wait_until(vm, 'RUNNING') do |nvm| + wait_until(vm, 'RUNNING', Constants::Storagelink::ATTACH_TIMEOUT) do |nvm| unless Backends::Opennebula::Helpers::Counter.xml_elements(nvm, 'TEMPLATE/DISK') > disks logger.error "Attaching IMAGE to VM[#{vm['ID']}] failed: #{vm['USER_TEMPLATE/ERROR']}" raise Errors::Backend::EntityCreateError, 'Could not attach storage to compute'