AMBARI-1791. Can not specify request context for smoke test request. (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1464715 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -552,6 +552,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1791. Can not specify request context for smoke test request. (swagle)
+
  AMBARI-1788. JMX getSpec error filling up server logs. (swagle)
 
  AMBARI-1787. Nagios script causes Datanode error. (swagle)

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java

@@ -390,10 +390,11 @@ public interface AmbariManagementController {
    * Create the action defined by the attributes in the given request object.
    *
    * @param request the request object which defines the action to be created
+   * @param requestProperties the request properties
    *
    * @throws AmbariException thrown if the action cannot be created
    */
-  public RequestStatusResponse createActions(Set<ActionRequest> request)
+  public RequestStatusResponse createActions(Set<ActionRequest> request, Map<String, String> requestProperties)
       throws AmbariException;
   
   /**

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

@@ -4066,10 +4066,16 @@ public class AmbariManagementControllerImpl implements
   }
 
   @Override
-  public RequestStatusResponse createActions(Set<ActionRequest> request)
+  public RequestStatusResponse createActions(Set<ActionRequest> request, Map<String, String> requestProperties)
       throws AmbariException {
     String clusterName = null;
 
+    String requestContext = "";
+    
+    if (requestProperties != null)
+      requestContext = requestProperties.get(REQUEST_CONTEXT_PROPERTY);
+      
+    
     String logDir = ""; //TODO empty for now
 
     for (ActionRequest actionRequest : request) {
@@ -4089,9 +4095,10 @@ public class AmbariManagementControllerImpl implements
         throw new AmbariException("Requests for different clusters found");
       }
     }
-
+    
     Stage stage = stageFactory.createNew(actionManager.getNextRequestId(),
-        logDir, clusterName, "");
+        logDir, clusterName, requestContext);
+    
     stage.setStageId(0);
     for (ActionRequest actionRequest : request) {
       if (actionRequest.getActionName().contains("SERVICE_CHECK")) {

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

@@ -64,13 +64,16 @@ class ActionResourceProvider extends AbstractControllerResourceProvider {
              NoSuchParentResourceException {
 
     final Set<ActionRequest> requests = new HashSet<ActionRequest>();
+    
+    final Map<String, String> requestInfoProperties = request.getRequestInfoProperties();
+    
     for (Map<String, Object> propertyMap : request.getProperties()) {
       requests.add(getRequest(propertyMap));
     }
     return getRequestStatus(createResources(new Command<RequestStatusResponse>() {
       @Override
       public RequestStatusResponse invoke() throws AmbariException {
-        return getManagementController().createActions(requests);
+        return getManagementController().createActions(requests, requestInfoProperties);
       }
     }));
   }

ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java

@@ -103,6 +103,8 @@ public class AmbariManagementControllerTest {
   private static final String NON_EXT_VALUE = "XXX";
 
   private static final String COMPONENT_NAME = "NAMENODE";
+  
+  private static final String REQUEST_CONTEXT_PROPERTY = "context";
 
   private AmbariManagementController controller;
   private Clusters clusters;
@@ -3472,13 +3474,18 @@ public class AmbariManagementControllerTest {
     }};
     ActionRequest actionRequest = new ActionRequest("c1", "HDFS", Role.HDFS_SERVICE_CHECK.name(), params);
     actionRequests.add(actionRequest);
+    
+    Map<String, String> requestProperties = new HashMap<String, String>();
+    requestProperties.put(REQUEST_CONTEXT_PROPERTY, "Called from a test");
 
-    RequestStatusResponse response = controller.createActions(actionRequests);
+    RequestStatusResponse response = controller.createActions(actionRequests, requestProperties);
     
     assertEquals(1, response.getTasks().size());
     ShortTaskStatus task = response.getTasks().get(0);
 
     List<HostRoleCommand> storedTasks = actionDB.getRequestTasks(response.getRequestId());
+    Stage stage = actionDB.getAllStages(response.getRequestId()).get(0);
+
     assertEquals(1, storedTasks.size());
     HostRoleCommand hostRoleCommand = storedTasks.get(0);
 
@@ -3490,10 +3497,12 @@ public class AmbariManagementControllerTest {
     assertEquals(actionRequest.getParameters(), hostRoleCommand.getExecutionCommandWrapper().getExecutionCommand().getRoleParams());
     assertNotNull(hostRoleCommand.getExecutionCommandWrapper().getExecutionCommand().getConfigurations());
     assertEquals(2, hostRoleCommand.getExecutionCommandWrapper().getExecutionCommand().getConfigurations().size());
-    
+    assertEquals(requestProperties.get(REQUEST_CONTEXT_PROPERTY), stage.getRequestContext());
     actionRequests.add(new ActionRequest("c1", "MAPREDUCE", Role.MAPREDUCE_SERVICE_CHECK.name(), null));
 
-    response = controller.createActions(actionRequests);
+
+
+    response = controller.createActions(actionRequests, requestProperties);
 
     assertEquals(2, response.getTasks().size());
 

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

@@ -42,6 +42,7 @@ import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
+import static org.easymock.EasyMock.eq;
 
 /**
  * ActionResourceProvider tests.
@@ -53,9 +54,12 @@ public class ActionResourceProviderTest {
 
     AmbariManagementController managementController = createMock(AmbariManagementController.class);
     RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
+    
+    Map<String, String> requestProperties = new HashMap<String, String>();
+    requestProperties.put("context", "Called from a test");
 
     expect(managementController.createActions(AbstractResourceProviderTest.Matcher.getActionRequestSet(
-        "Cluster100", "Service100", "Action100"))).andReturn(response);
+        "Cluster100", "Service100", "Action100"), eq(requestProperties))).andReturn(response);
 
     // replay
     replay(managementController, response);
@@ -80,7 +84,7 @@ public class ActionResourceProviderTest {
     propertySet.add(properties);
 
     // create the request
-    Request request = PropertyHelper.getCreateRequest(propertySet, null);
+    Request request = PropertyHelper.getCreateRequest(propertySet, requestProperties);
 
     provider.createResources(request);