diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ApplicationSubmissionContextInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ApplicationSubmissionContextInfo.java index 3d95ca1..23706ab 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ApplicationSubmissionContextInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/ApplicationSubmissionContextInfo.java @@ -88,21 +88,21 @@ String reservationId; public ApplicationSubmissionContextInfo() { - applicationId = ""; - applicationName = ""; + applicationId = null; + applicationName = null; containerInfo = new ContainerLaunchContextInfo(); resource = new ResourceInfo(); priority = Priority.UNDEFINED.getPriority(); isUnmanagedAM = false; cancelTokensWhenComplete = true; keepContainers = false; - applicationType = ""; + applicationType = null; tags = new HashSet(); - appNodeLabelExpression = ""; - amContainerNodeLabelExpression = ""; + appNodeLabelExpression = null; + amContainerNodeLabelExpression = null; logAggregationContextInfo = null; attemptFailuresValidityInterval = -1; - reservationId = ""; + reservationId = null; } public String getApplicationId() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 1cbdec3..a3892e3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -38,6 +38,7 @@ import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.ResourceRequest; import org.apache.hadoop.yarn.api.records.YarnApplicationState; +import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.MockAM; import org.apache.hadoop.yarn.server.resourcemanager.MockNM; @@ -52,10 +53,12 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.GuiceServletConfig; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; +import org.apache.hadoop.yarn.util.Records; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -1987,5 +1990,22 @@ public void verifyAppAttemptInfoGeneric(RMAppAttempt appAttempt, int id, + user)); } + @Test + public void testAppInitialValue() { + ApplicationSubmissionContextInfo contextInfo = new ApplicationSubmissionContextInfo(); + ApplicationSubmissionContext context = Records.newRecord(ApplicationSubmissionContext.class); + + assertEquals(contextInfo.getApplicationId(), context.getApplicationId()); + assertEquals(contextInfo.getApplicationName(), context.getApplicationName()); + assertEquals(contextInfo.getUnmanagedAM(), context.getUnmanagedAM()); + assertEquals(contextInfo.getCancelTokensWhenComplete(), context.getCancelTokensWhenComplete()); + assertEquals(contextInfo.getKeepContainersAcrossApplicationAttempts(), + context.getKeepContainersAcrossApplicationAttempts()); + assertEquals(contextInfo.getApplicationType(), context.getApplicationType()); + assertEquals(contextInfo.getAppNodeLabelExpression(), context.getNodeLabelExpression()); + assertEquals(contextInfo.getLogAggregationContextInfo(), context.getLogAggregationContext()); + assertEquals(contextInfo.getAttemptFailuresValidityInterval(), context.getAttemptFailuresValidityInterval()); + assertEquals(contextInfo.getReservationId(), context.getReservationID()); + } }