You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/02/12 20:13:33 UTC
[1/2] git commit: fixing member removal order
Updated Branches:
refs/heads/master a1e7acb3a -> 98f9ba35d
fixing member removal order
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/af8cba06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/af8cba06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/af8cba06
Branch: refs/heads/master
Commit: af8cba0678888f007fa69dd7102ac7fd76c4576c
Parents: 469b8c6
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Feb 13 00:38:38 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Feb 13 00:38:38 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/impl/CloudControllerServiceImpl.java | 6 +++---
.../cloud/controller/validate/AWSEC2PartitionValidator.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/af8cba06/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index a6abb18..eeaebf7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -850,9 +850,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
//updating the topology
TopologyBuilder.handleMemberTerminated(memberContext.getCartridgeType(), memberContext.getClusterId(), memberContext.getNetworkPartitionId(), memberContext.getPartition().getId(), memberContext.getMemberId());
- // update data holders
- dataHolder.removeMemberContext(memberContext.getMemberId(), memberContext.getClusterId());
-
//publishing data
CartridgeInstanceDataPublisher.publish(memberContext.getMemberId(),
memberContext.getPartition().getId(),
@@ -862,6 +859,9 @@ public class CloudControllerServiceImpl implements CloudControllerService {
MemberStatus.Terminated.toString(),
null);
+ // update data holders
+ dataHolder.removeMemberContext(memberContext.getMemberId(), memberContext.getClusterId());
+
// persist
persist();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/af8cba06/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java
index 8360f45..fe480ac 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/validate/AWSEC2PartitionValidator.java
@@ -62,7 +62,7 @@ public class AWSEC2PartitionValidator implements PartitionValidator {
IaasProvider updatedIaasProvider = new IaasProvider(iaasProvider);
- Iaas updatedIaas = CloudControllerUtil.setIaas(updatedIaasProvider);
+ Iaas updatedIaas = CloudControllerUtil.getIaas(updatedIaasProvider);
updatedIaas.setIaasProvider(updatedIaasProvider);
if (properties.containsKey(Scope.zone.toString())) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/98f9ba35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/98f9ba35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/98f9ba35
Branch: refs/heads/master
Commit: 98f9ba35d78f33e887f885f1d947af580dddeaab
Parents: af8cba0 a1e7acb
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Feb 13 00:38:49 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Feb 13 00:38:49 2014 +0530
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 72 +-
.../apache/stratos/cartridge/agent/Main.java | 1 +
.../config/CartridgeAgentConfiguration.java | 15 +
.../agent/data/publisher/DataContext.java | 52 ++
.../agent/data/publisher/DataPublisher.java | 97 ++
.../publisher/DataPublisherConfiguration.java | 161 ++++
.../exception/DataPublisherException.java | 31 +
.../agent/data/publisher/log/Constants.java | 29 +
.../publisher/log/FileBasedLogPublisher.java | 109 +++
.../agent/data/publisher/log/LogPublisher.java | 49 +
.../data/publisher/log/LogPublisherManager.java | 105 +++
.../publisher/HealthStatisticsNotifier.java | 2 +-
.../publisher/HealthStatisticsReader.java | 3 +-
.../agent/util/CartridgeAgentConstants.java | 3 +
.../agent/util/CartridgeAgentUtils.java | 12 +-
.../apache/stratos/cli/GenericRestClient.java | 2 +-
.../java/org/apache/stratos/cli/RestClient.java | 31 +-
.../stratos/cli/RestCommandLineService.java | 230 ++++-
.../apache/stratos/cli/StratosApplication.java | 22 +-
.../beans/cartridge/ServiceDefinitionBean.java | 86 ++
.../cli/commands/ActivateTenantCommand.java | 70 ++
.../cli/commands/DeactivateTenantCommand.java | 70 ++
.../cli/commands/DeleteTenantCommand.java | 70 ++
.../cli/commands/ListDeployServiceCommand.java | 65 ++
.../UndeployCartridgeDefinitionCommand.java | 70 ++
.../UndeployServiceDefinitionCommand.java | 2 +-
.../apache/stratos/cli/utils/CliConstants.java | 27 +-
.../console/configure_stratos.jag | 18 +-
.../console/configure_stratos_wizard.jag | 15 +-
.../console/controllers/router.jag | 8 +-
.../console/controllers/wizardSubmit.jag | 3 +
.../console/lbs.jag | 20 -
.../partials/configure_stratos_wizard.hbs | 90 +-
.../console/themes/theme1/partials/header.hbs | 80 +-
.../console/themes/theme1/partials/lbs.hbs | 88 --
.../theme1/renderers/cartridge_deployments.js | 45 -
.../console/themes/theme1/renderers/lbs.js | 47 -
.../theme1/renderers/mt_service_deployments.js | 48 -
.../theme1/renderers/partition_deployments.js | 46 -
.../theme1/renderers/policy_deployments.js | 46 -
.../console/util/utility.jag | 13 +
.../DataCartridgeSubscriptionConnector.java | 34 +-
.../stratos/manager/deploy/service/Service.java | 7 +-
.../service/ServiceDeploymentManager.java | 24 +
.../internal/ADCManagementServerComponent.java | 2 -
.../manager/CartridgeSubscriptionManager.java | 15 +
.../manager/persistence/PersistenceManager.java | 2 +
.../RegistryBasedPersistenceManager.java | 95 ++
.../DataInsertionAndRetrievalManager.java | 5 +
.../service/ApplicationManagementService.java | 677 --------------
.../InstanceInformationManagementService.java | 58 --
.../service/RepoNotificationService.java | 128 ---
.../subscription/CartridgeSubscription.java | 71 +-
.../SubscriptionSingleTenantBehaviour.java | 12 +-
.../utils/CartridgeSubscriptionUtils.java | 5 +
.../utils/ApplicationManagementUtil.java | 857 +-----------------
.../manager/utils/CartridgeConstants.java | 23 -
.../manager/utils/PersistenceManager.java | 892 -------------------
.../manager/utils/RepositoryFactory.java | 131 ---
.../stratos/manager/utils/StratosDBUtils.java | 213 -----
.../src/main/resources/META-INF/services.xml | 57 +-
.../bean/util/converter/PojoConverter.java | 25 +
.../stratos/rest/endpoint/mock/MockContext.java | 10 +
.../rest/endpoint/mock/StratosTestAdmin.java | 26 +-
.../rest/endpoint/services/ServiceUtils.java | 67 +-
.../rest/endpoint/services/StratosAdmin.java | 21 +
.../resources/conf/cartridge-config.properties | 64 --
.../src/main/resources/p2.inf | 1 -
.../distribution/src/main/conf/autoscaler.xml | 3 +
.../distribution/src/main/bin/stratos.sh | 12 +-
.../src/main/conf/cartridge-config.properties | 42 +-
71 files changed, 1924 insertions(+), 3708 deletions(-)
----------------------------------------------------------------------