CLOUDSTACK-3513: [Automation] Failed to copy iso and template between

minchen07 · minchen07 · commit cb2a84241b5f · 2013-07-17T17:31:50.000-07:00
zones.
diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -580,8 +580,8 @@ public AsyncCallFuture<TemplateApiResult> copyTemplate(TemplateInfo srcTemplate,
 
         TemplateOpContext<TemplateApiResult> context = new TemplateOpContext<TemplateApiResult>(null,
                 (TemplateObject) templateOnStore, future);
-        AsyncCallbackDispatcher<TemplateServiceImpl, CopyCommandResult> caller = AsyncCallbackDispatcher.create(this);
-        caller.setCallback(caller.getTarget().copyTemplateCallBack(null, null)).setContext(context);
+        AsyncCallbackDispatcher<TemplateServiceImpl, CreateCmdResult> caller = AsyncCallbackDispatcher.create(this);
+        caller.setCallback(caller.getTarget().copyTemplateCrossZoneCallBack(null, null)).setContext(context);
         destStore.getDriver().createAsync(destStore, templateOnStore, caller);
         return future;
     }
@@ -652,6 +652,28 @@ protected Void copyTemplateCallBack(AsyncCallbackDispatcher<TemplateServiceImpl,
         return null;
     }
 
+    protected Void copyTemplateCrossZoneCallBack(AsyncCallbackDispatcher<TemplateServiceImpl, CreateCmdResult> callback, TemplateOpContext<TemplateApiResult> context) {
+        TemplateInfo destTemplate = context.getTemplate();
+        CreateCmdResult result = callback.getResult();
+        AsyncCallFuture<TemplateApiResult> future = context.getFuture();
+        TemplateApiResult res = new TemplateApiResult(destTemplate);
+        try {
+            if (result.isFailed()) {
+                res.setResult(result.getResult());
+                destTemplate.processEvent(Event.OperationFailed);
+            } else {
+                destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+            }
+            future.complete(res);
+        } catch (Exception e) {
+            s_logger.debug("Failed to process copy template cross zones callback", e);
+            res.setResult(e.toString());
+            future.complete(res);
+        }
+
+        return null;
+    }
+
     @Override
     public void addSystemVMTemplatesToSecondary(DataStore store) {
         long storeId = store.getId();
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -634,9 +634,6 @@ public boolean copy(long userId, VMTemplateVO template, DataStore srcSecStore, D
             createEventType = EventTypes.EVENT_TEMPLATE_CREATE;
         }
 
-        Transaction txn = Transaction.currentTxn();
-        txn.start();
-
         TemplateInfo srcTemplate = this._tmplFactory.getTemplate(template.getId(), srcSecStore);
         // Copy will just find one eligible image store for the destination zone
         // and copy template there, not propagate to all image stores

Original file line number	Diff line number	Diff line change
`@@ -634,9 +634,6 @@ public boolean copy(long userId, VMTemplateVO template, DataStore srcSecStore, D`
`634`	`634`	`createEventType = EventTypes.EVENT_TEMPLATE_CREATE;`
`635`	`635`	`}`
`636`	`636`
`637`		`- Transaction txn = Transaction.currentTxn();`
`638`		`- txn.start();`
`639`		`-`
`640`	`637`	`TemplateInfo srcTemplate = this._tmplFactory.getTemplate(template.getId(), srcSecStore);`
`641`	`638`	`// Copy will just find one eligible image store for the destination zone`
`642`	`639`	`// and copy template there, not propagate to all image stores`