You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/10/09 07:14:34 UTC

[2/3] git commit: fixing the merging issue

fixing the merging issue


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/fea2b2b3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/fea2b2b3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/fea2b2b3

Branch: refs/heads/4.0.0-grouping
Commit: fea2b2b358cfbddc596158c1fc1435e338dc84b2
Parents: 81428ba bdca0f2
Author: reka <rt...@gmail.com>
Authored: Thu Oct 9 10:43:53 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Thu Oct 9 10:43:53 2014 +0530

----------------------------------------------------------------------
 .../grouping/dependency/DependencyBuilder.java  |   36 +-
 .../context/ApplicationContextFactory.java      |    4 +-
 .../AutoscalerHealthStatEventReceiver.java      |   18 +-
 .../AutoscalerTopologyEventReceiver.java        |  162 ++-
 .../stratos/autoscaler/monitor/Monitor.java     |   11 +-
 .../monitor/application/ApplicationMonitor.java |    2 +-
 .../autoscaler/monitor/group/GroupMonitor.java  |    2 +-
 .../status/checker/StatusChecker.java           |    2 +-
 .../parser/DefaultApplicationParser.java        |   57 +-
 .../application/parser/ParserUtils.java         |    2 +
 .../impl/CloudControllerServiceImpl.java        |   21 +-
 .../cloud/controller/pojo/Dependencies.java     |   20 +-
 .../cloud/controller/pojo/StartupOrder.java     |    3 +
 .../pojo/application/DependencyContext.java     |   20 +-
 .../controller/topology/TopologyBuilder.java    |   24 +-
 .../topology/TopologyEventPublisher.java        |    6 +-
 .../LoadBalancerTopologyEventReceiver.java      |   77 +-
 .../DefaultCompositeApplicationParser.java      |   32 +-
 .../structure/CompositeAppContext.java          |   12 +-
 .../application/structure/GroupContext.java     |   17 +-
 .../definitions/DependencyDefinitions.java      |   23 +-
 .../deployer/DefaultServiceGroupDeployer.java   |   36 +-
 .../StratosManagerTopologyEventReceiver.java    |   80 +-
 components/org.apache.stratos.messaging/pom.xml |   13 +-
 .../messaging/domain/topology/Application.java  |  143 +-
 .../domain/topology/DependencyOrder.java        |   39 +-
 .../messaging/domain/topology/Group.java        |  114 +-
 .../domain/topology/ParentBehavior.java         |  116 --
 .../domain/topology/ParentComponent.java        |  222 +++
 .../messaging/domain/topology/Service.java      |    9 +-
 .../messaging/domain/topology/StartupOrder.java |    3 +
 .../messaging/domain/topology/Topology.java     |   13 +-
 .../domain/topology/locking/TopologyLock.java   |   49 +
 .../topology/locking/TopologyLockHierarchy.java |  147 ++
 .../event/topology/ApplicationCreatedEvent.java |    2 +-
 .../event/topology/ApplicationRemovedEvent.java |   15 +-
 .../ApplicationActivatedMessageProcessor.java   |   52 +-
 .../ApplicationCreatedMessageProcessor.java     |   75 +-
 .../ApplicationRemovedMessageProcessor.java     |  103 +-
 .../topology/ClusterActivatedProcessor.java     |  106 +-
 .../ClusterCreatedMessageProcessor.java         |  129 +-
 .../ClusterMaintenanceModeMessageProcessor.java |  102 +-
 .../ClusterRemovedMessageProcessor.java         |  105 +-
 .../CompleteTopologyMessageProcessor.java       |  200 +--
 .../topology/GroupActivatedProcessor.java       |   68 +-
 .../InstanceSpawnedMessageProcessor.java        |  150 +-
 .../MemberActivatedMessageProcessor.java        |  183 +--
 .../MemberMaintenanceModeProcessor.java         |  159 ++-
 .../MemberReadyToShutdownMessageProcessor.java  |  160 ++-
 .../topology/MemberStartedMessageProcessor.java |  157 ++-
 .../MemberSuspendedMessageProcessor.java        |  155 ++-
 .../MemberTerminatedMessageProcessor.java       |  139 +-
 .../ServiceCreatedMessageProcessor.java         |   74 +-
 .../ServiceRemovedMessageProcessor.java         |   71 +-
 .../topology/TopologyMessageProcessorChain.java |   10 +-
 .../topology/TopologyEventMessageDelegator.java |   10 +-
 .../receiver/topology/TopologyManager.java      |  451 +++++-
 .../topology/locking/TopologyLockingTest.java   |  207 +++
 .../metadata/client/rest/DefaultRestClient.java |   19 +-
 .../bean/util/converter/PojoConverter.java      |   21 +-
 .../webapp/stratos/WEB-INF/schemas/schema.xsd   |   11 +-
 .../main/resources/CloudControllerService.wsdl  | 1298 +++++++++---------
 62 files changed, 3460 insertions(+), 2307 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/fea2b2b3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/DependencyBuilder.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/DependencyBuilder.java
