AMBARI-9093. Core Slaves shows weird step for AMBARI_SERVER_ACTION_EXECUTE (ncole)

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java

@@ -56,6 +56,7 @@ public class UpgradeItemResourceProvider extends ReadOnlyResourceProvider {
   protected static final String UPGRADE_REQUEST_ID = "UpgradeItem/request_id";
   protected static final String UPGRADE_GROUP_ID = "UpgradeItem/group_id";
   protected static final String UPGRADE_ITEM_STAGE_ID = "UpgradeItem/stage_id";
+  protected static final String UPGRADE_ITEM_TEXT = "UpgradeItem/text";
 
   private static final Set<String> PK_PROPERTY_IDS = new HashSet<String>(
       Arrays.asList(UPGRADE_REQUEST_ID, UPGRADE_ITEM_STAGE_ID));
@@ -73,6 +74,7 @@ public class UpgradeItemResourceProvider extends ReadOnlyResourceProvider {
     PROPERTY_IDS.add(UPGRADE_ITEM_STAGE_ID);
     PROPERTY_IDS.add(UPGRADE_GROUP_ID);
     PROPERTY_IDS.add(UPGRADE_REQUEST_ID);
+    PROPERTY_IDS.add(UPGRADE_ITEM_TEXT);
 
     // !!! boo
     for (String p : StageResourceProvider.PROPERTY_IDS) {
@@ -223,6 +225,7 @@ public class UpgradeItemResourceProvider extends ReadOnlyResourceProvider {
     setResourceProperty(resource, UPGRADE_REQUEST_ID, upgrade.getRequestId(), requestedIds);
     setResourceProperty(resource, UPGRADE_GROUP_ID, group.getId(), requestedIds);
     setResourceProperty(resource, UPGRADE_ITEM_STAGE_ID, item.getStageId(), requestedIds);
+    setResourceProperty(resource, UPGRADE_ITEM_TEXT, item.getText(), requestedIds);
 
     return resource;
   }

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java

@@ -80,6 +80,7 @@ import org.apache.ambari.server.state.stack.upgrade.Task;
 import org.apache.ambari.server.state.stack.upgrade.TaskWrapper;
 import org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent;
 import org.apache.ambari.server.utils.StageUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -668,10 +669,17 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
     commandParams.put("clusterName", cluster.getClusterName());
     commandParams.put("version", version);
 
-    String itemText = entity.getText();
+    String itemDetail = entity.getText();
+    String stageText = StringUtils.abbreviate(entity.getText(), 255);
+
     switch (task.getType()) {
       case MANUAL: {
-        itemText = ((ManualTask) task).message;
+        ManualTask mt = (ManualTask) task;
+        itemDetail = mt.message;
+        if (null != mt.summary) {
+          stageText = mt.summary;
+        }
+        entity.setText(itemDetail);
         break;
       }
       case CONFIGURE: {
@@ -679,15 +687,19 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
         commandParams.put("type", ct.configType);
         commandParams.put("key", ct.key);
         commandParams.put("value", ct.value);
-        itemText = String.format("Updating config %s/%s to %s", ct.configType, ct.key, ct.value);
+        itemDetail = String.format("Updating config %s/%s to %s", ct.configType, ct.key, ct.value);
+        if (null != ct.summary) {
+          stageText = ct.summary;
+        } else {
+          stageText = String.format("Updating Config %s", ct.configType);
+        }
+        entity.setText(itemDetail);
         break;
       }
       default:
         break;
     }
 
-    entity.setText(itemText);
-
     ActionExecutionContext actionContext = new ActionExecutionContext(
         cluster.getClusterName(), Role.AMBARI_SERVER_ACTION.toString(),
         Collections.<RequestResourceFilter>emptyList(),
@@ -701,7 +713,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
         "/tmp/ambari",
         cluster.getClusterName(),
         cluster.getClusterId(),
-        entity.getText(),
+        stageText,
         jsons.getClusterHostInfo(),
         jsons.getCommandParamsForStage(),
         jsons.getHostParamsForStage());
@@ -721,9 +733,13 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
     stage.addServerActionCommand(task.getImplementationClass(),
         Role.AMBARI_SERVER_ACTION,
         RoleCommand.EXECUTE,
-        cluster.getClusterName(), host,
+        cluster.getClusterName(),
+        host,
         new ServiceComponentHostServerActionEvent(StageUtils.getHostName(), System.currentTimeMillis()),
-        commandParams, null, 1200, allowRtery);
+        commandParams,
+        itemDetail,
+        Integer.valueOf(1200),
+        allowRtery);
 
     request.addStages(Collections.singletonList(stage));
   }

ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Batch.java

@@ -30,4 +30,7 @@ public class Batch {
   @XmlElement(name="message")
   public String message;
 
+  @XmlElement(name="summary")
+  public String summary;
+
 }

ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ColocatedGrouping.java

@@ -143,11 +143,12 @@ public class ColocatedGrouping extends Grouping {
 
       // !!! TODO when manual tasks are ready
       ManualTask task = new ManualTask();
+      task.summary = batch.summary;
       task.message = batch.message;
 
       StageWrapper wrapper = new StageWrapper(
           StageWrapper.Type.SERVER_SIDE_ACTION,
-          "Validate partial upgrade",
+          "Validate Partial Upgrade",
           new TaskWrapper(null, null, Collections.<String>emptySet(), task));
       results.add(wrapper);
 

ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigureTask.java

@@ -50,6 +50,9 @@ public class ConfigureTask extends ServerSideActionTask {
   @XmlElement(name="value")
   public String value;
 
+  @XmlElement(name="summary")
+  public String summary;
+
   @Override
   public Type getType() {
     return type;

ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ManualTask.java

@@ -44,6 +44,9 @@ public class ManualTask extends ServerSideActionTask {
   @XmlElement(name="message")
   public String message;
 
+  @XmlElement(name="summary")
+  public String summary;
+
   @Override
   public Task.Type getType() {
     return type;

ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml

@@ -63,6 +63,7 @@
 
       <batch>
         <percent>33</percent>
+        <summary>Verfication Required</summary>
         <message>Core Services have been upgraded. You are advised to perform tests against your cluster to ensure proper operation before proceeding with upgrade of remaining services.</message>
       </batch>
     </group>

ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java

@@ -277,9 +277,29 @@ public class UpgradeResourceProviderTest {
     resources = upgradeItemResourceProvider.getResources(request, predicate);
 
     assertEquals(2, resources.size());
+
     res = resources.iterator().next();
     assertNotNull(res.getPropertyValue("UpgradeItem/status"));
 
+    // !!! check for manual stage vs item text
+    propertyIds.clear();
+    propertyIds.add("UpgradeItem");
+
+    predicate = new PredicateBuilder()
+      .property(UpgradeItemResourceProvider.UPGRADE_GROUP_ID).equals("3").and()
+      .property(UpgradeItemResourceProvider.UPGRADE_REQUEST_ID).equals("1").and()
+      .property(UpgradeItemResourceProvider.UPGRADE_CLUSTER_NAME).equals("c1")
+      .toPredicate();
+    request = PropertyHelper.getReadRequest(propertyIds);
+
+    upgradeItemResourceProvider = new UpgradeItemResourceProvider(amc);
+    resources = upgradeItemResourceProvider.getResources(request, predicate);
+    assertEquals(1, resources.size());
+    res = resources.iterator().next();
+
+    assertEquals("Validate Partial Upgrade", res.getPropertyValue("UpgradeItem/context"));
+    assertTrue(res.getPropertyValue("UpgradeItem/text").toString().startsWith("Please run"));
+
   }
 
 

ambari-server/src/test/resources/stacks/HDP/2.1.1/upgrades/upgrade_test.xml

@@ -97,6 +97,7 @@
       <component name="ZOOKEEPER_SERVER">
         <pre-upgrade>
           <task xsi:type="manual">
+            <summary>SUMMARY OF PREPARE</summary>
             <message>Preparing with a manual</message>
           </task>
         </pre-upgrade>