etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve log when live patching fails (#6324)

This commit is contained in:
Pearl Dsilva 2022-04-28 21:31:15 +05:30 committed by GitHub
parent fd8dfa108e
commit 923a5a4425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/src/main/java/com/cloud/utils/FileUtil.java
View File

@ -38,7 +38,7 @@ public class FileUtil {
}
public static void scpPatchFiles(String controlIp, String destPath, int sshPort, File pemFile, String[] files, String basePath) {
String errMsg = "Failed to scp files to system VM";
String finalErrMsg = "";
List<String> srcFiles = Arrays.asList(files);
srcFiles = srcFiles.stream()
.map(file -> basePath + file) // Using Lambda notation to update the entries
@ -50,10 +50,11 @@ public class FileUtil {
destPath, newSrcFiles, "0755");
return;
} catch (Exception e) {
errMsg += ", retrying";
s_logger.error(errMsg);
finalErrMsg = String.format("Failed to scp files to system VM due to, %s",
e.getCause() != null ? e.getCause().getLocalizedMessage() : e.getLocalizedMessage());
s_logger.error(finalErrMsg);
}
}
throw new CloudRuntimeException(errMsg);
throw new CloudRuntimeException(finalErrMsg);
}
}