You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/11/28 12:33:13 UTC
[1/2] git commit: updated refs/heads/volume-upload to b6c86bd
Repository: cloudstack
Updated Branches:
refs/heads/volume-upload 3da3d7418 -> b6c86bdb7
volume upload: sending the preshared key to ssvm
sending the key to ssvm in the secondary storage setup command
saving it in a file on ssvm
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d2ef7295
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d2ef7295
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d2ef7295
Branch: refs/heads/volume-upload
Commit: d2ef7295f90ea52788da0d99306bbcf84555cc5b
Parents: 3da3d74
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri Nov 28 16:40:20 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Fri Nov 28 16:40:20 2014 +0530
----------------------------------------------------------------------
.../cloud/agent/api/SecStorageSetupCommand.java | 8 ++++++++
.../SecondaryStorageManagerImpl.java | 4 ++++
.../resource/NfsSecondaryStorageResource.java | 19 ++++++++++++++++---
3 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2ef7295/core/src/com/cloud/agent/api/SecStorageSetupCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/SecStorageSetupCommand.java b/core/src/com/cloud/agent/api/SecStorageSetupCommand.java
index 2c29cde..28e55c2 100644
--- a/core/src/com/cloud/agent/api/SecStorageSetupCommand.java
+++ b/core/src/com/cloud/agent/api/SecStorageSetupCommand.java
@@ -27,6 +27,7 @@ public class SecStorageSetupCommand extends Command {
private DataStoreTO store;
private String secUrl;
private KeystoreManager.Certificates certs;
+ private String postUploadKey;
public SecStorageSetupCommand() {
@@ -66,4 +67,11 @@ public class SecStorageSetupCommand extends Command {
this.store = store;
}
+ public String getPostUploadKey() {
+ return postUploadKey;
+ }
+
+ public void setPostUploadKey(String postUploadKey) {
+ this.postUploadKey = postUploadKey;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2ef7295/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index 3ba4242..79a1486 100755
--- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -310,6 +310,10 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
setupCmd = new SecStorageSetupCommand(ssStore.getTO(), secUrl, certs);
}
+ //template/volume file upload key
+ String postUploadKey = _configDao.getValue(Config.SSVMPSK.key());
+ setupCmd.setPostUploadKey(postUploadKey);
+
Answer answer = _agentMgr.easySend(ssHostId, setupCmd);
if (answer != null && answer.getResult()) {
SecStorageSetupAnswer an = (SecStorageSetupAnswer)answer;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2ef7295/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 55f80e1..54c3630 100755
--- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -47,6 +47,7 @@ import java.util.UUID;
import javax.naming.ConfigurationException;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -1264,6 +1265,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
if (!_inSystemVM) {
return new Answer(cmd, true, null);
}
+ Answer answer = null;
DataStoreTO dStore = cmd.getDataStore();
if (dStore instanceof NfsTO) {
String secUrl = cmd.getSecUrl();
@@ -1277,17 +1279,28 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
configCerts(cmd.getCerts());
nfsIps.add(nfsHostIp);
- return new SecStorageSetupAnswer(dir);
+ answer = new SecStorageSetupAnswer(dir);
} catch (Exception e) {
String msg = "GetRootDir for " + secUrl + " failed due to " + e.toString();
s_logger.error(msg);
- return new Answer(cmd, false, msg);
+ answer = new Answer(cmd, false, msg);
}
} else {
// TODO: what do we need to setup for S3/Swift, maybe need to mount
// to some cache storage
- return new Answer(cmd, true, null);
+ answer = new Answer(cmd, true, null);
+ }
+
+ savePostUploadPSK(cmd.getPostUploadKey());
+ return answer;
+ }
+
+ private void savePostUploadPSK(String psk) {
+ try {
+ FileUtils.writeStringToFile(new File("/etc/cloudstack/agent/ms-psk"),psk, "utf-8");
+ } catch (IOException ex) {
+ s_logger.debug("Failed to copy PSK to the file.", ex);
}
}
[2/2] git commit: updated refs/heads/volume-upload to b6c86bd
Posted by ra...@apache.org.
changed commons-io version to the latest stable 2.4
also updated version numbers in all the poms its used.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6c86bdb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6c86bdb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6c86bdb
Branch: refs/heads/volume-upload
Commit: b6c86bdb75143071c0f25e6cf9ca80a65ee63fa8
Parents: d2ef729
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri Nov 28 17:01:16 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Fri Nov 28 17:01:16 2014 +0530
----------------------------------------------------------------------
agent/pom.xml | 1 +
framework/db/pom.xml | 1 +
framework/jobs/pom.xml | 1 +
framework/spring/module/pom.xml | 1 +
plugins/hypervisors/kvm/pom.xml | 1 +
pom.xml | 2 +-
server/pom.xml | 1 +
services/iam/server/pom.xml | 1 +
utils/pom.xml | 1 +
9 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/agent/pom.xml
----------------------------------------------------------------------
diff --git a/agent/pom.xml b/agent/pom.xml
index 62a43dd..7f7ffc6 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -39,6 +39,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
</dependency>
<dependency>
<groupId>commons-daemon</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/framework/db/pom.xml
----------------------------------------------------------------------
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index b523743..b33d37e 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -38,6 +38,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/framework/jobs/pom.xml
----------------------------------------------------------------------
diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml
index ccbbe24..33826e1 100644
--- a/framework/jobs/pom.xml
+++ b/framework/jobs/pom.xml
@@ -70,6 +70,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/framework/spring/module/pom.xml
----------------------------------------------------------------------
diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml
index e95a488..4d83e2f 100644
--- a/framework/spring/module/pom.xml
+++ b/framework/spring/module/pom.xml
@@ -36,6 +36,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/plugins/hypervisors/kvm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index a18e8a7..6ba6a47 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -32,6 +32,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 99e23a1..218e551 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
<cs.powermock.version>1.5.3</cs.powermock.version>
<cs.aws.sdk.version>1.3.22</cs.aws.sdk.version>
<cs.lang.version>2.6</cs.lang.version>
- <cs.commons-io.version>1.4</cs.commons-io.version>
+ <cs.commons-io.version>2.4</cs.commons-io.version>
<cs.reflections.version>0.9.8</cs.reflections.version>
<cs.java-ipv6.version>0.10</cs.java-ipv6.version>
<cs.replace.properties>build/replace.properties</cs.replace.properties>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index c293aa1..c161850 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -21,6 +21,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/services/iam/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/iam/server/pom.xml b/services/iam/server/pom.xml
index ffd792b..ed33008 100644
--- a/services/iam/server/pom.xml
+++ b/services/iam/server/pom.xml
@@ -30,6 +30,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${cs.commons-io.version}</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6c86bdb/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 6b16b99..0bf940c 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -114,6 +114,7 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>provided</scope>
+ <version>${cs.commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>