#63: deployment (execution) using new code works

pongasoft · Jun 12, 2011 · 067cacc · 067cacc
1 parent b42d4f8
commit 067cacc
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 47 deletions.
diff --git a/...ebapp/grails-app/controllers/org/linkedin/glu/console/controllers/SystemController.groovy b/...ebapp/grails-app/controllers/org/linkedin/glu/console/controllers/SystemController.groovy
@@ -202,34 +202,35 @@ class SystemController extends ControllerBase
       args.fabric = request.fabric
       args.name = params.title
 
-      Plan plan = deploymentService.computeDeploymentPlan(args)
-
       def plans =
-        deploymentService.groupByInstance(plan, [type: 'deploy', name: args.name])
+        deploymentService.computeDeploymentPlans(params,
+                                                 [type: 'deploy',
+                                                  name: args.name])
 
-      session.delta.addAll(plans)
+      if(plans)
+        session.delta.addAll(plans)
 
-      def bouncePlans
+      def bouncePlans = null
 
-      def bouncePlan = deploymentService.computeBouncePlan(args) { true }
-      if(bouncePlan)
-      {
-        bouncePlan.name = "Bounce ${params.title}"
-        bouncePlans =
-          deploymentService.groupByInstance(bouncePlan, [type: 'bounce', name: args.name])
-        session.delta.addAll(bouncePlans)
-      }
+//      def bouncePlan = deploymentService.computeBouncePlan(args) { true }
+//      if(bouncePlan)
+//      {
+//        bouncePlan.name = "Bounce ${params.title}"
+//        bouncePlans =
+//          deploymentService.groupByInstance(bouncePlan, [type: 'bounce', name: args.name])
+//        session.delta.addAll(bouncePlans)
+//      }
 
-      def redeployPlans
+      def redeployPlans = null
 
-      def redeployPlan = deploymentService.computeRedeployPlan(args) { true }
-      if(redeployPlan)
-      {
-        redeployPlan.name = "Redeploy ${params.title}"
-        redeployPlans =
-          deploymentService.groupByInstance(redeployPlan, [type: 'redeploy', name: args.name])
-        session.delta.addAll(redeployPlans)
-      }
+//      def redeployPlan = deploymentService.computeRedeployPlan(args) { true }
+//      if(redeployPlan)
+//      {
+//        redeployPlan.name = "Redeploy ${params.title}"
+//        redeployPlans =
+//          deploymentService.groupByInstance(redeployPlan, [type: 'redeploy', name: args.name])
+//        session.delta.addAll(redeployPlans)
+//      }
 
       [
           delta: plans,

diff --git a/...linkedin/glu/orchestration/engine/core/action/execution/ActionExecutionFactoryImpl.groovy b/...linkedin/glu/orchestration/engine/core/action/execution/ActionExecutionFactoryImpl.groovy
@@ -152,7 +152,7 @@ public class ActionExecutionFactoryImpl implements ActionExecutionFactory
   @Override
   <V> ActionExecution<V> createAction(ActionDescriptor actionDescriptor)
   {
-    Closure actionClosure = this."${actionDescriptor.class.name}_execution"
+    Closure actionClosure = this."${actionDescriptor.class.simpleName}_execution"
 
     return new ClosureActionExecution<V>(actionDescriptor: actionDescriptor,
                                          actionClosure: actionClosure)

diff --git a/...main/groovy/org/linkedin/glu/orchestration/engine/deployment/DeploymentServiceImpl.groovy b/...main/groovy/org/linkedin/glu/orchestration/engine/deployment/DeploymentServiceImpl.groovy
@@ -93,7 +93,7 @@ class DeploymentServiceImpl implements DeploymentService
 
     SystemModelDelta delta = deltaMgr.computeDelta(expectedModel, currentModel)
 
-    if(!delta)
+    if(!delta.hasDelta())
       return []
 
     Collection<Type> types = []
@@ -110,6 +110,17 @@ class DeploymentServiceImpl implements DeploymentService
       plan.setMetadata('fabric', expectedModel.fabric)
       plan.setMetadata('systemId', expectedModel.id)
       plan.setMetadata(metadata)
+
+      plan.step?.metadata?.putAll(metadata)
+
+      def name = params.name ?: metadata.name
+      if(!name)
+      {
+        name = metadata.collect { k,v -> "${k}=$v"}.join(' - ')
+      }
+      name = "${name} - ${type}".toString()
+      plan.name = name
+
       return plan
     }
   }

