[cloudstack] branch main updated: Fix permission issue during Diagnostic service garbage collection (#5504)

[nvazquez]

This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 32051fb  Fix permission issue during Diagnostic service garbage 
collection (#5504)
32051fb is described below

commit 32051fb5fabf817bf190368cef1be68ff265ce51
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Thu Sep 30 16:48:23 2021 +0530

    Fix permission issue during Diagnostic service garbage collection (#5504)
---
 .../diagnostics/DiagnosticsServiceImpl.java           | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git 
a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
 
b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
index f5bba77..a93d277 100644
--- 
a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
+++ 
b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
@@ -18,7 +18,6 @@
 package org.apache.cloudstack.diagnostics;
 
 import static 
org.apache.cloudstack.diagnostics.DiagnosticsHelper.getTimeDifference;
-import static 
org.apache.cloudstack.diagnostics.DiagnosticsHelper.umountSecondaryStorage;
 import static 
org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesList.RouterDefaultSupportedFiles;
 import static 
org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesList.SystemVMDefaultSupportedFiles;
 
@@ -352,8 +351,6 @@ public class DiagnosticsServiceImpl extends ManagerBase 
implements PluggableServ
             String msg = String.format("Exception caught during scp from %s to 
secondary store %s: ", vmSshIp, dataDirectoryInSecondaryStore);
             LOGGER.error(msg, e);
             return new Pair<>(false, msg);
-        } finally {
-            umountSecondaryStorage(mountPoint);
         }
 
         return new Pair<>(success, "File copied to secondary storage 
successfully");
@@ -481,17 +478,11 @@ public class DiagnosticsServiceImpl extends ManagerBase 
implements PluggableServ
 
         private void cleanupOldDiagnosticFiles(DataStore store) {
             String mountPoint = null;
-            try {
-                mountPoint = 
serviceImpl.mountManager.getMountPoint(store.getUri(), null);
-                if (StringUtils.isNotBlank(mountPoint)) {
-                    File directory = new File(mountPoint + File.separator + 
DIAGNOSTICS_DIRECTORY);
-                    if (directory.isDirectory()) {
-                        deleteOldDiagnosticsFiles(directory, store.getName());
-                    }
-                }
-            } finally {
-                if (StringUtils.isNotBlank(mountPoint)) {
-                    umountSecondaryStorage(mountPoint);
+            mountPoint = 
serviceImpl.mountManager.getMountPoint(store.getUri(), null);
+            if (StringUtils.isNotBlank(mountPoint)) {
+                File directory = new File(mountPoint + File.separator + 
DIAGNOSTICS_DIRECTORY);
+                if (directory.isDirectory()) {
+                    deleteOldDiagnosticsFiles(directory, store.getName());
                 }
             }
         }