From e8bf8745790cbb4f67a3e6c03adb128205817cef Mon Sep 17 00:00:00 2001 From: Vishesh Date: Fri, 12 Jan 2024 17:37:11 +0530 Subject: [PATCH 1/2] Fix host stuck in connecting state --- .../src/main/java/com/cloud/agent/manager/AgentManagerImpl.java | 1 + .../kvm/resource/wrapper/LibvirtReadyCommandWrapper.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java index 023f9c18e0a5..d8671ed29dfa 100644 --- a/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java @@ -596,6 +596,7 @@ protected AgentAttache notifyMonitorsOfConnection(final AgentAttache attache, fi final Long dcId = host.getDataCenterId(); final ReadyCommand ready = new ReadyCommand(dcId, host.getId(), NumbersUtil.enableHumanReadableSizes); + ready.setWait(60); final Answer answer = easySend(hostId, ready); if (answer == null || !answer.getResult()) { // this is tricky part for secondary storage diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java index fc57cd412f0c..4df74decdea3 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReadyCommandWrapper.java @@ -55,7 +55,7 @@ private boolean hostSupportsUefi(boolean isUbuntuHost) { cmd = "dpkg -l ovmf"; } s_logger.debug("Running command : " + cmd); - int result = Script.runSimpleBashScriptForExitValue(cmd); + int result = Script.runSimpleBashScriptForExitValue(cmd, 60, false); s_logger.debug("Got result : " + result); return result == 0; } From a7d108cee3e3340b2cee1d40a6bcb8d7478e751d Mon Sep 17 00:00:00 2001 From: Vishesh Date: Fri, 12 Jan 2024 22:39:27 +0530 Subject: [PATCH 2/2] Add wait for ModifyStoragePoolCommand cmd --- .../storage/datastore/provider/DefaultHostListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java index e344a87831de..90e8742c84d7 100644 --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java @@ -121,6 +121,7 @@ private NicTO createNicTOFromNetworkAndOffering(NetworkVO networkVO, NetworkOffe public boolean hostConnect(long hostId, long poolId) throws StorageConflictException { StoragePool pool = (StoragePool) this.dataStoreMgr.getDataStore(poolId, DataStoreRole.Primary); ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool); + cmd.setWait(60); final Answer answer = agentMgr.easySend(hostId, cmd); if (answer == null) {