Fixing formating and minor issues
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c842d6be Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c842d6be Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c842d6be Branch: refs/heads/master Commit: c842d6bee19ec1b4c86add7eeed9f2e68dc5787f Parents: 92eb63b Author: anuruddhal <[email protected]> Authored: Wed Jul 29 12:02:03 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Jul 30 14:07:45 2015 +0530 ---------------------------------------------------------------------- .../publisher/ClusterStatusEventPublisher.java | 4 +- .../monitor/cluster/ClusterMonitor.java | 8 +- .../autoscaler/rule/RuleTasksDelegator.java | 3 +- .../services/impl/AutoscalerServiceImpl.java | 3 +- .../metadata/service/api/MetadataApi.java | 6 +- .../service/registry/CarbonRegistry.java | 132 ++++++++++--------- .../util/converter/ObjectConverter.java | 2 +- 7 files changed, 82 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c842d6be/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java index c0ae737..3407f4d 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java @@ -227,9 +227,7 @@ public class ClusterStatusEventPublisher { publishEvent(appStatusClusterTerminatedEvent); } else { - if (log.isDebugEnabled()) { - log.warn("Cluster is already terminated, [cluster] " + clusterId); - } + log.warn("Cluster is already terminated, [cluster] " + clusterId); } } else { log.warn("Terminated is not in the possible state list for [ClusterInstance] " + http://git-wip-us.apache.org/repos/asf/stratos/blob/c842d6be/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java index b1cf3ea..d4a2746 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java @@ -746,9 +746,11 @@ public class ClusterMonitor extends Monitor { float averageRequestsInFlight = value * clusterInstanceContext.getActiveMemberCount() / totalActiveMemberCount; clusterInstanceContext.setAverageRequestsInFlight(averageRequestsInFlight); - log.debug(String.format("Calculated average RIF: [cluster] %s [cluster-instance] %s " + - "[network-partition] %s [average-rif] %s", clusterId, - clusterInstanceContext.getId(), networkPartitionId, averageRequestsInFlight)); + if (log.isDebugEnabled()) { + log.debug(String.format("Calculated average RIF: [cluster] %s [cluster-instance] %s " + + "[network-partition] %s [average-rif] %s", clusterId, + clusterInstanceContext.getId(), networkPartitionId, averageRequestsInFlight)); + } } } } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/c842d6be/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java index 43274bf..89633f7 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java @@ -62,8 +62,7 @@ public class RuleTasksDelegator { public int getNumberOfInstancesRequiredBasedOnRif(float rifPredictedValue, float rifThreshold) { - if (rifThreshold != 0) { - + if (rifThreshold > 0) { float requiredNumberOfInstances = rifPredictedValue / rifThreshold; return (int) Math.ceil(requiredNumberOfInstances); } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/c842d6be/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java index da1abdc..52c8dbe 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java @@ -1075,7 +1075,8 @@ public class AutoscalerServiceImpl implements AutoscalerService { if ((!StratosConstants.PARTITION_ROUND_ROBIN_ALGORITHM_ID.equals(partitionAlgorithm)) && (!StratosConstants.PARTITION_ONE_AFTER_ANOTHER_ALGORITHM_ID.equals(partitionAlgorithm))) { String msg = String.format("Partition algorithm is not valid: [deployment-policy-id] %s " + - "[network-partition-id] %s [partition-algorithm] %s", + "[network-partition-id] %s [partition-algorithm] %s. : " + + "Partition algorithm should be either one-after-another or round-robin ", deploymentPolicyId, networkPartitionId, partitionAlgorithm); log.error(msg); throw new InvalidDeploymentPolicyException(msg); http://git-wip-us.apache.org/repos/asf/stratos/blob/c842d6be/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/api/MetadataApi.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/api/MetadataApi.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/api/MetadataApi.java index dea5eba..85caa7d 100644 --- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/api/MetadataApi.java +++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/api/MetadataApi.java @@ -248,7 +248,11 @@ public class MetadataApi { try { boolean deleted = registry.removePropertyFromApplication(applicationId, propertyName); - + if (!deleted) { + log.warn(String.format( + "No metadata is associated with given appId %s", + applicationId)); + } } catch (RegistryException e) { String msg = String.format("[application-id] %s [property-name] deletion failed ", applicationId, propertyName); log.error(msg, e); http://git-wip-us.apache.org/repos/asf/stratos/blob/c842d6be/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java index f7eb014..11746f1 100644 --- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java +++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java @@ -55,7 +55,7 @@ public class CarbonRegistry implements DataStore { if (!tempRegistry.resourceExists(resourcePath)) { return null; } - + // We are using only super tenant registry to persist PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); @@ -93,9 +93,9 @@ public class CarbonRegistry implements DataStore { if (!tempRegistry.resourceExists(resourcePath)) { return null; - //throw new RegistryException("Cluster does not exist at " + resourcePath); } + // We are using only super tenant registry to persist PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); @@ -125,6 +125,7 @@ public class CarbonRegistry implements DataStore { String resourcePath = mainResource + applicationId; try { + // We are using only super tenant registry to persist PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); @@ -141,18 +142,18 @@ public class CarbonRegistry implements DataStore { } boolean updated = false; - for(String value : property.getValues()){ - if(!propertyValueExist(nodeResource, property.getKey(), value)){ + for (String value : property.getValues()) { + if (!propertyValueExist(nodeResource, property.getKey(), value)) { updated = true; log.info(String.format("Registry property is added: [resource-path] %s [Property Name] %s [Property Value] %s", resourcePath, property.getKey(), value)); nodeResource.addProperty(property.getKey(), value); - }else{ + } else { log.info(String.format("Property value already exist property=%s value=%s", property.getKey(), value)); } } - if(updated){ + if (updated) { registry.put(resourcePath, nodeResource); } //registry.commitTransaction(); @@ -166,9 +167,9 @@ public class CarbonRegistry implements DataStore { private boolean propertyValueExist(Resource nodeResource, String key, String value) { List<String> properties = nodeResource.getPropertyValues(key); - if(properties == null){ + if (properties == null) { return false; - }else{ + } else { return properties.contains(value); } @@ -178,23 +179,24 @@ public class CarbonRegistry implements DataStore { Registry registry = getRegistry(); String resourcePath = mainResource + applicationId; - PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); - ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + // We are using only super tenant registry to persist + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); + ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); - registry.beginTransaction(); - Resource nodeResource; - if (registry.resourceExists(resourcePath)) { - nodeResource = registry.get(resourcePath); - } else { - log.warn(String.format("Registry [resource] %s not found ", resourcePath)); - return false; - } - nodeResource.removePropertyValue(propertyName, valueToRemove); - registry.put(resourcePath, nodeResource); - registry.commitTransaction(); + registry.beginTransaction(); + Resource nodeResource; + if (registry.resourceExists(resourcePath)) { + nodeResource = registry.get(resourcePath); + } else { + log.warn(String.format("Registry [resource] %s not found ", resourcePath)); + return false; + } + nodeResource.removePropertyValue(propertyName, valueToRemove); + registry.put(resourcePath, nodeResource); + registry.commitTransaction(); - log.info(String.format("Application %s property %s value %s is removed from metadata ", applicationId, propertyName, valueToRemove)); + log.info(String.format("Application %s property %s value %s is removed from metadata ", applicationId, propertyName, valueToRemove)); return true; } @@ -211,25 +213,26 @@ public class CarbonRegistry implements DataStore { Registry registry = getRegistry(); String resourcePath = mainResource + applicationId + "/" + clusterId; - PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); - ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + // We are using only super tenant registry to persist + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); + ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); - Resource nodeResource = null; - if (registry.resourceExists(resourcePath)) { - nodeResource = registry.get(resourcePath); - } else { - nodeResource = registry.newResource(); - if (log.isDebugEnabled()) { - log.debug("Registry resource is create at path for cluster" + nodeResource.getPath() + " for cluster"); - } + Resource nodeResource = null; + if (registry.resourceExists(resourcePath)) { + nodeResource = registry.get(resourcePath); + } else { + nodeResource = registry.newResource(); + if (log.isDebugEnabled()) { + log.debug("Registry resource is create at path for cluster" + nodeResource.getPath() + " for cluster"); } + } - nodeResource.setProperty(property.getKey(), Arrays.asList(property.getValues())); - registry.put(resourcePath, nodeResource); + nodeResource.setProperty(property.getKey(), Arrays.asList(property.getValues())); + registry.put(resourcePath, nodeResource); - log.info(String.format("Registry property is persisted: [resource-path] %s [Property Name] %s [Property Values] %s", - resourcePath, property.getKey(), Arrays.asList(property.getValues()))); + log.info(String.format("Registry property is persisted: [resource-path] %s [Property Name] %s [Property Values] %s", + resourcePath, property.getKey(), Arrays.asList(property.getValues()))); } private UserRegistry getRegistry() throws RegistryException { @@ -248,21 +251,21 @@ public class CarbonRegistry implements DataStore { throw new IllegalArgumentException("Application ID can not be null"); } + // We are using only super tenant registry to persist PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); Registry registry; String resourcePath = mainResource + applicationId; - - registry = getRegistry(); - registry.beginTransaction(); - if (registry.resourceExists(resourcePath)) { - registry.delete(resourcePath); - registry.commitTransaction(); - log.info(String.format("Application [application-id ] properties removed from registry %s", applicationId)); - return true; - } + registry = getRegistry(); + registry.beginTransaction(); + if (registry.resourceExists(resourcePath)) { + registry.delete(resourcePath); + registry.commitTransaction(); + log.info(String.format("Application [application-id ] properties removed from registry %s", applicationId)); + return true; + } return false; } @@ -270,26 +273,25 @@ public class CarbonRegistry implements DataStore { public boolean removePropertyFromApplication(String applicationId, String propertyName) throws org.wso2.carbon.registry.api.RegistryException { Registry registry = getRegistry(); String resourcePath = mainResource + applicationId; + // We are using only super tenant registry to persist + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); + ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); - PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID); - ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); - - Resource nodeResource; - if (registry.resourceExists(resourcePath)) { - nodeResource = registry.get(resourcePath); - if(nodeResource.getProperty(propertyName) == null) { - log.info(String.format("[application-id] %s does not have a property [property-name] %s ", applicationId, propertyName)); - return false; - }else{ - nodeResource.removeProperty(propertyName); - registry.put(resourcePath, nodeResource); - } - - }else { - log.error("Registry resource not not found at " + resourcePath); - return false; + Resource nodeResource; + if (registry.resourceExists(resourcePath)) { + nodeResource = registry.get(resourcePath); + if (nodeResource.getProperty(propertyName) == null) { + log.info(String.format("[application-id] %s does not have a property [property-name] %s ", applicationId, propertyName)); + return false; + } else { + nodeResource.removeProperty(propertyName); + registry.put(resourcePath, nodeResource); } + } else { + log.error("Registry resource not not found at " + resourcePath); + return false; + } log.info(String.format("Application [application-id] %s property [property-name] %s removed from Registry ", applicationId, propertyName)); return true; http://git-wip-us.apache.org/repos/asf/stratos/blob/c842d6be/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index 2f2fb46..c452de8 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -1387,7 +1387,7 @@ public class ObjectConverter { infoContext.setDeploymentPolicy(subscribableInfo.getDeploymentPolicy()); infoContext.setMaxMembers(subscribableInfo.getMaxMembers()); infoContext.setMinMembers(subscribableInfo.getMinMembers()); - infoContext.setLvsVirtualIP(subscribableInfo.getLvsVirtualIP()); + infoContext.setLvsVirtualIP(subscribableInfo.getLvsVirtualIP()); if (subscribableInfo.getArtifactRepository() != null) { ArtifactRepositoryBean artifactRepository = subscribableInfo.getArtifactRepository();
