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 2017/02/23 00:38:17 UTC
[1/5] git commit: updated refs/heads/master to bb274a1
Repository: cloudstack
Updated Branches:
refs/heads/master 87f11044c -> bb274a186
CLOUDSTACK-9628: Use correct virtualsize with Swift as secondary storage
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/79f41772
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79f41772
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79f41772
Branch: refs/heads/master
Commit: 79f4177212c7d0ac09887fea2ae9f1e2e2820412
Parents: 7da95172
Author: Syed <sy...@gmail.com>
Authored: Fri Dec 9 15:48:08 2016 -0500
Committer: Syed <sy...@gmail.com>
Committed: Fri Dec 9 15:48:08 2016 -0500
----------------------------------------------------------------------
.../storage/resource/NfsSecondaryStorageResource.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79f41772/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 420842f..b38e0b7 100644
--- 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
@@ -1585,19 +1585,28 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
String line = null;
String uniqName = null;
Long size = null;
+ Long physicalSize = null;
String name = null;
while ((line = brf.readLine()) != null) {
if (line.startsWith("uniquename=")) {
uniqName = line.split("=")[1];
} else if (line.startsWith("size=")) {
+ physicalSize = Long.parseLong(line.split("=")[1]);
+ } else if (line.startsWith("virtualsize=")){
size = Long.parseLong(line.split("=")[1]);
} else if (line.startsWith("filename=")) {
name = line.split("=")[1];
}
}
+
+ //fallback
+ if (size == null) {
+ size = physicalSize;
+ }
+
tempFile.delete();
if (uniqName != null) {
- TemplateProp prop = new TemplateProp(uniqName, container + File.separator + name, size, size, true, false);
+ TemplateProp prop = new TemplateProp(uniqName, container + File.separator + name, size, physicalSize, true, false);
tmpltInfos.put(uniqName, prop);
}
} catch (IOException ex)
@@ -1615,7 +1624,6 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
}
}
return tmpltInfos;
-
}
Map<String, TemplateProp> s3ListTemplate(S3TO s3) {
[4/5] git commit: updated refs/heads/master to bb274a1
Posted by ra...@apache.org.
Merge pull request #1947 from ustcweizhou/RemoveSecondaryIP
CLOUDSTACK-9789: Fix releasing secondary guest IP fails with associated static nat which is actually not used
* pr/1947:
CLOUDSTACK-9789: Fix releasing secondary guest IP fails with associated static nat which is actually not used
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c6f0ba76
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c6f0ba76
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c6f0ba76
Branch: refs/heads/master
Commit: c6f0ba76b1a8e92f23aa6fa8193aa0d04df9539c
Parents: f3d38be 0f05424
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Thu Feb 23 06:05:56 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Thu Feb 23 06:05:56 2017 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/5] git commit: updated refs/heads/master to bb274a1
Posted by ra...@apache.org.
Merge pull request #1770 from syed/tmpl-virt-size
CLOUDSTACK-9628: Fix Template Size in Swift as Secondary StorageCloudstack incorrectly uses the physical size as the size of the
template. Ideally, the size should refelct the virtual size. This
PR fixes that issue.
* pr/1770:
CLOUDSTACK-9628: Use correct virtualsize with Swift as secondary storage
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f3d38be8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f3d38be8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f3d38be8
Branch: refs/heads/master
Commit: f3d38be80811a8263e78d015e3b07558b8580f2a
Parents: e860249 79f4177
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Thu Feb 23 06:04:34 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Thu Feb 23 06:04:34 2017 +0530
----------------------------------------------------------------------
.../storage/resource/NfsSecondaryStorageResource.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] git commit: updated refs/heads/master to bb274a1
Posted by ra...@apache.org.
CLOUDSTACK-9789: Fix releasing secondary guest IP fails with associated static nat which is actually not used
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f054246
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f054246
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f054246
Branch: refs/heads/master
Commit: 0f054246b65d003ae7f024b6ef125b2ec1846879
Parents: 6dced70
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Thu Feb 16 14:18:56 2017 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Thu Feb 16 14:18:56 2017 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f054246/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index b6dac87..e77b40e 100644
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -835,7 +835,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
}
}
//check if the secondary ip associated with any static nat rule
- IPAddressVO publicIpVO = _ipAddressDao.findByVmIp(secondaryIp);
+ IPAddressVO publicIpVO = _ipAddressDao.findByIpAndNetworkId(secIpVO.getNetworkId(), secondaryIp);
if (publicIpVO != null) {
s_logger.debug("VM nic IP " + secondaryIp + " is associated with the static NAT rule public IP address id " + publicIpVO.getId());
throw new InvalidParameterValueException("Can' remove the ip " + secondaryIp + "is associate with static NAT rule public IP address id " + publicIpVO.getId());
[5/5] git commit: updated refs/heads/master to bb274a1
Posted by ra...@apache.org.
Merge release branch 4.9 to master
* 4.9:
CLOUDSTACK-9789: Fix releasing secondary guest IP fails with associated static nat which is actually not used
CLOUDSTACK-9628: Use correct virtualsize with Swift as secondary storage
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb274a18
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb274a18
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb274a18
Branch: refs/heads/master
Commit: bb274a18650a4897d8e73e68ca127cdee047e429
Parents: 87f1104 c6f0ba7
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Thu Feb 23 06:07:52 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Thu Feb 23 06:07:52 2017 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 2 +-
.../storage/resource/NfsSecondaryStorageResource.java | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb274a18/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb274a18/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------