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

SWIFT : do not sync template to swift if it is marked as destroyed in secondry stoarge

Browse Source
This commit is contained in:
anthony 2011-12-16 21:27:58 -08:00
parent 141cceacef
commit a85864e160
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -204,7 +204,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
} }
String result = swiftUpload(swift, "T-" + templateId.toString(), lPath, "*"); String result = swiftUpload(swift, "T-" + templateId.toString(), lPath, "*");
if (result != null) { if (result != null) {
String errMsg = "failed to download template from Swift to secondary storage " + lPath + " , err=" + result; String errMsg = "failed to upload template from secondary storage " + lPath + " to swift , err=" + result;
s_logger.debug(errMsg); s_logger.debug(errMsg);
return new Answer(cmd, false, errMsg); return new Answer(cmd, false, errMsg);
} }

3
server/src/com/cloud/template/TemplateManagerImpl.java
View File

@ -883,6 +883,9 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
try { try {
List<VMTemplateHostVO> templtHostRefs = _tmpltHostDao.listByState(VMTemplateHostVO.Status.DOWNLOADED); List<VMTemplateHostVO> templtHostRefs = _tmpltHostDao.listByState(VMTemplateHostVO.Status.DOWNLOADED);
for (VMTemplateHostVO templtHostRef : templtHostRefs) { for (VMTemplateHostVO templtHostRef : templtHostRefs) {
if (templtHostRef.getDestroyed()) {
continue;
}
if (!templateIds.contains(templtHostRef.getTemplateId())) { if (!templateIds.contains(templtHostRef.getTemplateId())) {
continue; continue;
} }