From 71da03b69d897bf02c715bc31567b1c7fcbd7743 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Tue, 9 Aug 2011 15:31:40 -0700
Subject: [PATCH] bug 10809: add copyvolume for kvm status 10809: resolved
 fixed

---
 .../computing/LibvirtComputingResource.java   | 46 ++++++++++++++++++-
 .../computing/LibvirtStorageResource.java     | 13 ++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
index b6438ec5815..fac23ea6ff9 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
@@ -138,6 +138,8 @@ import com.cloud.agent.api.proxy.WatchConsoleProxyLoadCommand;
 import com.cloud.agent.api.routing.IpAssocCommand;
 import com.cloud.agent.api.routing.IpAssocAnswer;
 import com.cloud.agent.api.routing.NetworkElementCommand;
+import com.cloud.agent.api.storage.CopyVolumeAnswer;
+import com.cloud.agent.api.storage.CopyVolumeCommand;
 import com.cloud.agent.api.storage.CreateAnswer;
 import com.cloud.agent.api.storage.CreateCommand;
 import com.cloud.agent.api.storage.CreatePrivateTemplateAnswer;
@@ -894,6 +896,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
                return execute((NetworkRulesSystemVmCommand)cmd);
             } else if (cmd instanceof CleanupNetworkRulesCmd) {
                return execute((CleanupNetworkRulesCmd)cmd);
+            } else if (cmd instanceof CopyVolumeCommand) {
+               return execute((CopyVolumeCommand)cmd);
             } else {
         		s_logger.warn("Unsupported command ");
                 return Answer.createUnsupportedCommandAnswer(cmd);
@@ -904,7 +908,47 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
 	}
 	
 	
-	protected Answer execute(DeleteStoragePoolCommand cmd) {
+	private CopyVolumeAnswer execute(CopyVolumeCommand cmd) {
+	    boolean copyToSecondary = cmd.toSecondaryStorage();
+	    String volumePath = cmd.getVolumePath();
+	    StorageFilerTO pool = cmd.getPool();
+	    String secondaryStorageUrl = cmd.getSecondaryStorageURL();
+	    StoragePool primaryPool = null;
+	    Connect conn;
+        try {
+            conn = LibvirtConnection.getConnection();
+            primaryPool = _storageResource.getStoragePool(conn, pool.getUuid());
+            LibvirtStoragePoolDef primary = _storageResource.getStoragePoolDef(conn, primaryPool);
+            String primaryMountPath = primary.getTargetPath();
+            
+            StoragePool secondaryStoragePool = _storageResource.getStoragePoolbyURI(conn, new URI(secondaryStorageUrl));
+            LibvirtStoragePoolDef spd = _storageResource.getStoragePoolDef(conn, secondaryStoragePool);
+            String ssPmountPath = spd.getTargetPath();
+            
+            String volumeName = UUID.randomUUID().toString();
+            
+            if (copyToSecondary) {
+                StorageVol volume = _storageResource.getVolume(conn, primaryPool, volumePath);
+                String volumeDestPath = ssPmountPath + File.separator + "volumes/" + cmd.getVolumeId() + File.separator;
+                _storageResource.copyVolume(volumePath, volumeDestPath, volumeName, _cmdsTimeout);
+                return new CopyVolumeAnswer(cmd, true, null, null, volumeName);
+            } else {
+                volumePath = ssPmountPath + File.separator + "volumes/" + cmd.getVolumeId() + File.separator + volumePath;
+                _storageResource.copyVolume(volumePath, primaryMountPath, volumeName, _cmdsTimeout);
+                return new CopyVolumeAnswer(cmd, true, null, null, primaryMountPath + File.separator + volumeName);
+            }
+           
+        } catch (LibvirtException e) {
+            return new CopyVolumeAnswer(cmd, false, e.toString(), null, null);
+        } catch (URISyntaxException e) {
+            return new CopyVolumeAnswer(cmd, false, e.toString(), null, null);
+        } catch (InternalErrorException e) {
+            return new CopyVolumeAnswer(cmd, false, e.toString(), null, null);
+        }
+       
+    }
+
+    protected Answer execute(DeleteStoragePoolCommand cmd) {
 		try {
 			Connect conn = LibvirtConnection.getConnection();
 			_storageResource.deleteStoragePool(conn, cmd.getPool());
diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtStorageResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtStorageResource.java
index bdbef6d6924..4143d01548c 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtStorageResource.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtStorageResource.java
@@ -386,6 +386,19 @@ public class LibvirtStorageResource {
         return vol;
     }
     
+    public boolean copyVolume(String srcPath, String destPath, String volumeName, int timeout)  throws InternalErrorException{
+        _storageLayer.mkdirs(destPath);
+        if (!_storageLayer.exists(srcPath)) {
+            throw new InternalErrorException("volume:" + srcPath + " is not exits");
+        }
+        String result = Script.runSimpleBashScript("cp " + srcPath + " " + destPath + File.separator + volumeName, timeout);
+        if (result != null) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+    
     public LibvirtStoragePoolDef getStoragePoolDef(Connect conn, StoragePool pool) throws LibvirtException {
         String poolDefXML = pool.getXMLDesc(0);
         LibvirtStoragePoolXMLParser parser = new LibvirtStoragePoolXMLParser();