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

CLOUDSTACK-6824: In case there is a failure to delete the soft link of a download url, dont bail out since there can be cases such as destroy ssvm where the soft links do not exist any more.

This commit is contained in:
Nitin Mehta 2014-06-02 17:52:37 -07:00 committed by Daan Hoogland
parent 004e0cbf61
commit 16afdc0314
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java
View File

@ -316,9 +316,9 @@ public class UploadManagerImpl extends ManagerBase implements UploadManager {
command.add("unlink /var/www/html/userdata/" + extractUrl.substring(extractUrl.lastIndexOf(File.separator) + 1));
String result = command.execute();
if (result != null) {
String errorString = "Error in deleting =" + result;
s_logger.warn(errorString);
return new Answer(cmd, false, errorString);
// FIXME - Ideally should bail out if you cant delete symlink. Not doing it right now.
// This is because the ssvm might already be destroyed and the symlinks do not exist.
s_logger.warn("Error in deleting symlink :" + result);
}
// If its a volume also delete the Hard link since it was created only for the purpose of download.
@ -329,7 +329,7 @@ public class UploadManagerImpl extends ManagerBase implements UploadManager {
s_logger.warn(" " + parentDir + File.separator + path);
result = command.execute();
if (result != null) {
String errorString = "Error in linking err=" + result;
String errorString = "Error in deleting volume " + path + " : " + result;
s_logger.warn(errorString);
return new Answer(cmd, false, errorString);
}