Merge branch 'stratos-4.1.x' of https://git-wip-us.apache.org/repos/asf/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d5eb495d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d5eb495d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d5eb495d Branch: refs/heads/stratos-4.1.x Commit: d5eb495d1a18f113094ec241d4eb17bd1ef1a092 Parents: e1d3c58 b0f8e80 Author: Isuru Haththotuwa <[email protected]> Authored: Tue Nov 24 17:42:48 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Tue Nov 24 17:42:48 2015 +0530 ---------------------------------------------------------------------- .../monitor/cluster/ClusterMonitor.java | 21 ++- .../publisher/AutoscalerPublisherFactory.java | 5 +- .../publisher/DASScalingDecisionPublisher.java | 25 ++- .../publisher/ScalingDecisionPublisher.java | 24 ++- .../autoscaler/util/AutoscalerConstants.java | 1 + .../messaging/topology/TopologyBuilder.java | 40 +---- .../CloudControllerPublisherFactory.java | 9 +- .../DASMemberInformationPublisher.java | 23 ++- .../publisher/DASMemberStatusPublisher.java | 22 ++- .../publisher/MemberInformationPublisher.java | 12 +- .../publisher/MemberStatusPublisher.java | 16 +- .../util/CloudControllerConstants.java | 2 + ...InvalidStatisticsPublisherTypeException.java | 30 ++++ .../publisher/HealthStatisticsPublisher.java | 12 +- .../HealthStatisticsPublisherFactory.java | 5 +- .../publisher/InFlightRequestPublisher.java | 11 +- .../InFlightRequestPublisherFactory.java | 5 +- .../publisher/ThriftStatisticsPublisher.java | 86 +++++---- .../cep/WSO2CEPHealthStatisticsPublisher.java | 20 ++- .../cep/WSO2CEPInFlightRequestPublisher.java | 28 ++- .../stratos/metadata/service/Constants.java | 3 +- .../MetadataApplicationEventReceiver.java | 93 ++++++++++ .../service/MetadataTopologyEventReceiver.java | 12 +- .../service/exception/MetadataException.java | 4 + .../metadata/service/registry/DataStore.java | 4 +- .../service/registry/MetadataApiRegistry.java | 180 ++++++++++++------- .../apache/stratos/das/extension/TimeUDF.java | 49 +++++ .../das/extension/spark/udf/TimeUDF.java | 49 ----- .../src/main/conf/drools/dependent-scaling.drl | 8 +- .../src/main/conf/drools/mincheck.drl | 9 +- .../src/main/conf/drools/scaling.drl | 8 +- .../integration/common/RestConstants.java | 2 + .../integration/common/TopologyHandler.java | 2 + .../integration/common/rest/RestClient.java | 21 ++- .../tests/StratosIntegrationTest.java | 5 +- .../ApplicationBurstingTestCase.java | 95 +++++----- .../ApplicationStartupOrderTestCase.java | 95 +++++----- .../application/ApplicationUpdateTestCase.java | 108 ++++++----- .../application/GroupStartupOrderTestCase.java | 101 ++++++----- .../application/SampleApplicationsTestCase.java | 4 +- .../SingleClusterScalingTestCase.java | 62 ++++--- .../server/StratosServerRestartTestCase.java | 127 +++++-------- .../app-bursting-single-cartriddge-group.json | 70 -------- .../applications/application-bursting-test.json | 70 ++++++++ .../application-policy-1.json | 17 -- ...n-policy-application-startup-order-test.json | 17 ++ .../application-startup-order-test.json | 135 ++++++++++++++ .../applications/application.json | 135 -------------- .../autoscaling-policy-1.json | 14 -- ...g-policy-application-startup-order-test.json | 14 ++ ...pp-group-application-startup-order-test.json | 20 +++ .../cartridges-groups/app-group.json | 20 --- ...db-group-application-startup-order-test.json | 13 ++ .../cartridges-groups/db-group.json | 13 -- .../esb-application-startup-order-test.json | 50 ++++++ .../cartridges/mock/esb.json | 50 ------ .../mysql-application-startup-order-test.json | 50 ++++++ .../cartridges/mock/mysql.json | 50 ------ .../php-application-startup-order-test.json | 51 ++++++ .../cartridges/mock/php.json | 51 ------ ...postgres-application-startup-order-test.json | 50 ++++++ .../cartridges/mock/postgres.json | 50 ------ .../tomcat-application-startup-order-test.json | 53 ++++++ .../cartridges/mock/tomcat.json | 53 ------ ...policy-1-application-startup-order-test.json | 15 ++ .../deployment-policy-1.json | 15 -- ...policy-2-application-startup-order-test.json | 29 +++ .../deployment-policy-2.json | 29 --- ...tition-1-application-startup-order-test.json | 15 ++ .../mock/network-partition-1.json | 15 -- ...tition-2-application-startup-order-test.json | 24 +++ .../mock/network-partition-2.json | 24 --- .../g-sc-G123-1-application-update-test-v1.json | 2 +- .../g-sc-G123-1-application-update-test.json | 2 +- ...rdige-nested-application-update-test-v1.json | 50 ------ ...artrdige-nested-application-update-test.json | 50 ------ ...artridge-nested-application-update-test.json | 50 ++++++ .../src/test/resources/common/scaling.drl | 8 +- ...rk-partition-group-startup-order-test-2.json | 24 --- ...dige-nested-sample-applications-test-v1.json | 50 ------ ...rtrdige-nested-sample-applications-test.json | 50 ------ ...rtridge-nested-sample-applications-test.json | 50 ++++++ ...ment-policy-sample-applications-test-v1.json | 36 ---- ...partition-sample-applications-test-1-v1.json | 28 --- 84 files changed, 1535 insertions(+), 1515 deletions(-) ----------------------------------------------------------------------
