From a85864e160fa2bd91165f825b0ad37ce0e9b3d85 Mon Sep 17 00:00:00 2001 From: anthony Date: Fri, 16 Dec 2011 21:27:58 -0800 Subject: [PATCH] SWIFT : do not sync template to swift if it is marked as destroyed in secondry stoarge --- .../cloud/storage/resource/NfsSecondaryStorageResource.java | 2 +- server/src/com/cloud/template/TemplateManagerImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java index 137e298ecb4..678ad623fc2 100755 --- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java +++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java @@ -204,7 +204,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S } String result = swiftUpload(swift, "T-" + templateId.toString(), lPath, "*"); 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); return new Answer(cmd, false, errMsg); } diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index cffd1bf5bde..d2920f12469 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -883,6 +883,9 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe try { List templtHostRefs = _tmpltHostDao.listByState(VMTemplateHostVO.Status.DOWNLOADED); for (VMTemplateHostVO templtHostRef : templtHostRefs) { + if (templtHostRef.getDestroyed()) { + continue; + } if (!templateIds.contains(templtHostRef.getTemplateId())) { continue; }