index cf8004e,7c087ec..fcdaade
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/DependencyBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/DependencyBuilder.java
@@@ -54,14 -53,10 +54,10 @@@ public class DependencyBuilder 
       * @param component it will give the necessary information to build the tree
       * @return the dependency tree out of the dependency orders
       */
-     public DependencyTree buildDependency(ParentBehavior component) throws DependencyBuilderException {
-         String alias = null;
-         if(component instanceof Application) {
-             alias = ((Application)component).getId();
-         } else if(component instanceof Group) {
-             alias = ((Group) component).getAlias();
-         }
-         DependencyTree dependencyTree = new DependencyTree(alias);
 -    public DependencyTree buildDependency(ParentComponent component) {
++    public DependencyTree buildDependency(ParentComponent component) throws DependencyBuilderException{
+ 
+         String identifier = component.getUniqueIdentifier();
+         DependencyTree dependencyTree = new DependencyTree(identifier);
          DependencyOrder dependencyOrder = component.getDependencyOrder();
  
          if (dependencyOrder != null) {
@@@ -97,39 -101,18 +102,36 @@@
  
                      ApplicationContext existingApplicationContext =
                              dependencyTree.findApplicationContextWithId(id);
 -                    if (existingApplicationContext == null) {                  
 +                    if (existingApplicationContext == null) {
 +                        if (foundContext != null) {
 +                            //appending the start up order to existing group/cluster
 +                            foundContext.addApplicationContext(applicationContext);
 +                            if (log.isDebugEnabled()) {
 +                                log.debug("Found an existing [dependency] " + foundContext.getId() +
 +                                        " and adding the [dependency] " + id + " as the child");
 +                            }
 +                        } else {
                              //adding list of startup order to the dependency tree
                              dependencyTree.addApplicationContext(applicationContext);
 -                    }
 +                        }
 +                    } else {
 +                        if (foundContext == null) {
 +                            //assigning the found context to the later use.
 +                            foundContext = existingApplicationContext;
 +                            if (log.isDebugEnabled()) {
 +                                log.debug("Found an existing [dependency] " + id + " and setting it " +
 +                                        "for the next dependency to follow");
 +                            }
 +                        } else {
 +                            String msg = "Startup order is not consistent. It contains the group/cluster " +
 +                                    "which has been used more than one in another startup order";
 +                            throw new DependencyBuilderException(msg);
 +                        }
  
 +                    }
- 
                  }
--
              }
--
--            //TODO need to parser the scalable dependencies
++                    //TODO need to parser the scalable dependencies
          }
  
  

http://git-wip-us.apache.org/repos/asf/stratos/blob/fea2b2b3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
index 9098a04,d4616b2..b7d671f
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java
@@@ -92,10 -90,11 +92,10 @@@ public class AutoscalerTopologyEventRec
          topologyEventReceiver.addEventListener(new CompleteTopologyEventListener() {
              @Override
              protected void onEvent(Event event) {
-                 try {
+ 
+                 if (!topologyInitialized) {
                      TopologyManager.acquireReadLock();
-                     if (!topologyInitialized) {
-                         topologyInitialized = true;
 -
+                     try {
                          for (Application application : TopologyManager.getTopology().getApplications()) {
                              startApplicationMonitor(application);
                          }
@@@ -322,9 -343,9 +343,9 @@@
  
                      AbstractClusterMonitor monitor;
  
-                     if (e.isLbCluster()) {
+                     if (clusterRemovedEvent.isLbCluster()) {
                          DeploymentPolicy depPolicy = PolicyManager.getInstance().
 -                                                        getDeploymentPolicy(deploymentPolicy);
 +                                getDeploymentPolicy(deploymentPolicy);
                          if (depPolicy != null) {
                              List<NetworkPartitionLbHolder> lbHolders = PartitionManager.getInstance()
                                      .getNetworkPartitionLbHolders(depPolicy);
@@@ -397,11 -425,11 +425,11 @@@
                      }
  
                      NetworkPartitionContext networkPartitionContext = monitor.
 -                                                        getNetworkPartitionCtxt(networkPartitionId);
 +                            getNetworkPartitionCtxt(networkPartitionId);
  
                      PartitionContext partitionContext = networkPartitionContext.
-                             getPartitionCtxt(partitionId);
-                     String memberId = e.getMemberId();
+                                                                     getPartitionCtxt(partitionId);
+                     String memberId = memberTerminatedEvent.getMemberId();
                      partitionContext.removeMemberStatsContext(memberId);
  
                      if (partitionContext.removeTerminationPendingMember(memberId)) {
@@@ -570,28 -612,23 +612,28 @@@
              ApplicationMonitor applicationMonitor = null;
              int retries = 5;
              boolean success = false;
 -             do {
 -                 try {
 -                     Thread.sleep(5000);
 -                 } catch (InterruptedException e1) {
 -                 }
 +            do {
 +                try {
 +                    Thread.sleep(5000);
 +                } catch (InterruptedException e1) {
 +                }
                  try {
                      long start = System.currentTimeMillis();
 -                    if(log.isDebugEnabled()) {
 +                    if (log.isDebugEnabled()) {
                          log.debug("application monitor is going to be started for [application] " +
-                                 application.getId());
+                                 application.getUniqueIdentifier());
                      }
                      applicationMonitor = AutoscalerUtil.getApplicationMonitor(application);
 +
                      long end = System.currentTimeMillis();
 -                    log.info("Time taken to start Napp monitor: " + (end - start)/1000);
 +                    log.info("Time taken to start Napp monitor: " + (end - start) / 1000);
                      success = true;
                      //TODO exception handling
 -                } catch (Exception e) {
 +                } catch (DependencyBuilderException e) {
 +                    String msg = "Application monitor creation failed for Application: ";
 +                    log.warn(msg, e);
 +                    retries--;
 +                } catch (TopologyInConsistentException e) {
                      String msg = "Application monitor creation failed for Application: ";
                      log.warn(msg, e);
                      retries--;

http://git-wip-us.apache.org/repos/asf/stratos/blob/fea2b2b3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
index bdf2099,5728583..475cb4f
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java
@@@ -64,11 -61,11 +63,11 @@@ public abstract class Monitor implement
      //status of the monitor whether it is running/in_maintainable/terminated
      protected Status status;
  
-     public Monitor(ParentBehavior component) throws DependencyBuilderException {
 -    public Monitor(ParentComponent component) {
++    public Monitor(ParentComponent component) throws DependencyBuilderException {
          aliasToGroupMonitorsMap = new HashMap<String, GroupMonitor>();
          clusterIdToClusterMonitorsMap = new HashMap<String, AbstractClusterMonitor>();
 -        //preOrderTraverse = new LinkedList<String>();
          this.component = component;
 +        //Building the dependency for this monitor within the immediate children
          dependencyTree = DependencyBuilder.getInstance().buildDependency(component);
      }
  

http://git-wip-us.apache.org/repos/asf/stratos/blob/fea2b2b3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
index fbfb2f0,13967d2..90390e0
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java
@@@ -40,11 -38,9 +40,11 @@@ import java.util.List
  public class ApplicationMonitor extends Monitor {
      private static final Log log = LogFactory.getLog(ApplicationMonitor.class);
  
 -    public ApplicationMonitor(Application application) {
 +    public ApplicationMonitor(Application application) throws DependencyBuilderException,
 +                                                        TopologyInConsistentException {
          super(application);
-         this.id = application.getId();
 +        //starting the first set of dependencies from its children
+         this.id = application.getUniqueIdentifier();
          startDependency();
      }
  

http://git-wip-us.apache.org/repos/asf/stratos/blob/fea2b2b3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
index 2774f20,735bcd6..99d5305
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java
@@@ -77,22 -89,11 +77,22 @@@ public class GroupMonitor extends Monit
      @Override
      protected void monitor(MonitorStatusEvent statusEvent) {
          ApplicationContext context = this.dependencyTree.
 -                                            findApplicationContextWithId(statusEvent.getId());
 +                findApplicationContextWithId(statusEvent.getId());
          if(context.getStatusLifeCycle().isEmpty()) {
 -            startDependency(statusEvent.getId());
 +            try {
 +                //if life cycle is empty, need to start the monitor
 +                boolean startDep = startDependency(statusEvent.getId());
 +                //updating the life cycle
 +                context.addStatusToLIfeCycle(statusEvent.getStatus());
 +                if(!startDep) {
-                     
++
 +                }
 +            } catch (TopologyInConsistentException e) {
 +                //TODO revert the siblings and notify parent, change a flag for reverting/un-subscription
 +                log.error(e);
 +            }
          } else {
 -            //TODO act based on life cyle events
 +            //TODO act based on life cycle events
          }
  
      }