You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/13 19:53:46 UTC
[1/2] git commit: updated refs/heads/4.3 to 76f5f30
Repository: cloudstack
Updated Branches:
refs/heads/4.3 2aabcc11d -> 76f5f3048
CLOUDSTACK-6371: Set snapshot size in copycommand answer during snapshot backup
(cherry picked from commit 295fa84d4d3bb100055d7124bb0d0d68491328fc)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/83df80b7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/83df80b7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/83df80b7
Branch: refs/heads/4.3
Commit: 83df80b715c76bf4db38d20eac9bff8b3f27eacb
Parents: 2aabcc1
Author: Kishan Kavala <ki...@cloud.com>
Authored: Thu Apr 10 12:59:04 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Nov 14 00:12:16 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/83df80b7/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 8d237cc..3d1ca55 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
@@ -689,6 +689,7 @@ public class KVMStorageProcessor implements StorageProcessor {
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.
@@ -733,6 +734,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());
@@ -763,10 +765,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());
[2/2] git commit: updated refs/heads/4.3 to 76f5f30
Posted by bh...@apache.org.
CLOUDSTACK-6432: Blocking DHCP server to service DNS outside network
This would cover only DHCP only network since in basic and shared network, the
private IP used by VR and network may expose to outside.
(cherry picked from commit a554ebdf750be2ff2fd02fda38713b40313fcca8)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76f5f304
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76f5f304
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76f5f304
Branch: refs/heads/4.3
Commit: 76f5f3048e115c5ba25ec09a44e4947b5b290ebb
Parents: 83df80b
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Apr 16 18:40:26 2014 -0700
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Nov 14 00:19:31 2014 +0530
----------------------------------------------------------------------
.../router/VirtualNetworkApplianceManagerImpl.java | 11 ++++++++---
.../patches/debian/config/etc/init.d/cloud-early-config | 11 +++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76f5f304/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index bab1419..b0e1228 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2239,12 +2239,14 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
if (domain != null) {
buf.append(" domain=" + domain);
}
-
+
+ long cidrSize = 0;
+
//setup dhcp range
if (dc.getNetworkType() == NetworkType.Basic) {
if (guestNic.isDefaultNic()) {
- long cidrSize = NetUtils.getCidrSize(guestNic.getNetmask());
- String cidr = NetUtils.getCidrSubNet(guestNic.getGateway(), cidrSize);
+ cidrSize = NetUtils.getCidrSize(guestNic.getNetmask());
+ final String cidr = NetUtils.getCidrSubNet(guestNic.getGateway(), cidrSize);
if (cidr != null) {
dhcpRange = NetUtils.getIpRangeStartIpFromCidr(cidr, cidrSize);
}
@@ -2252,11 +2254,14 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
} else if (dc.getNetworkType() == NetworkType.Advanced) {
String cidr = guestNetwork.getCidr();
if (cidr != null) {
+ cidrSize = NetUtils.getCidrSize(NetUtils.getCidrNetmask(cidr));
dhcpRange = NetUtils.getDhcpRange(cidr);
}
}
if (dhcpRange != null) {
+ // To limit DNS to the cidr range
+ buf.append(" cidrsize=" + String.valueOf(cidrSize));
buf.append(" dhcprange=" + dhcpRange);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76f5f304/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 77cb05a..4783ec2 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1083,8 +1083,16 @@ setup_dhcpsrvr() {
enable_svc cloud 0
enable_fwding 0
chkconfig nfs-common off
+
cp /etc/iptables/iptables-router /etc/iptables/rules.v4
cp /etc/iptables/iptables-router /etc/iptables/rules
+
+ #Only allow DNS service for current network
+ sed -i "s/-A INPUT -i eth0 -p udp -m udp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p udp -m udp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
+ sed -i "s/-A INPUT -i eth0 -p udp -m udp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p udp -m udp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules
+ sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
+ sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules
+
if [ "$SSHONGUEST" == "true" ]
then
setup_sshd $ETH0_IP "eth0"
@@ -1425,6 +1433,9 @@ for i in $CMDLINE
vpccidr)
VPCCIDR=$VALUE
;;
+ cidrsize)
+ CIDR_SIZE=$VALUE
+ ;;
esac
done