diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java index 9bbd148ff41..3186d387663 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.DataOutputBuffer; import org.apache.hadoop.test.GenericTestUtils; @@ -112,6 +113,10 @@ import org.apache.hadoop.yarn.util.Records; import org.apache.hadoop.yarn.util.YarnVersionInfo; import org.apache.hadoop.yarn.util.resource.ResourceUtils; +import org.junit.Rule; +import org.junit.rules.TestRule; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; import org.slf4j.event.Level; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -121,6 +126,16 @@ @SuppressWarnings("unchecked") public class MockRM extends ResourceManager { + private static Description description; + + @Rule + public TestRule watcher = new TestWatcher() { + protected void starting(Description description) { + MockRM.description = description; + System.out.println("Starting test: " + MockRM.description.getMethodName()); + } + }; + static final Logger LOG = LoggerFactory.getLogger(MockRM.class); static final String ENABLE_WEBAPP = "mockrm.webapp.enabled"; private static final int SECOND = 1000; @@ -819,6 +834,33 @@ public RMApp submitApp(List amResourceRequests, String name, Map applicationTimeouts, ByteBuffer tokensConf, Set applicationTags, String appNodeLabel) throws Exception { + + + LOG.info("####Submitapp#### testcase: " + MockRM.description.getMethodName()); + LOG.info("####Submitapp#### name: " + name); + LOG.info("####Submitapp#### user: " + user); + LOG.info("####Submitapp#### acls: " + acls); + LOG.info("####Submitapp#### unmanaged: " + unmanaged); + LOG.info("####Submitapp#### queue: " + queue); + LOG.info("####Submitapp#### AM res reqs: " + amResourceRequests); + LOG.info("####Submitapp#### maxattempts: " + maxAppAttempts); + LOG.info("####Submitapp#### credentials: " + ts); + LOG.info("####Submitapp#### appType: " + appType); + LOG.info("####Submitapp#### waitForAccepted: " + waitForAccepted); + LOG.info("####Submitapp#### keepContainers: " + keepContainers); + LOG.info("####Submitapp#### isAppIdProvided: " + isAppIdProvided); + LOG.info("####Submitapp#### applicationId: " + applicationId); + LOG.info("####Submitapp#### attemptFailuresValidityInterval: " + attemptFailuresValidityInterval); + LOG.info("####Submitapp#### logaggregationcontext: " + logAggregationContext); + LOG.info("####Submitapp#### cancelTokensWhenComplete: " + cancelTokensWhenComplete); + LOG.info("####Submitapp#### priority: " + priority); + LOG.info("####Submitapp#### amLabel: " + amLabel); + LOG.info("####Submitapp#### applicationTimeouts: " + applicationTimeouts); + LOG.info("####Submitapp#### tokensConf: " + tokensConf); + LOG.info("####Submitapp#### applicationTags: " + applicationTags); + LOG.info("####Submitapp#### appNodeLabel: " + appNodeLabel); + + ApplicationId appId = isAppIdProvided ? applicationId : null; ApplicationClientProtocol client = getClientRMService(); if (! isAppIdProvided) { @@ -826,6 +868,8 @@ public RMApp submitApp(List amResourceRequests, String name, .newRecord(GetNewApplicationRequest.class)); appId = resp.getApplicationId(); } + LOG.info("####Submitapp#### applicationId after: " + appId); + SubmitApplicationRequest req = Records .newRecord(SubmitApplicationRequest.class); ApplicationSubmissionContext sub = Records @@ -876,6 +920,8 @@ public RMApp submitApp(List amResourceRequests, String name, } sub.setAMContainerResourceRequests(amResourceRequests); req.setApplicationSubmissionContext(sub); + + LOG.info("####Submitapp#### submissioncontext: " + ReflectionToStringBuilder.toString(sub)); UserGroupInformation fakeUser = UserGroupInformation.createUserForTesting(user, new String[] {"someGroup"}); PrivilegedExceptionAction action =