apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix permission issue during Diagnostic service garbage collection (#5504)

Browse Source
This commit is contained in:
Pearl Dsilva 2021-09-30 16:48:23 +05:30 committed by GitHub
parent 75922bb727
commit 32051fb5fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
View File

@ -18,7 +18,6 @@
package org.apache.cloudstack.diagnostics; package org.apache.cloudstack.diagnostics;
import static org.apache.cloudstack.diagnostics.DiagnosticsHelper.getTimeDifference; 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.RouterDefaultSupportedFiles;
import static org.apache.cloudstack.diagnostics.fileprocessor.DiagnosticsFilesList.SystemVMDefaultSupportedFiles; 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); String msg = String.format("Exception caught during scp from %s to secondary store %s: ", vmSshIp, dataDirectoryInSecondaryStore);
LOGGER.error(msg, e); LOGGER.error(msg, e);
return new Pair<>(false, msg); return new Pair<>(false, msg);
} finally {
umountSecondaryStorage(mountPoint);
} }
return new Pair<>(success, "File copied to secondary storage successfully"); 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) { private void cleanupOldDiagnosticFiles(DataStore store) {
String mountPoint = null; String mountPoint = null;
try { mountPoint = serviceImpl.mountManager.getMountPoint(store.getUri(), null);
mountPoint = serviceImpl.mountManager.getMountPoint(store.getUri(), null); if (StringUtils.isNotBlank(mountPoint)) {
if (StringUtils.isNotBlank(mountPoint)) { File directory = new File(mountPoint + File.separator + DIAGNOSTICS_DIRECTORY);
File directory = new File(mountPoint + File.separator + DIAGNOSTICS_DIRECTORY); if (directory.isDirectory()) {
if (directory.isDirectory()) { deleteOldDiagnosticsFiles(directory, store.getName());
deleteOldDiagnosticsFiles(directory, store.getName());
}
}
} finally {
if (StringUtils.isNotBlank(mountPoint)) {
umountSecondaryStorage(mountPoint);
} }
} }
} }