prevent commands when extension path is not ready

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java

@@ -425,6 +425,7 @@ protected void updateExtensionPathReady(Extension extension, boolean ready) {
         ExtensionVO extensionVO = extensionDao.createForUpdate(extension.getId());
         extensionVO.setPathReady(ready);
         extensionDao.update(extension.getId(), extensionVO);
+        updateAllExtensionHosts(extension, null, false);
     }
 
     protected void disableExtension(long extensionId) {
@@ -1530,7 +1531,7 @@ public ConfigKey<?>[] getConfigKeys() {
 
     public class PathStateCheckWorker extends ManagedContextRunnable {
 
-        protected void runCleanupForLongestRunningManagementServer() {
+        protected void runCheckUsingLongestRunningManagementServer() {
             try {
                 List<ManagementServerHostVO> msHosts = managementServerHostDao.listBy(ManagementServerHost.State.Up);
                 msHosts.sort(Comparator.comparingLong(ManagementServerHostVO::getRunid));
@@ -1554,7 +1555,7 @@ protected void runInContext() {
             try {
                 if (gcLock.lock(3)) {
                     try {
-                        runCleanupForLongestRunningManagementServer();
+                        runCheckUsingLongestRunningManagementServer();
                     } finally {
                         gcLock.unlock();
                     }

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/agent/manager/ExternalServerPlanner.java

@@ -86,6 +86,11 @@ public DeployDestination plan(VirtualMachineProfile vmProfile, DeploymentPlan pl
                     extensionVO, vmProfile.getInstanceName());
             return null;
         }
+        if (!extensionVO.isPathReady()) {
+            logger.error("{} path is not in ready state therefore planning can not be done for deployment of external instance {}",
+                    extensionVO, vmProfile.getInstanceName());
+            return null;
+        }
 
         String haVmTag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.HaTag);
 

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/discoverer/ExternalServerDiscoverer.java

@@ -140,6 +140,7 @@ protected void addExtensionDataToResourceParams(ExtensionVO extension, Map<Strin
         params.put("extensionName", extension.getName());
         params.put("extensionRelativePath", extension.getRelativePath());
         params.put("extensionState", extension.getState());
+        params.put("extensionPathReady", extension.isPathReady());
     }
 
     @Override

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResource.java

@@ -87,6 +87,7 @@ public class ExternalResource implements ServerResource {
     private String extensionName;
     private String extensionRelativePath;
     private Extension.State extensionState;
+    private boolean extensionPathReady;
 
     protected boolean isExtensionDisconnected() {
         return StringUtils.isAnyBlank(extensionName, extensionRelativePath);
@@ -96,6 +97,10 @@ protected boolean isExtensionNotEnabled() {
         return !Extension.State.Enabled.equals(extensionState);
     }
 
+    protected boolean isExtensionPathNotReady() {
+        return !extensionPathReady;
+    }
+
     public ExternalResource() {
         type = Host.Type.Routing;
     }
@@ -176,8 +181,12 @@ protected String logAndGetExtensionNotConnectedOrDisabledError() {
             logger.error("Extension not connected to host: {}", name);
             return "Extension not connected";
         }
-        logger.error("Extension: {} connected to host: {} is not in Enabled state", extensionName, name);
-        return "Extension is disabled";
+        if (isExtensionNotEnabled()) {
+            logger.error("Extension: {} connected to host: {} is not in Enabled state", extensionName, name);
+            return "Extension is disabled";
+        }
+        logger.error("Extension: {} connected to host: {} is not having path in Ready state", extensionName, name);
+        return "Extension is not ready";
     }
 
     private Answer execute(ExtensionRoutingUpdateCommand cmd) {
@@ -241,14 +250,14 @@ public GetHostStatsAnswer execute(GetHostStatsCommand cmd) {
     }
 
     public StartAnswer execute(StartCommand cmd) {
-        if (isExtensionDisconnected() || isExtensionNotEnabled()) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
             return new StartAnswer(cmd, logAndGetExtensionNotConnectedOrDisabledError());
         }
         return externalProvisioner.startInstance(guid, extensionName, extensionRelativePath, cmd);
     }
 
     public StopAnswer execute(StopCommand cmd) {
-        if (isExtensionDisconnected() || isExtensionNotEnabled()) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
             return new StopAnswer(cmd, logAndGetExtensionNotConnectedOrDisabledError(), false);
         }
         if (cmd.isExpungeVM()) {
@@ -258,28 +267,28 @@ public StopAnswer execute(StopCommand cmd) {
     }
 
     public RebootAnswer execute(RebootCommand cmd) {
-        if (isExtensionDisconnected() || isExtensionNotEnabled()) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
             return new RebootAnswer(cmd, logAndGetExtensionNotConnectedOrDisabledError(), false);
         }
         return externalProvisioner.rebootInstance(guid, extensionName, extensionRelativePath, cmd);
     }
 
     public PrepareExternalProvisioningAnswer execute(PrepareExternalProvisioningCommand cmd) {
-        if (isExtensionDisconnected() || isExtensionNotEnabled()) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
             return new PrepareExternalProvisioningAnswer(cmd, false, logAndGetExtensionNotConnectedOrDisabledError());
         }
         return externalProvisioner.prepareExternalProvisioning(guid, extensionName, extensionRelativePath, cmd);
     }
 
     public RunCustomActionAnswer execute(RunCustomActionCommand cmd) {
-        if (isExtensionDisconnected() || isExtensionNotEnabled()) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
             return new RunCustomActionAnswer(cmd, false, logAndGetExtensionNotConnectedOrDisabledError());
         }
         return externalProvisioner.runCustomAction(guid, extensionName, extensionRelativePath, cmd);
     }
 
     public Answer execute(Command cmd) {
-        if (isExtensionDisconnected() || isExtensionNotEnabled()) {
+        if (isExtensionDisconnected() || isExtensionNotEnabled() || isExtensionPathNotReady()) {
             return new Answer(cmd, false, logAndGetExtensionNotConnectedOrDisabledError());
         }
         RunCustomActionCommand runCustomActionCommand = new RunCustomActionCommand(cmd.toString());
@@ -351,6 +360,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
         extensionName = (String)params.get("extensionName");
         extensionRelativePath = (String)params.get("extensionRelativePath");
         extensionState = (Extension.State)params.get("extensionState");
+        extensionPathReady = (boolean)params.get("extensionPathReady");
         return true;
     }