You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/12/04 13:50:03 UTC
[4/5] stratos git commit: Fixing merge conflicts and NPE s
Fixing merge conflicts and NPE s
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f58c5859
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f58c5859
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f58c5859
Branch: refs/heads/master
Commit: f58c585989a5b19df0e026d43bdd29660a56c118
Parents: 00a3e63 64e8747
Author: sajhak <sa...@gmail.com>
Authored: Thu Dec 4 18:09:36 2014 +0530
Committer: sajhak <sa...@gmail.com>
Committed: Thu Dec 4 18:09:36 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/Constants.java | 4 +-
.../autoscaler/api/AutoScalerServiceImpl.java | 51 +-
.../dependency/DependencyBuilder.java | 8 +-
.../parser/DefaultApplicationParser.java | 5 +-
.../applications/topic/ApplicationBuilder.java | 65 +-
.../topic/ApplicationsEventPublisher.java | 12 +-
.../client/CloudControllerClient.java | 9 +-
.../autoscaler/context/AutoscalerContext.java | 29 +
.../context/cluster/ClusterContextFactory.java | 2 +-
.../context/cluster/ClusterInstanceContext.java | 3 +-
.../context/cluster/VMClusterContext.java | 58 +-
.../partition/ClusterLevelPartitionContext.java | 1 +
.../ClusterLevelNetworkPartitionContext.java | 7 +-
.../InstanceNotificationPublisher.java | 4 +-
.../AutoscalerHealthStatEventReceiver.java | 31 +-
.../AutoscalerTopologyEventReceiver.java | 215 ++-
.../interfaces/AutoScalerServiceInterface.java | 4 +-
.../internal/AutoscalerServerComponent.java | 139 +-
.../stratos/autoscaler/monitor/Monitor.java | 70 +
.../autoscaler/monitor/MonitorFactory.java | 27 +-
.../monitor/cluster/AbstractClusterMonitor.java | 19 +-
.../cluster/KubernetesClusterMonitor.java | 31 +-
.../KubernetesServiceClusterMonitor.java | 17 +-
.../monitor/cluster/VMClusterMonitor.java | 281 +--
.../monitor/cluster/VMLbClusterMonitor.java | 2 +-
.../monitor/component/ApplicationMonitor.java | 60 +-
.../monitor/component/GroupMonitor.java | 77 +-
.../component/ParentComponentMonitor.java | 11 +-
.../autoscaler/pojo/policy/PolicyManager.java | 33 +-
.../rule/AutoscalerRuleEvaluator.java | 291 +--
.../autoscaler/rule/RuleTasksDelegator.java | 2 +-
.../status/processor/StatusChecker.java | 520 -----
.../ClusterStatusTerminatedProcessor.java | 19 +-
.../group/GroupStatusTerminatedProcessor.java | 2 +-
.../group/GroupStatusTerminatingProcessor.java | 4 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 12 +-
.../stratos/autoscaler/util/StatusChecker.java | 519 +++++
.../stratos/autoscaler/TestRulesPackaged.java | 8 +-
.../src/test/resources/autoscaler.xml | 4 +-
.../stratos/cartridge/agent/CartridgeAgent.java | 12 +-
.../org.apache.stratos.cloud.controller/pom.xml | 19 +-
.../context/CloudControllerContext.java | 226 ++-
.../controller/domain/FloatingNetwork.java | 87 +
.../controller/domain/FloatingNetworks.java | 44 +
.../controller/domain/NetworkInterface.java | 15 +
.../CloudControllerServiceComponent.java | 136 +-
.../internal/ServiceReferenceHolder.java | 10 +
.../application/ApplicationTopicReceiver.java | 68 +-
.../status/ClusterStatusTopicReceiver.java | 172 +-
.../status/InstanceStatusTopicReceiver.java | 125 +-
.../messaging/topology/TopologyBuilder.java | 13 +-
.../topology/TopologyEventPublisher.java | 3 +-
.../services/CloudControllerService.java | 4 +-
.../impl/CloudControllerServiceImpl.java | 1655 ++++++++--------
components/org.apache.stratos.common/pom.xml | 5 +
.../clustering/DistributedObjectProvider.java | 44 +-
.../impl/HazelcastDistributedListProvider.java | 269 +++
.../HazelcastDistributedObjectProvider.java | 276 +--
.../clustering/impl/ListEntryListener.java | 37 +
.../common/constants/StratosConstants.java | 3 +
.../internal/StratosCommonServiceComponent.java | 42 +-
.../common/threading/StratosThreadPool.java | 57 +
.../apache/stratos/common/util/ConfUtil.java | 73 +
.../apache/stratos/common/test/CommonTest.java | 1 +
.../test/DistributedObjectProviderTest.java | 88 +-
.../extension/api/LoadBalancerExtension.java | 267 +--
.../load/balancer/context/AlgorithmContext.java | 22 +-
.../context/map/AlgorithmContextMap.java | 16 +-
.../internal/LoadBalancerServiceComponent.java | 50 +-
.../LoadBalancerTenantEventReceiver.java | 16 +-
.../LoadBalancerTopologyEventReceiver.java | 20 +-
.../manager/client/AutoscalerServiceClient.java | 6 +-
.../client/CloudControllerServiceClient.java | 4 +
.../internal/ADCManagementServerComponent.java | 25 +-
.../InstanceNotificationPublisher.java | 2 +-
.../StratosManagerTopologyEventReceiver.java | 17 +-
.../domain/applications/DependencyOrder.java | 10 +-
.../applications/ScalingDependentList.java | 40 +
.../domain/applications/ScalingOrder.java | 40 -
.../messaging/domain/topology/Cluster.java | 7 +-
.../ApplicationInactivatedEvent.java | 46 -
.../ApplicationInstanceInactivatedEvent.java | 46 +
.../ApplicationInstanceTerminatedEvent.java | 48 +
.../ApplicationInstanceTerminatingEvent.java | 48 +
.../ApplicationTerminatedEvent.java | 48 -
.../ApplicationTerminatingEvent.java | 48 -
.../notifier/InstanceCleanupClusterEvent.java | 8 +-
.../topology/ClusterInstanceCreatedEvent.java | 21 +-
.../ApplicationInactivatedMessageProcessor.java | 10 +-
.../ApplicationTerminatedMessageProcessor.java | 14 +-
.../ApplicationTerminatingMessageProcessor.java | 10 +-
.../ClusterInstanceCreatedMessageProcessor.java | 3 +-
.../applications/ApplicationsEventReceiver.java | 34 +-
.../status/ClusterStatusEventReceiver.java | 34 +-
.../health/stat/HealthStatEventReceiver.java | 40 +-
.../notifier/InstanceNotifierEventReceiver.java | 6 +-
.../status/InstanceStatusEventReceiver.java | 33 +-
.../receiver/tenant/TenantEventReceiver.java | 14 +-
.../topology/TopologyEventMessageDelegator.java | 20 +-
.../topology/TopologyEventReceiver.java | 31 +-
.../config/cartridgeagentconfiguration.py | 3 +
.../modules/healthstatspublisher/healthstats.py | 3 +
.../modules/util/cartridgeagentconstants.py | 1 +
.../rest/endpoint/api/StratosApiV40Utils.java | 11 +-
.../rest/endpoint/api/StratosApiV41.java | 19 +-
.../rest/endpoint/api/StratosApiV41Utils.java | 83 +-
.../policy/deployment/DeploymentPolicy.java | 2 -
.../definition/FloatingNetworkBean.java | 51 +
.../definition/NetworkInterfaceBean.java | 21 +
.../bean/util/converter/PojoConverter.java | 28 +-
.../stratos/rest/endpoint/mock/MockContext.java | 2 +-
dependencies/pom.xml | 9 +-
.../AverageInFlightRequestsFinder.xml | 2 +-
.../cep/extension/CEPTopologyEventReceiver.java | 16 +-
.../extension/FaultHandlingWindowProcessor.java | 98 +-
.../apache/stratos/haproxy/extension/Main.java | 54 +-
.../pom.xml | 23 +-
.../main/resources/conf/cloud-controller.xml | 1 +
pom.xml | 4 +-
products/stratos/conf/stratos-config.xml | 30 +
.../modules/distribution/src/assembly/bin.xml | 6 +
.../distribution/src/main/conf/autoscaler.xml | 4 +
.../src/main/conf/drools/container-mincheck.drl | 16 +-
.../conf/drools/container-obsoletecheck.drl | 14 +-
.../src/main/conf/drools/container-scaling.drl | 64 +-
.../src/main/conf/drools/dependent-scaling.drl | 119 +-
.../src/main/conf/drools/mincheck.drl | 4 +-
.../src/main/conf/drools/obsoletecheck.drl | 36 +-
.../src/main/conf/drools/scaling.drl | 18 +-
.../src/main/conf/drools/terminateall.drl | 16 +-
.../main/conf/drools/terminatedependency.drl | 16 +-
.../src/main/resources/AutoScalerService.wsdl | 429 +++--
.../main/resources/CloudControllerService.wsdl | 1805 +++++++++---------
tools/stratos-installer/conf/setup.conf | 2 +
.../all/repository/conf/cloud-controller.xml | 1 +
.../cc/repository/conf/cloud-controller.xml | 1 +
tools/stratos-installer/openstack.sh | 1 +
137 files changed, 5873 insertions(+), 4384 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f58c5859/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index 699aa29,7361b46..b95c765
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@@ -58,6 -56,6 +58,7 @@@ public class DefaultApplicationParser i
private Set<ApplicationClusterContext> applicationClusterContexts;
private Map<String, Properties> aliasToProperties;
++ private Map<String, SubscribableInfoContext> subscribableInformation = new HashMap<String, SubscribableInfoContext>();
public DefaultApplicationParser () {
this.applicationClusterContexts = new HashSet<ApplicationClusterContext>();
@@@ -174,40 -172,6 +175,40 @@@
return definedGroups;
}
+ private Map<String, SubscribableInfoContext> getSubscribableInfo(GroupContext[] groupContexts) throws
+ ApplicationDefinitionException {
- // map [cartridge alias -> Subscribable Information]
- Map<String, SubscribableInfoContext> subscribableInformation = new HashMap<String, SubscribableInfoContext>();
++ if(groupContexts != null) {
+ for (GroupContext groupContext : groupContexts) {
+ if (groupContext.getGroupContexts() != null) {
+ getSubscribableInfo(groupContext.getGroupContexts());
+ } else {
+ CartridgeContext[] cartridgeContexts = groupContext.getCartridgeContexts();
+ for (CartridgeContext cartridgeContext : cartridgeContexts) {
+
+ if (StringUtils.isEmpty(cartridgeContext.getSubscribableInfoContext().getAlias()) ||
+ !ApplicationUtils.isAliasValid(cartridgeContext.getSubscribableInfoContext().getAlias())) {
+ handleError("Invalid alias specified for Subscribable Information Obj: [ " +
+ cartridgeContext.getSubscribableInfoContext().getAlias() + " ]");
+ }
+
+ // check if a group is already defined under the same alias
+ if(subscribableInformation.get(cartridgeContext.getSubscribableInfoContext().getAlias()) != null) {
+ // a group with same alias already exists, can't continue
+ handleError("A Subscribable Info obj with alias " + cartridgeContext.getSubscribableInfoContext().getAlias() + " already exists");
+ }
+ subscribableInformation.put(cartridgeContext.getSubscribableInfoContext().getAlias(),
+ cartridgeContext.getSubscribableInfoContext());
+ if (log.isDebugEnabled()) {
+ log.debug("Added Subcribables Info obj [ " +
+ cartridgeContext.getSubscribableInfoContext().getAlias() + " ] to map [cartridge alias -> Subscribable Information]");
+ }
+ }
+ }
++ }
+ }
+ return subscribableInformation;
+ }
+
/**
* Extract Subscription Information from the Application Definition
*
http://git-wip-us.apache.org/repos/asf/stratos/blob/f58c5859/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
index 8492f11,8492f11..2e345d4
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java
@@@ -223,8 -223,8 +223,11 @@@ public class Cluster implements Seriali
}
public ClusterStatus getStatus(String applicationInstanceId) {
-- //return status;
-- return getInstanceIdToInstanceContextMap().get(applicationInstanceId).getStatus();
++ ClusterInstance clusterInstance = getInstanceIdToInstanceContextMap().get(applicationInstanceId);
++ if(clusterInstance != null) {
++ return clusterInstance.getStatus();
++ }
++ return null;
}
public boolean setStatus(ClusterStatus newStatus, String applicationInstanceId) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/f58c5859/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
index 1bdd69f,284f5da..128a33e
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
@@@ -463,7 -482,7 +484,7 @@@ public class PojoConverter
cluster1.property = getPropertyBeans(cluster.getProperties());
cluster1.member = new ArrayList<Member>();
cluster1.hostNames = new ArrayList<String>();
-- cluster1.status = cluster.getStatus(null).toString();
++ cluster1.status = cluster.getStatus(null).toString(); //TODO why null is passed?
for (org.apache.stratos.messaging.domain.topology.Member tmp : cluster.getMembers()) {
Member member = new Member();
@@@ -1199,7 -1169,7 +1219,7 @@@
}
GroupBean groupBean = new GroupBean();
-- groupBean.setStatus(group.getStatus(null).toString());
++ groupBean.setStatus(group.getStatus(null).toString()); // TODO -- why null is passed?
groupBean.setAlias(group.getUniqueIdentifier());
//TODO*******groupBean.setDeploymentPolicy(group.getDeploymentPolicy());
groupBean.setAutoScalingPolicy(group.getAutoscalingPolicy());