diff --git a/...c/main/java/org/linkedin/glu/orchestration/engine/action/descriptor/ActionDescriptor.java b/...c/main/java/org/linkedin/glu/orchestration/engine/action/descriptor/ActionDescriptor.java
@@ -23,7 +23,7 @@
  */
 public interface ActionDescriptor
 {
-  String getDescription();
+  String getName();
 
   Map<String, Object> toMetadata();
 

diff --git a/...n/java/org/linkedin/glu/orchestration/engine/action/descriptor/AgentActionDescriptor.java b/...n/java/org/linkedin/glu/orchestration/engine/action/descriptor/AgentActionDescriptor.java
@@ -29,9 +29,9 @@ public class AgentActionDescriptor extends BaseActionDescriptor
   /**
    * Constructor
    */
-  public AgentActionDescriptor(String description, String fabric, String agent)
+  public AgentActionDescriptor(String name, String fabric, String agent)
   {
-    super(description);
+    super(name);
     _fabric = fabric;
     _agent = agent;
   }

diff --git a/...in/java/org/linkedin/glu/orchestration/engine/action/descriptor/BaseActionDescriptor.java b/...in/java/org/linkedin/glu/orchestration/engine/action/descriptor/BaseActionDescriptor.java
@@ -24,20 +24,20 @@
  */
 public class BaseActionDescriptor implements ActionDescriptor
 {
-  private final String _description;
+  private final String _name;
 
   /**
    * Constructor
    */
-  public BaseActionDescriptor(String description)
+  public BaseActionDescriptor(String name)
   {
-    _description = description;
+    _name = name;
   }
 
   @Override
-  public String getDescription()
+  public String getName()
   {
-    return _description;
+    return _name;
   }
 
   @Override
@@ -51,6 +51,6 @@ public Map<String, Object> toMetadata()
   @Override
   public void toMetadata(Map<String, Object> metadata)
   {
-    metadata.put("description", _description);
+    metadata.put("name", _name);
   }
 }
diff --git a/...a/org/linkedin/glu/orchestration/engine/action/descriptor/MountPointActionDescriptor.java b/...a/org/linkedin/glu/orchestration/engine/action/descriptor/MountPointActionDescriptor.java
@@ -28,12 +28,12 @@ public class MountPointActionDescriptor extends AgentActionDescriptor
   /**
    * Constructor
    */
-  public MountPointActionDescriptor(String description,
+  public MountPointActionDescriptor(String name,
                                     String fabric,
                                     String agent,
                                     String mountPoint)
   {
-    super(description, fabric, agent);
+    super(name, fabric, agent);
     _mountPoint = mountPoint;
   }
 

diff --git a/...in/java/org/linkedin/glu/orchestration/engine/action/descriptor/NoOpActionDescriptor.java b/...in/java/org/linkedin/glu/orchestration/engine/action/descriptor/NoOpActionDescriptor.java
@@ -28,9 +28,9 @@ public class NoOpActionDescriptor extends BaseActionDescriptor
   /**
    * Constructor
    */
-  public NoOpActionDescriptor(String description, Map<String, Object> details)
+  public NoOpActionDescriptor(String name, Map<String, Object> details)
   {
-    super(description);
+    super(name);
     _details = details;
   }
 

diff --git a/...in/glu/orchestration/engine/action/descriptor/ScriptLifecycleInstallActionDescriptor.java b/...in/glu/orchestration/engine/action/descriptor/ScriptLifecycleInstallActionDescriptor.java
@@ -30,15 +30,15 @@ public class ScriptLifecycleInstallActionDescriptor extends MountPointActionDesc
   /**
    * Constructor
    */
-  public ScriptLifecycleInstallActionDescriptor(String description,
+  public ScriptLifecycleInstallActionDescriptor(String name,
                                                 String fabric,
                                                 String agent,
                                                 String mountPoint,
                                                 String parent,
                                                 Object script,
                                                 Map initParameters)
   {
-    super(description, fabric, agent, mountPoint);
+    super(name, fabric, agent, mountPoint);
     _parent = parent;
     _script = script;
     _initParameters = initParameters;

diff --git a/.../glu/orchestration/engine/action/descriptor/ScriptLifecycleUninstallActionDescriptor.java b/.../glu/orchestration/engine/action/descriptor/ScriptLifecycleUninstallActionDescriptor.java
@@ -26,12 +26,12 @@ public class ScriptLifecycleUninstallActionDescriptor extends MountPointActionDe
   /**
    * Constructor
    */
-  public ScriptLifecycleUninstallActionDescriptor(String description,
+  public ScriptLifecycleUninstallActionDescriptor(String name,
                                                   String fabric,
                                                   String agent,
                                                   String mountPoint)
   {
-    super(description, fabric, agent, mountPoint);
+    super(name, fabric, agent, mountPoint);
   }
 
   @Override

diff --git a/...linkedin/glu/orchestration/engine/action/descriptor/ScriptTransitionActionDescriptor.java b/...linkedin/glu/orchestration/engine/action/descriptor/ScriptTransitionActionDescriptor.java
@@ -30,15 +30,15 @@ public class ScriptTransitionActionDescriptor extends MountPointActionDescriptor
   /**
    * Constructor
    */
-  public ScriptTransitionActionDescriptor(String description,
+  public ScriptTransitionActionDescriptor(String name,
                                           String fabric,
                                           String agent,
                                           String mountPoint,
                                           String action,
                                           String endState,
                                           Map actionArgs)
   {
-    super(description, fabric, agent, mountPoint);
+    super(name, fabric, agent, mountPoint);
     _action = action;
     _endState = endState;
     _actionArgs = actionArgs;

diff --git a/...ngine/src/main/java/org/linkedin/glu/orchestration/engine/delta/SystemEntryDeltaImpl.java b/...ngine/src/main/java/org/linkedin/glu/orchestration/engine/delta/SystemEntryDeltaImpl.java
@@ -92,7 +92,7 @@ public String getAgent()
   @Override
   public String getMountPoint()
   {
-    return _expectedEntry == null ? _currentEntry.getMountPoint() : _expectedEntry.getAgent();
+    return _expectedEntry == null ? _currentEntry.getMountPoint() : _expectedEntry.getMountPoint();
   }
 
   @Override

diff --git a/...ation-engine/src/main/java/org/linkedin/glu/orchestration/engine/planner/PlannerImpl.java b/...ation-engine/src/main/java/org/linkedin/glu/orchestration/engine/planner/PlannerImpl.java
@@ -118,7 +118,13 @@ protected void processEntryDelta(ICompositeStepBuilder<ActionDescriptor> stepBui
     // not deployed => need to deploy it or deployed but not expected => need to undeploy
     if(entryDelta.getCurrentEntry() == null || entryDelta.getExpectedEntry() == null)
     {
-      processEntryStateMismatch(stepBuilder.addCompositeSteps(IStep.Type.SEQUENTIAL),
+      ICompositeStepBuilder<ActionDescriptor> entryStepsBuilder =
+        stepBuilder.addCompositeSteps(IStep.Type.SEQUENTIAL);
+
+      entryStepsBuilder.setMetadata("agent", entryDelta.getAgent());
+      entryStepsBuilder.setMetadata("mountPoint", entryDelta.getMountPoint());
+
+      processEntryStateMismatch(entryStepsBuilder,
                                 systemModelDelta,
                                 entryDelta);
       return;
@@ -255,8 +261,7 @@ protected void addTransitionStep(ICompositeStepBuilder<ActionDescriptor> stepBui
                                            entryDelta.getMountPoint(),
                                            action,
                                            endState,
-                                           actionArgs
-      );
+                                           actionArgs);
 
     addLeafStep(stepBuilder, actionDescriptor);
   }