You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2015/04/21 10:34:05 UTC
[1/2] stratos git commit: adding a flag to fore creation of locks if
not found
Repository: stratos
Updated Branches:
refs/heads/master 5eca1c7a1 -> 6ee528efe
adding a flag to fore creation of locks if not found
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1bf3acf0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1bf3acf0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1bf3acf0
Branch: refs/heads/master
Commit: 1bf3acf00e7a96f57dbce331efbad8f95861aa42
Parents: 5578aa4
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Mon Apr 20 13:29:57 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Mon Apr 20 13:29:57 2015 +0530
----------------------------------------------------------------------
.../domain/topology/locking/TopologyLockHierarchy.java | 8 ++++----
.../processor/topology/updater/TopologyUpdater.java | 8 ++++----
.../message/receiver/topology/TopologyManager.java | 10 +++++-----
3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1bf3acf0/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java
index 001c3a5..b139ea1 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/locking/TopologyLockHierarchy.java
@@ -61,9 +61,9 @@ public class TopologyLockHierarchy {
return topologyLockHierarchy;
}
- public TopologyLock getTopologyLockForService(String serviceName) {
+ public TopologyLock getTopologyLockForService(String serviceName, boolean forceCreationIfNotFound) {
TopologyLock topologyLock = serviceNameToTopologyLockMap.get(serviceName);
- if (topologyLock == null) {
+ if (topologyLock == null && forceCreationIfNotFound) {
synchronized (TopologyLockHierarchy.class) {
if (topologyLock == null) {
topologyLock = new TopologyLock();
@@ -74,9 +74,9 @@ public class TopologyLockHierarchy {
return topologyLock;
}
- public TopologyLock getTopologyLockForCluster(String clusterId) {
+ public TopologyLock getTopologyLockForCluster(String clusterId, boolean forceCreationIfNotFound) {
TopologyLock topologyLock = clusterIdToTopologyLockMap.get(clusterId);
- if (topologyLock == null) {
+ if (topologyLock == null && forceCreationIfNotFound) {
synchronized (TopologyLockHierarchy.class) {
if (topologyLock == null) {
topologyLock = new TopologyLock();
http://git-wip-us.apache.org/repos/asf/stratos/blob/1bf3acf0/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java
index a112645..d7ab46b 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java
@@ -115,7 +115,7 @@ public class TopologyUpdater {
// acquire read lock for all Applications
TopologyManager.acquireReadLockForServices();
- TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName);
+ TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName, true);
if (topologyServiceLock == null) {
handleLockNotFound("Topology lock not found for Service " + serviceName);
@@ -134,7 +134,7 @@ public class TopologyUpdater {
*/
public static void releaseWriteLockForService(String serviceName) {
- TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName);
+ TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName, false);
if (topologyServiceLock == null) {
handleLockNotFound("Topology lock not found for Service " + serviceName);
@@ -162,7 +162,7 @@ public class TopologyUpdater {
// acquire read lock for the relevant Services
TopologyManager.acquireReadLockForService(serviceName);
- TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId);
+ TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId, true);
if (topologyClusterLock == null) {
handleLockNotFound("Topology lock not found for Cluster " + clusterId);
@@ -184,7 +184,7 @@ public class TopologyUpdater {
*/
public static void releaseWriteLockForCluster(String serviceName, String clusterId) {
- TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId);
+ TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId, false);
if (topologyClusterLock == null) {
handleLockNotFound("Topology lock not found for Cluster " + clusterId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/1bf3acf0/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java
index 8b27992..7d38620 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java
@@ -117,7 +117,7 @@ public class TopologyManager {
// acquire read lock for all Services
acquireReadLockForServices();
- TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName);
+ TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName, true);
if (topologyServiceLock == null) {
handleLockNotFound("Topology lock not found for Service " + serviceName);
@@ -136,7 +136,7 @@ public class TopologyManager {
*/
public static void releaseReadLockForService(String serviceName) {
- TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName);
+ TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName, false);
if (topologyServiceLock == null) {
handleLockNotFound("Topology lock not found for Service " + serviceName);
@@ -164,7 +164,7 @@ public class TopologyManager {
// acquire read lock for the relevant Services
acquireReadLockForService(serviceName);
- TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId);
+ TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId, true);
if (topologyClusterLock == null) {
handleLockNotFound("Topology lock not found for Cluster " + clusterId);
@@ -187,7 +187,7 @@ public class TopologyManager {
*/
public static void releaseReadLockForCluster(String serviceName, String clusterId) {
- TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId);
+ TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId, false);
if (topologyClusterLock == null) {
handleLockNotFound("Topology lock not found for Cluster " + clusterId);
@@ -204,7 +204,7 @@ public class TopologyManager {
}
private static void handleLockNotFound(String errorMsg) {
- log.warn(errorMsg);
+ log.error(errorMsg);
//throw new RuntimeException(errorMsg);
}
[2/2] stratos git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
merging
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6ee528ef
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6ee528ef
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6ee528ef
Branch: refs/heads/master
Commit: 6ee528efeb695c2501538d0efe0ff374f3589ea6
Parents: 1bf3acf 5eca1c7
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Tue Apr 21 13:06:15 2015 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Tue Apr 21 13:06:15 2015 +0530
----------------------------------------------------------------------
.../parser/DefaultApplicationParser.java | 3 +-
.../autoscaler/registry/RegistryManager.java | 7 +-
.../stratos/cli/CommandLineApplication.java | 33 +-
.../apache/stratos/cli/CommandLineService.java | 22 +-
.../java/org/apache/stratos/cli/RestClient.java | 18 +-
.../stratos/cli/RestCommandLineService.java | 21 +-
.../apache/stratos/cli/StratosApplication.java | 3 -
.../cli/commands/ActivateTenantCommand.java | 3 +
.../commands/AddApplicationPolicyCommand.java | 9 +-
.../commands/AddApplicationSignupCommand.java | 2 +-
.../commands/AddAutoscalingPolicyCommand.java | 7 +-
.../cli/commands/AddCartridgeCommand.java | 7 +-
.../commands/AddDeploymentPolicyCommand.java | 7 +-
.../commands/AddKubernetesClusterCommand.java | 4 +-
.../cli/commands/AddKubernetesHostCommand.java | 4 +-
.../commands/AddNetworkPartitionCommand.java | 7 +-
.../stratos/cli/commands/AddTenantCommand.java | 7 +-
.../stratos/cli/commands/AddUserCommand.java | 18 +-
.../cli/commands/CreateApplicationCommand.java | 7 +-
.../cli/commands/DeactivateTenantCommand.java | 3 +
.../cli/commands/DeleteApplicationCommand.java | 3 +
.../DeleteApplicationSignupCommand.java | 3 +
.../DeleteAutoScalingPolicyCommand.java | 5 +-
.../cli/commands/DeleteTenantCommand.java | 71 ----
.../stratos/cli/commands/DeleteUserCommand.java | 11 +-
.../cli/commands/DeployApplicationCommand.java | 10 +-
.../commands/DescribeApplicationCommand.java | 3 +
.../DescribeApplicationPolicyCommand.java | 5 +-
.../DescribeApplicationRuntimeCommand.java | 3 +
.../DescribeApplicationSignupCommand.java | 3 +
.../DescribeAutoScalingPolicyCommand.java | 5 +-
.../cli/commands/DescribeCartridgeCommand.java | 11 +-
.../commands/DescribeCartridgeGroupCommand.java | 5 +-
.../DescribeDeploymentPolicyCommand.java | 5 +-
.../DescribeKubernetesClusterCommand.java | 11 +-
.../DescribeKubernetesMasterCommand.java | 6 +-
.../DescribeNetworkPartitionCommand.java | 11 +-
.../cli/commands/DescribeTenantCommand.java | 16 +-
.../stratos/cli/commands/ExitCommand.java | 9 +-
.../stratos/cli/commands/HelpCommand.java | 11 +-
.../stratos/cli/commands/InfoCommand.java | 11 +-
.../ListApplicationPoliciesCommand.java | 6 +-
.../cli/commands/ListApplicationsCommand.java | 9 +-
.../commands/ListAutoscalePolicyCommand.java | 6 +-
.../commands/ListCartridgeGroupsCommand.java | 9 +-
.../commands/ListCartridgesByFilterCommand.java | 118 ------
.../cli/commands/ListCartridgesCommand.java | 3 +
.../commands/ListDeploymentPoliciesCommand.java | 3 +
.../cli/commands/ListDomainMappingsCommand.java | 3 +
.../commands/ListKubernetesClustersCommand.java | 5 +-
.../commands/ListKubernetesHostsCommand.java | 11 +-
.../commands/ListNetworkPartitionCommand.java | 3 +
.../ListPartialSearchTenantsCommand.java | 7 +-
.../stratos/cli/commands/ListTenants.java | 3 +
.../apache/stratos/cli/commands/ListUsers.java | 3 +
.../RemoveApplicationPolicyCommand.java | 6 +-
.../cli/commands/RemoveCartridgeCommand.java | 3 +
.../commands/RemoveCartridgeGroupCommand.java | 2 +-
.../commands/RemoveDeploymentPolicyCommand.java | 5 +-
.../commands/RemoveKubernetesHostCommand.java | 4 +-
.../commands/RemoveNetworkPartitionCommand.java | 5 +-
.../commands/SynchronizeArtifactsCommand.java | 13 +-
.../commands/UndeployApplicationCommand.java | 2 +-
.../UpdateApplicationPolicyCommand.java | 9 +-
.../UpdateAutoscalingPolicyCommand.java | 11 +-
.../cli/commands/UpdateCartridgeCommand.java | 7 +-
.../commands/UpdateDeploymentPolicyCommand.java | 4 +-
.../commands/UpdateKubernetesHostCommand.java | 4 +-
.../commands/UpdateKubernetesMasterCommand.java | 4 +-
.../commands/UpdateNetworkPartitionCommand.java | 7 +-
.../cli/commands/UpdateTenantCommand.java | 25 +-
.../stratos/cli/commands/UpdateUserCommand.java | 25 +-
.../context/CloudControllerContext.java | 6 +-
.../main/resources/CloudControllerService.wsdl | 368 +++++++++----------
74 files changed, 513 insertions(+), 596 deletions(-)
----------------------------------------------------------------------