changes

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

api/src/main/java/com/cloud/event/EventTypes.java

@@ -844,6 +844,7 @@ public class EventTypes {
     public static final String EVENT_EXTENSION_CREATE = "EXTENSION.CREATE";
     public static final String EVENT_EXTENSION_UPDATE = "EXTENSION.UPDATE";
     public static final String EVENT_EXTENSION_DELETE = "EXTENSION.DELETE";
+    public static final String EVENT_EXTENSION_SYNC = "EXTENSION.SYNC";
     public static final String EVENT_EXTENSION_RESOURCE_REGISTER = "EXTENSION.RESOURCE.REGISTER";
     public static final String EVENT_EXTENSION_RESOURCE_UNREGISTER = "EXTENSION.RESOURCE.UNREGISTER";
     public static final String EVENT_EXTENSION_CUSTOM_ACTION_ADD = "EXTENSION.CUSTOM.ACTION.ADD";

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/api/SyncExtensionCmd.java

@@ -26,6 +26,7 @@
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
@@ -35,6 +36,7 @@
 import org.apache.cloudstack.extension.Extension;
 import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
 
+import com.cloud.event.EventTypes;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.user.Account;
 
@@ -45,7 +47,7 @@
         entityType = {Extension.class},
         authorized = {RoleType.Admin},
         since = "4.23.0")
-public class SyncExtensionCmd extends BaseCmd {
+public class SyncExtensionCmd extends BaseAsyncCmd {
 
     @Inject
     ExtensionsManager extensionsManager;
@@ -124,4 +126,14 @@ public ApiCommandResourceType getApiResourceType() {
     public Long getApiResourceId() {
         return getId();
     }
+
+    @Override
+    public String getEventType() {
+        return EventTypes.EVENT_EXTENSION_SYNC;
+    }
+
+    @Override
+    public String getEventDescription() {
+        return "Sync extension: " + getId();
+    }
 }

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

@@ -539,6 +539,12 @@ protected void checkOrchestratorTemplates(Long extensionId) {
         }
     }
 
+    protected void checkExtensionPathState(Extension extension) {
+        List<ManagementServerHostVO> msList = managementServerHostDao.listBy(ManagementServerHost.State.Up);
+        msList.removeIf(ms -> ms.getMsid() == ManagementServerNode.getManagementServerId());
+        checkExtensionPathState(extension, msList);
+    }
+
     protected void checkExtensionPathState(Extension extension, List<ManagementServerHostVO> msHosts) {
         String checksum = extensionsFilesystemManager.getChecksumForExtensionPath(extension.getName(),
                 extension.getRelativePath());
@@ -1704,6 +1710,8 @@ public boolean syncExtension(SyncExtensionCmd cmd) {
             throw new CloudRuntimeException(String.format("Failed to sync extension '%s' via '%s': %s",
                     extension.getName(), sourceManagementServer.getName(), result.second()));
         }
+
+        checkExtensionPathState(extension);
         return true;
     }
 

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

@@ -375,6 +375,31 @@ protected void applyExtensionSync(Extension extension, DownloadAndSyncExtensionF
         FileUtil.deleteRecursively(applyRoot);
     }
 
+    protected void  cleanupExtensionsShareFiles(long cutoff) throws IOException {
+        Path sharePath = getExtensionsSharePath();
+        if (!Files.exists(sharePath) || !Files.isDirectory(sharePath)) {
+            return;
+        }
+        try (Stream<Path> paths = Files.list(sharePath)) {
+            paths.filter(p -> p.getFileName().toString().endsWith(".tgz"))
+                    .filter(p -> {
+                        try {
+                            return Files.getLastModifiedTime(p).toMillis() < cutoff;
+                        } catch (IOException e) {
+                            return false;
+                        }
+                    })
+                    .forEach(p -> {
+                        try {
+                            Files.delete(p);
+                            logger.debug("Deleted expired extension archive {}", p);
+                        } catch (IOException e) {
+                            logger.warn("Failed to delete expired extension archive {}", p, e);
+                        }
+                    });
+        }
+    }
+
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         try {
@@ -504,32 +529,9 @@ public ArchiveInfo(Path path, long size, String checksum,
     protected class ShareCleanupWorker extends ManagedContextRunnable {
         protected void reallyRun() {
             try {
-                Path sharePath = getExtensionsSharePath();
-                if (Files.exists(sharePath) && Files.isDirectory(sharePath)) {
-                    return;
-                }
                 long expiryMillis = shareLinkValidityInterval * 1100L;
                 long cutoff = System.currentTimeMillis() - expiryMillis;
-                try (Stream<Path> paths = Files.list(sharePath)) {
-                    paths.filter(p -> p.getFileName().toString().endsWith(".tgz"))
-                            .filter(p -> {
-                                try {
-                                    return Files.getLastModifiedTime(p).toMillis() < cutoff;
-                                } catch (IOException e) {
-                                    return false;
-                                }
-                            })
-                            .forEach(p -> {
-                                try {
-                                    Files.delete(p);
-                                    logger.debug("Deleted expired extension archive {}", p);
-                                } catch (IOException e) {
-                                    logger.warn("Failed to delete expired extension archive {}", p, e);
-                                }
-                            });
-                } catch (IOException e) {
-                    logger.warn("Failed to list extension share archives for cleanup", e);
-                }
+                cleanupExtensionsShareFiles(cutoff);
             } catch (Exception e) {
                 logger.warn("Extensions share cleanup failed", e);
             }