You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/26 19:11:10 UTC
[1/3] git commit: updated refs/heads/master to 5c1ad90
Repository: cloudstack
Updated Branches:
refs/heads/master a6bae2b9c -> 5c1ad900a
Fixed Coverity Issue: Unintentional Integer FLow
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fae20570
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fae20570
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fae20570
Branch: refs/heads/master
Commit: fae20570c2ba74885a3738c650537c6db6eb5853
Parents: e5e226e
Author: Kshitij Kansal <ka...@gmail.com>
Authored: Tue Sep 15 16:49:22 2015 +0530
Committer: Kshitij Kansal <ka...@gmail.com>
Committed: Thu Apr 21 12:06:36 2016 +0530
----------------------------------------------------------------------
server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fae20570/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
index 1478910..ecdbcae 100755
--- a/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
@@ -115,7 +115,7 @@ public class ImageStoreUploadMonitorImpl extends ManagerBase implements ImageSto
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("Upload-Monitor"));
_monitoringInterval = UploadMonitoringInterval.value();
- _uploadOperationTimeout = UploadOperationTimeout.value() * 60 * 1000;
+ _uploadOperationTimeout = UploadOperationTimeout.value() * 60 * 1000L;
_nodeId = ManagementServerNode.getManagementServerId();
return true;
}
[2/3] git commit: updated refs/heads/master to 5c1ad90
Posted by sw...@apache.org.
Fixed: Error given when creating VPN user in one network if VR for another network is stopped
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e5e226e5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e5e226e5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e5e226e5
Branch: refs/heads/master
Commit: e5e226e549e0224a3f6ddf4cc570e983d1cb9292
Parents: 3393555
Author: Kshitij Kansal <ka...@gmail.com>
Authored: Tue Sep 15 14:42:29 2015 +0530
Committer: Kshitij Kansal <ka...@gmail.com>
Committed: Thu Apr 21 12:06:36 2016 +0530
----------------------------------------------------------------------
.../cloudstack/network/topology/BasicNetworkTopology.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e5e226e5/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
index 2b88737..0869b22 100644
--- a/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
+++ b/server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
@@ -278,7 +278,11 @@ public class BasicNetworkTopology implements NetworkTopology {
boolean agentResults = true;
for (final DomainRouterVO router : routers) {
- if (router.getState() != State.Running) {
+ if(router.getState() == State.Stopped || router.getState() == State.Stopping){
+ s_logger.info("The router " + router.getInstanceName()+ " is in the " + router.getState() + " state. So not applying the VPN rules. Will be applied once the router gets restarted.");
+ continue;
+ }
+ else if (router.getState() != State.Running) {
s_logger.warn("Failed to add/remove VPN users: router not in running state");
throw new ResourceUnavailableException("Unable to assign ip addresses, domR is not in right state " + router.getState(), DataCenter.class,
network.getDataCenterId());
[3/3] git commit: updated refs/heads/master to 5c1ad90
Posted by sw...@apache.org.
Merge pull request #826 from kansal/CLOUDSTACK-8853
Fixed: Error given when creating VPN user in one network if VR for another network is stopped.
Problem: Adding a VPN user to an IP on an isolated network fails with an exception if the end-user has two isolated networks and one of them is not in use (i.e. VR is stopped).
Fix: Presently in the code, all the VR which are not in Running state are forced to throw error. Added a check for the Stopped and Stopping state routers. Configurations will be applied to them when they get restarted.
* pr/826:
Fixed Coverity Issue: Unintentional Integer FLow
Fixed: Error given when creating VPN user in one network if VR for another network is stopped
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5c1ad900
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5c1ad900
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5c1ad900
Branch: refs/heads/master
Commit: 5c1ad900a273bcc7068fcee19cc8545ffdcec0c4
Parents: a6bae2b fae2057
Author: Will Stevens <wi...@gmail.com>
Authored: Tue Apr 26 13:10:30 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Tue Apr 26 13:10:30 2016 -0400
----------------------------------------------------------------------
server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java | 2 +-
.../cloudstack/network/topology/BasicNetworkTopology.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------