Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos into topology_mgr
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3e2d598a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3e2d598a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3e2d598a Branch: refs/heads/master Commit: 3e2d598a5e74ee2545adcfdd5706ca6c551cb9d1 Parents: 04bed7e 8a036e5 Author: Isuru <[email protected]> Authored: Thu Dec 12 22:46:38 2013 +0530 Committer: Isuru <[email protected]> Committed: Thu Dec 12 22:46:38 2013 +0530 ---------------------------------------------------------------------- .../src/conf/cartridge-config.properties | 2 + .../adc/mgt/client/AutoscalerServiceClient.java | 6 +- .../adc/mgt/client/CartridgeAgentClient.java | 4 +- .../client/CloudControllerServiceClient.java | 2 +- .../manager/CartridgeSubscriptionManager.java | 2 +- .../stratos/adc/mgt/payload/CarbonPayload.java | 8 +- .../apache/stratos/adc/mgt/payload/Payload.java | 7 +- .../mgt/publisher/TenantSynzhronizerTask.java | 4 +- .../SubscriptionSingleTenantBehaviour.java | 8 + .../adc/mgt/utils/CartridgeConstants.java | 4 +- .../org.apache.stratos.autoscaler/pom.xml | 4 +- .../stratos/autoscaler/AutoscalerContext.java | 4 + .../apache/stratos/autoscaler/Constants.java | 22 +- .../stratos/autoscaler/LbClusterMonitor.java | 27 +- .../autoscaler/NetworkPartitionContext.java | 62 +++- .../stratos/autoscaler/PartitionContext.java | 22 ++ .../autoscaler/algorithm/OneAfterAnother.java | 14 +- .../autoscaler/algorithm/RoundRobin.java | 16 +- .../cloud/controller/CloudControllerClient.java | 29 +- .../internal/AutoscalerServerComponent.java | 13 +- .../health/HealthEventMessageDelegator.java | 366 ++++++++++++++----- .../autoscaler/partition/PartitionManager.java | 8 +- .../rule/AutoscalerRuleEvaluator.java | 106 +----- .../autoscaler/rule/ExecutorTaskScheduler.java | 89 ----- .../autoscaler/rule/RuleTasksDelegator.java | 114 ++++++ .../topology/AutoscalerTopologyReceiver.java | 109 +++--- .../stratos/autoscaler/util/AutoscalerUtil.java | 216 +++++++---- .../src/main/resources/META-INF/component.xml | 5 +- .../org/apache/stratos/cli/AutoscalePolicy.java | 52 +++ .../java/org/apache/stratos/cli/Cartridge.java | 1 - .../apache/stratos/cli/CartridgeInfoBean.java | 18 + .../apache/stratos/cli/GenericRestClient.java | 6 +- .../java/org/apache/stratos/cli/Partition.java | 76 ++++ .../org/apache/stratos/cli/PropertyBean.java | 42 +++ .../java/org/apache/stratos/cli/RestClient.java | 20 +- .../stratos/cli/RestCommandLineService.java | 295 +++++++++++++-- .../apache/stratos/cli/StratosApplication.java | 17 + .../stratos/cli/commands/AddTenantCommand.java | 20 +- .../cli/commands/AutoscalePolicyCommand.java | 51 +++ .../stratos/cli/commands/PartitionCommand.java | 66 ++++ .../stratos/cli/commands/SubscribeCommand.java | 59 ++- .../apache/stratos/cli/utils/CliConstants.java | 41 ++- .../impl/CloudControllerServiceImpl.java | 103 ++---- .../cloud/controller/pojo/Cartridge.java | 9 - .../runtime/FasterLookUpDataHolder.java | 4 + .../controller/topology/TopologyBuilder.java | 47 +-- .../topology/TopologyEventSender.java | 4 +- .../controller/util/CloudControllerUtil.java | 5 +- .../WSO2CEPInFlightRequestPublisher.java | 2 +- .../messaging/domain/topology/Cluster.java | 22 +- .../ClusterCreatedMessageProcessor.java | 2 +- .../ServiceCreatedMessageProcessor.java | 1 + .../message/receiver/tenant/TenantManager.java | 2 +- .../receiver/topology/TopologyManager.java | 2 +- .../stratos/messaging/util/Constants.java | 5 + .../apache/stratos/rest/endpoint/Constants.java | 5 +- .../policy/autoscale/AutoscalePolicy.java | 40 +- .../bean/util/converter/PojoConverter.java | 56 +-- .../rest/endpoint/services/ServiceUtils.java | 64 +++- .../HealthStatisticsEventBuilder.xml | 10 + .../InstanceStatusStatisticsBuilder.xml | 10 + .../LoadBalancerStatisticsEventBuilder.xml | 10 + .../AverageInFlightRequestsEventFormatter.xml | 11 + .../AverageLoadAverageEventFormatter.xml | 11 + .../AverageMemoryConsumptionEventFormatter.xml | 11 + .../FaultMessageEventFormatter.xml | 11 + .../GradientInFlightRequestsEventFormatter.xml | 11 + .../GradientLoadAverageEventFormatter.xml | 11 + .../GradientMemoryConsumptionEventFormatter.xml | 11 + ...DerivativeInFlightRequestsEventFormatter.xml | 11 + ...econdDerivativeLoadAverageEventFormatter.xml | 11 + ...erivativeMemoryConsumptionEventFormatter.xml | 11 + .../HealthStatisticsEventBuilder.xml | 10 - .../InstanceStatisticsEventBuilder.xml | 22 -- .../LoadBalancerStatisticsEventBuilder.xml | 10 - .../stratos.instance.stats_1.0.0_builder.xml | 10 - .../AverageLoadAverageEventFormatter.xml | 11 - .../AverageMemoryConsumptionEventFormatter.xml | 11 - .../AverageRequestsInflightEventFormatter.xml | 11 - .../FaultMessageEventFormatter.xml | 11 - .../eventformatters/GradientEventFormatter.xml | 11 - .../GradientLoadAverageEventFormatter.xml | 11 - .../GradientMemoryConsumptionEventFormatter.xml | 11 - .../SecondDerivativeEventFormatter.xml | 11 - ...econdDerivativeLoadAverageEventFormatter.xml | 11 - ...erivativeMemoryConsumptionEventFormatter.xml | 11 - .../execution-plans/AverageHeathRequest.xml | 23 ++ .../AverageInFlightRequestsFinder.xml | 19 + .../execution-plans/GradientOfHealthRequest.xml | 21 ++ .../GradientOfRequestsInFlightFinder.xml | 18 + .../SecondDerivativeOfHealthRequest.xml | 21 ++ ...SecondDerivativeOfRequestsInFlightFinder.xml | 19 + .../executionplans/AverageHeathRequest.xml | 23 -- .../AverageRequestsInflightFinder.xml | 19 - .../executionplans/GradientOfHealthRequest.xml | 23 -- .../GradientOfRequestsInFlightFinder.xml | 18 - .../SecondDerivativeOfHealthRequest.xml | 21 -- ...SecondDerivativeOfRequestsInFlightFinder.xml | 19 - .../DefaultWSO2EventInputAdaptor.xml | 3 + .../DefaultWSO2EventInputAdaptor.xml | 3 - .../InstanceStatsInputAdaptor.xml | 9 - .../DefaultWSO2EventOutputAdaptor.xml | 8 + .../output-event-adaptors/JMSOutputAdaptor.xml | 8 + .../DefaultWSO2EventOutputAdaptor.xml | 8 - .../outputeventadaptors/JMSOutputAdaptor.xml | 8 - .../stream-manager-config.xml | 175 +++++++++ .../stream-manager-config.xml | 182 --------- .../src/main/conf/jndi.properties | 1 + .../resources/conf/cartridge-config.properties | 2 + .../pom.xml | 8 + .../distribution/src/main/conf/jndi.properties | 2 +- .../distribution/src/main/conf/mincheck.drl | 6 +- .../distribution/src/main/conf/scaling.drl | 22 +- .../ec2/load-balancer/cartridge-agent.sh | 89 +++++ .../ec2/load-balancer/start-load-balancer.sh | 7 + .../templates/loadbalancer.conf.template | 10 +- .../src/main/resources/jndi.properties | 1 + .../src/main/resources/jndi.properties | 1 + .../agent/health/publisher/HealthPublisher.java | 18 +- .../src/main/resources/jndi.properties | 1 + .../distribution/src/main/conf/jndi.properties | 2 +- .../conf/templates/jndi.properties.template | 2 + .../stratos-controller/conf/jndi.properties | 2 +- .../modules/distribution/src/assembly/bin.xml | 3 +- .../src/main/conf/cartridge-config.properties | 65 ++++ .../main/resources/CloudControllerService.wsdl | 1 + .../puppet/etc/puppet/files/cartridge-agent.sh | 108 ++++++ tools/puppet/etc/puppet/files/environment | 22 ++ .../puppet/etc/puppet/files/event-publisher.sh | 28 ++ .../puppet/etc/puppet/files/event-subscriber.sh | 28 ++ .../etc/puppet/files/get-launch-params.rb | 54 +++ .../puppet/etc/puppet/files/health-publisher.sh | 33 ++ tools/puppet/etc/puppet/files/healthcheck.sh | 31 ++ tools/puppet/etc/puppet/fileserver.conf | 35 ++ tools/puppet/manifests/classes/apt.pp | 43 +++ tools/puppet/manifests/classes/hosts.pp | 29 ++ tools/puppet/manifests/classes/java.pp | 65 ++++ tools/puppet/manifests/classes/mcollective.pp | 84 +++++ tools/puppet/manifests/classes/php_cartridge.pp | 141 +++++++ tools/puppet/manifests/classes/ssh.pp | 61 ++++ tools/puppet/manifests/classes/system_config.pp | 77 ++++ tools/puppet/manifests/nodes.pp | 63 ++++ tools/puppet/manifests/site.pp | 23 ++ tools/puppet/modules/apt/files/90forceyes | 23 ++ .../modules/commons/files/bin/puppet_init.sh | 53 +++ .../modules/commons/files/bin/sign_jars.sh | 39 ++ .../configs/bin/native/wrapper-linux-x86-32 | Bin 0 -> 111027 bytes .../commons/files/configs/lib/home/favicon.ico | Bin 0 -> 1150 bytes tools/puppet/modules/commons/files/environment | 23 ++ .../java/files/jars/copy_java_patches_here | 22 ++ .../java/files/jdk-7u7-linux-x64.tar.gz.file | 22 ++ .../php_cartridge/etc/apache2/apache2.conf.erb | 256 +++++++++++++ .../etc/apache2/sites-available/default-ssl.erb | 195 ++++++++++ .../etc/apache2/sites-available/default.erb | 64 ++++ .../config/as/repository/conf/jndi.properties | 2 +- .../config/cc/repository/conf/jndi.properties | 2 +- .../config/cep/repository/conf/jndi.properties | 1 + .../config/sm/repository/conf/jndi.properties | 2 +- .../resources/stratos_foundation.sql | 2 +- 159 files changed, 3995 insertions(+), 1239 deletions(-) ----------------------------------------------------------------------
