You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2014/04/14 13:34:08 UTC
[1/4] git commit: updated refs/heads/4.3 to 889d80b
Repository: cloudstack
Updated Branches:
refs/heads/4.3 0965fdb9f -> 889d80b7e
debian: Add JNA flag when starting agent
In some situations local JNA libraries might prevent the agent
from starting.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d473fa8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d473fa8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d473fa8
Branch: refs/heads/4.3
Commit: 7d473fa8ea356662248a9cee29f1f6decbad8b6d
Parents: cd20127
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Wed Mar 26 13:31:02 2014 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Apr 14 13:27:08 2014 +0200
----------------------------------------------------------------------
packaging/debian/init/cloud-agent | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d473fa8/packaging/debian/init/cloud-agent
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-agent b/packaging/debian/init/cloud-agent
index e733875..ff550bb 100755
--- a/packaging/debian/init/cloud-agent
+++ b/packaging/debian/init/cloud-agent
@@ -96,7 +96,7 @@ start() {
wait_for_network
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
+ if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -Djna.nosys=true -pidfile "$PIDFILE" -errfile SYSLOG $CLASS
RETVAL=$?
then
rc=0
[3/4] git commit: updated refs/heads/4.3 to 889d80b
Posted by wi...@apache.org.
CLOUDSTACK-4665: Depend on rados-java 0.1.4
This fixes the ArrayIndexOutOfBounds exception during the
removal of a RBD based volume
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a7822757
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a7822757
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a7822757
Branch: refs/heads/4.3
Commit: a78227570a23f5206179d3d8e891a577845df2ca
Parents: 0965fdb
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Apr 8 17:43:50 2014 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Apr 14 13:27:08 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7822757/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ac89c31..3d1e747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
<cs.java-ipv6.version>0.10</cs.java-ipv6.version>
<cs.replace.properties>build/replace.properties</cs.replace.properties>
<cs.libvirt-java.version>0.5.1</cs.libvirt-java.version>
- <cs.rados-java.version>0.1.3</cs.rados-java.version>
+ <cs.rados-java.version>0.1.4</cs.rados-java.version>
<cs.target.dir>target</cs.target.dir>
<cs.daemon.version>1.0.10</cs.daemon.version>
<cs.jna.version>4.0.0</cs.jna.version>
[4/4] git commit: updated refs/heads/4.3 to 889d80b
Posted by wi...@apache.org.
debian: cloudstack-management requires libmysql-java for SQL connection
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/889d80b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/889d80b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/889d80b7
Branch: refs/heads/4.3
Commit: 889d80b7e79ef55534727f088b2091e5b025d67c
Parents: 7d473fa
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Mar 25 21:13:15 2014 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Apr 14 13:27:09 2014 +0200
----------------------------------------------------------------------
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/889d80b7/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index c756dcd..c23ab3a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C
Package: cloudstack-management
Architecture: all
-Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, python-paramiko, augeas-tools
+Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
[2/4] git commit: updated refs/heads/4.3 to 889d80b
Posted by wi...@apache.org.
CLOUDSTACK-4665: Check if a snapshot is protected before trying to unprotect
Otherwise a RBDException will be thrown with the message that the snapshot
isn't protected.
modified: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd20127f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd20127f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd20127f
Branch: refs/heads/4.3
Commit: cd20127fbb113d6a6d1bdad7035ac44da8b8893d
Parents: a782275
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Thu Apr 10 05:28:56 2014 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Apr 14 13:27:08 2014 +0200
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd20127f/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index bdccc10..76659ec 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -770,7 +770,13 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
RbdImage image = rbd.open(uuid);
List<RbdSnapInfo> snaps = image.snapList();
for (RbdSnapInfo snap : snaps) {
- image.snapUnprotect(snap.name);
+ if (image.snapIsProtected(snap.name)) {
+ s_logger.debug("Unprotecting snapshot " + pool.getSourceDir() + "/" + uuid + "@" + snap.name);
+ image.snapUnprotect(snap.name);
+ } else {
+ s_logger.debug("Snapshot " + pool.getSourceDir() + "/" + uuid + "@" + snap.name + " is not protected.");
+ }
+ s_logger.debug("Removing snapshot " + pool.getSourceDir() + "/" + uuid + "@" + snap.name);
image.snapRemove(snap.name);
}