You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/04/10 11:58:24 UTC
[1/3] git commit: updated refs/heads/master to 26746fe
Repository: cloudstack
Updated Branches:
refs/heads/master 6a725c679 -> 26746feb3
CLOUDSTACK-6371: Set snapshot size in copycommand answer during snapshot backup
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85072cb6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85072cb6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85072cb6
Branch: refs/heads/master
Commit: 85072cb6b9c33cb14b6d211935a1d2a557b02f69
Parents: 6a725c6
Author: Kishan Kavala <ki...@cloud.com>
Authored: Thu Apr 10 12:59:04 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Thu Apr 10 14:45:14 2014 +0530
----------------------------------------------------------------------
.../com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85072cb6/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 604bdae..a294ced 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -688,6 +688,7 @@ public class KVMStorageProcessor implements StorageProcessor {
snapshotDisk = storagePoolMgr.getPhysicalDisk(primaryStore.getPoolType(), primaryStore.getUuid(), volumePath);
primaryPool = snapshotDisk.getPool();
+ long size = 0;
/**
* RBD snapshots can't be copied using qemu-img, so we have to use
* the Java bindings for librbd here.
@@ -731,6 +732,7 @@ public class KVMStorageProcessor implements StorageProcessor {
offset += bytes;
}
s_logger.debug("Completed backing up RBD snapshot " + snapshotName + " to " + snapFile.getAbsolutePath() + ". Bytes written: " + offset);
+ size = offset;
bos.close();
s_logger.debug("Attempting to remove snapshot RBD " + snapshotName + " from image " + snapshotDisk.getName());
@@ -761,10 +763,15 @@ public class KVMStorageProcessor implements StorageProcessor {
s_logger.debug("Failed to backup snaptshot: " + result);
return new CopyCmdAnswer(result);
}
+ File snapFile = new File(snapshotDestPath + "/" + snapshotName);
+ if(snapFile.exists()){
+ size = snapFile.length();
+ }
}
SnapshotObjectTO newSnapshot = new SnapshotObjectTO();
newSnapshot.setPath(snapshotRelPath + File.separator + snapshotName);
+ newSnapshot.setPhysicalSize(size);
return new CopyCmdAnswer(newSnapshot);
} catch (LibvirtException e) {
s_logger.debug("Failed to backup snapshot: " + e.toString());
[3/3] git commit: updated refs/heads/master to 26746fe
Posted by ki...@apache.org.
CLOUDSTACK-6376: Return empty list when network tier has no ACL list associated.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26746feb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26746feb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26746feb
Branch: refs/heads/master
Commit: 26746feb39da6483059be7b33a2d5cd41f042c78
Parents: 16ab5ce
Author: Kishan Kavala <ki...@cloud.com>
Authored: Tue Mar 4 11:18:09 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Thu Apr 10 14:45:15 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26746feb/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index d2aa617..72996d1 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -532,6 +532,11 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
if (networkId != null) {
Network network = _networkDao.findById(networkId);
aclId = network.getNetworkACLId();
+ if( aclId == null){
+ // No aclId associated with the network.
+ //Return empty list
+ return new Pair(new ArrayList<NetworkACLItem>(), 0);
+ }
}
if (trafficType != null) {
[2/3] git commit: updated refs/heads/master to 26746fe
Posted by ki...@apache.org.
CLOUDSTACK-6374: Remove entries from lb vm map when lb rule apply fails
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/16ab5ce7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/16ab5ce7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/16ab5ce7
Branch: refs/heads/master
Commit: 16ab5ce76c68c2a6c813daec9cd2c90d4c5eb8c6
Parents: 85072cb
Author: Kishan Kavala <ki...@cloud.com>
Authored: Thu Apr 10 14:41:52 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Thu Apr 10 14:45:15 2014 +0530
----------------------------------------------------------------------
.../lb/LoadBalancingRulesManagerImpl.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16ab5ce7/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 63912b3..91b6aa4 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -1095,7 +1095,10 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
applyLoadBalancerConfig(loadBalancerId);
success = true;
} catch (ResourceUnavailableException e) {
- if (isRollBackAllowedForProvider(loadBalancer)) {
+ s_logger.warn("Unable to apply the load balancer config because resource is unavaliable.", e);
+ success = false;
+ } finally {
+ if (!success) {
final List<Long> vmInstanceIds = new ArrayList<Long>();
Transaction.execute(new TransactionCallbackNoReturn() {
@Override
@@ -1111,16 +1114,14 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
}
loadBalancer.setState(backupState);
_lbDao.persist(loadBalancer);
+ CloudRuntimeException ex = new CloudRuntimeException("Failed to add specified loadbalancerruleid for vms "
+ + instanceIds);
+ ex.addProxyObject(loadBalancer.getUuid(), "loadBalancerId");
+ // TBD: Also pack in the instanceIds in the exception using the
+ // right VO object or table name.
+ throw ex;
}
- s_logger.warn("Unable to apply the load balancer config because resource is unavaliable.", e);
- }
- if (!success) {
- CloudRuntimeException ex = new CloudRuntimeException("Failed to add specified loadbalancerruleid for vms " + instanceIds);
- ex.addProxyObject(loadBalancer.getUuid(), "loadBalancerId");
- // TBD: Also pack in the instanceIds in the exception using the
- // right VO object or table name.
- throw ex;
}
return success;