From a980e4a4b8da81c3c95bfe6322ce31a6a1df3265 Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Fri, 20 Jan 2012 03:33:41 +0000 Subject: [PATCH 01/14] HADOOP-7982. UserGroupInformation fails to login if thread's context classloader can't load HadoopLoginModule. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1233750 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop/security/UserGroupInformation.java | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a295a04af1f..a64e33b26c7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -140,6 +140,9 @@ Release 0.23.1 - Unreleased HADOOP-7971. Adding back job/pipes/queue commands to bin/hadoop for backward compatibility. (Prashath Sharma via acmurthy) + HADOOP-7982. UserGroupInformation fails to login if thread's context + classloader can't load HadoopLoginModule. (todd) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java index e2e6b905126..7c7e975193f 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java @@ -416,9 +416,19 @@ public class UserGroupInformation { private static LoginContext newLoginContext(String appName, Subject subject) throws LoginException { - return new LoginContext(appName, subject, null, new HadoopConfiguration()); + // Temporarily switch the thread's ContextClassLoader to match this + // class's classloader, so that we can properly load HadoopLoginModule + // from the JAAS libraries. + Thread t = Thread.currentThread(); + ClassLoader oldCCL = t.getContextClassLoader(); + t.setContextClassLoader(HadoopLoginModule.class.getClassLoader()); + try { + return new LoginContext(appName, subject, null, new HadoopConfiguration()); + } finally { + t.setContextClassLoader(oldCCL); + } } - + private LoginContext getLogin() { return user.getLogin(); } From 3801eee0361efeb128abcf5bf75133fbf664370e Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Fri, 20 Jan 2012 07:25:59 +0000 Subject: [PATCH 02/14] HDFS-2810. Leases not getting renewed properly by clients. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1233793 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 + .../org/apache/hadoop/hdfs/DFSClient.java | 10 ++- .../org/apache/hadoop/hdfs/LeaseRenewer.java | 10 ++- .../apache/hadoop/hdfs/TestLeaseRenewer.java | 81 ++++++++++++++++--- 4 files changed, 89 insertions(+), 14 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 2a67ebeba21..b75b7ac8419 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -159,6 +159,8 @@ Release 0.23.1 - UNRELEASED HDFS-2790. FSNamesystem.setTimes throws exception with wrong configuration name in the message. (Arpit Gupta via eli) + HDFS-2810. Leases not getting renewed properly by clients (todd) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java index 53095b2ef05..6265d02e7a4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java @@ -374,11 +374,17 @@ public class DFSClient implements java.io.Closeable { return clientRunning; } - /** Renew leases */ - void renewLease() throws IOException { + /** + * Renew leases. + * @return true if lease was renewed. May return false if this + * client has been closed or has no files open. + **/ + boolean renewLease() throws IOException { if (clientRunning && !isFilesBeingWrittenEmpty()) { namenode.renewLease(clientName); + return true; } + return false; } /** Abort and release resources held. Ignore all errors. */ diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java index 14b9c9a3b72..862be0c184d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/LeaseRenewer.java @@ -67,7 +67,7 @@ import org.apache.hadoop.util.StringUtils; *

*/ class LeaseRenewer { - private static final Log LOG = LogFactory.getLog(LeaseRenewer.class); + static final Log LOG = LogFactory.getLog(LeaseRenewer.class); static final long LEASE_RENEWER_GRACE_DEFAULT = 60*1000L; static final long LEASE_RENEWER_SLEEP_DEFAULT = 1000L; @@ -407,7 +407,13 @@ class LeaseRenewer { final DFSClient c = copies.get(i); //skip if current client name is the same as the previous name. if (!c.getClientName().equals(previousName)) { - c.renewLease(); + if (!c.renewLease()) { + if (LOG.isDebugEnabled()) { + LOG.debug("Did not renew lease for client " + + c); + } + continue; + } previousName = c.getClientName(); if (LOG.isDebugEnabled()) { LOG.debug("Lease renewed for client " + previousName); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java index f3817671b07..1bdb4979274 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRenewer.java @@ -17,11 +17,14 @@ */ package org.apache.hadoop.hdfs; +import static org.junit.Assert.*; + import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.test.GenericTestUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -29,6 +32,8 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import com.google.common.base.Supplier; + public class TestLeaseRenewer { private String FAKE_AUTHORITY="hdfs://nn1/"; private UserGroupInformation FAKE_UGI_A = @@ -46,19 +51,24 @@ public class TestLeaseRenewer { @Before public void setupMocksAndRenewer() throws IOException { - MOCK_DFSCLIENT = Mockito.mock(DFSClient.class); - Mockito.doReturn(true) - .when(MOCK_DFSCLIENT).isClientRunning(); - Mockito.doReturn((int)FAST_GRACE_PERIOD) - .when(MOCK_DFSCLIENT).getHdfsTimeout(); - Mockito.doReturn("myclient") - .when(MOCK_DFSCLIENT).getClientName(); + MOCK_DFSCLIENT = createMockClient(); renewer = LeaseRenewer.getInstance( FAKE_AUTHORITY, FAKE_UGI_A, MOCK_DFSCLIENT); renewer.setGraceSleepPeriod(FAST_GRACE_PERIOD); } + private DFSClient createMockClient() { + DFSClient mock = Mockito.mock(DFSClient.class); + Mockito.doReturn(true) + .when(mock).isClientRunning(); + Mockito.doReturn((int)FAST_GRACE_PERIOD) + .when(mock).getHdfsTimeout(); + Mockito.doReturn("myclient") + .when(mock).getClientName(); + return mock; + } + @Test public void testInstanceSharing() throws IOException { // Two lease renewers with the same UGI should return @@ -93,11 +103,11 @@ public class TestLeaseRenewer { public void testRenewal() throws Exception { // Keep track of how many times the lease gets renewed final AtomicInteger leaseRenewalCount = new AtomicInteger(); - Mockito.doAnswer(new Answer() { + Mockito.doAnswer(new Answer() { @Override - public Void answer(InvocationOnMock invocation) throws Throwable { + public Boolean answer(InvocationOnMock invocation) throws Throwable { leaseRenewalCount.incrementAndGet(); - return null; + return true; } }).when(MOCK_DFSCLIENT).renewLease(); @@ -120,6 +130,57 @@ public class TestLeaseRenewer { renewer.closeFile(filePath, MOCK_DFSCLIENT); } + /** + * Regression test for HDFS-2810. In this bug, the LeaseRenewer has handles + * to several DFSClients with the same name, the first of which has no files + * open. Previously, this was causing the lease to not get renewed. + */ + @Test + public void testManyDfsClientsWhereSomeNotOpen() throws Exception { + // First DFSClient has no files open so doesn't renew leases. + final DFSClient mockClient1 = createMockClient(); + Mockito.doReturn(false).when(mockClient1).renewLease(); + assertSame(renewer, LeaseRenewer.getInstance( + FAKE_AUTHORITY, FAKE_UGI_A, mockClient1)); + + // Set up a file so that we start renewing our lease. + DFSOutputStream mockStream1 = Mockito.mock(DFSOutputStream.class); + String filePath = "/foo"; + renewer.put(filePath, mockStream1, mockClient1); + + // Second DFSClient does renew lease + final DFSClient mockClient2 = createMockClient(); + Mockito.doReturn(true).when(mockClient2).renewLease(); + assertSame(renewer, LeaseRenewer.getInstance( + FAKE_AUTHORITY, FAKE_UGI_A, mockClient2)); + + // Set up a file so that we start renewing our lease. + DFSOutputStream mockStream2 = Mockito.mock(DFSOutputStream.class); + renewer.put(filePath, mockStream2, mockClient2); + + + // Wait for lease to get renewed + GenericTestUtils.waitFor(new Supplier() { + @Override + public Boolean get() { + try { + Mockito.verify(mockClient1, Mockito.atLeastOnce()).renewLease(); + Mockito.verify(mockClient2, Mockito.atLeastOnce()).renewLease(); + return true; + } catch (AssertionError err) { + LeaseRenewer.LOG.warn("Not yet satisfied", err); + return false; + } catch (IOException e) { + // should not throw! + throw new RuntimeException(e); + } + } + }, 100, 10000); + + renewer.closeFile(filePath, mockClient1); + renewer.closeFile(filePath, mockClient2); + } + @Test public void testThreadName() throws Exception { DFSOutputStream mockStream = Mockito.mock(DFSOutputStream.class); From 5809510395e896c2542d771773fe18433962f0c4 Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Fri, 20 Jan 2012 07:31:44 +0000 Subject: [PATCH 03/14] HDFS-2751. Datanode may incorrectly drop OS cache behind reads even for short reads. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1233795 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/datanode/BlockSender.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index b75b7ac8419..300526af629 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -161,6 +161,9 @@ Release 0.23.1 - UNRELEASED HDFS-2810. Leases not getting renewed properly by clients (todd) + HDFS-2751. Datanode may incorrectly drop OS cache behind reads + even for short reads. (todd) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java index cf4e8032600..a59a5596365 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java @@ -315,7 +315,7 @@ class BlockSender implements java.io.Closeable { * close opened files. */ public void close() throws IOException { - if (blockInFd != null && shouldDropCacheBehindRead) { + if (blockInFd != null && shouldDropCacheBehindRead && isLongRead()) { // drop the last few MB of the file from cache try { NativeIO.posixFadviseIfPossible( From 71ac65859ebf0934f78df1b839168b8be57c6858 Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Fri, 20 Jan 2012 18:55:20 +0000 Subject: [PATCH 04/14] Merge -r 1215140:1215141 from trunk to branch. FIXES: MAPREDUCE-778 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234070 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 5 +- hadoop-mapreduce-project/ivy.xml | 7 + .../ivy/libraries.properties | 5 +- .../hadoop/mapred/gridmix/GridmixJob.java | 17 +- .../src/documentation/content/xdocs/rumen.xml | 172 +- .../tools/rumen/TestRumenAnonymization.java | 1940 +++++++++++++++++ .../hadoop/tools/rumen/TestRumenFolder.java | 4 - .../tools/rumen/TestRumenJobTraces.java | 4 +- .../apache/hadoop/tools/rumen/Anonymizer.java | 273 +++ .../org/apache/hadoop/tools/rumen/Folder.java | 79 +- .../tools/rumen/HadoopLogsAnalyzer.java | 45 +- .../apache/hadoop/tools/rumen/JobBuilder.java | 25 +- .../tools/rumen/JsonObjectMapperWriter.java | 19 + .../apache/hadoop/tools/rumen/LoggedJob.java | 78 +- .../hadoop/tools/rumen/LoggedLocation.java | 47 +- .../tools/rumen/LoggedNetworkTopology.java | 19 +- .../apache/hadoop/tools/rumen/LoggedTask.java | 11 +- .../hadoop/tools/rumen/LoggedTaskAttempt.java | 47 +- .../apache/hadoop/tools/rumen/ParsedHost.java | 14 +- .../hadoop/tools/rumen/ZombieCluster.java | 7 +- .../apache/hadoop/tools/rumen/ZombieJob.java | 52 +- .../rumen/anonymization/DataAnonymizer.java | 27 + .../tools/rumen/anonymization/WordList.java | 106 + .../WordListAnonymizerUtility.java | 110 + .../rumen/datatypes/AnonymizableDataType.java | 28 + .../tools/rumen/datatypes/ClassName.java | 57 + .../tools/rumen/datatypes/DataType.java | 25 + .../DefaultAnonymizableDataType.java | 67 + .../rumen/datatypes/DefaultDataType.java | 37 + .../tools/rumen/datatypes/FileName.java | 213 ++ .../hadoop/tools/rumen/datatypes/JobName.java | 41 + .../tools/rumen/datatypes/JobProperties.java | 93 + .../tools/rumen/datatypes/NodeName.java | 185 ++ .../tools/rumen/datatypes/QueueName.java | 41 + .../tools/rumen/datatypes/UserName.java | 40 + .../util/DefaultJobPropertiesParser.java | 31 + .../datatypes/util/JobPropertyParser.java | 34 + .../util/MapReduceJobPropertiesParser.java | 227 ++ .../rumen/serializers/BlockingSerializer.java | 36 + .../DefaultAnonymizingRumenSerializer.java | 57 + .../serializers/DefaultRumenSerializer.java | 42 + .../serializers/ObjectStringSerializer.java | 35 + .../hadoop/tools/rumen/state/State.java | 46 + .../tools/rumen/state/StateDeserializer.java | 59 + .../hadoop/tools/rumen/state/StatePool.java | 345 +++ 45 files changed, 4603 insertions(+), 249 deletions(-) create mode 100644 hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenAnonymization.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Anonymizer.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/WordList.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/ClassName.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DataType.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/FileName.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/JobName.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/NodeName.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/QueueName.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/UserName.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/State.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/StateDeserializer.java create mode 100644 hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/StatePool.java diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 764975f0554..b339d542c40 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -4,7 +4,8 @@ Release 0.23.1 - Unreleased INCOMPATIBLE CHANGES - NEW FEATURES + NEW FEATURES + MAPREDUCE-778. Rumen Anonymizer. (Amar Kamat and Chris Douglas via amarrk) MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev) @@ -14,6 +15,8 @@ Release 0.23.1 - Unreleased MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR ApplicationMaster. (Anupam Seth via mahadev) + MAPREDUCE-778. Rumen Anonymizer. (Amar Kamat and Chris Douglas via amarrk) + IMPROVEMENTS MAPREDUCE-3375. [Gridmix] Memory Emulation system tests. (Vinay Thota via amarrk) diff --git a/hadoop-mapreduce-project/ivy.xml b/hadoop-mapreduce-project/ivy.xml index e9b38d077eb..e04da7019bb 100644 --- a/hadoop-mapreduce-project/ivy.xml +++ b/hadoop-mapreduce-project/ivy.xml @@ -139,6 +139,13 @@ + + + + + diff --git a/hadoop-mapreduce-project/ivy/libraries.properties b/hadoop-mapreduce-project/ivy/libraries.properties index 06ed6d98f65..76d05e295df 100644 --- a/hadoop-mapreduce-project/ivy/libraries.properties +++ b/hadoop-mapreduce-project/ivy/libraries.properties @@ -81,5 +81,6 @@ wagon-http.version=1.0-beta-2 xmlenc.version=0.52 xerces.version=1.4.4 -yarn.version=0.23.1-SNAPSHOT -hadoop-mapreduce.version=0.23.1-SNAPSHOT +jackson.version=1.8.2 +yarn.version=0.24.0-SNAPSHOT +hadoop-mapreduce.version=0.24.0-SNAPSHOT diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java b/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java index 9b6ed69f575..77ec697872f 100644 --- a/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java +++ b/hadoop-mapreduce-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java @@ -26,8 +26,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.security.PrivilegedExceptionAction; import org.apache.hadoop.conf.Configuration; @@ -49,6 +47,7 @@ import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.tools.rumen.JobStory; +import static org.apache.hadoop.tools.rumen.datatypes.util.MapReduceJobPropertiesParser.extractMaxHeapOpts; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -92,8 +91,6 @@ abstract class GridmixJob implements Callable, Delayed { // configuration key to enable/disable task jvm options static final String GRIDMIX_TASK_JVM_OPTIONS_ENABLE = "gridmix.task.jvm-options.enable"; - private static final Pattern maxHeapPattern = - Pattern.compile("-Xmx[0-9]+[kKmMgGtT]?+"); private static void setJobQueue(Job job, String queue) { if (queue != null) { @@ -225,18 +222,6 @@ abstract class GridmixJob implements Callable, Delayed { } } } - - private static void extractMaxHeapOpts(String javaOptions, - List maxOpts, List others) { - for (String opt : javaOptions.split(" ")) { - Matcher matcher = maxHeapPattern.matcher(opt); - if (matcher.find()) { - maxOpts.add(opt); - } else { - others.add(opt); - } - } - } // Scales the desired job-level configuration parameter. This API makes sure // that the ratio of the job level configuration parameter to the cluster diff --git a/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/rumen.xml b/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/rumen.xml index 75b97ac5e8a..dbe72c56ca7 100644 --- a/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/rumen.xml +++ b/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/rumen.xml @@ -73,6 +73,11 @@ computed for the total number of successful tasks for every attempt. +
  • Anonymized traces enables sharing of production traces of large + scale Hadoop deployments. Sharing of traces will foster + collaboration within the Hadoop community. It can also be used to + supplement interesting research findings. +
    • @@ -102,6 +107,11 @@ Increasing the trace runtime might involve adding some dummy jobs to the resulting trace and scaling up the runtime of individual jobs. +
  • Anonymizer : + A utility to anonymize Hadoop job and cluster topology traces by + masking certain sensitive fields but retaining important workload + characteristics. +

    • @@ -128,10 +138,11 @@ output-duration, concentration etc. -

    Rumen provides 2 basic commands

    +

    Rumen provides 3 basic commands

    • TraceBuilder
    • Folder
      • +
    • Anonymizer

    Firstly, we need to generate the Gold Trace. Hence the first @@ -139,8 +150,9 @@ The output of the TraceBuilder is a job-trace file (and an optional cluster-topology file). In case we want to scale the output, we can use the Folder utility to fold the current trace to the - desired length. The remaining part of this section explains these - utilities in detail. + desired length. For anonymizing the trace, use the + Anonymizer utility. The remaining part of this section + explains these utilities in detail.

    Examples in this section assumes that certain libraries are present @@ -426,8 +438,156 @@

    +

    +

    +

    +

    +

    + + + + +
    + Anonymizer + +

    Command:

    + java org.apache.hadoop.tools.rumen.Anonymizer [options] [-trace <jobtrace-input> <jobtrace-output>] [-topology <topology-input> <topology-output>] + +

    This command invokes the Anonymizer utility of + Rumen. It anonymizes sensitive information from the + <jobtrace-input> file and outputs the anonymized + content into the <jobtrace-output> + file. It also anonymizes the cluster layout (topology) from the + <topology-input> and outputs it in + the <topology-output> file. + <job-input> represents the job trace file obtained + using TraceBuilder or Folder. + <topology-input> represents the cluster topology + file obtained using TraceBuilder. +

    + +

    Options :

    + + + + + + + + + + + + + + + + +
    ParameterDescriptionNotes
    -traceAnonymizes job traces.Anonymizes sensitive fields like user-name, job-name, queue-name + host-names, job configuration parameters etc.
    -topologyAnonymizes cluster topologyAnonymizes rack-names and host-names.
    + +
    + <em>Anonymizer</em> Configuration Parameters +

    The Rumen anonymizer can be configured using the following + configuration parameters: +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    ParameterDescription
    + rumen.data-types.classname.preserve + A comma separated list of prefixes that the Anonymizer + will not anonymize while processing classnames. If + rumen.data-types.classname.preserve is set to + 'org.apache,com.hadoop.' then + classnames starting with 'org.apache' or + 'com.hadoop.' will not be anonymized. +
    + rumen.datatypes.jobproperties.parsers + A comma separated list of job properties parsers. These parsers + decide how the job configuration parameters + (i.e <key,value> pairs) should be processed. Default is + MapReduceJobPropertiesParser. The default parser will + only parse framework-level MapReduce specific job configuration + properties. Users can add custom parsers by implementing the + JobPropertiesParser interface. Rumen also provides an + all-pass (i.e no filter) parser called + DefaultJobPropertiesParser. +
    + rumen.anonymization.states.dir + Set this to a location (on LocalFileSystem or HDFS) for enabling + state persistence and/or reload. This parameter is not set by + default. Reloading and persistence of states depend on the state + directory. Note that the state directory will contain the latest + as well as previous states. +
    + rumen.anonymization.states.persist + Set this to 'true' to persist the current state. + Default value is 'false'. Note that the states will + be persisted to the state manager's state directory + specified using the rumen.anonymization.states.dir + parameter. +
    + rumen.anonymization.states.reload + Set this to 'true' to enable reuse of previously + persisted state. The default value is 'false'. The + previously persisted state will be reloaded from the state + manager's state directory specified using the + rumen.anonymization.states.dir parameter. Note that + the Anonymizer will bail out if it fails to find any + previously persisted state in the state directory or if the state + directory is not set. If the user wishes to retain/reuse the + states across multiple invocations of the Anonymizer, + then the very first invocation of the Anonymizer should + have rumen.anonymization.states.reload set to + 'false' and + rumen.anonymization.states.persist set to + 'true'. Subsequent invocations of the + Anonymizer can then have + rumen.anonymization.states.reload set to + 'true'. +
    +
    + +
    + Example + java org.apache.hadoop.tools.rumen.Anonymizer -trace file:///home/user/job-trace.json file:///home/user/job-trace-anonymized.json -topology file:///home/user/cluster-topology.json file:///home/user/cluster-topology-anonymized.json +

    +

    This will anonymize the job details from + file:///home/user/job-trace.json and output it to + file:///home/user/job-trace-anonymized.json. + It will also anonymize the cluster topology layout from + file:///home/user/cluster-topology.json and output it to + file:///home/user/cluster-topology-anonymized.json. + Note that the Anonymizer also supports input and output + files on HDFS. +

    +
    -

    N3O~LszCa@D_&QJz-QqE6?nn{6dK+Ccp|}J&xEIb#p>mxuBC_FN>Y<`Y$}aTiWwx?1=;X^R8QSD(_A;GC1aLGadoYUIAJ-YmH`vKo><+d5!d$^Fs?@MppJTl& zAAqr5&rYKv+ZLu7qoiu-GyFzOGV!4TrnQqrTx~kx%{fl|b9a$PqDQ z=TS~JfY#>K7{fI%s9iebK#B`|)AKy@bi_54!GM%haSmxU+q=g984vUWg-voR(PP7kQriYlY>JDs6yjc@Ox>R1VD@Nythns5e~#HT2mD@8x{#v)g@)RHk}or2{ZRk>eC)NYIPWQT z`z{yox{JGdy6|$G5}&=Q)K@ufs0r)RSeVNr)q?M7c+^HN!Y`N1=*;;~}u4P66bE=nJHfdBzIM!1D z((12A|2v1@3A+%B+!qR5K+a9&Cqi>22sNw;aU;J{^6P2uu_n!g^-}*MF^8D;XKlO( zDx0?)-sSx6BXdD&$smv5-A1>~h=`8$bvpBY2miGqGg&~BC5FdPTsJngIpO@Oy0s2H ztcw<}g}-~&ax*CxDy+pAVMb@uUHVB7wC0_5hu=NE%eLgml5RdQf0NLBoiE&wIys^a z^Yvf==uVT{EFjZcjz7sPJD57_rr-1K_WXj5*T2G`!JaqUqD6p! zO{uJ4VN`?vRm!F5Dxv*s`tu<)!CU6%@MLLMje#CR$3XoMnd}&Es76j}j!WfD5Sus} zl8t5fg4YqPG_c^MLE6xi8Z0cs$4PSG@4fhi*w0q)olCY`XBRz0#1}C`W}GQCEoCKk zz3rpR+@Uh8Us#*dosM|w8jaBR6%HZ&9KK1b-!3BbY<@3}#H&(aA{rgrL_A8YsMdu# z>Da^t^T%6r?Uuo#Qg+-{f9Ez3r2qX)!c)?-7R8_JqnOoOFN(>dH|7hwH|}R6{_)`` z*u}N_hw^Z3H|Www+60SDg_)E<#L5stYXDjjJhs5mFSN~y1=&YJ!SQ( z3Vue*l&uT@iL?X-RW|v*mWQooDd=@G(pa&gKsIu5G zD%3*Xz}Wv9eP-MGxo!sEz5{9wMY~GZO6j+#W(MB_-}Z<57{T%^3P z2QtTNhO7pSS)gvTmYK8!3#n+a`ygnf*`T!6C{4R6Mks4`M%#hNkEY1$5q6!9t{T$p zbyIE=h3iC^#zr`uvPTZw=M!^|8jXK~OldU={^5zG9lLU}0~s~q1p_LDsAw5?WKOE% zS7d^VGM4v`_ocAT({u#@=>d{agv;*PXk(ECH}OQQq%rx$S&Qo2`w7blroa=y&IU_} z$7x)xEK5Q4UWj$l6yQ=}t{Vq%s)^QWbU1Xa9=8^XVFt356eN~8K=b!W)?|m8fROod zptE>&Cr3a#>iE8XOx*A?1;lg0!5tU%>BBo2s5*aN+R?;3;)I+efsV} z6u~`=Zqb);v|RQht>LVh6$rl74i}vrWKa!bieT*Pm~$=SXlankKG7jo6kfqeVJn7sDyrxA`f10Q?Gk&tdt`fpYG|0AI_&UNWK=* zbKH>5NcziA446@M?zxZ@d&$64*l2(4-H;4jn9ZQk>=9%rrxEyZX*1t<)3igl1v?WP zq{h3M%6@9XYr^M^QDn#(gPhhnuB0>NpzK zap8)|IGv7q=h{Rs2RsPBIxF#~MX*Bbtr6v?Mbw5fDc+HQ3iV0M8ur?;N=Rzg@YJNE zzBEX6an)NK;a{J*kvLDtQveK}7W9t}-uNUKJCGcs;z`I6!k@H6$PgIJlDmVKuzm7C z@(u5+HZ;tu$wP3^+j?i|+XJN@u@G=R*fi7|Dlp!_1w(3`&9K`mA9zUuEB))DhFYjb z)1WjPPxvK{ls!Ba^6m8G4MU^?a39p|4F&qt!`b$Qb1kY29WxMOI-x5dXBoS<4;wQV zhfBz?55A@uU8iDqZCyOutlT8l$x?Xr9+!`SiEbaA?ohe@QYiLM5DG@Met&>~z>sz7J= z7oxv{>`^une+g)7#%uVOrma6xn`R1as1Bc}diY{nYRj~&=V&^?X7cuGWmRHN-*^e} zcl)hN?ExpRoYH^6M{D}i31v-N)vUwj3jQ8seJmG5^=YZA{HvH`9&b#p z&3d%dT|dIJ0zuB|7D0}Lqmw=n`UV}c;?|#T z{++RXEAzS@GJ8)Lm@E@h9a88ZltfH?9v=4S?xP;6__kX;X}N1}E|ka69S1t;?=JL< zp#WMNq>t3)`(uhCu8m#N_fijMMb)>7^akXQMeENB%WoxzV)WaT61(# zq|GKyEdht)1_rY^9cW~9(77n%orQQn&rFwfzZ{l9i<)+N)wrnPJU}m)6mB!+RTe9} zesf#2u<>VaPK$*=pOjJFCVBxUag^(cl`cvIAx>T!0z^MZQpr_ig`U}6WdfY9oj8+viO=%0*R7*&Erb* zW+&lxu24gnJ%`KtG)tD}h*1~14bdNpIrCF8;;~d5r;|E*KW>+2qyTl$IJyZ+9?6I> z8yH=tV!aT}L(Lv){S1}dDDbZOgC%5{kR|)We*XF^`r*rq@sKbk*BMsTlM8Omyk>DI zoyrNC=-i)5tDcx+ws6dU<`V=At$9noA+nSL{++OYt2X zum5+lg;-STs@uid0K!TGoBZ5=#ltb$Zu({9I5BPM1OrH})k|f#iFC;!n{qV1l;WdA zC_P+5ZaQ!FFU|)jPA2CM2HzWHWT|+kYT~( zG=oS+IMA^<0*-U;H=^V?vLEr1gYPDo#U|v|Fv|1AE}{8*$kG2bhba%J6^#5vBnw(D^88L`6IN_Y)uEaGlH-nW zo(`*=#L!?+(Rq~?_7-ivNX?R{;#R?oji z2@u`csjQ6wE(5V(XHS*l%M6)9%oO)G@IJv-ekb`$dxx`ihk#1V@@p7jfX*kzzm|QZ z+6&42`Z;@V80x9O7M6!BV$OSXOL>QbP#5JBR#7MK_)lU*JiLjzL5z<`8kv{OZA>ap z2WrVBLCW?(jb8M=u3SU*myKtJ$O4 zE94vo-e@^lcg3G*Isc8PK7$aNv9EIAmFcRvx|R|vm7TY% zxpKrj%p34mP)(`2?BP(Q?#Ep$(sdA;!2n}*jiVt-Ja#n;U^_2TR*ciZQu?J@^qdd0 zNAKu#VrD*(m%r!F220p2jDvn*TH}vOq^rEKQ6;6bWJ|cxBNdyX6wrv&3!Q_lfJaOK zSK>KGhwX^_t~V<|zzt^MQnuL?7rJw9KG}3KsnwKH>^0ix6u+&>>u}iy(XXGzEnk^G z_f`W7x{nbg1dVX5;F|5sUS%AuSqLbXuXZhc_74$4ppK~oA}jrwPqOyeV=ZE))WBB_ zQ*EzYpKA?R_u14Jib07>eQ(wD3%+RTQ!HV4zHs-2 z9It}Bvyt$)L`;l}LC_OI1A(Zi!8vxwcxUYnO@}Q>Ff~Ft7LQ4A^s$TH6DOSBiJA!&yr`* zEPLURRQ92Oj~mp4q}kId8eYu(j~p>C(w%OWGNB_JwRcHOKb_?1jU`zuCf>20)?ZXV z#Pm)8F75vv6t1MzfDRQ6EgBddz&tD$v0B}Ct&8e_KcfMNg#j(Y?S3mL_+HvN8a&vp z1MZ5M4`QfDi#-)+Knxmj>EZX*iYS##N-pWeT`!!P12qmAKAE{N=brZWAw|UO8rivz z>hmN?Zl+st$TOH&ZHBhzKgCG1^~uK}rE0 zOV^_o1L2pb-JT5MeC%~vDcX_bHn$Gp4B$(TnGurt01r$?V2k$|u5oS>(H8ua8{1C` zgnJAfP@c<60kPrf2#S`Nx0({!PX_2h${K#XBPz&A9+`5OXXCr-fQ;NLtVWbCUt;2> ziu@wk>+^l1_kj}Tm{2&Y*YT6Mg=k*6@eEI*c?c{fpCs@XTd$sC*0u-r-akWL5iQ+6 zE}hRylj)TKs}p=y2<`Wq4qlqOcO2(i`o!oAD3jyMa*T-tf@|Q3GI>!HRbA4!za7o7 zhR~VLU}9_lhzaK>LKGP$P5Oa{S0epgxXK@0l}-tFK1y~%%qDC01io3*Z4J@ti&Bay zhRysb^AJR3P(}Z>Nds)tW#{RRe;l{vlmBgxBEruV$^+pdxksmW-QU51H_LTBpq;=n zP|%_n?2!r0ObCTgCs`nF1P^NZ!Kc_!)6ebq%;rt=?w+ys&deWdjKwk$ zoBQ=LI%XoY1mIF}gR{~jq|&?%ZHJvu%*%gaQ{CgE7G z8JlYR&llI+77WMe^F$?Gc58fYSwe3-h3~$I3&9IjF~L=tSI}`HlWV3>r~?s7o3u8C zNYqOr70(5}=+d6{JR%z?6ApTIRcQ;g-uPmc3;ev{i0h7{tx>8M4u%lgU-Ohu#8sxi z&G9pqrN~kI;V~EPB>G$5=Mv&(RMUe7_A|k!b51&(T9<1jpN06PN*Tl;S=P(bDv9m5ve0I&{N1*mkCEf5GVm6TplpbH`1^#KI1ju^c zfQ0?$AAv3aqQ%+S2xB9S1|W@-s@4g5ldONeLL|a|Pncu$BWV4#lw~bqX02ALbFMNk zo1@izPyn{#_v*_iSzitpdHG$EZmWqZXhEb-_*wZ}9QgYCA7NWaO_yX>8I_q|XDSFYLjgfgoN_cOCdbQ(OnfS!h3+|$zh<6o@=Y6VcscDl&Q&UU&`kE1sC;+z7%pjt_0!jVHX-5xDT ztm*{(>9!_D{tfR*$1_lC2yE51iay_@pL+98I}bu#wd8w!P3E1;879o3y30SXRNpDN zT5*0V`~7ocsDe^GXx`P;%Zd_4a}c)NRK=5*B{?zFxv`};l#rBnqV;>oI$t{ zP(R1q1r2+e_IepYayrE>w|psTO!0afpL4o4RWF3&mW7pGRf!}gd6+1c`0-dj9oUV_ z#pHThS5P$|cZ6%#$xN{*GmEM4Psg1!9}k$soqAR|7j^|6FvxT%LOWK;b*BJ1=zbmW zd~==!=@w$N&ggm1O@w=bg}g~ff{|S0%8?crK}yk%HYia~RhX0gx$0+=b?r))R|D!dziR;>0t(KGkk-yrb3i@NzWV1F)kXf5}jouTJJ4VZ@ zvg`5rs0ZUY_Px3NVzVfH(NM3fbeZD=^Ej-8#%*e@^2Mag0XYsf^OBdJiVe+QoFV^& zVJd7DF_UNwM64|{@9`c9&ShBy;O!XCZaZmK4YOQU>owR%| z?J**oWOmID8GdDl%PE?(%@qzx$JN6&kZRlU3z5XvS)Z_)tV4d^(q9}430<@pbDE(Q z?R4j`PN8d^hZ*KExNjedp7Vq_2OKk27H-i@8beuiop~XXuI>Q6f=iv&nqWIB$MkN<0Qw&S#S-%c%I&d2vm$+iZF5~i~W;{!5%D&clI z&+$Z%QJcr~AYZH)7P?}?G>ISaOCsbGGFfBBgHD~f82`+P8NwlOkrH_kpEHVkrGCW8 z$#7;wigFX-T$;6^cZp!mzbLQ>LQ62(LMXLwJ+(+%K+3J&snCb;LupiP_S_dAqdOGS z4I2-95X^|C9UNHt;8n`uiYPV@JNVDvtK4otVo6Bo+@b+-y`+Fkj#hFRsb%9Zc5o=2oPqB9~|^-RVPs$%DP| zdvJ813Qdxjxxv1sp(Ywg2&hH2O8TA<)*Pie9xE@Ramb1u)}cJv-=TXr`Oim^`M*BW zGmE?u-`){A4f4i~`7WVpVQ|4igJUG9>_gbFPTxs0iOc)SSE6FvKq45y#M!UQ_iBA3b{Is)T-2+#+s9o6|8lR5$&cBT~~EM4@~MgifB%6gm7 zPRBXB|EFf}4u`9Y_9l9QNJI%if+*2DqedGgAzDcE7NVCKokP^<646T%-C(o?ql^|M zL}&EQ7^8$yqJQ(=``y3J^PKaXz4qE`?Nxt^Hg#Q##nwzAC8Z5q_7AeC!>{0NxM5EK7;A4^7I=_SlAhX)bXb{uh;7g0$^qdrF7Px$C!Rzn{Wp;xV!h>bE5$ ziDd8eRg$pwH_#(i5PX8Ryd#M3Y^;w0;Zm z3IS1>$;Y3@4T9Ci8xvfP&Cf&^wakQQC(cEvE*~`pw*P9|ERU&pD62LRxg7q;s_zj{ z{Od@+jn9kQ3B2)MX#^@(Sfw@g2t)B{fZA1?_Tj7j@R2b0`$vr*Sc zaZ+6`in4!qGI0kU7w;>#MZ$yJOMtZE`*F5LME8OS$An>FNBdj-))vBIAcQ^ z2|Rx0mXY(1g_lQkrIJs#>Vn#G)^YZ(CW;@!@)huX(^=FDn~_h#FJF9meb96c5HRz) z8mmPUsyS(CPzJld%_CREC(h76ANoh~c=Ub!OtXeUEy_HM>B^|OX9D9UUlE`B!vltaCKO8#aQaGV`A$3rAnz2vw{j?Fj#DND${|B47vk!C~!ERd$8zWOB zoHFe{9))m>zn|H1nR1{*r5L*%DHvsl{b&s}cI!UkyWt>bJ^gIpTJI-Am-&6+FzT_0aXy3qt02)%Fi|tDL*3eNGh_v$5fY}E5 z@-th`w{@Ns9ZF?0(!hWfLA{dii>82Q-;LKmhu6Z3Zl8{E5B$TY5x28mP`Jt|vnP95U^KV$A|c3_YQJj8SW1*Ahs1g%JHwj* zC2*?Ci8vgD2S~!B}u*;ve26F%4nAHj6&&!fdheg&8^j@v3eE} z9TqsEs`rbgwgg}+yuDhQ)wYJmeG4eWtgBaBw@w z#Vfufzo59i{RQ&RQ47(%{&YE$MBj&cVs`AIma#xO%PPQ&v`~B;ShHQO9c5}C7SYQ; zUVapqv|YTW_{BwC;b>t-`2ORS{rv|pzKWct zovMx*^UbGUw)v;CRIohjm~b1XF3kS+wHZ@F3M0Ydo!G)<#n9MXw9!t`tz6;8M*{HC zuF{7Tpns2%mQ45xIl=tLC+;eP>DLkhNB3B(V{5cu8+FYSmD6)D zBLJc?5fI^+$`O6qxTzfQyxg|@$&o4_hA zyV5?Z5i%CUr57Vqc&(LRm$@=eZ3pIfcGcjdY<{2by7E!P<~I{Fk91ac7G{ww5K zBP+as;pyLX^G^2>DK2r>zu%!zbR}1$z5$5Cr4m5;Ut5=Y)K&9f*@uN_wo0+~gsDs# z+S>T3b{^l{+Xd>_QrW<9n`zX&R-j$b&21dw+&azKP1DmB0b?C(yZ*>JxU0QSbQ*Ue z{JUyQ>bu-b)V7tK3S-cEbC~>xajo_5WDc(zrp6ok4hdhqk5@BnpxP5y$!oW&xO&a%0Q+yIz*qo!K z1_oBWjMhruU)rpJwOupnDbpOVbF(*(kbaFt*Lia4QooII-)Sc5S8(Zcb5&CNU$WAw_I-q}$z^^*dbBBaALUmguv04ggLja}fZm#aP2AAz1toBv@*#URMBEX*XVN|Zg>?;F$vuM}F` z5C=3SVw4(p|AtZ%=I1RNwGd4PX#(I#v6NQLhg&*!4PyPaT$I*3J=yGgHG+S9$VFmm z;7eLk!Iqb)`~=iievvRvf)PG4k;E5r<9}Z+^v~F<_%0(plFL;A(WSzI?&Z!QlwE;w zT;nWERk?0v=B{+>jMx92`C3t(m^J}KqoB__J{K9G%2Itjj-+Rd0-Eh#QpAgC*dSz)j3BDZtb zduRjZCdA!t?^@)7MaVPlwE_Rr9V>Io&`LI=e!D-g^ey)d` z%?_bkp&lC0sRi-ny(NdgKjf3t(42?GuERaWg#H~dzogh5{9I@+5 zsHym5WZ!9n`7I`)vZ-J7#8bmB?x;e^)Yn=vG0HvZT4oT?nDqAmO2QbxaxV$(UWVRR z8hp{*xY1gml*`_kr6=GXYbWbe`w=9l&NHQ^q^1G{w8=YZ4AToe59=_nFSx?)g&)D> z8C>Z#tsTF!x-z-A!@$QitQ)pVcd>$`G+u`^h8B>D4^WQwfcPF=&c93@@0bjVehsmO z9o(-XJ0|22j;OUMU|ALdh7=&|q^D^Q!eM@r#3!a>QOuD+d;dinxHMbe*GZyP z2#5uU3(hr#DdynMth<|}iaJHNQaek(|Ce1oKiT3;C$PuKL>g_X2i=5t>zv{=gsBPq zylg=v z+UE6SG240-g@4x&GVVWA))r(`&WpOJY8uRvWE9zk4^4|KpQD1IhhNnrXmiDZF1B%LGdF$y> zd3R2Wq?**9czHfAk)Dn-d z>I_({V(@F8jrR906ui<8VrDU-PB|>p!c4^7;{3sjW_Q{pSQw{fLvp%- z#ee#IS{A=^t-8ju^px1!*RqQaXTL;1T)WhEq+o}1c?B|leFcn=@_YNZXtD{4Kdj5i zy}J;;E08Blj~YN7AjU#uQ&;P&;(pB5BrvGDQweF8zq&KMrx+TP%dn1hF&sh>_?69+ znrO!-zAKQ_uhT0T^l4Iv+N2^;$WCBun$d9LIoG2U0-g7jH#GX-JYzK41+=RSTWSqL z`^>^J{B=NPj6}$hbK@k{(wmc;#?GN+h3ZBbFL7!bC>7AujO2R4IesLTdK#(tMR@s8 zSXX&eBPSit{|zJi;q^9j8t zPwHJ@J|FEpjc(xU*BG#%6VkV~yvDNBz)eJm&o|gwWnok+vERB;2}%w>#*_DET(fA0 z-UzIkfg-a#1cUc=dSuA;mg2mF5PT~+A4kc0S90{9R)%&q9cD&%$(Wbw<*k^B;5?(e zt!#^52E=-+@!v+rl5wr(6#V!a%kacQus|MQ^Axlcc`#(pw%gw1DCht=`qL$zb3tC^ zXw6(sS3^x_+P(B@P&w~1*E$zELyCxjn!ii8s>y({R|{^aloD6)<@-xlsHh6q=Hj+9 zDkn`C#-C4zLh+Qav1G;8EIdTqCh4u@VbBY>F&bi$;Fl9zPlh#<6+6VLe?3ll2Usmc zi+t7uH2T*clO|i{O`K)m7t7=r6Im(NIu% ze63#;lmL;;<|Kh_%@{skSc14OCF8MPE8tuS( z7gIsaK8E>vCGsi~0&=qb1 zEv&0csVcmkYCO_rPu;S68$k?u;zc$@LQ_Il;5h=}xcAeoHO8CJKnH*b4b8M|8*#_5 zGkLx_4j9RK3`4Er#n)umir|pGHwpXEi>M#ky0v&)`Def%+muP?>vkg~U#6ME>g1G8 zHsP>j$-rI$ag{}O(m$?bQ&d@$5Bf>}T#r^2 zTpkuN%OemKjvdwwZh+BfXH?sb@ZC|hCc52VQ@+_oGozh)y2_P3XQ_~4Be&twY}|eG zdg267b*N9!<_fjXIiH%Uuixm*yT4Q8R>S-?N_P8ym|n9JkL@B^NAqTk zDI*~>;J{?TpV|u{3*<*UXz@bXpWn0BVYA<=9My0&fz?Cc6hLd^Yo*5lqnS3}EDuy@ z>cBhCX5~A-KD6JWG4%HvMaYW20?yAQ{bvb%jgHE%hVnZMwr&A-kEZBq`d&k>+q)}t zMrYx_;$Bs59^?+kh{R06zW#v0e% zbQ$(h8m+TMau)YW+V|o(<{WA%!a20dw%gg{(-AAgOh`|C3j>rtjW>!zs+eA#OI&K( z?g&<>Bv%iCP*KpSQqqb#y(R6U4~u$_OOpR!gug87>liEGJWQgsE^OIf+b(dq2yH?z z7l0vnnzOnpM$Ov%pnWiBFP=UBe{U-|{?;yER3~Dmz}y6-uzU^W;D1EI9taJXp0Hhj z+1mPA=hm`MJ;Y{J>o{|KrfktUTf$#hS?Y+zYJc<2V~tR2e<3|NJi(H1PcJz2i!Yb= zPVe7#)wW3QWyc{d!!k|4%q$Ot0Obv6gJn`5_JmGl6M6xbt)`xs45Y|Vpzc0rX_r1* z4qqZYEX%65f z90!N_`i`XabmZwQRPZl<| zq34fj;3HFy5s(sPW(J_C#0zRczjKhFOkez}MS6FPx3O6pB}Hl{6&aLfzbZ-eo)G;% zd`Wte9A?^tGZA|>&Xuozx_p3+HF+>ZcejP8KoGch3w>glv`oE^7g-ZtWYTE(>O4Z^ z@prFD&ol!zwkGa;??}h4{>Fm$%)T!+o)5T2i252=1=|8jT*PdRB9EEn90}3X!*Y*? zFd5obd7IuAtVCL6A>C;mZbI>dbaw|U%yb#K@alM$qnMl0XH1zne0ERlerP%$DpKtJ zNyhNE!`!oZk$>8z>(n`MS`f~JDYTuH+q|BPe}!z};i^Rx1w==qFrP)HhPB!APEmHu zf7&m@3{2kZjHz*Bv(Ks9emB*zZ1ynj5%$EBWN3lQmoI0)B7zCqb`?N8gxAGK*hR(J zaPLjgF1z!H?p}TRq}R@v9tmX_fo(f!4h|F3BAbuRO(a-X>rbtDK*Jglz+dCaMv4~R zRme2A@tWH<`1XcwrSJI@?CV}#@PoU9gJ>N$zzoNLf8ncuce;!SHz-jtN4r^-X^AfQ zQLwlcvv2{}GwOe*=#I7|S00x6kYKZ?p9-!A1Us0ZZ;w{QnV@7?2xmD08NQ9`m(P(* zeHoT}Jara(U)d@*{Y_U-go%B~gDL+o2{SoiTI`VOk2;2L)kFEUQ8+pkn_RXIfQb|a zw^=}7VuVh=lU3A7KZ7;nJ5O;7<0W;E7r}m1t}j4DuB5kC7Ab(O+~mJ{_gouYlsnZ` z#1DT{eEiQ*fOd^iFCbd)A7aH-UHY)GCWX~M*_pCwtEunJU2hM< zLL6YJ4&KE{7$L5umf4;e^7^)?1>wykjL;>Qh~U;|YaY~J3_1q^>sqekYctjsFSau;J|xVHDA9G;z=Tv9 ztvz6jNaL-(a5nB}HE;Voa%Rt7W@E#X`8hmR^LnuBN$w)VMzwIfjS$m55l+w9tEz-p z1;R4NuN;CAJ8Bw<{W4?rd{LVjl+O_!$9qOd97NS!tM~CjOODQfx7F*08qCQ0ZkAYK zS4KaDnJPjj`vF6XZ8L=Q$5YZ@v4ZAjgKJN6@0@6a!QOC*^nr3f#fBPri9EJ?{GV6D zGBtd?F7U>uLv#j^@07E`$6N!P7mjy2()p zIVqKn!{0?-;RRWi6^=M>)0>w$i9Gm#D@SF}s7@yk0*aA#=#<=>87UaBO_9f2)sNB) z!vPSyhmuF&4bSlwd${)*Sk^-aHt=xa2t)q7i#Tc~Xo`u;WhZf4qFDb$Cx9?q`MCgQ zbR1n4r{1@pz~~e_pfmf4HJ(JzdsMJi!Ef0ip#%4>1kz7Gl zkX7-|^N(lvP|NVDdN$^9dP zWALo<*6IxWbG~81tS9a+lqmBF;;|+@VeGIFzOc>yeK^t8A^LzbP1guzx7LLqe z=MsVUoPI0*6WjA>v+3i#xhjyCMpt(cp0Nxp&M*84dTuUn+1i#r7tv{UhpV#@k0U#%2l&-USm#&7{M^`T(SLzBWJ z)$4Zt3T^wl&zP`>4Bvt{-H@!FWX*8KF|f^zBiYo$##vZbr1$*@ug}bq+@6Mjn+?ZO zg7@e{p?PF6NksBOXYOjw()GFe_PDF=20bN%C-t=yWF?2HeX>fhNM$Uy`#*ajLp1ry zIl)`R_?dJrnRa&dHy?b2HoKk5uN>(OD7*h!y7||fOGVeI(|pLR-Eydnn3kPrBW#2A*R}^{@_) zIq1`KzkC?_v#g3!yWW8V2e=y%@;rqs@)qN_{@foquwP$$%`dk7(G5L^lfBA5*OaRn zx1fAwY48kKX}H87gKuEStCb7Ipo=ax;9{dBB=X16sV4lo1bK~Gy55rl&fS+Td-0De ztlga#;9#`jPD8*d4rF*JTDFuZ*D08Cul&AYhWoDmyf*K>)p2iC?c{YjV65G zvjkoBesxQ)RlHik|DL~eeQlZ8+wVU138Zj=*a%7Y=>&og)z56r=CY6OAz(JQ3GGy&@VN%QWMFVnmE*FF65CASu zdWB9ikY^|P$eC$oJhOZU9BLQYHz((v$v104K>zB}<=iO}A%E#JnRWf<+U~rUTJa1} PJiFl)>e?e}B_a5KUEx-O diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java index 30597d3f5c4..479e62e5518 100644 --- a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java +++ b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java @@ -31,6 +31,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.mapreduce.jobhistory.AMStartedEvent; import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent; +import org.apache.hadoop.mapreduce.jobhistory.JobFinished; import org.apache.hadoop.mapreduce.jobhistory.JobFinishedEvent; import org.apache.hadoop.mapreduce.jobhistory.JobInfoChangeEvent; import org.apache.hadoop.mapreduce.jobhistory.JobInitedEvent; @@ -45,14 +46,15 @@ import org.apache.hadoop.mapreduce.jobhistory.ReduceAttemptFinishedEvent; import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinished; import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinishedEvent; import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptStartedEvent; +import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptUnsuccessfulCompletion; import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptUnsuccessfulCompletionEvent; +import org.apache.hadoop.mapreduce.jobhistory.TaskFailed; import org.apache.hadoop.mapreduce.jobhistory.TaskFailedEvent; import org.apache.hadoop.mapreduce.jobhistory.TaskFinished; import org.apache.hadoop.mapreduce.jobhistory.TaskFinishedEvent; import org.apache.hadoop.mapreduce.jobhistory.TaskStartedEvent; import org.apache.hadoop.mapreduce.jobhistory.TaskUpdatedEvent; import org.apache.hadoop.tools.rumen.Pre21JobHistoryConstants.Values; -import org.apache.hadoop.tools.rumen.datatypes.JobProperties; import org.apache.hadoop.util.StringUtils; /** @@ -67,16 +69,16 @@ public class JobBuilder { private boolean finalized = false; - private LoggedJob result = new LoggedJob(); + private ParsedJob result = new ParsedJob(); - private Map mapTasks = new HashMap(); - private Map reduceTasks = - new HashMap(); - private Map otherTasks = - new HashMap(); + private Map mapTasks = new HashMap(); + private Map reduceTasks = + new HashMap(); + private Map otherTasks = + new HashMap(); - private Map attempts = - new HashMap(); + private Map attempts = + new HashMap(); private Map allHosts = new HashMap(); @@ -123,7 +125,7 @@ public class JobBuilder { public void process(HistoryEvent event) { if (finalized) { throw new IllegalStateException( - "JobBuilder.process(HistoryEvent event) called after LoggedJob built"); + "JobBuilder.process(HistoryEvent event) called after ParsedJob built"); } // these are in lexicographical order by class name. @@ -229,12 +231,16 @@ public class JobBuilder { public void process(Properties conf) { if (finalized) { throw new IllegalStateException( - "JobBuilder.process(Properties conf) called after LoggedJob built"); + "JobBuilder.process(Properties conf) called after ParsedJob built"); } //TODO remove this once the deprecate APIs in LoggedJob are removed - result.setQueue(extract(conf, JobConfPropertyNames.QUEUE_NAMES - .getCandidates(), "default")); + String queue = extract(conf, JobConfPropertyNames.QUEUE_NAMES + .getCandidates(), null); + // set the queue name if existing + if (queue != null) { + result.setQueue(queue); + } result.setJobName(extract(conf, JobConfPropertyNames.JOB_NAMES .getCandidates(), null)); @@ -252,9 +258,9 @@ public class JobBuilder { * Request the builder to build the final object. Once called, the * {@link JobBuilder} would accept no more events or job-conf properties. * - * @return Parsed {@link LoggedJob} object. + * @return Parsed {@link ParsedJob} object. */ - public LoggedJob build() { + public ParsedJob build() { // The main job here is to build CDFs and manage the conf finalized = true; @@ -416,7 +422,7 @@ public class JobBuilder { } private void processTaskUpdatedEvent(TaskUpdatedEvent event) { - LoggedTask task = getTask(event.getTaskId().toString()); + ParsedTask task = getTask(event.getTaskId().toString()); if (task == null) { return; } @@ -424,7 +430,7 @@ public class JobBuilder { } private void processTaskStartedEvent(TaskStartedEvent event) { - LoggedTask task = + ParsedTask task = getOrMakeTask(event.getTaskType(), event.getTaskId().toString(), true); task.setStartTime(event.getStartTime()); task.setPreferredLocations(preferredLocationForSplits(event @@ -432,7 +438,7 @@ public class JobBuilder { } private void processTaskFinishedEvent(TaskFinishedEvent event) { - LoggedTask task = + ParsedTask task = getOrMakeTask(event.getTaskType(), event.getTaskId().toString(), false); if (task == null) { return; @@ -443,18 +449,22 @@ public class JobBuilder { } private void processTaskFailedEvent(TaskFailedEvent event) { - LoggedTask task = + ParsedTask task = getOrMakeTask(event.getTaskType(), event.getTaskId().toString(), false); if (task == null) { return; } task.setFinishTime(event.getFinishTime()); task.setTaskStatus(getPre21Value(event.getTaskStatus())); + TaskFailed t = (TaskFailed)(event.getDatum()); + task.putDiagnosticInfo(t.error.toString()); + task.putFailedDueToAttemptId(t.failedDueToAttempt.toString()); + // No counters in TaskFailedEvent } private void processTaskAttemptUnsuccessfulCompletionEvent( TaskAttemptUnsuccessfulCompletionEvent event) { - LoggedTaskAttempt attempt = + ParsedTaskAttempt attempt = getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(), event.getTaskAttemptId().toString()); @@ -476,20 +486,27 @@ public class JobBuilder { attempt.arraySetCpuUsages(event.getCpuUsages()); attempt.arraySetVMemKbytes(event.getVMemKbytes()); attempt.arraySetPhysMemKbytes(event.getPhysMemKbytes()); + TaskAttemptUnsuccessfulCompletion t = + (TaskAttemptUnsuccessfulCompletion) (event.getDatum()); + attempt.putDiagnosticInfo(t.error.toString()); + // No counters in TaskAttemptUnsuccessfulCompletionEvent } private void processTaskAttemptStartedEvent(TaskAttemptStartedEvent event) { - LoggedTaskAttempt attempt = + ParsedTaskAttempt attempt = getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(), event.getTaskAttemptId().toString()); if (attempt == null) { return; } attempt.setStartTime(event.getStartTime()); + attempt.putTrackerName(event.getTrackerName()); + attempt.putHttpPort(event.getHttpPort()); + attempt.putShufflePort(event.getShufflePort()); } private void processTaskAttemptFinishedEvent(TaskAttemptFinishedEvent event) { - LoggedTaskAttempt attempt = + ParsedTaskAttempt attempt = getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(), event.getAttemptId().toString()); if (attempt == null) { @@ -507,7 +524,7 @@ public class JobBuilder { private void processReduceAttemptFinishedEvent( ReduceAttemptFinishedEvent event) { - LoggedTaskAttempt attempt = + ParsedTaskAttempt attempt = getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(), event.getAttemptId().toString()); if (attempt == null) { @@ -536,7 +553,7 @@ public class JobBuilder { } private void processMapAttemptFinishedEvent(MapAttemptFinishedEvent event) { - LoggedTaskAttempt attempt = + ParsedTaskAttempt attempt = getOrMakeTaskAttempt(event.getTaskType(), event.getTaskId().toString(), event.getAttemptId().toString()); if (attempt == null) { @@ -568,6 +585,7 @@ public class JobBuilder { result.setOutcome(Pre21JobHistoryConstants.Values .valueOf(event.getStatus())); result.setFinishTime(event.getFinishTime()); + // No counters in JobUnsuccessfulCompletionEvent } private void processJobSubmittedEvent(JobSubmittedEvent event) { @@ -575,8 +593,14 @@ public class JobBuilder { result.setJobName(event.getJobName()); result.setUser(event.getUserName()); result.setSubmitTime(event.getSubmitTime()); - // job queue name is set when conf file is processed. - // See JobBuilder.process(Properties) method for details. + result.putJobConfPath(event.getJobConfPath()); + result.putJobAcls(event.getJobAcls()); + + // set the queue name if existing + String queue = event.getJobQueueName(); + if (queue != null) { + result.setQueue(queue); + } } private void processJobStatusChangedEvent(JobStatusChangedEvent event) { @@ -603,10 +627,19 @@ public class JobBuilder { result.setFinishTime(event.getFinishTime()); result.setJobID(jobID); result.setOutcome(Values.SUCCESS); + + JobFinished job = (JobFinished)event.getDatum(); + Map countersMap = + JobHistoryUtils.extractCounters(job.totalCounters); + result.putTotalCounters(countersMap); + countersMap = JobHistoryUtils.extractCounters(job.mapCounters); + result.putMapCounters(countersMap); + countersMap = JobHistoryUtils.extractCounters(job.reduceCounters); + result.putReduceCounters(countersMap); } - private LoggedTask getTask(String taskIDname) { - LoggedTask result = mapTasks.get(taskIDname); + private ParsedTask getTask(String taskIDname) { + ParsedTask result = mapTasks.get(taskIDname); if (result != null) { return result; @@ -630,9 +663,9 @@ public class JobBuilder { * if true, we can create a task. * @return */ - private LoggedTask getOrMakeTask(TaskType type, String taskIDname, + private ParsedTask getOrMakeTask(TaskType type, String taskIDname, boolean allowCreate) { - Map taskMap = otherTasks; + Map taskMap = otherTasks; List tasks = this.result.getOtherTasks(); switch (type) { @@ -650,10 +683,10 @@ public class JobBuilder { // no code } - LoggedTask result = taskMap.get(taskIDname); + ParsedTask result = taskMap.get(taskIDname); if (result == null && allowCreate) { - result = new LoggedTask(); + result = new ParsedTask(); result.setTaskType(getPre21Value(type.toString())); result.setTaskID(taskIDname); taskMap.put(taskIDname, result); @@ -663,13 +696,13 @@ public class JobBuilder { return result; } - private LoggedTaskAttempt getOrMakeTaskAttempt(TaskType type, + private ParsedTaskAttempt getOrMakeTaskAttempt(TaskType type, String taskIDName, String taskAttemptName) { - LoggedTask task = getOrMakeTask(type, taskIDName, false); - LoggedTaskAttempt result = attempts.get(taskAttemptName); + ParsedTask task = getOrMakeTask(type, taskIDName, false); + ParsedTaskAttempt result = attempts.get(taskAttemptName); if (result == null && task != null) { - result = new LoggedTaskAttempt(); + result = new ParsedTaskAttempt(); result.setAttemptID(taskAttemptName); attempts.put(taskAttemptName, result); task.getAttempts().add(result); diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryUtils.java b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryUtils.java index f09726d60db..22a18fedb45 100644 --- a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryUtils.java +++ b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryUtils.java @@ -18,10 +18,15 @@ package org.apache.hadoop.tools.rumen; import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.hadoop.mapreduce.JobID; +import org.apache.hadoop.mapreduce.jobhistory.JhCounter; +import org.apache.hadoop.mapreduce.jobhistory.JhCounterGroup; +import org.apache.hadoop.mapreduce.jobhistory.JhCounters; import org.apache.hadoop.mapreduce.jobhistory.JobHistory; /** @@ -143,4 +148,21 @@ public class JobHistoryUtils { String jobId = extractJobIDFromConfFileName(fileName); return jobId != null; } + + /** + * Extract/Add counters into the Map from the given JhCounters object. + * @param counters the counters to be extracted from + * @return the map of counters + */ + static Map extractCounters(JhCounters counters) { + Map countersMap = new HashMap(); + if (counters != null) { + for (JhCounterGroup group : counters.groups) { + for (JhCounter counter : group.counts) { + countersMap.put(counter.name.toString(), counter.value); + } + } + } + return countersMap; + } } diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java index ba91d5d895f..785feb31325 100644 --- a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java +++ b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java @@ -360,6 +360,10 @@ public class LoggedJob implements DeepCompare { this.relativeTime = relativeTime; } + /** + * @return job queue name if it is available in job history file or + * job history conf file. Returns null otherwise. + */ public QueueName getQueue() { return queue; } diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedJob.java b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedJob.java new file mode 100644 index 00000000000..dcd854968ac --- /dev/null +++ b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedJob.java @@ -0,0 +1,179 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * + */ +package org.apache.hadoop.tools.rumen; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.mapreduce.JobACL; +import org.apache.hadoop.security.authorize.AccessControlList; + +/** + * This is a wrapper class around {@link LoggedJob}. This provides also the + * extra information about the job obtained from job history which is not + * written to the JSON trace file. + */ +public class ParsedJob extends LoggedJob { + + private static final Log LOG = LogFactory.getLog(ParsedJob.class); + + private Map totalCountersMap = new HashMap(); + private Map mapCountersMap = new HashMap(); + private Map reduceCountersMap = new HashMap(); + + private String jobConfPath; + private Map jobAcls; + + ParsedJob() { + + } + + ParsedJob(String jobID) { + super(); + + setJobID(jobID); + } + + /** Set the job total counters */ + void putTotalCounters(Map totalCounters) { + this.totalCountersMap = totalCounters; + } + + /** + * @return the job total counters + */ + public Map obtainTotalCounters() { + return totalCountersMap; + } + + /** Set the job level map tasks' counters */ + void putMapCounters(Map mapCounters) { + this.mapCountersMap = mapCounters; + } + + /** + * @return the job level map tasks' counters + */ + public Map obtainMapCounters() { + return mapCountersMap; + } + + /** Set the job level reduce tasks' counters */ + void putReduceCounters(Map reduceCounters) { + this.reduceCountersMap = reduceCounters; + } + + /** + * @return the job level reduce tasks' counters + */ + public Map obtainReduceCounters() { + return reduceCountersMap; + } + + /** Set the job conf path in staging dir on hdfs */ + void putJobConfPath(String confPath) { + jobConfPath = confPath; + } + + /** + * @return the job conf path in staging dir on hdfs + */ + public String obtainJobConfpath() { + return jobConfPath; + } + + /** Set the job acls */ + void putJobAcls(Map acls) { + jobAcls = acls; + } + + /** + * @return the job acls + */ + public Map obtainJobAcls() { + return jobAcls; + } + + /** + * @return the list of map tasks of this job + */ + public List obtainMapTasks() { + List tasks = super.getMapTasks(); + return convertTasks(tasks); + } + + /** + * @return the list of reduce tasks of this job + */ + public List obtainReduceTasks() { + List tasks = super.getReduceTasks(); + return convertTasks(tasks); + } + + /** + * @return the list of other tasks of this job + */ + public List obtainOtherTasks() { + List tasks = super.getOtherTasks(); + return convertTasks(tasks); + } + + /** As we know that this list of {@link LoggedTask} objects is actually a list + * of {@link ParsedTask} objects, we go ahead and cast them. + * @return the list of {@link ParsedTask} objects + */ + private List convertTasks(List tasks) { + List result = new ArrayList(); + + for (LoggedTask t : tasks) { + if (t instanceof ParsedTask) { + result.add((ParsedTask)t); + } else { + throw new RuntimeException("Unexpected type of tasks in the list..."); + } + } + return result; + } + + /** Dump the extra info of ParsedJob */ + void dumpParsedJob() { + LOG.info("ParsedJob details:" + obtainTotalCounters() + ";" + + obtainMapCounters() + ";" + obtainReduceCounters() + + "\n" + obtainJobConfpath() + "\n" + obtainJobAcls() + + ";Q=" + (getQueue() == null ? "null" : getQueue().getValue())); + List maps = obtainMapTasks(); + for (ParsedTask task : maps) { + task.dumpParsedTask(); + } + List reduces = obtainReduceTasks(); + for (ParsedTask task : reduces) { + task.dumpParsedTask(); + } + List others = obtainOtherTasks(); + for (ParsedTask task : others) { + task.dumpParsedTask(); + } + } +} diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTask.java b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTask.java new file mode 100644 index 00000000000..90eebd66fbb --- /dev/null +++ b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTask.java @@ -0,0 +1,128 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.tools.rumen; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.mapreduce.jobhistory.JhCounters; + +/** + * This is a wrapper class around {@link LoggedTask}. This provides also the + * extra information about the task obtained from job history which is not + * written to the JSON trace file. + */ +public class ParsedTask extends LoggedTask { + + private static final Log LOG = LogFactory.getLog(ParsedTask.class); + + private String diagnosticInfo; + private String failedDueToAttempt; + private Map countersMap = new HashMap(); + + ParsedTask() { + super(); + } + + public void incorporateCounters(JhCounters counters) { + Map countersMap = + JobHistoryUtils.extractCounters(counters); + putCounters(countersMap); + + super.incorporateCounters(counters); + } + + /** Set the task counters */ + public void putCounters(Map counters) { + this.countersMap = counters; + } + + /** + * @return the task counters + */ + public Map obtainCounters() { + return countersMap; + } + + /** Set the task diagnostic-info */ + public void putDiagnosticInfo(String msg) { + diagnosticInfo = msg; + } + + /** + * @return the diagnostic-info of this task. + * If the task is successful, returns null. + */ + public String obtainDiagnosticInfo() { + return diagnosticInfo; + } + + /** + * Set the failed-due-to-attemptId info of this task. + */ + public void putFailedDueToAttemptId(String attempt) { + failedDueToAttempt = attempt; + } + + /** + * @return the failed-due-to-attemptId info of this task. + * If the task is successful, returns null. + */ + public String obtainFailedDueToAttemptId() { + return failedDueToAttempt; + } + + List obtainTaskAttempts() { + List attempts = getAttempts(); + return convertTaskAttempts(attempts); + } + + List convertTaskAttempts( + List attempts) { + List result = new ArrayList(); + + for (LoggedTaskAttempt t : attempts) { + if (t instanceof ParsedTaskAttempt) { + result.add((ParsedTaskAttempt)t); + } else { + throw new RuntimeException( + "Unexpected type of taskAttempts in the list..."); + } + } + return result; + } + + /** Dump the extra info of ParsedTask */ + void dumpParsedTask() { + LOG.info("ParsedTask details:" + obtainCounters() + + "\n" + obtainFailedDueToAttemptId() + + "\nPreferred Locations are:"); + List loc = getPreferredLocations(); + for (LoggedLocation l : loc) { + LOG.info(l.getLayers() + ";" + l.toString()); + } + List attempts = obtainTaskAttempts(); + for (ParsedTaskAttempt attempt : attempts) { + attempt.dumpParsedTaskAttempt(); + } + } +} diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java new file mode 100644 index 00000000000..6374368b720 --- /dev/null +++ b/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java @@ -0,0 +1,119 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.tools.rumen; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.mapreduce.jobhistory.JhCounters; + +/** + * This is a wrapper class around {@link LoggedTaskAttempt}. This provides + * also the extra information about the task attempt obtained from + * job history which is not written to the JSON trace file. + */ +public class ParsedTaskAttempt extends LoggedTaskAttempt { + + private static final Log LOG = LogFactory.getLog(ParsedTaskAttempt.class); + + private String diagnosticInfo; + private String trackerName; + private Integer httpPort, shufflePort; + private Map countersMap = new HashMap(); + + ParsedTaskAttempt() { + super(); + } + + /** incorporate event counters */ + public void incorporateCounters(JhCounters counters) { + + Map countersMap = + JobHistoryUtils.extractCounters(counters); + putCounters(countersMap); + + super.incorporateCounters(counters); + } + + /** Set the task attempt counters */ + public void putCounters(Map counters) { + this.countersMap = counters; + } + + /** + * @return the task attempt counters + */ + public Map obtainCounters() { + return countersMap; + } + + /** Set the task attempt diagnostic-info */ + public void putDiagnosticInfo(String msg) { + diagnosticInfo = msg; + } + + /** + * @return the diagnostic-info of this task attempt. + * If the attempt is successful, returns null. + */ + public String obtainDiagnosticInfo() { + return diagnosticInfo; + } + + void putTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + public String obtainTrackerName() { + return trackerName; + } + + void putHttpPort(int port) { + httpPort = port; + } + + /** + * @return http port if set. Returns null otherwise. + */ + public Integer obtainHttpPort() { + return httpPort; + } + + void putShufflePort(int port) { + shufflePort = port; + } + + /** + * @return shuffle port if set. Returns null otherwise. + */ + public Integer obtainShufflePort() { + return shufflePort; + } + + /** Dump the extra info of ParsedTaskAttempt */ + void dumpParsedTaskAttempt() { + LOG.info("ParsedTaskAttempt details:" + obtainCounters() + + ";DiagnosticInfo=" + obtainDiagnosticInfo() + "\n" + + obtainTrackerName() + ";" + obtainHttpPort() + ";" + + obtainShufflePort() + ";rack=" + getHostName().getRackName() + + ";host=" + getHostName().getHostName()); + } +} From 716895487c1f972389bc0b464cbe076c013b0b29 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Fri, 20 Jan 2012 19:50:42 +0000 Subject: [PATCH 06/14] HADOOP-7986. Adding config for MapReduce History Server protocol in hadoop-policy.xml for service level authorization. Contributed by Mahadev Konar. svn merge --ignore-ancestry -c 1234097 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234098 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/packages/templates/conf/hadoop-policy.xml | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a64e33b26c7..e7709ef037a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -143,6 +143,9 @@ Release 0.23.1 - Unreleased HADOOP-7982. UserGroupInformation fails to login if thread's context classloader can't load HadoopLoginModule. (todd) + HADOOP-7986. Adding config for MapReduce History Server protocol in + hadoop-policy.xml for service level authorization. (Mahadev Konar via vinodkv) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-policy.xml b/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-policy.xml index 2533cac40dc..600902623f5 100644 --- a/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-policy.xml +++ b/hadoop-common-project/hadoop-common/src/main/packages/templates/conf/hadoop-policy.xml @@ -209,4 +209,14 @@ A special value of "*" means all users are allowed. + + security.mrhs.client.protocol.acl + * + ACL for HSClientProtocol, used by job clients to + communciate with the MR History Server job status etc. + The ACL is a comma-separated list of user and group names. The user and + group list is separated by a blank. For e.g. "alice,bob users,wheel". + A special value of "*" means all users are allowed. + + From 25e8aad054e6ed64339ff0fdab6a98ae347dea06 Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Fri, 20 Jan 2012 19:54:20 +0000 Subject: [PATCH 07/14] Merge -r 1233089:1233090 from trunk to branch. FIXES: MAPREDUCE-3582 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234100 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 + .../hadoop/mapreduce/v2/hs/JobHistory.java | 5 + .../org/apache/hadoop/cli/CLITestCmdMR.java | 0 .../java}/org/apache/hadoop/cli/data60bytes | 0 .../org/apache/hadoop/cli/testMRConf.xml | 0 .../hadoop/cli/util/CLICommandArchive.java | 0 .../hadoop/cli/util/CLICommandMRAdmin.java | 0 .../org/apache/hadoop/conf/TestJobConf.java | 0 .../java}/org/apache/hadoop/fi/FiConfig.java | 0 .../apache/hadoop/fi/ProbabilityModel.java | 0 .../apache/hadoop/fs/AccumulatingReducer.java | 0 .../org/apache/hadoop/fs/DFSCIOTest.java | 2 + .../apache/hadoop/fs/DistributedFSCheck.java | 2 + .../org/apache/hadoop/fs/IOMapperBase.java | 0 .../org/apache/hadoop/fs/JHLogAnalyzer.java | 0 .../java}/org/apache/hadoop/fs/TestDFSIO.java | 0 .../org/apache/hadoop/fs/TestFileSystem.java | 0 .../java}/org/apache/hadoop/fs/TestJHLA.java | 0 .../org/apache/hadoop/fs/slive/AppendOp.java | 0 .../hadoop/fs/slive/ArgumentParser.java | 0 .../hadoop/fs/slive/BadFileException.java | 0 .../hadoop/fs/slive/ConfigExtractor.java | 0 .../apache/hadoop/fs/slive/ConfigMerger.java | 0 .../apache/hadoop/fs/slive/ConfigOption.java | 0 .../org/apache/hadoop/fs/slive/Constants.java | 0 .../org/apache/hadoop/fs/slive/CreateOp.java | 0 .../apache/hadoop/fs/slive/DataHasher.java | 0 .../apache/hadoop/fs/slive/DataVerifier.java | 0 .../apache/hadoop/fs/slive/DataWriter.java | 0 .../org/apache/hadoop/fs/slive/DeleteOp.java | 0 .../hadoop/fs/slive/DummyInputFormat.java | 0 .../org/apache/hadoop/fs/slive/Formatter.java | 0 .../org/apache/hadoop/fs/slive/Helper.java | 0 .../org/apache/hadoop/fs/slive/ListOp.java | 0 .../org/apache/hadoop/fs/slive/MkdirOp.java | 0 .../apache/hadoop/fs/slive/ObserveableOp.java | 0 .../org/apache/hadoop/fs/slive/Operation.java | 0 .../apache/hadoop/fs/slive/OperationData.java | 0 .../hadoop/fs/slive/OperationFactory.java | 0 .../hadoop/fs/slive/OperationOutput.java | 0 .../hadoop/fs/slive/OperationWeight.java | 0 .../apache/hadoop/fs/slive/PathFinder.java | 0 .../org/apache/hadoop/fs/slive/Range.java | 0 .../org/apache/hadoop/fs/slive/ReadOp.java | 0 .../org/apache/hadoop/fs/slive/RenameOp.java | 0 .../apache/hadoop/fs/slive/ReportWriter.java | 0 .../hadoop/fs/slive/RouletteSelector.java | 0 .../org/apache/hadoop/fs/slive/SleepOp.java | 0 .../apache/hadoop/fs/slive/SliveMapper.java | 0 .../hadoop/fs/slive/SlivePartitioner.java | 0 .../apache/hadoop/fs/slive/SliveReducer.java | 0 .../org/apache/hadoop/fs/slive/SliveTest.java | 0 .../org/apache/hadoop/fs/slive/TestSlive.java | 0 .../org/apache/hadoop/fs/slive/Timer.java | 0 .../hadoop/fs/slive/WeightSelector.java | 0 .../org/apache/hadoop/fs/slive/Weights.java | 0 .../java}/org/apache/hadoop/hdfs/NNBench.java | 0 .../apache/hadoop/hdfs/NNBenchWithoutMR.java | 0 .../java}/org/apache/hadoop/io/FileBench.java | 0 .../io/TestSequenceFileMergeProgress.java | 0 .../apache/hadoop/ipc/TestSocketFactory.java | 2 + .../apache/hadoop/mapred/BigMapOutput.java | 0 .../mapred/DummyResourceCalculatorPlugin.java | 0 .../hadoop/mapred/EmptyInputFormat.java | 0 .../hadoop/mapred/JobClientUnitTest.java | 0 .../org/apache/hadoop/mapred/MRBench.java | 0 .../org/apache/hadoop/mapred/MRCaching.java | 0 .../apache/hadoop/mapred/ReliabilityTest.java | 0 .../apache/hadoop/mapred/TestAuditLogger.java | 0 .../apache/hadoop/mapred/TestBadRecords.java | 3 +- .../mapred/TestClusterMRNotification.java | 3 + .../mapred/TestClusterMapReduceTestCase.java | 3 +- .../org/apache/hadoop/mapred/TestCollect.java | 0 .../mapred/TestCombineFileInputFormat.java | 0 .../mapred/TestCombineOutputCollector.java | 0 .../mapred/TestCommandLineJobSubmission.java | 3 +- .../apache/hadoop/mapred/TestComparators.java | 0 .../TestConcatenatedCompressedInput.java | 3 +- .../hadoop/mapred/TestFieldSelection.java | 0 .../hadoop/mapred/TestFileInputFormat.java | 0 .../mapred/TestFileInputFormatPathFilter.java | 0 .../mapred/TestFileOutputCommitter.java | 0 .../hadoop/mapred/TestGetSplitHosts.java | 0 .../org/apache/hadoop/mapred/TestIFile.java | 0 .../hadoop/mapred/TestIFileStreams.java | 0 .../apache/hadoop/mapred/TestIndexCache.java | 0 .../apache/hadoop/mapred/TestInputPath.java | 0 .../hadoop/mapred/TestJavaSerialization.java | 0 .../apache/hadoop/mapred/TestJobClient.java | 3 +- .../org/apache/hadoop/mapred/TestJobConf.java | 3 +- .../org/apache/hadoop/mapred/TestJobName.java | 3 +- .../hadoop/mapred/TestJobSysDirWithDFS.java | 0 .../mapred/TestKeyValueTextInputFormat.java | 0 .../hadoop/mapred/TestLineRecordReader.java | 0 .../hadoop/mapred/TestMapOutputType.java | 0 .../apache/hadoop/mapred/TestMapProgress.java | 0 .../org/apache/hadoop/mapred/TestMapRed.java | 0 .../hadoop/mapred/TestMiniMRBringup.java | 0 .../hadoop/mapred/TestMiniMRChildTask.java | 2 + .../hadoop/mapred/TestMiniMRClasspath.java | 2 + .../hadoop/mapred/TestMiniMRDFSCaching.java | 2 + .../TestMiniMRWithDFSWithDistinctUsers.java | 2 + .../mapred/TestMultiFileInputFormat.java | 0 .../hadoop/mapred/TestMultiFileSplit.java | 0 .../mapred/TestMultipleLevelCaching.java | 2 + .../mapred/TestMultipleTextOutputFormat.java | 0 .../hadoop/mapred/TestNetworkedJob.java | 0 .../apache/hadoop/mapred/TestReduceFetch.java | 0 .../mapred/TestReduceFetchFromPartialMem.java | 0 .../apache/hadoop/mapred/TestReduceTask.java | 0 .../apache/hadoop/mapred/TestReporter.java | 0 .../TestSequenceFileAsBinaryInputFormat.java | 0 .../TestSequenceFileAsBinaryOutputFormat.java | 0 .../TestSequenceFileAsTextInputFormat.java | 0 .../mapred/TestSequenceFileInputFilter.java | 0 .../mapred/TestSequenceFileInputFormat.java | 0 .../hadoop/mapred/TestSortedRanges.java | 0 .../mapred/TestStatisticsCollector.java | 0 .../mapred/TestTaskPerformanceSplits.java | 0 .../apache/hadoop/mapred/TestTaskStatus.java | 0 .../hadoop/mapred/TestTextInputFormat.java | 0 .../hadoop/mapred/TestTextOutputFormat.java | 0 .../mapred/TestUserDefinedCounters.java | 0 .../org/apache/hadoop/mapred/TestUtils.java | 0 .../hadoop/mapred/TestWritableJobConf.java | 0 .../hadoop/mapred/join/IncomparableKey.java | 0 .../hadoop/mapred/join/TestDatamerge.java | 0 .../hadoop/mapred/join/TestTupleWritable.java | 0 .../TestWrappedRecordReaderClassloader.java | 0 .../apache/hadoop/mapred/lib/TestChain.java | 0 .../mapred/lib/TestDelegatingInputFormat.java | 0 .../lib/TestKeyFieldBasedPartitioner.java | 0 .../mapred/lib/TestLineInputFormat.java | 0 .../hadoop/mapred/lib/TestMultipleInputs.java | 0 .../mapred/lib/aggregate/AggregatorTests.java | 0 .../mapred/lib/aggregate/TestAggregates.java | 0 .../mapred/lib/db/TestConstructQuery.java | 0 .../apache/hadoop/mapred/pipes/TestPipes.java | 3 +- .../mapred/pipes/WordCountInputFormat.java | 0 .../org/apache/hadoop/mapreduce/FailJob.java | 0 .../org/apache/hadoop/mapreduce/SleepJob.java | 0 .../TestClientProtocolProviderImpls.java | 0 .../apache/hadoop/mapreduce/TestCounters.java | 0 .../hadoop/mapreduce/TestLocalRunner.java | 0 .../hadoop/mapreduce/TestMRJobClient.java | 3 +- .../hadoop/mapreduce/TestMapCollection.java | 0 .../hadoop/mapreduce/TestMapReduce.java | 0 .../mapreduce/TestNoJobSetupCleanup.java | 3 +- .../hadoop/mapreduce/TestTaskContext.java | 1 + .../hadoop/mapreduce/TestValueIterReset.java | 0 .../mapreduce/filecache/TestURIFragments.java | 0 .../lib/aggregate/AggregatorTests.java | 0 .../aggregate/TestMapReduceAggregates.java | 0 .../mapreduce/lib/db/TestDBOutputFormat.java | 0 .../mapreduce/lib/db/TestIntegerSplitter.java | 0 .../mapreduce/lib/db/TestTextSplitter.java | 0 .../lib/fieldsel/TestMRFieldSelection.java | 0 .../lib/input/TestCombineFileInputFormat.java | 0 .../lib/input/TestDelegatingInputFormat.java | 0 .../lib/input/TestFileInputFormat.java | 0 .../lib/input/TestLineRecordReader.java | 0 .../input/TestMRKeyValueTextInputFormat.java | 0 ...TestMRSequenceFileAsBinaryInputFormat.java | 0 .../TestMRSequenceFileAsTextInputFormat.java | 0 .../input/TestMRSequenceFileInputFilter.java | 0 .../lib/input/TestNLineInputFormat.java | 0 .../lib/jobcontrol/TestControlledJob.java | 0 .../TestMapReduceJobControlWithMocks.java | 0 .../mapreduce/lib/join/TestJoinDatamerge.java | 0 .../lib/join/TestJoinProperties.java | 0 .../lib/join/TestJoinTupleWritable.java | 0 .../lib/join/TestWrappedRRClassloader.java | 0 .../lib/output/TestFileOutputCommitter.java | 0 ...estMRSequenceFileAsBinaryOutputFormat.java | 0 .../lib/partition/TestBinaryPartitioner.java | 0 .../lib/partition/TestInputSampler.java | 0 .../lib/partition/TestKeyFieldHelper.java | 0 .../TestMRKeyFieldBasedPartitioner.java | 0 .../partition/TestTotalOrderPartitioner.java | 0 .../security/TestBinaryTokenFile.java | 2 + .../TestUmbilicalProtocolWithJobToken.java | 2 + .../token/TestDelegationTokenRenewal.java | 2 + .../token/delegation/TestDelegationToken.java | 3 +- .../util/LinuxMemoryCalculatorPlugin.java | 0 .../mapreduce/util/MRAsyncDiskService.java | 0 .../util/MemoryCalculatorPlugin.java | 0 .../util/TestMRAsyncDiskService.java | 0 .../util/TestProcfsBasedProcessTree.java | 0 .../hadoop/util/TestReflectionUtils.java | 0 .../org/apache/hadoop/util/TestRunJar.java | 2 + .../test/java}/testjar/ClassWordCount.java | 0 .../java}/testjar/CustomOutputCommitter.java | 0 .../testjar/ExternalIdentityReducer.java | 0 .../java}/testjar/ExternalMapperReducer.java | 0 .../test/java}/testjar/ExternalWritable.java | 0 .../src/test/java}/testjar/Hello.java | 0 .../test/java}/testjar/JobKillCommitter.java | 0 .../java}/testjar/UserNamePermission.java | 0 .../java}/testshell/ExternalMapReduce.java | 0 .../hadoop-mapreduce-examples/pom.xml | 45 +++ .../examples/TestBaileyBorweinPlouffe.java | 0 .../apache/hadoop/examples/TestWordStats.java | 272 ++++++++++++++++++ .../hadoop/examples/pi/math/TestLongLong.java | 0 .../hadoop/examples/pi/math/TestModular.java | 0 .../examples/pi/math/TestSummation.java | 0 .../examples/terasort/TestTeraSort.java | 3 +- hadoop-project/pom.xml | 10 + hadoop-tools/hadoop-extras/pom.xml | 120 ++++++++ .../apache/hadoop/mapred/tools/GetGroups.java | 5 +- .../hadoop/mapred/tools/package-info.java | 0 .../java}/org/apache/hadoop/tools/DistCh.java | 0 .../java}/org/apache/hadoop/tools/DistCp.java | 1 - .../hadoop/tools/DistCp_Counter.properties | 0 .../org/apache/hadoop/tools/DistTool.java | 0 .../org/apache/hadoop/tools/Logalyzer.java | 0 .../org/apache/hadoop/tools/package-info.java | 0 .../hadoop/mapred/tools/TestGetGroups.java | 2 + .../apache/hadoop/tools/TestCopyFiles.java | 2 + .../org/apache/hadoop/tools/TestDistCh.java | 7 +- hadoop-tools/hadoop-rumen/pom.xml | 121 ++++++++ .../tools/rumen/AbstractClusterStory.java | 0 .../apache/hadoop/tools/rumen/Anonymizer.java | 0 .../CDFPiecewiseLinearRandomGenerator.java | 0 .../tools/rumen/CDFRandomGenerator.java | 0 .../hadoop/tools/rumen/ClusterStory.java | 0 .../tools/rumen/ClusterTopologyReader.java | 0 .../hadoop/tools/rumen/CurrentJHParser.java | 2 +- .../hadoop/tools/rumen/DeepCompare.java | 0 .../tools/rumen/DeepInequalityException.java | 0 .../tools/rumen/DefaultInputDemuxer.java | 0 .../hadoop/tools/rumen/DefaultOutputter.java | 0 .../tools/rumen/DeskewedJobTraceReader.java | 0 .../org/apache/hadoop/tools/rumen/Folder.java | 0 .../hadoop/tools/rumen/Hadoop20JHParser.java | 0 .../tools/rumen/HadoopLogsAnalyzer.java | 0 .../apache/hadoop/tools/rumen/Histogram.java | 0 .../tools/rumen/HistoryEventEmitter.java | 0 .../hadoop/tools/rumen/InputDemuxer.java | 0 .../rumen/Job20LineHistoryEventEmitter.java | 0 .../apache/hadoop/tools/rumen/JobBuilder.java | 0 .../tools/rumen/JobConfPropertyNames.java | 0 .../tools/rumen/JobConfigurationParser.java | 0 .../hadoop/tools/rumen/JobHistoryParser.java | 0 .../tools/rumen/JobHistoryParserFactory.java | 0 .../hadoop/tools/rumen/JobHistoryUtils.java | 2 +- .../apache/hadoop/tools/rumen/JobStory.java | 0 .../hadoop/tools/rumen/JobStoryProducer.java | 0 .../hadoop/tools/rumen/JobTraceReader.java | 0 .../tools/rumen/JsonObjectMapperParser.java | 0 .../tools/rumen/JsonObjectMapperWriter.java | 0 .../hadoop/tools/rumen/LogRecordType.java | 0 .../hadoop/tools/rumen/LoggedDiscreteCDF.java | 0 .../apache/hadoop/tools/rumen/LoggedJob.java | 0 .../hadoop/tools/rumen/LoggedLocation.java | 0 .../tools/rumen/LoggedNetworkTopology.java | 0 .../rumen/LoggedSingleRelativeRanking.java | 0 .../apache/hadoop/tools/rumen/LoggedTask.java | 0 .../hadoop/tools/rumen/LoggedTaskAttempt.java | 0 .../hadoop/tools/rumen/MachineNode.java | 0 .../MapAttempt20LineHistoryEventEmitter.java | 0 .../tools/rumen/MapTaskAttemptInfo.java | 0 .../org/apache/hadoop/tools/rumen/Node.java | 0 .../apache/hadoop/tools/rumen/Outputter.java | 0 .../org/apache/hadoop/tools/rumen/Pair.java | 0 .../hadoop/tools/rumen/ParsedConfigFile.java | 0 .../apache/hadoop/tools/rumen/ParsedHost.java | 0 .../apache/hadoop/tools/rumen/ParsedJob.java | 0 .../apache/hadoop/tools/rumen/ParsedLine.java | 0 .../apache/hadoop/tools/rumen/ParsedTask.java | 0 .../hadoop/tools/rumen/ParsedTaskAttempt.java | 0 .../PossiblyDecompressedInputStream.java | 0 .../tools/rumen/Pre21JobHistoryConstants.java | 2 +- .../apache/hadoop/tools/rumen/RackNode.java | 0 .../tools/rumen/RandomSeedGenerator.java | 0 ...educeAttempt20LineHistoryEventEmitter.java | 0 .../tools/rumen/ReduceTaskAttemptInfo.java | 0 .../tools/rumen/ResourceUsageMetrics.java | 0 .../tools/rumen/RewindableInputStream.java | 0 .../tools/rumen/SingleEventEmitter.java | 0 .../rumen/Task20LineHistoryEventEmitter.java | 0 .../rumen/TaskAttempt20LineEventEmitter.java | 0 .../hadoop/tools/rumen/TaskAttemptInfo.java | 0 .../apache/hadoop/tools/rumen/TaskInfo.java | 0 .../hadoop/tools/rumen/TopologyBuilder.java | 0 .../hadoop/tools/rumen/TraceBuilder.java | 2 +- .../apache/hadoop/tools/rumen/TreePath.java | 0 .../rumen/Version20LogInterfaceUtils.java | 0 .../hadoop/tools/rumen/ZombieCluster.java | 0 .../apache/hadoop/tools/rumen/ZombieJob.java | 0 .../hadoop/tools/rumen/ZombieJobProducer.java | 0 .../rumen/anonymization/DataAnonymizer.java | 0 .../tools/rumen/anonymization/WordList.java | 0 .../WordListAnonymizerUtility.java | 0 .../rumen/datatypes/AnonymizableDataType.java | 0 .../tools/rumen/datatypes/ClassName.java | 0 .../tools/rumen/datatypes/DataType.java | 0 .../DefaultAnonymizableDataType.java | 0 .../rumen/datatypes/DefaultDataType.java | 0 .../tools/rumen/datatypes/FileName.java | 0 .../hadoop/tools/rumen/datatypes/JobName.java | 0 .../tools/rumen/datatypes/JobProperties.java | 0 .../tools/rumen/datatypes/NodeName.java | 0 .../tools/rumen/datatypes/QueueName.java | 0 .../tools/rumen/datatypes/UserName.java | 0 .../util/DefaultJobPropertiesParser.java | 0 .../datatypes/util/JobPropertyParser.java | 0 .../util/MapReduceJobPropertiesParser.java | 0 .../hadoop/tools/rumen/package-info.java | 0 .../rumen/serializers/BlockingSerializer.java | 0 .../DefaultAnonymizingRumenSerializer.java | 0 .../serializers/DefaultRumenSerializer.java | 0 .../serializers/ObjectStringSerializer.java | 0 .../hadoop/tools/rumen/state/State.java | 0 .../tools/rumen/state/StateDeserializer.java | 0 .../hadoop/tools/rumen/state/StatePool.java | 0 .../rumen/ConcatenatedInputFilesDemuxer.java | 0 .../tools/rumen/HistogramRawTestData.java | 0 .../hadoop/tools/rumen/TestHistograms.java | 3 +- .../TestPiecewiseLinearInterpolation.java | 0 .../tools/rumen/TestRandomSeedGenerator.java | 0 hadoop-tools/hadoop-tools-dist/pom.xml | 10 + hadoop-tools/pom.xml | 2 + 322 files changed, 655 insertions(+), 25 deletions(-) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/cli/CLITestCmdMR.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/cli/data60bytes (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/cli/testMRConf.xml (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/cli/util/CLICommandArchive.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/cli/util/CLICommandMRAdmin.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/conf/TestJobConf.java (100%) rename hadoop-mapreduce-project/{src/test/aop => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fi/FiConfig.java (100%) rename hadoop-mapreduce-project/{src/test/aop => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fi/ProbabilityModel.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/AccumulatingReducer.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/DFSCIOTest.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/DistributedFSCheck.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/IOMapperBase.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/JHLogAnalyzer.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/TestDFSIO.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/TestFileSystem.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/TestJHLA.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/AppendOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/ArgumentParser.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/BadFileException.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/ConfigExtractor.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/ConfigMerger.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/ConfigOption.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/Constants.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/CreateOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/DataHasher.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/DataVerifier.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/DataWriter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/DeleteOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/DummyInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/Formatter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/Helper.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/ListOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/MkdirOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/ObserveableOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/Operation.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/OperationData.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/OperationFactory.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/OperationOutput.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/OperationWeight.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/PathFinder.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/Range.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/ReadOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/RenameOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/ReportWriter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/RouletteSelector.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/SleepOp.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/SliveMapper.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/SlivePartitioner.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/SliveReducer.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/SliveTest.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/TestSlive.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/Timer.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/WeightSelector.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/fs/slive/Weights.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/hdfs/NNBench.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/hdfs/NNBenchWithoutMR.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/io/FileBench.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/io/TestSequenceFileMergeProgress.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/ipc/TestSocketFactory.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/BigMapOutput.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/DummyResourceCalculatorPlugin.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/EmptyInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/JobClientUnitTest.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/MRBench.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/MRCaching.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/ReliabilityTest.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestAuditLogger.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestBadRecords.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestClusterMRNotification.java (97%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestCollect.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestCombineFileInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestCombineOutputCollector.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestComparators.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestFieldSelection.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestFileInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestFileOutputCommitter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestGetSplitHosts.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestIFile.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestIFileStreams.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestIndexCache.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestInputPath.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestJavaSerialization.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestJobClient.java (98%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestJobConf.java (98%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestJobName.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestLineRecordReader.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMapOutputType.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMapProgress.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMapRed.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMiniMRBringup.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMiniMRChildTask.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMiniMRClasspath.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java (98%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMultiFileInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMultiFileSplit.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMultipleLevelCaching.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestNetworkedJob.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestReduceFetch.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestReduceTask.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestReporter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestSortedRanges.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestStatisticsCollector.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestTaskStatus.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestTextInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestTextOutputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestUserDefinedCounters.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestUtils.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/TestWritableJobConf.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/join/IncomparableKey.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/join/TestDatamerge.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/join/TestTupleWritable.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/lib/TestChain.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/lib/TestLineInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/lib/TestMultipleInputs.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/lib/aggregate/AggregatorTests.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/pipes/TestPipes.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapred/pipes/WordCountInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/FailJob.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/SleepJob.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestClientProtocolProviderImpls.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestCounters.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestLocalRunner.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestMRJobClient.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestMapCollection.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestMapReduce.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestTaskContext.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/TestValueIterReset.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/filecache/TestURIFragments.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/aggregate/AggregatorTests.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/aggregate/TestMapReduceAggregates.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestLineRecordReader.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/unit => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java (100%) rename hadoop-mapreduce-project/{src/test/unit => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/join/TestJoinProperties.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/join/TestJoinTupleWritable.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/join/TestWrappedRRClassloader.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java (99%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationToken.java (99%) rename hadoop-mapreduce-project/{src => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test}/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java (100%) rename hadoop-mapreduce-project/{src => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test}/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java (100%) rename hadoop-mapreduce-project/{src => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test}/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/util/TestReflectionUtils.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/org/apache/hadoop/util/TestRunJar.java (97%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testjar/ClassWordCount.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testjar/CustomOutputCommitter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testjar/ExternalIdentityReducer.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testjar/ExternalMapperReducer.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testjar/ExternalWritable.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testjar/Hello.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testjar/JobKillCommitter.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testjar/UserNamePermission.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java}/testshell/ExternalMapReduce.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-examples/src/test/java}/org/apache/hadoop/examples/TestBaileyBorweinPlouffe.java (100%) create mode 100644 hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-examples/src/test/java}/org/apache/hadoop/examples/pi/math/TestLongLong.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-examples/src/test/java}/org/apache/hadoop/examples/pi/math/TestModular.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-examples/src/test/java}/org/apache/hadoop/examples/pi/math/TestSummation.java (100%) rename hadoop-mapreduce-project/{src/test/mapred => hadoop-mapreduce-examples/src/test/java}/org/apache/hadoop/examples/terasort/TestTeraSort.java (98%) create mode 100644 hadoop-tools/hadoop-extras/pom.xml rename {hadoop-mapreduce-project/src => hadoop-tools/hadoop-extras/src/main}/java/org/apache/hadoop/mapred/tools/GetGroups.java (95%) rename {hadoop-mapreduce-project/src => hadoop-tools/hadoop-extras/src/main}/java/org/apache/hadoop/mapred/tools/package-info.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-extras/src/main/java}/org/apache/hadoop/tools/DistCh.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-extras/src/main/java}/org/apache/hadoop/tools/DistCp.java (99%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-extras/src/main/java}/org/apache/hadoop/tools/DistCp_Counter.properties (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-extras/src/main/java}/org/apache/hadoop/tools/DistTool.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-extras/src/main/java}/org/apache/hadoop/tools/Logalyzer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-extras/src/main/java}/org/apache/hadoop/tools/package-info.java (100%) rename {hadoop-mapreduce-project/src/test/mapred => hadoop-tools/hadoop-extras/src/test/java}/org/apache/hadoop/mapred/tools/TestGetGroups.java (98%) rename {hadoop-mapreduce-project/src/test/mapred => hadoop-tools/hadoop-extras/src/test/java}/org/apache/hadoop/tools/TestCopyFiles.java (99%) rename {hadoop-mapreduce-project/src/test/mapred => hadoop-tools/hadoop-extras/src/test/java}/org/apache/hadoop/tools/TestDistCh.java (98%) create mode 100644 hadoop-tools/hadoop-rumen/pom.xml rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/AbstractClusterStory.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Anonymizer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ClusterStory.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/CurrentJHParser.java (97%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/DeepCompare.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/DeepInequalityException.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/DefaultOutputter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Folder.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Histogram.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/InputDemuxer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobBuilder.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobConfigurationParser.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobHistoryParser.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobHistoryUtils.java (99%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobStory.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobStoryProducer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JobTraceReader.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/LogRecordType.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/LoggedJob.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/LoggedLocation.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/LoggedTask.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/MachineNode.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Node.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Outputter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Pair.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ParsedConfigFile.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ParsedHost.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ParsedJob.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ParsedLine.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ParsedTask.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java (98%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/RackNode.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/RewindableInputStream.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/SingleEventEmitter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/TaskInfo.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/TopologyBuilder.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/TraceBuilder.java (99%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/TreePath.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ZombieCluster.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ZombieJob.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/ZombieJobProducer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/anonymization/WordList.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/ClassName.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/DataType.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/FileName.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/JobName.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/NodeName.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/QueueName.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/UserName.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/package-info.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/state/State.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/state/StateDeserializer.java (100%) rename {hadoop-mapreduce-project/src/tools => hadoop-tools/hadoop-rumen/src/main/java}/org/apache/hadoop/tools/rumen/state/StatePool.java (100%) rename {hadoop-mapreduce-project/src/test/mapred => hadoop-tools/hadoop-rumen/src/test/java}/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java (100%) rename {hadoop-mapreduce-project/src/test/mapred => hadoop-tools/hadoop-rumen/src/test/java}/org/apache/hadoop/tools/rumen/HistogramRawTestData.java (100%) rename {hadoop-mapreduce-project/src/test/mapred => hadoop-tools/hadoop-rumen/src/test/java}/org/apache/hadoop/tools/rumen/TestHistograms.java (99%) rename {hadoop-mapreduce-project/src/test/mapred => hadoop-tools/hadoop-rumen/src/test/java}/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java (100%) rename {hadoop-mapreduce-project/src/test/mapred => hadoop-tools/hadoop-rumen/src/test/java}/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java (100%) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index fe700d34d6a..6d81be32445 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -466,6 +466,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3684. LocalDistributedCacheManager does not shut down its thread pool (tomwhite) + MAPREDUCE-3582. Move successfully passing MR1 tests to MR2 maven tree. + (ahmed via tucu) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java index ee5e8786145..8cc05ee3c6a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java @@ -35,6 +35,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,6 +50,7 @@ import org.apache.hadoop.fs.PathFilter; import org.apache.hadoop.fs.RemoteIterator; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.mapred.JobACLsManager; +import org.apache.hadoop.mapreduce.JobID; import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.TypeConverter; import org.apache.hadoop.mapreduce.jobhistory.JobSummary; @@ -86,6 +88,9 @@ public class JobHistory extends AbstractService implements HistoryContext { private static final Log LOG = LogFactory.getLog(JobHistory.class); private static final Log SUMMARY_LOG = LogFactory.getLog(JobSummary.class); + public static final Pattern CONF_FILENAME_REGEX = + Pattern.compile("(" + JobID.JOBID_REGEX + ")_conf.xml(?:\\.[0-9]+\\.old)?"); + public static final String OLD_SUFFIX = ".old"; private static String DONE_BEFORE_SERIAL_TAIL = JobHistoryUtils.doneSubdirsBeforeSerialTail(); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/CLITestCmdMR.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/CLITestCmdMR.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/CLITestCmdMR.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/CLITestCmdMR.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/data60bytes b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/data60bytes similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/data60bytes rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/data60bytes diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/util/CLICommandArchive.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/util/CLICommandArchive.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/util/CLICommandArchive.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/util/CLICommandArchive.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/util/CLICommandMRAdmin.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/util/CLICommandMRAdmin.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/cli/util/CLICommandMRAdmin.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/util/CLICommandMRAdmin.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/conf/TestJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/conf/TestJobConf.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/conf/TestJobConf.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/conf/TestJobConf.java diff --git a/hadoop-mapreduce-project/src/test/aop/org/apache/hadoop/fi/FiConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fi/FiConfig.java similarity index 100% rename from hadoop-mapreduce-project/src/test/aop/org/apache/hadoop/fi/FiConfig.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fi/FiConfig.java diff --git a/hadoop-mapreduce-project/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fi/ProbabilityModel.java similarity index 100% rename from hadoop-mapreduce-project/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fi/ProbabilityModel.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/AccumulatingReducer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/AccumulatingReducer.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/AccumulatingReducer.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/AccumulatingReducer.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/DFSCIOTest.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DFSCIOTest.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/DFSCIOTest.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DFSCIOTest.java index a013ab3a2da..1caa2cdae6c 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/DFSCIOTest.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DFSCIOTest.java @@ -38,6 +38,7 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.SequenceFile.CompressionType; import org.apache.hadoop.mapred.*; +import org.junit.Ignore; /** * Distributed i/o benchmark. @@ -66,6 +67,7 @@ import org.apache.hadoop.mapred.*; *
  • standard i/o rate deviation
    • * */ +@Ignore public class DFSCIOTest extends TestCase { // Constants private static final Log LOG = LogFactory.getLog(DFSCIOTest.class); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/DistributedFSCheck.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DistributedFSCheck.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/DistributedFSCheck.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DistributedFSCheck.java index 127a42e6278..34d1308cc3e 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/DistributedFSCheck.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/DistributedFSCheck.java @@ -41,6 +41,7 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.SequenceFile.CompressionType; import org.apache.hadoop.mapred.*; +import org.junit.Ignore; /** * Distributed checkup of the file system consistency. @@ -52,6 +53,7 @@ import org.apache.hadoop.mapred.*; * Optionally displays statistics on read performance. * */ +@Ignore public class DistributedFSCheck extends TestCase { // Constants private static final Log LOG = LogFactory.getLog(DistributedFSCheck.class); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/IOMapperBase.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/IOMapperBase.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/IOMapperBase.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/IOMapperBase.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/JHLogAnalyzer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/JHLogAnalyzer.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/TestDFSIO.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/TestDFSIO.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestDFSIO.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/TestFileSystem.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/TestFileSystem.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestFileSystem.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/TestJHLA.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestJHLA.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/TestJHLA.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/TestJHLA.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/AppendOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/AppendOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/AppendOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/AppendOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ArgumentParser.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ArgumentParser.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ArgumentParser.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ArgumentParser.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/BadFileException.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/BadFileException.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/BadFileException.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/BadFileException.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ConfigExtractor.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ConfigExtractor.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ConfigExtractor.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ConfigExtractor.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ConfigMerger.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ConfigMerger.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ConfigMerger.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ConfigMerger.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ConfigOption.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ConfigOption.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ConfigOption.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ConfigOption.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Constants.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Constants.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Constants.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Constants.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/CreateOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/CreateOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/CreateOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/CreateOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DataHasher.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DataHasher.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DataHasher.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DataHasher.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DataVerifier.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DataVerifier.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DataVerifier.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DataVerifier.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DataWriter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DataWriter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DataWriter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DataWriter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DeleteOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DeleteOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DeleteOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DeleteOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DummyInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/DummyInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Formatter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Formatter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Formatter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Formatter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Helper.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Helper.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Helper.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Helper.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ListOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ListOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ListOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ListOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/MkdirOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/MkdirOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/MkdirOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/MkdirOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ObserveableOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ObserveableOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ObserveableOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ObserveableOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Operation.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Operation.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Operation.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Operation.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/OperationData.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/OperationData.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/OperationData.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/OperationData.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/OperationFactory.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/OperationFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/OperationFactory.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/OperationFactory.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/OperationOutput.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/OperationOutput.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/OperationOutput.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/OperationOutput.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/OperationWeight.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/OperationWeight.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/OperationWeight.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/OperationWeight.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/PathFinder.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/PathFinder.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/PathFinder.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/PathFinder.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Range.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Range.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Range.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Range.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ReadOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ReadOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ReadOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ReadOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/RenameOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/RenameOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/RenameOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/RenameOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ReportWriter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ReportWriter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/ReportWriter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/ReportWriter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/RouletteSelector.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/RouletteSelector.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/RouletteSelector.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/RouletteSelector.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SleepOp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SleepOp.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SleepOp.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SleepOp.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SliveMapper.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SliveMapper.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SlivePartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SlivePartitioner.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SliveReducer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SliveReducer.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SliveTest.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/SliveTest.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/TestSlive.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TestSlive.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/TestSlive.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/TestSlive.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Timer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Timer.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Timer.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Timer.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/WeightSelector.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/WeightSelector.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/WeightSelector.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/WeightSelector.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Weights.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Weights.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/slive/Weights.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/Weights.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/NNBench.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/NNBench.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/NNBenchWithoutMR.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBenchWithoutMR.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/NNBenchWithoutMR.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBenchWithoutMR.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/FileBench.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/FileBench.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/FileBench.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/TestSequenceFileMergeProgress.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/TestSequenceFileMergeProgress.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/TestSocketFactory.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/ipc/TestSocketFactory.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/TestSocketFactory.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/ipc/TestSocketFactory.java index 7faafae3bb0..87ab4e0cfd2 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/TestSocketFactory.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/ipc/TestSocketFactory.java @@ -35,10 +35,12 @@ import org.apache.hadoop.mapred.JobStatus; import org.apache.hadoop.mapred.MiniMRCluster; import org.apache.hadoop.mapreduce.MRConfig; import org.apache.hadoop.net.StandardSocketFactory; +import org.junit.Ignore; /** * This class checks that RPCs can use specialized socket factories. */ +@Ignore public class TestSocketFactory extends TestCase { /** diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/BigMapOutput.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/BigMapOutput.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/BigMapOutput.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/BigMapOutput.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/DummyResourceCalculatorPlugin.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/DummyResourceCalculatorPlugin.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/DummyResourceCalculatorPlugin.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/DummyResourceCalculatorPlugin.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/EmptyInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/EmptyInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/EmptyInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/EmptyInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/JobClientUnitTest.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/JobClientUnitTest.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/JobClientUnitTest.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/JobClientUnitTest.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/MRBench.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MRBench.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/MRBench.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MRBench.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MRCaching.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/MRCaching.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/ReliabilityTest.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ReliabilityTest.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/ReliabilityTest.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/ReliabilityTest.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestAuditLogger.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestAuditLogger.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestAuditLogger.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestAuditLogger.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestBadRecords.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestBadRecords.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestBadRecords.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestBadRecords.java index 29b10fd4a51..ea9f3d3f989 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestBadRecords.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestBadRecords.java @@ -39,7 +39,8 @@ import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.TaskCounter; import org.apache.hadoop.util.ReflectionUtils; - +import org.junit.Ignore; +@Ignore public class TestBadRecords extends ClusterMapReduceTestCase { private static final Log LOG = diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestClusterMRNotification.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMRNotification.java similarity index 97% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestClusterMRNotification.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMRNotification.java index 019fc1febcd..cedbb50877d 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestClusterMRNotification.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMRNotification.java @@ -20,9 +20,12 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.junit.Ignore; + /** * Tests Job end notification in cluster mode. */ +@Ignore public class TestClusterMRNotification extends NotificationTestCase { public TestClusterMRNotification() throws IOException { diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java index a90b9416779..175cbc609b0 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java @@ -21,10 +21,11 @@ import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; +import org.junit.Ignore; import java.io.*; import java.util.Properties; - +@Ignore public class TestClusterMapReduceTestCase extends ClusterMapReduceTestCase { public void _testMapReduce(boolean restart) throws Exception { OutputStream os = getFileSystem().create(new Path(getInputDir(), "text.txt")); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCollect.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCollect.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCollect.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCollect.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineFileInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineFileInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineFileInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineOutputCollector.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineOutputCollector.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCombineOutputCollector.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCombineOutputCollector.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java index d3c42c7f780..6e1a575e23f 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java @@ -28,12 +28,13 @@ import org.apache.hadoop.fs.*; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.ToolRunner; import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.junit.Ignore; /** * check for the job submission options of * -libjars -files -archives */ - +@Ignore public class TestCommandLineJobSubmission extends TestCase { // Input output paths for this.. // these are all dummy and does not test diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestComparators.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestComparators.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestComparators.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java index 09f5fbee5ab..1192ee70ce5 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestConcatenatedCompressedInput.java @@ -36,12 +36,13 @@ import org.apache.hadoop.io.compress.*; import org.apache.hadoop.util.LineReader; import org.apache.hadoop.util.ReflectionUtils; +import org.junit.Ignore; import org.junit.Test; import static junit.framework.Assert.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - +@Ignore public class TestConcatenatedCompressedInput { private static final Log LOG = LogFactory.getLog(TestConcatenatedCompressedInput.class.getName()); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestFieldSelection.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFieldSelection.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestFieldSelection.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFieldSelection.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestFileInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestFileOutputCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileOutputCommitter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestFileOutputCommitter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestFileOutputCommitter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestGetSplitHosts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestGetSplitHosts.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestGetSplitHosts.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestGetSplitHosts.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestIFile.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFile.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestIFile.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFile.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestIFileStreams.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFileStreams.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestIFileStreams.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFileStreams.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestIndexCache.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIndexCache.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestIndexCache.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIndexCache.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestInputPath.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestInputPath.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestInputPath.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestInputPath.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJavaSerialization.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJavaSerialization.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobClient.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClient.java similarity index 98% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobClient.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClient.java index 610fa8d269d..8e32022a6ca 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobClient.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClient.java @@ -29,7 +29,8 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.TestMRJobClient; import org.apache.hadoop.mapreduce.tools.CLI; import org.apache.hadoop.util.Tool; - +import org.junit.Ignore; +@Ignore public class TestJobClient extends TestMRJobClient { private String runJob() throws Exception { diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobConf.java similarity index 98% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobConf.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobConf.java index 79f1e433737..3bd2c7866c5 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobConf.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.mapred; +import org.junit.Ignore; import org.junit.Test; import java.io.File; import java.net.URLClassLoader; @@ -29,7 +30,7 @@ import org.apache.hadoop.fs.FileUtil; import static org.junit.Assert.*; - +@Ignore public class TestJobConf { private static final String JAR_RELATIVE_PATH = "build/test/mapred/testjar/testjob.jar"; diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobName.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobName.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobName.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobName.java index fd457503122..9655dc57e77 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobName.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobName.java @@ -33,7 +33,8 @@ import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.serializer.JavaSerializationComparator; import org.apache.hadoop.mapred.lib.IdentityMapper; - +import org.junit.Ignore; +@Ignore public class TestJobName extends ClusterMapReduceTestCase { public void testComplexName() throws Exception { diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestLineRecordReader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReader.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestLineRecordReader.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReader.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMapOutputType.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapOutputType.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMapOutputType.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapOutputType.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMapProgress.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapProgress.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMapProgress.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapProgress.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMapRed.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapRed.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMapRed.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMapRed.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRBringup.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRBringup.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRBringup.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRBringup.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRChildTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRChildTask.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java index 4e25f868525..7ae63c8c0c0 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRChildTask.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java @@ -34,12 +34,14 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.lib.IdentityReducer; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.junit.Ignore; /** * Class to test mapred task's * - temp directory * - child env */ +@Ignore public class TestMiniMRChildTask extends TestCase { private static final Log LOG = LogFactory.getLog(TestMiniMRChildTask.class.getName()); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRClasspath.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClasspath.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRClasspath.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClasspath.java index 2563902d4bc..9f8b4a73903 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRClasspath.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRClasspath.java @@ -30,11 +30,13 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; +import org.junit.Ignore; /** * A JUnit test to test Mini Map-Reduce Cluster with multiple directories * and check for correct classpath */ +@Ignore public class TestMiniMRClasspath extends TestCase { diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java similarity index 98% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java index d02da35256d..6e8abd73a06 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java @@ -23,11 +23,13 @@ import junit.framework.TestCase; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.mapred.MRCaching.TestResult; +import org.junit.Ignore; /** * A JUnit test to test caching with DFS * */ +@Ignore public class TestMiniMRDFSCaching extends TestCase { public void testWithDFS() throws IOException { diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java index e1c8daa56f1..7ebf8c7e77b 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java @@ -30,10 +30,12 @@ import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; import org.apache.hadoop.security.*; +import org.junit.Ignore; /** * A JUnit test to test Mini Map-Reduce Cluster with Mini-DFS. */ +@Ignore public class TestMiniMRWithDFSWithDistinctUsers extends TestCase { static final UserGroupInformation DFS_UGI = createUGI("dfs", true); static final UserGroupInformation ALICE_UGI = createUGI("alice", false); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultiFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultiFileInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultiFileSplit.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultiFileSplit.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleLevelCaching.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleLevelCaching.java index 6b767fc1238..6d3fd2927ab 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleLevelCaching.java @@ -31,10 +31,12 @@ import org.apache.hadoop.mapred.lib.IdentityMapper; import org.apache.hadoop.mapred.lib.IdentityReducer; import org.apache.hadoop.mapreduce.JobCounter; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; +import org.junit.Ignore; /** * This test checks whether the task caches are created and used properly. */ +@Ignore public class TestMultipleLevelCaching extends TestCase { private static final int MAX_LEVEL = 5; final Path inDir = new Path("/cachetesting"); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestNetworkedJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestNetworkedJob.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestReduceFetch.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetch.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestReduceFetch.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetch.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceFetchFromPartialMem.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestReduceTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestReduceTask.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestReporter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReporter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestReporter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReporter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSortedRanges.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSortedRanges.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestStatisticsCollector.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestStatisticsCollector.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskPerformanceSplits.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestTaskStatus.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestTaskStatus.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestTextInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestTextOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextOutputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestTextOutputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTextOutputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestUserDefinedCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestUserDefinedCounters.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUserDefinedCounters.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestUtils.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUtils.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestUtils.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUtils.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestWritableJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestWritableJobConf.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestWritableJobConf.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestWritableJobConf.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/join/IncomparableKey.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/IncomparableKey.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/join/IncomparableKey.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/IncomparableKey.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/join/TestDatamerge.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestDatamerge.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/join/TestDatamerge.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestDatamerge.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/join/TestTupleWritable.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestTupleWritable.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/join/TestTupleWritable.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestTupleWritable.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/join/TestWrappedRecordReaderClassloader.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestChain.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChain.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestChain.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChain.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestLineInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestLineInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestLineInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestLineInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestMultipleInputs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleInputs.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/TestMultipleInputs.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestMultipleInputs.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/aggregate/AggregatorTests.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/aggregate/AggregatorTests.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/aggregate/AggregatorTests.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/aggregate/AggregatorTests.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/pipes/TestPipes.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipes.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/pipes/TestPipes.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipes.java index 2df117b1078..46b6b59e8ca 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/pipes/TestPipes.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipes.java @@ -43,9 +43,10 @@ import org.apache.hadoop.mapred.Counters.Counter; import org.apache.hadoop.mapreduce.MapReduceTestUtil; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.ToolRunner; +import org.junit.Ignore; import junit.framework.TestCase; - +@Ignore public class TestPipes extends TestCase { private static final Log LOG = LogFactory.getLog(TestPipes.class.getName()); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/pipes/WordCountInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/WordCountInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/pipes/WordCountInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/WordCountInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/FailJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/FailJob.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/FailJob.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/FailJob.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/SleepJob.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/SleepJob.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/SleepJob.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestClientProtocolProviderImpls.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestClientProtocolProviderImpls.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestClientProtocolProviderImpls.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestClientProtocolProviderImpls.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestCounters.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestLocalRunner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestLocalRunner.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestLocalRunner.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestLocalRunner.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java index 5fa329a24fc..a7939e539d0 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestMRJobClient.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java @@ -35,8 +35,9 @@ import org.apache.hadoop.mapreduce.tools.CLI; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; +import org.junit.Ignore; import org.junit.Test; - +@Ignore public class TestMRJobClient extends ClusterMapReduceTestCase { private static final Log LOG = LogFactory.getLog(TestMRJobClient.class); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestMapCollection.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapCollection.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestMapCollection.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapCollection.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduce.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapReduce.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestMapReduce.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMapReduce.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java index 1116d4cda6b..5d36c92e420 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java @@ -29,7 +29,8 @@ import org.apache.hadoop.fs.FileAlreadyExistsException; import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; - +import org.junit.Ignore; +@Ignore public class TestNoJobSetupCleanup extends HadoopTestCase { private static String TEST_ROOT_DIR = new File(System.getProperty("test.build.data","/tmp")) diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestTaskContext.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestTaskContext.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestTaskContext.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestTaskContext.java index 372c64fd0ae..bf742c46169 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestTaskContext.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestTaskContext.java @@ -38,6 +38,7 @@ import org.junit.Test; * Tests context api and {@link StatusReporter#getProgress()} via * {@link TaskAttemptContext#getProgress()} API . */ +@Ignore public class TestTaskContext extends HadoopTestCase { private static final Path rootTempDir = new Path(System.getProperty("test.build.data", "/tmp")); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestValueIterReset.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestValueIterReset.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestValueIterReset.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestValueIterReset.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestURIFragments.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/filecache/TestURIFragments.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/filecache/TestURIFragments.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/filecache/TestURIFragments.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/aggregate/AggregatorTests.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/aggregate/AggregatorTests.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/aggregate/AggregatorTests.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/aggregate/AggregatorTests.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/aggregate/TestMapReduceAggregates.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/aggregate/TestMapReduceAggregates.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/aggregate/TestMapReduceAggregates.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/aggregate/TestMapReduceAggregates.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestLineRecordReader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestLineRecordReader.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestLineRecordReader.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestLineRecordReader.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java diff --git a/hadoop-mapreduce-project/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java similarity index 100% rename from hadoop-mapreduce-project/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java diff --git a/hadoop-mapreduce-project/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java similarity index 100% rename from hadoop-mapreduce-project/src/test/unit/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/join/TestJoinDatamerge.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinProperties.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/join/TestJoinProperties.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinProperties.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/join/TestJoinProperties.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinTupleWritable.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/join/TestJoinTupleWritable.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestJoinTupleWritable.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/join/TestJoinTupleWritable.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestWrappedRRClassloader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/join/TestWrappedRRClassloader.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/join/TestWrappedRRClassloader.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/join/TestWrappedRRClassloader.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java index fc53324d7c3..e9e779f24f4 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestBinaryTokenFile.java @@ -48,9 +48,11 @@ import org.apache.hadoop.util.ToolRunner; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; @SuppressWarnings("deprecation") +@Ignore public class TestBinaryTokenFile { // my sleep class diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java index 466cd85ca49..dd4b3489750 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java @@ -50,9 +50,11 @@ import org.apache.hadoop.security.SaslRpcServer; import org.apache.hadoop.security.UserGroupInformation; import org.apache.log4j.Level; +import org.junit.Ignore; import org.junit.Test; /** Unit tests for using Job Token over RPC. */ +@Ignore public class TestUmbilicalProtocolWithJobToken { private static final String ADDRESS = "0.0.0.0"; diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java index ebd27b4f628..c2e71e920b2 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java @@ -45,6 +45,7 @@ import org.apache.hadoop.security.token.SecretManager.InvalidToken; import org.apache.hadoop.security.token.TokenRenewer; import org.apache.hadoop.util.StringUtils; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; /** @@ -52,6 +53,7 @@ import org.junit.Test; * tests addition/deletion/cancelation of renewals of delegation tokens * */ +@Ignore public class TestDelegationTokenRenewal { private static final Log LOG = LogFactory.getLog(TestDelegationTokenRenewal.class); diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationToken.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationToken.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationToken.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationToken.java index 4c1e34da947..a031cd73ac0 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationToken.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationToken.java @@ -29,10 +29,11 @@ import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.SecretManager.InvalidToken; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; - +@Ignore public class TestDelegationToken { private MiniMRCluster cluster; private UserGroupInformation user1; diff --git a/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java similarity index 100% rename from hadoop-mapreduce-project/src/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java diff --git a/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java similarity index 100% rename from hadoop-mapreduce-project/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java diff --git a/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java similarity index 100% rename from hadoop-mapreduce-project/src/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/util/TestReflectionUtils.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/util/TestReflectionUtils.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/util/TestRunJar.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/util/TestRunJar.java similarity index 97% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/util/TestRunJar.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/util/TestRunJar.java index f5c7f18a15f..472f82bfddc 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/util/TestRunJar.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/util/TestRunJar.java @@ -20,12 +20,14 @@ package org.apache.hadoop.util; import java.io.File; import org.apache.hadoop.fs.Path; +import org.junit.Ignore; import junit.framework.TestCase; /** * A test to rest the RunJar class. */ +@Ignore public class TestRunJar extends TestCase { private static String TEST_ROOT_DIR = new Path(System.getProperty( diff --git a/hadoop-mapreduce-project/src/test/mapred/testjar/ClassWordCount.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/ClassWordCount.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testjar/ClassWordCount.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/ClassWordCount.java diff --git a/hadoop-mapreduce-project/src/test/mapred/testjar/CustomOutputCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/CustomOutputCommitter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testjar/CustomOutputCommitter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/CustomOutputCommitter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/testjar/ExternalIdentityReducer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/ExternalIdentityReducer.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testjar/ExternalIdentityReducer.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/ExternalIdentityReducer.java diff --git a/hadoop-mapreduce-project/src/test/mapred/testjar/ExternalMapperReducer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/ExternalMapperReducer.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testjar/ExternalMapperReducer.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/ExternalMapperReducer.java diff --git a/hadoop-mapreduce-project/src/test/mapred/testjar/ExternalWritable.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/ExternalWritable.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testjar/ExternalWritable.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/ExternalWritable.java diff --git a/hadoop-mapreduce-project/src/test/mapred/testjar/Hello.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/Hello.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testjar/Hello.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/Hello.java diff --git a/hadoop-mapreduce-project/src/test/mapred/testjar/JobKillCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/JobKillCommitter.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testjar/JobKillCommitter.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/JobKillCommitter.java diff --git a/hadoop-mapreduce-project/src/test/mapred/testjar/UserNamePermission.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/UserNamePermission.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testjar/UserNamePermission.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testjar/UserNamePermission.java diff --git a/hadoop-mapreduce-project/src/test/mapred/testshell/ExternalMapReduce.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testshell/ExternalMapReduce.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/testshell/ExternalMapReduce.java rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/testshell/ExternalMapReduce.java diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml index 86885c5c6e3..1d3680732a9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml @@ -38,16 +38,61 @@ ${project.version} provided     + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + test + test-jar + org.apache.hadoop hadoop-common provided + + org.apache.hadoop + hadoop-common + test + test-jar + org.apache.hadoop hadoop-hdfs provided + + org.apache.hadoop + hadoop-hdfs + test + test-jar + + + org.apache.hadoop + hadoop-yarn-server-tests + test + test-jar + + + org.apache.hadoop + hadoop-mapreduce-client-app + provided + + + org.apache.hadoop + hadoop-mapreduce-client-app + test-jar + test + + + org.apache.hadoop + hadoop-mapreduce-client-hs + provided + + + org.apache.hadoop + hadoop-mapreduce-client-hs + test + diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/TestBaileyBorweinPlouffe.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestBaileyBorweinPlouffe.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/TestBaileyBorweinPlouffe.java rename to hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestBaileyBorweinPlouffe.java diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java new file mode 100644 index 00000000000..3a2ec5ec112 --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/TestWordStats.java @@ -0,0 +1,272 @@ +package org.apache.hadoop.examples; + +import static org.junit.Assert.assertEquals; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.StringTokenizer; +import java.util.TreeMap; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.util.ToolRunner; +import org.junit.Before; +import org.junit.Test; + +public class TestWordStats { + + private final static String INPUT = "src/test/java/org/apache/hadoop/examples/pi/math"; + private final static String MEAN_OUTPUT = "build/data/mean_output"; + private final static String MEDIAN_OUTPUT = "build/data/median_output"; + private final static String STDDEV_OUTPUT = "build/data/stddev_output"; + + /** + * Modified internal test class that is designed to read all the files in the + * input directory, and find the standard deviation between all of the word + * lengths. + */ + public static class WordStdDevReader { + private long wordsRead = 0; + private long wordLengthsRead = 0; + private long wordLengthsReadSquared = 0; + + public WordStdDevReader() { + } + + public double read(String path) throws IOException { + FileSystem fs = FileSystem.get(new Configuration()); + FileStatus[] files = fs.listStatus(new Path(path)); + + for (FileStatus fileStat : files) { + if (!fileStat.isFile()) + continue; + + BufferedReader br = null; + + try { + br = new BufferedReader(new InputStreamReader(fs.open(fileStat.getPath()))); + + String line; + while ((line = br.readLine()) != null) { + StringTokenizer st = new StringTokenizer(line); + String word; + while (st.hasMoreTokens()) { + word = st.nextToken(); + this.wordsRead++; + this.wordLengthsRead += word.length(); + this.wordLengthsReadSquared += (long) Math.pow(word.length(), 2.0); + } + } + + } catch (IOException e) { + System.out.println("Output could not be read!"); + throw e; + } finally { + br.close(); + } + } + + double mean = (((double) this.wordLengthsRead) / ((double) this.wordsRead)); + mean = Math.pow(mean, 2.0); + double term = (((double) this.wordLengthsReadSquared / ((double) this.wordsRead))); + double stddev = Math.sqrt((term - mean)); + return stddev; + } + + } + + /** + * Modified internal test class that is designed to read all the files in the + * input directory, and find the median length of all the words. + */ + public static class WordMedianReader { + private long wordsRead = 0; + private TreeMap map = new TreeMap(); + + public WordMedianReader() { + } + + public double read(String path) throws IOException { + FileSystem fs = FileSystem.get(new Configuration()); + FileStatus[] files = fs.listStatus(new Path(path)); + + int num = 0; + + for (FileStatus fileStat : files) { + if (!fileStat.isFile()) + continue; + + BufferedReader br = null; + + try { + br = new BufferedReader(new InputStreamReader(fs.open(fileStat.getPath()))); + + String line; + while ((line = br.readLine()) != null) { + StringTokenizer st = new StringTokenizer(line); + String word; + while (st.hasMoreTokens()) { + word = st.nextToken(); + this.wordsRead++; + if (this.map.get(word.length()) == null) { + this.map.put(word.length(), 1); + } else { + int count = this.map.get(word.length()); + this.map.put(word.length(), count + 1); + } + } + } + } catch (IOException e) { + System.out.println("Output could not be read!"); + throw e; + } finally { + br.close(); + } + } + + int medianIndex1 = (int) Math.ceil((this.wordsRead / 2.0)); + int medianIndex2 = (int) Math.floor((this.wordsRead / 2.0)); + + for (Integer key : this.map.navigableKeySet()) { + int prevNum = num; + num += this.map.get(key); + + if (medianIndex2 >= prevNum && medianIndex1 <= num) { + return key; + } else if (medianIndex2 >= prevNum && medianIndex1 < num) { + Integer nextCurrLen = this.map.navigableKeySet().iterator().next(); + double median = (key + nextCurrLen) / 2.0; + return median; + } + } + return -1; + } + + } + + /** + * Modified internal test class that is designed to read all the files in the + * input directory, and find the mean length of all the words. + */ + public static class WordMeanReader { + private long wordsRead = 0; + private long wordLengthsRead = 0; + + public WordMeanReader() { + } + + public double read(String path) throws IOException { + FileSystem fs = FileSystem.get(new Configuration()); + FileStatus[] files = fs.listStatus(new Path(path)); + + for (FileStatus fileStat : files) { + if (!fileStat.isFile()) + continue; + + BufferedReader br = null; + + try { + br = new BufferedReader(new InputStreamReader(fs.open(fileStat.getPath()))); + + String line; + while ((line = br.readLine()) != null) { + StringTokenizer st = new StringTokenizer(line); + String word; + while (st.hasMoreTokens()) { + word = st.nextToken(); + this.wordsRead++; + this.wordLengthsRead += word.length(); + } + } + } catch (IOException e) { + System.out.println("Output could not be read!"); + throw e; + } finally { + br.close(); + } + } + + double mean = (((double) this.wordLengthsRead) / ((double) this.wordsRead)); + return mean; + } + + } + + /** + * Internal class designed to delete the output directory. Meant solely for + * use before and after the test is run; this is so next iterations of the + * test do not encounter a "file already exists" error. + * + * @param dir + * The directory to delete. + * @return Returns whether the deletion was successful or not. + */ + public static boolean deleteDir(File dir) { + if (dir.isDirectory()) { + String[] children = dir.list(); + for (int i = 0; i < children.length; i++) { + boolean success = deleteDir(new File(dir, children[i])); + if (!success) { + System.out.println("Could not delete directory after test!"); + return false; + } + } + } + + // The directory is now empty so delete it + return dir.delete(); + } + + @Before public void setup() throws Exception { + deleteDir(new File(MEAN_OUTPUT)); + deleteDir(new File(MEDIAN_OUTPUT)); + deleteDir(new File(STDDEV_OUTPUT)); + } + + @Test public void testGetTheMean() throws Exception { + String args[] = new String[2]; + args[0] = INPUT; + args[1] = MEAN_OUTPUT; + + WordMean wm = new WordMean(); + ToolRunner.run(new Configuration(), wm, args); + double mean = wm.getMean(); + + // outputs MUST match + WordMeanReader wr = new WordMeanReader(); + assertEquals(mean, wr.read(INPUT), 0.0); + } + + @Test public void testGetTheMedian() throws Exception { + String args[] = new String[2]; + args[0] = INPUT; + args[1] = MEDIAN_OUTPUT; + + WordMedian wm = new WordMedian(); + ToolRunner.run(new Configuration(), wm, args); + double median = wm.getMedian(); + + // outputs MUST match + WordMedianReader wr = new WordMedianReader(); + assertEquals(median, wr.read(INPUT), 0.0); + } + + @Test public void testGetTheStandardDeviation() throws Exception { + String args[] = new String[2]; + args[0] = INPUT; + args[1] = STDDEV_OUTPUT; + + WordStandardDeviation wsd = new WordStandardDeviation(); + ToolRunner.run(new Configuration(), wsd, args); + double stddev = wsd.getStandardDeviation(); + + // outputs MUST match + WordStdDevReader wr = new WordStdDevReader(); + assertEquals(stddev, wr.read(INPUT), 0.0); + } + +} diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/pi/math/TestLongLong.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/pi/math/TestLongLong.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/pi/math/TestLongLong.java rename to hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/pi/math/TestLongLong.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/pi/math/TestModular.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/pi/math/TestModular.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/pi/math/TestModular.java rename to hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/pi/math/TestModular.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/pi/math/TestSummation.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/pi/math/TestSummation.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/pi/math/TestSummation.java rename to hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/pi/math/TestSummation.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/terasort/TestTeraSort.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java similarity index 98% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/terasort/TestTeraSort.java rename to hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java index 9e78b605107..4a11c9a331e 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/examples/terasort/TestTeraSort.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java @@ -24,7 +24,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapred.HadoopTestCase; import org.apache.hadoop.util.ToolRunner; - +import org.junit.Ignore; +@Ignore public class TestTeraSort extends HadoopTestCase { public TestTeraSort() diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index b494ea28d6a..b90f99cba3e 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -223,6 +223,16 @@ hadoop-archives ${project.version}     + + org.apache.hadoop + hadoop-rumen + ${project.version} + + + org.apache.hadoop + hadoop-extras + ${project.version} + com.google.guava diff --git a/hadoop-tools/hadoop-extras/pom.xml b/hadoop-tools/hadoop-extras/pom.xml new file mode 100644 index 00000000000..4eee9a54ac3 --- /dev/null +++ b/hadoop-tools/hadoop-extras/pom.xml @@ -0,0 +1,120 @@ + + + + 4.0.0 + + org.apache.hadoop + hadoop-project + 0.23.1-SNAPSHOT + ../../hadoop-project + + org.apache.hadoop + hadoop-extras + 0.23.1-SNAPSHOT + Apache Hadoop Extras + Apache Hadoop Extras + jar + + + ${project.build.directory}/log + + + + + org.apache.hadoop + hadoop-annotations + provided + + + org.apache.hadoop + hadoop-mapreduce-client-hs + provided + + + org.apache.hadoop + hadoop-mapreduce-client-core + provided + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + provided + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + test + test-jar + + + org.apache.hadoop + hadoop-common + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + org.apache.hadoop + hadoop-common + test + test-jar + + + org.apache.hadoop + hadoop-hdfs + test + test-jar + + + org.apache.hadoop + hadoop-yarn-server-tests + test-jar + test + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + create-log-dir + process-test-resources + + run + + + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + + diff --git a/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/tools/GetGroups.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/GetGroups.java similarity index 95% rename from hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/tools/GetGroups.java rename to hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/GetGroups.java index a2be335ee38..3793749a9cd 100644 --- a/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/tools/GetGroups.java +++ b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/GetGroups.java @@ -22,7 +22,6 @@ import java.io.PrintStream; import java.net.InetSocketAddress; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.mapred.JobTracker; import org.apache.hadoop.tools.GetGroupsBase; import org.apache.hadoop.util.ToolRunner; @@ -48,11 +47,11 @@ public class GetGroups extends GetGroupsBase { @Override protected InetSocketAddress getProtocolAddress(Configuration conf) throws IOException { - return JobTracker.getAddress(conf); + throw new UnsupportedOperationException(); } public static void main(String[] argv) throws Exception { int res = ToolRunner.run(new GetGroups(new Configuration()), argv); System.exit(res); } -} \ No newline at end of file +} diff --git a/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/tools/package-info.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/package-info.java similarity index 100% rename from hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/tools/package-info.java rename to hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/mapred/tools/package-info.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistCh.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistCh.java rename to hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCh.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistCp.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp.java similarity index 99% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistCp.java rename to hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp.java index 5c21f887f9b..04d123af910 100644 --- a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistCp.java +++ b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp.java @@ -62,7 +62,6 @@ import org.apache.hadoop.mapred.InputSplit; import org.apache.hadoop.mapred.InvalidInputException; import org.apache.hadoop.mapred.JobClient; import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapred.JobTracker; import org.apache.hadoop.mapred.Mapper; import org.apache.hadoop.mapred.OutputCollector; import org.apache.hadoop.mapred.RecordReader; diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistCp_Counter.properties b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp_Counter.properties similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistCp_Counter.properties rename to hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistCp_Counter.properties diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistTool.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistTool.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/DistTool.java rename to hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/DistTool.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/Logalyzer.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/Logalyzer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/Logalyzer.java rename to hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/Logalyzer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/package-info.java b/hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/package-info.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/package-info.java rename to hadoop-tools/hadoop-extras/src/main/java/org/apache/hadoop/tools/package-info.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/tools/TestGetGroups.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/mapred/tools/TestGetGroups.java similarity index 98% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/tools/TestGetGroups.java rename to hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/mapred/tools/TestGetGroups.java index 26da8539570..ed7b8aa8632 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/tools/TestGetGroups.java +++ b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/mapred/tools/TestGetGroups.java @@ -26,10 +26,12 @@ import org.apache.hadoop.tools.GetGroupsTestBase; import org.apache.hadoop.util.Tool; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; /** * Tests for the MR implementation of {@link GetGroups} */ +@Ignore public class TestGetGroups extends GetGroupsTestBase { private MiniMRCluster cluster; diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/TestCopyFiles.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/TestCopyFiles.java rename to hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java index ce6f400ae7e..0dbfde10ed4 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/TestCopyFiles.java +++ b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestCopyFiles.java @@ -51,11 +51,13 @@ import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.tools.DistCp; import org.apache.hadoop.util.ToolRunner; import org.apache.log4j.Level; +import org.junit.Ignore; /** * A JUnit test for copying files recursively. */ +@Ignore public class TestCopyFiles extends TestCase { { ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hdfs.StateChange") diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/TestDistCh.java b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java similarity index 98% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/TestDistCh.java rename to hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java index 24e7c577e39..9fa1aa8a7fc 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/TestDistCh.java +++ b/hadoop-tools/hadoop-extras/src/test/java/org/apache/hadoop/tools/TestDistCh.java @@ -40,16 +40,15 @@ import org.apache.hadoop.hdfs.server.datanode.DataNode; import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.mapred.MiniMRCluster; -import org.apache.hadoop.mapred.TaskTracker; import org.apache.log4j.Level; - +import org.junit.Ignore; +@Ignore public class TestDistCh extends junit.framework.TestCase { { ((Log4JLogger)LogFactory.getLog("org.apache.hadoop.hdfs.StateChange") ).getLogger().setLevel(Level.OFF); ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.OFF); ((Log4JLogger)LogFactory.getLog(FSNamesystem.class)).getLogger().setLevel(Level.OFF); - ((Log4JLogger)TaskTracker.LOG).getLogger().setLevel(Level.OFF); } static final Long RANDOM_NUMBER_GENERATOR_SEED = null; @@ -218,4 +217,4 @@ public class TestDistCh extends junit.framework.TestCase { System.out.println("results:\n" + results); return results; } -} \ No newline at end of file +} diff --git a/hadoop-tools/hadoop-rumen/pom.xml b/hadoop-tools/hadoop-rumen/pom.xml new file mode 100644 index 00000000000..58d7ba81913 --- /dev/null +++ b/hadoop-tools/hadoop-rumen/pom.xml @@ -0,0 +1,121 @@ + + + + 4.0.0 + + org.apache.hadoop + hadoop-project + 0.23.1-SNAPSHOT + ../../hadoop-project + + org.apache.hadoop + hadoop-rumen + 0.23.1-SNAPSHOT + Apache Hadoop Rumen + Apache Hadoop Rumen + jar + + + ${project.build.directory}/log + + + + + org.apache.hadoop + hadoop-annotations + provided + + + org.apache.hadoop + hadoop-mapreduce-client-hs + provided + + + org.apache.hadoop + hadoop-mapreduce-client-core + provided + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + provided + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + test + test-jar + + + org.apache.hadoop + hadoop-common + provided + + + org.apache.hadoop + hadoop-hdfs + provided + + + org.apache.hadoop + hadoop-common + test + test-jar + + + org.apache.hadoop + hadoop-hdfs + test + test-jar + + + org.apache.hadoop + hadoop-yarn-server-tests + test-jar + test + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + create-log-dir + process-test-resources + + run + + + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/AbstractClusterStory.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/AbstractClusterStory.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/AbstractClusterStory.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/AbstractClusterStory.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Anonymizer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Anonymizer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Anonymizer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Anonymizer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ClusterStory.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterStory.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ClusterStory.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterStory.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/CurrentJHParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CurrentJHParser.java similarity index 97% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/CurrentJHParser.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CurrentJHParser.java index 15d4ce148e0..518f8c1337b 100644 --- a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/CurrentJHParser.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/CurrentJHParser.java @@ -23,7 +23,7 @@ import java.io.InputStream; import org.apache.hadoop.mapreduce.jobhistory.EventReader; import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent; -import org.apache.hadoop.mapreduce.jobhistory.JobHistory; +import org.apache.hadoop.mapreduce.v2.hs.JobHistory; /** * {@link JobHistoryParser} that parses {@link JobHistory} files produced by diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DeepCompare.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepCompare.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DeepCompare.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepCompare.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DeepInequalityException.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepInequalityException.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DeepInequalityException.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeepInequalityException.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultInputDemuxer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DefaultOutputter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultOutputter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DefaultOutputter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DefaultOutputter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/DeskewedJobTraceReader.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Folder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Folder.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Folder.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Folder.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Hadoop20JHParser.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Histogram.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Histogram.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Histogram.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Histogram.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/InputDemuxer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/InputDemuxer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/InputDemuxer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/InputDemuxer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Job20LineHistoryEventEmitter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobBuilder.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobBuilder.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfPropertyNames.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobConfigurationParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfigurationParser.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobConfigurationParser.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobConfigurationParser.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParser.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryParser.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParser.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryParserFactory.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryUtils.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java similarity index 99% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryUtils.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java index 22a18fedb45..6ae87bbd40a 100644 --- a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobHistoryUtils.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobHistoryUtils.java @@ -27,7 +27,7 @@ import org.apache.hadoop.mapreduce.JobID; import org.apache.hadoop.mapreduce.jobhistory.JhCounter; import org.apache.hadoop.mapreduce.jobhistory.JhCounterGroup; import org.apache.hadoop.mapreduce.jobhistory.JhCounters; -import org.apache.hadoop.mapreduce.jobhistory.JobHistory; +import org.apache.hadoop.mapreduce.v2.hs.JobHistory; /** * Job History related utils for handling multiple formats of history logs of diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobStory.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStory.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobStory.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStory.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobStoryProducer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStoryProducer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobStoryProducer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobStoryProducer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobTraceReader.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobTraceReader.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JobTraceReader.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JobTraceReader.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/JsonObjectMapperWriter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LogRecordType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LogRecordType.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LogRecordType.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LogRecordType.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedJob.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedJob.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedLocation.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedLocation.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedLocation.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedLocation.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTask.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTask.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTask.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/MachineNode.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MachineNode.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/MachineNode.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MachineNode.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapAttempt20LineHistoryEventEmitter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Node.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Node.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Node.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Node.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Outputter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Outputter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Outputter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Outputter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Pair.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pair.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Pair.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pair.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedConfigFile.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedConfigFile.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedConfigFile.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedConfigFile.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedHost.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedHost.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedJob.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedJob.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedJob.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedJob.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedLine.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedLine.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedLine.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedLine.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTask.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTask.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTaskAttempt.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/PossiblyDecompressedInputStream.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java similarity index 98% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java index 184db8ff046..239d666f41e 100644 --- a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java @@ -20,7 +20,7 @@ package org.apache.hadoop.tools.rumen; import java.util.regex.Pattern; import org.apache.hadoop.mapreduce.JobID; -import org.apache.hadoop.mapreduce.jobhistory.JobHistory; +import org.apache.hadoop.mapreduce.v2.hs.JobHistory; /** * Job History related constants for Hadoop releases prior to 0.21 diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/RackNode.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RackNode.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/RackNode.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RackNode.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceAttempt20LineHistoryEventEmitter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ResourceUsageMetrics.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/RewindableInputStream.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RewindableInputStream.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/RewindableInputStream.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RewindableInputStream.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/SingleEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/SingleEventEmitter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/SingleEventEmitter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/SingleEventEmitter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttempt20LineEventEmitter.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TaskInfo.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskInfo.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TaskInfo.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TaskInfo.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TopologyBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TopologyBuilder.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TopologyBuilder.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TopologyBuilder.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TraceBuilder.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TraceBuilder.java similarity index 99% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TraceBuilder.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TraceBuilder.java index c03030971c7..9a35e84284c 100644 --- a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TraceBuilder.java +++ b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TraceBuilder.java @@ -40,7 +40,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.RemoteIterator; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent; -import org.apache.hadoop.mapreduce.jobhistory.JobHistory; +import org.apache.hadoop.mapreduce.v2.hs.JobHistory; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TreePath.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TreePath.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/TreePath.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/TreePath.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Version20LogInterfaceUtils.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ZombieCluster.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieCluster.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ZombieCluster.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieCluster.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ZombieJobProducer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJobProducer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/ZombieJobProducer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJobProducer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/DataAnonymizer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/WordList.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/WordList.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordListAnonymizerUtility.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/AnonymizableDataType.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/ClassName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/ClassName.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/ClassName.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/ClassName.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DataType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DataType.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DataType.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DataType.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultAnonymizableDataType.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/DefaultDataType.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/FileName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/FileName.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/FileName.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/FileName.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/JobName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobName.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/JobName.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobName.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/JobProperties.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/NodeName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/NodeName.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/NodeName.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/NodeName.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/QueueName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/QueueName.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/QueueName.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/QueueName.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/UserName.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/UserName.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/UserName.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/UserName.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/DefaultJobPropertiesParser.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/JobPropertyParser.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/datatypes/util/MapReduceJobPropertiesParser.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/package-info.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/package-info.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/package-info.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/package-info.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/BlockingSerializer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultAnonymizingRumenSerializer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/DefaultRumenSerializer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/serializers/ObjectStringSerializer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/State.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/State.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/State.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/State.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/StateDeserializer.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StateDeserializer.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/StateDeserializer.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StateDeserializer.java diff --git a/hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/StatePool.java b/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StatePool.java similarity index 100% rename from hadoop-mapreduce-project/src/tools/org/apache/hadoop/tools/rumen/state/StatePool.java rename to hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/state/StatePool.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java rename to hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/ConcatenatedInputFilesDemuxer.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/HistogramRawTestData.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/HistogramRawTestData.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/HistogramRawTestData.java rename to hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/HistogramRawTestData.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestHistograms.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java similarity index 99% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestHistograms.java rename to hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java index b43ab5da83e..372d93e1062 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestHistograms.java +++ b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestHistograms.java @@ -32,9 +32,10 @@ import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.map.ObjectMapper; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; - +@Ignore public class TestHistograms { /** diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java rename to hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestPiecewiseLinearInterpolation.java diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java b/hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java similarity index 100% rename from hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java rename to hadoop-tools/hadoop-rumen/src/test/java/org/apache/hadoop/tools/rumen/TestRandomSeedGenerator.java diff --git a/hadoop-tools/hadoop-tools-dist/pom.xml b/hadoop-tools/hadoop-tools-dist/pom.xml index b3f77a4c71b..f9b985fbe6b 100644 --- a/hadoop-tools/hadoop-tools-dist/pom.xml +++ b/hadoop-tools/hadoop-tools-dist/pom.xml @@ -43,6 +43,16 @@ hadoop-archives compile + + org.apache.hadoop + hadoop-rumen + compile + + + org.apache.hadoop + hadoop-extras + compile + diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml index 0e8b768ba64..b95798988d9 100644 --- a/hadoop-tools/pom.xml +++ b/hadoop-tools/pom.xml @@ -30,7 +30,9 @@ hadoop-streaming hadoop-archives + hadoop-rumen hadoop-tools-dist + hadoop-extras From 6f27abfe728f1aea660f6f0658453411095f1395 Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Fri, 20 Jan 2012 20:47:02 +0000 Subject: [PATCH 08/14] MAPREDUCE-3698. Client cannot talk to the history server in secure mode. (mahadev) - Merging r1234120 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234125 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 ++ .../authorize/ClientHSPolicyProvider.java | 45 +++++++++++++++++++ .../client/HSClientProtocolPBClientImpl.java | 9 +++- .../client/MRClientProtocolPBClientImpl.java | 4 +- .../v2/jobhistory/JHAdminConfig.java | 5 +++ .../security/client/ClientHSSecurityInfo.java | 4 +- .../mapreduce/v2/hs/HistoryClientService.java | 6 +-- .../yarn/ipc/ProtoOverHadoopRpcEngine.java | 1 - 8 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/security/authorize/ClientHSPolicyProvider.java diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 6d81be32445..a5605f12d39 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -469,6 +469,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3582. Move successfully passing MR1 tests to MR2 maven tree. (ahmed via tucu) + MAPREDUCE-3698. Client cannot talk to the history server in secure mode. + (mahadev) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/security/authorize/ClientHSPolicyProvider.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/security/authorize/ClientHSPolicyProvider.java new file mode 100644 index 00000000000..968d0423a78 --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/security/authorize/ClientHSPolicyProvider.java @@ -0,0 +1,45 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.mapreduce.v2.app.security.authorize; + +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; +import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; +import org.apache.hadoop.security.authorize.PolicyProvider; +import org.apache.hadoop.security.authorize.Service; +import org.apache.hadoop.yarn.proto.HSClientProtocol; + +/** + * {@link PolicyProvider} for YARN MapReduce protocols. + */ +@InterfaceAudience.Private +@InterfaceStability.Unstable +public class ClientHSPolicyProvider extends PolicyProvider { + + private static final Service[] mrHSServices = + new Service[] { + new Service( + JHAdminConfig.MR_HS_SECURITY_SERVICE_AUTHORIZATION, + HSClientProtocol.HSClientProtocolService.BlockingInterface.class) + }; + + @Override + public Service[] getServices() { + return mrHSServices; + } +} diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/HSClientProtocolPBClientImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/HSClientProtocolPBClientImpl.java index c9b745002c2..aa5d40e8e74 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/HSClientProtocolPBClientImpl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/HSClientProtocolPBClientImpl.java @@ -22,13 +22,20 @@ import java.io.IOException; import java.net.InetSocketAddress; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.mapreduce.v2.api.HSClientProtocol; +import org.apache.hadoop.yarn.ipc.ProtoOverHadoopRpcEngine; +import org.apache.hadoop.yarn.proto.HSClientProtocol.HSClientProtocolService; public class HSClientProtocolPBClientImpl extends MRClientProtocolPBClientImpl implements HSClientProtocol { public HSClientProtocolPBClientImpl(long clientVersion, InetSocketAddress addr, Configuration conf) throws IOException { - super(clientVersion, addr, conf); + super(); + RPC.setProtocolEngine(conf, HSClientProtocolService.BlockingInterface.class, + ProtoOverHadoopRpcEngine.class); + proxy = (HSClientProtocolService.BlockingInterface)RPC.getProxy( + HSClientProtocolService.BlockingInterface.class, clientVersion, addr, conf); } } \ No newline at end of file diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java index 4a37c46630b..1fb57f972ce 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/impl/pb/client/MRClientProtocolPBClientImpl.java @@ -93,7 +93,9 @@ import com.google.protobuf.ServiceException; public class MRClientProtocolPBClientImpl implements MRClientProtocol { - private MRClientProtocolService.BlockingInterface proxy; + protected MRClientProtocolService.BlockingInterface proxy; + + public MRClientProtocolPBClientImpl() {}; public MRClientProtocolPBClientImpl(long clientVersion, InetSocketAddress addr, Configuration conf) throws IOException { RPC.setProtocolEngine(conf, MRClientProtocolService.BlockingInterface.class, ProtoOverHadoopRpcEngine.class); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java index cb529243d12..a89f70c901d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JHAdminConfig.java @@ -111,4 +111,9 @@ public class JHAdminConfig { public static final int DEFAULT_MR_HISTORY_WEBAPP_PORT = 19888; public static final String DEFAULT_MR_HISTORY_WEBAPP_ADDRESS = "0.0.0.0:" + DEFAULT_MR_HISTORY_WEBAPP_PORT; + /* + * HS Service Authorization + */ + public static final String MR_HS_SECURITY_SERVICE_AUTHORIZATION = + "security.mrhs.client.protocol.acl"; } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java index f3893a99a12..4eb5e9fee97 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/security/client/ClientHSSecurityInfo.java @@ -20,6 +20,8 @@ package org.apache.hadoop.mapreduce.v2.security.client; import java.lang.annotation.Annotation; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; import org.apache.hadoop.security.KerberosInfo; @@ -30,7 +32,7 @@ import org.apache.hadoop.security.token.TokenSelector; import org.apache.hadoop.yarn.proto.HSClientProtocol; public class ClientHSSecurityInfo extends SecurityInfo { - + @Override public KerberosInfo getKerberosInfo(Class protocol, Configuration conf) { if (!protocol diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java index ab3eb5c1505..ca933b4e104 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryClientService.java @@ -66,7 +66,7 @@ import org.apache.hadoop.mapreduce.v2.api.records.TaskId; import org.apache.hadoop.mapreduce.v2.api.records.TaskType; import org.apache.hadoop.mapreduce.v2.app.job.Job; import org.apache.hadoop.mapreduce.v2.app.job.Task; -import org.apache.hadoop.mapreduce.v2.app.security.authorize.MRAMPolicyProvider; +import org.apache.hadoop.mapreduce.v2.app.security.authorize.ClientHSPolicyProvider; import org.apache.hadoop.mapreduce.v2.hs.webapp.HsWebApp; import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig; import org.apache.hadoop.net.NetUtils; @@ -136,9 +136,9 @@ public class HistoryClientService extends AbstractService { if (conf.getBoolean( CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION, false)) { - server.refreshServiceAcl(conf, new MRAMPolicyProvider()); + server.refreshServiceAcl(conf, new ClientHSPolicyProvider()); } - + server.start(); this.bindAddress = NetUtils.createSocketAddr(hostNameResolved.getHostAddress() diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java index e68b420f2e8..6900b0ff839 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/ProtoOverHadoopRpcEngine.java @@ -67,7 +67,6 @@ public class ProtoOverHadoopRpcEngine implements RpcEngine { public ProtocolProxy getProxy(Class protocol, long clientVersion, InetSocketAddress addr, UserGroupInformation ticket, Configuration conf, SocketFactory factory, int rpcTimeout) throws IOException { - return new ProtocolProxy(protocol, (T) Proxy.newProxyInstance(protocol .getClassLoader(), new Class[] { protocol }, new Invoker(protocol, addr, ticket, conf, factory, rpcTimeout)), false); From 8539e71bd035261861471d0051b87f20b7441c4a Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Fri, 20 Jan 2012 21:07:21 +0000 Subject: [PATCH 09/14] Merge -r 1234134:1234135 from trunk to branch. FIXES: HDFS-2816 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234138 13f79535-47bb-0310-9956-ffa450edef68 --- .../dev-support/findbugsExcludeFile.xml | 16 ++++++++++++++++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 19 insertions(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/dev-support/findbugsExcludeFile.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/dev-support/findbugsExcludeFile.xml index 1f5a4f5bc4f..94c1d76bf3e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/dev-support/findbugsExcludeFile.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/dev-support/findbugsExcludeFile.xml @@ -1,3 +1,19 @@ + diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 300526af629..e32cb00ddb5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -164,6 +164,9 @@ Release 0.23.1 - UNRELEASED HDFS-2751. Datanode may incorrectly drop OS cache behind reads even for short reads. (todd) + HDFS-2816. Fix missing license header in httpfs findbugsExcludeFile.xml. + (hitesh via tucu) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES From f80dc919ad9bbea4616b0af3b05ae8ebd6aa102a Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Fri, 20 Jan 2012 21:29:28 +0000 Subject: [PATCH 10/14] MAPREDUCE-3689. RM web UI doesn't handle newline in job name. (Thomas Graves via mahadev) - Merging r1234148 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234149 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/webapp/view/Jsons.java | 2 +- .../hadoop/yarn/server/resourcemanager/webapp/AppsList.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index a5605f12d39..3ea675b0437 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -472,6 +472,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3698. Client cannot talk to the history server in secure mode. (mahadev) + MAPREDUCE-3689. RM web UI doesn't handle newline in job name. + (Thomas Graves via mahadev) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/Jsons.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/Jsons.java index 06e5d062c79..8e1794062bd 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/Jsons.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/view/Jsons.java @@ -40,7 +40,7 @@ public class Jsons { public static PrintWriter appendProgressBar(PrintWriter out, float progress) { - return appendProgressBar(out, String.format("%.1f", progress * 100)); + return appendProgressBar(out, String.format("%.1f", progress)); } public static PrintWriter appendSortable(PrintWriter out, Object value) { diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java index f3378d2747e..a7b35abaaac 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java @@ -66,7 +66,7 @@ class AppsList implements ToJSON { appendLink(out, appInfo.getAppId(), rc.prefix(), "app", appInfo.getAppId()).append(_SEP). append(escapeHtml(appInfo.getUser())).append(_SEP). - append(escapeHtml(appInfo.getName())).append(_SEP). + append(escapeJavaScript(escapeHtml(appInfo.getName()))).append(_SEP). append(escapeHtml(appInfo.getQueue())).append(_SEP). append(appInfo.getState()).append(_SEP). append(appInfo.getFinalStatus()).append(_SEP); From 6d331aee036472509badcf59baa294588f5b750c Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Fri, 20 Jan 2012 21:47:59 +0000 Subject: [PATCH 11/14] MAPREDUCE-3701. Delete HadoopYarnRPC from 0.23 branch. (mahadev) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234161 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 + .../apache/hadoop/yarn/ipc/HadoopYarnRPC.java | 80 ------------------- 2 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 3ea675b0437..2d9d3a25eff 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -475,6 +475,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3689. RM web UI doesn't handle newline in job name. (Thomas Graves via mahadev) + MAPREDUCE-3701. Delete HadoopYarnRPC from 0.23 branch. + (mahadev) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java deleted file mode 100644 index 3ad757da574..00000000000 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/HadoopYarnRPC.java +++ /dev/null @@ -1,80 +0,0 @@ -/** -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -package org.apache.hadoop.yarn.ipc; - -import java.io.IOException; -import java.net.InetSocketAddress; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.ipc.AvroSpecificRpcEngine; -import org.apache.hadoop.ipc.RPC; -import org.apache.hadoop.ipc.Server; -import org.apache.hadoop.security.token.SecretManager; -import org.apache.hadoop.security.token.TokenIdentifier; -import org.apache.hadoop.yarn.YarnException; - -/** - * This uses Hadoop RPC. Uses a tunnel AvroSpecificRpcEngine over - * Hadoop connection. - * This does not give cross-language wire compatibility, since the Hadoop - * RPC wire format is non-standard, but it does permit use of Avro's protocol - * versioning features for inter-Java RPCs. - */ -public class HadoopYarnRPC extends YarnRPC { - - private static final Log LOG = LogFactory.getLog(HadoopYarnRPC.class); - - @Override - public Object getProxy(Class protocol, InetSocketAddress addr, - Configuration conf) { - LOG.debug("Creating a HadoopYarnRpc proxy for protocol " + protocol); - RPC.setProtocolEngine(conf, protocol, AvroSpecificRpcEngine.class); - try { - return RPC.getProxy(protocol, 1, addr, conf); - } catch (IOException e) { - throw new YarnException(e); - } - } - - @Override - public void stopProxy(Object proxy, Configuration conf) { - RPC.stopProxy(proxy); - } - - @Override - public Server getServer(Class protocol, Object instance, - InetSocketAddress addr, Configuration conf, - SecretManager secretManager, - int numHandlers) { - LOG.debug("Creating a HadoopYarnRpc server for protocol " + protocol + - " with " + numHandlers + " handlers"); - RPC.setProtocolEngine(conf, protocol, AvroSpecificRpcEngine.class); - final RPC.Server hadoopServer; - try { - hadoopServer = RPC.getServer(protocol, instance, addr.getHostName(), - addr.getPort(), numHandlers, false, conf, secretManager); - } catch (IOException e) { - throw new YarnException(e); - } - return hadoopServer; - } - -} From 8df34a0ccab30bcb6ce910480f50d4f4f8678769 Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Sat, 21 Jan 2012 00:42:03 +0000 Subject: [PATCH 12/14] HDFS-2817. Combine the two TestSafeMode test suites. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234220 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 + .../org/apache/hadoop/hdfs/TestSafeMode.java | 49 ++++++++++- .../hdfs/server/namenode/TestSafeMode.java | 82 ------------------- 3 files changed, 50 insertions(+), 83 deletions(-) delete mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSafeMode.java diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index e32cb00ddb5..25c53f5aa00 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -92,6 +92,8 @@ Release 0.23.1 - UNRELEASED HDFS-2803. Add logging to LeaseRenewer for better lease expiration debugging. (Jimmy Xiang via todd) + HDFS-2817. Combine the two TestSafeMode test suites. (todd) + OPTIMIZATIONS HDFS-2130. Switch default checksum to CRC32C. (todd) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java index 73adf8efcfe..6ec5f8bf521 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java @@ -113,6 +113,21 @@ public class TestSafeMode { dfs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE)); } + /** + * Test that, if there are no blocks in the filesystem, + * the NameNode doesn't enter the "safemode extension" period. + */ + @Test(timeout=45000) + public void testNoExtensionIfNoBlocks() throws IOException { + cluster.getConfiguration(0).setInt( + DFSConfigKeys.DFS_NAMENODE_SAFEMODE_EXTENSION_KEY, 60000); + cluster.restartNameNode(); + // Even though we have safemode extension set high, we should immediately + // exit safemode on startup because there are no blocks in the namespace. + String status = cluster.getNameNode().getNamesystem().getSafemode(); + assertEquals("", status); + } + public interface FSRun { public abstract void run(FileSystem fs) throws IOException; } @@ -193,5 +208,37 @@ public class TestSafeMode { assertFalse("Could not leave SM", dfs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE)); } - + + /** + * Verify that the NameNode stays in safemode when dfs.safemode.datanode.min + * is set to a number greater than the number of live datanodes. + */ + @Test + public void testDatanodeThreshold() throws IOException { + cluster.shutdown(); + Configuration conf = cluster.getConfiguration(0); + conf.setInt(DFSConfigKeys.DFS_NAMENODE_SAFEMODE_EXTENSION_KEY, 0); + conf.setInt(DFSConfigKeys.DFS_NAMENODE_SAFEMODE_MIN_DATANODES_KEY, 1); + + cluster.restartNameNode(); + fs = (DistributedFileSystem)cluster.getFileSystem(); + + String tipMsg = cluster.getNamesystem().getSafemode(); + assertTrue("Safemode tip message looks right: " + tipMsg, + tipMsg.contains("The number of live datanodes 0 needs an additional " + + "2 live datanodes to reach the minimum number 1. " + + "Safe mode will be turned off automatically.")); + + // Start a datanode + cluster.startDataNodes(conf, 1, true, null, null); + + // Wait long enough for safemode check to refire + try { + Thread.sleep(1000); + } catch (InterruptedException ignored) {} + + // We now should be out of safe mode. + assertEquals("", cluster.getNamesystem().getSafemode()); + } + } \ No newline at end of file diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSafeMode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSafeMode.java deleted file mode 100644 index 88a1d0d955e..00000000000 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestSafeMode.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.hdfs.server.namenode; - -import java.io.IOException; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction; -import org.apache.hadoop.hdfs.DFSConfigKeys; -import org.apache.hadoop.hdfs.DistributedFileSystem; -import org.apache.hadoop.hdfs.HdfsConfiguration; -import org.apache.hadoop.hdfs.MiniDFSCluster; - -import org.junit.Test; -import static org.junit.Assert.*; - -/** - * Tests to verify safe mode correctness. - */ -public class TestSafeMode { - - /** - * Verify that the NameNode stays in safemode when dfs.safemode.datanode.min - * is set to a number greater than the number of live datanodes. - */ - @Test - public void testDatanodeThreshold() throws IOException { - MiniDFSCluster cluster = null; - DistributedFileSystem fs = null; - try { - Configuration conf = new HdfsConfiguration(); - conf.setInt(DFSConfigKeys.DFS_NAMENODE_SAFEMODE_EXTENSION_KEY, 0); - conf.setInt(DFSConfigKeys.DFS_NAMENODE_SAFEMODE_MIN_DATANODES_KEY, 1); - - // bring up a cluster with no datanodes - cluster = new MiniDFSCluster.Builder(conf).numDataNodes(0).format(true).build(); - cluster.waitActive(); - fs = (DistributedFileSystem)cluster.getFileSystem(); - - assertTrue("No datanode started, but we require one - safemode expected", - fs.setSafeMode(SafeModeAction.SAFEMODE_GET)); - - String tipMsg = cluster.getNamesystem().getSafeModeTip(); - assertTrue("Safemode tip message looks right", - tipMsg.contains("The number of live datanodes 0 needs an additional " + - "2 live datanodes to reach the minimum number 1. " + - "Safe mode will be turned off automatically.")); - - // Start a datanode - cluster.startDataNodes(conf, 1, true, null, null); - - // Wait long enough for safemode check to refire - try { - Thread.sleep(1000); - } catch (InterruptedException ignored) {} - - // We now should be out of safe mode. - assertFalse( - "Out of safe mode after starting datanode.", - fs.setSafeMode(SafeModeAction.SAFEMODE_GET)); - } finally { - if (fs != null) fs.close(); - if (cluster != null) cluster.shutdown(); - } - } -} From 6b3f5b7bd2422e9848c49b990f49dc7f790aa2ea Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Sat, 21 Jan 2012 00:55:16 +0000 Subject: [PATCH 13/14] MAPREDUCE-3549. write api documentation for web service apis for RM, NM, mapreduce app master, and job history server (Thomas Graves via mahadev) - Merging r1234222 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234224 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 + .../webapp/dao/JobTaskAttemptCounterInfo.java | 2 +- .../app/webapp/TestAMWebServicesAttempts.java | 4 +- .../hs/webapp/TestHsWebServicesAttempts.java | 4 +- .../src/site/apt/HistoryServerRest.apt.vm | 2733 +++++++++++++++++ .../src/site/apt/MapredAppMasterRest.apt.vm | 2701 ++++++++++++++++ .../src/site/apt/NodeManagerRest.apt.vm | 635 ++++ .../src/site/apt/ResourceManagerRest.apt.vm | 1469 +++++++++ .../src/site/apt/WebServicesIntro.apt.vm | 595 ++++ hadoop-project/src/site/site.xml | 8 + 10 files changed, 8149 insertions(+), 5 deletions(-) create mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm create mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm create mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm create mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm create mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 2d9d3a25eff..1cba5a6de47 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -478,6 +478,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3701. Delete HadoopYarnRPC from 0.23 branch. (mahadev) + MAPREDUCE-3549. write api documentation for web service apis for RM, NM, + mapreduce app master, and job history server (Thomas Graves via mahadev) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobTaskAttemptCounterInfo.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobTaskAttemptCounterInfo.java index 2026c76ddbc..f61b930430c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobTaskAttemptCounterInfo.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/webapp/dao/JobTaskAttemptCounterInfo.java @@ -30,7 +30,7 @@ import org.apache.hadoop.mapreduce.Counters; import org.apache.hadoop.mapreduce.v2.app.job.TaskAttempt; import org.apache.hadoop.mapreduce.v2.util.MRApps; -@XmlRootElement(name = "JobTaskAttemptCounters") +@XmlRootElement(name = "jobTaskAttemptCounters") @XmlAccessorType(XmlAccessType.FIELD) public class JobTaskAttemptCounterInfo { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java index ee824ee10a1..e33a50671c8 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java @@ -629,7 +629,7 @@ public class TestAMWebServicesAttempts extends JerseyTest { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - JSONObject info = json.getJSONObject("JobTaskAttemptCounters"); + JSONObject info = json.getJSONObject("jobTaskAttemptCounters"); verifyAMJobTaskAttemptCounters(info, att); } } @@ -661,7 +661,7 @@ public class TestAMWebServicesAttempts extends JerseyTest { InputSource is = new InputSource(); is.setCharacterStream(new StringReader(xml)); Document dom = db.parse(is); - NodeList nodes = dom.getElementsByTagName("JobTaskAttemptCounters"); + NodeList nodes = dom.getElementsByTagName("jobTaskAttemptCounters"); verifyAMTaskCountersXML(nodes, att); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java index 6fdb94d9029..7ba200fcc53 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesAttempts.java @@ -642,7 +642,7 @@ public class TestHsWebServicesAttempts extends JerseyTest { assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType()); JSONObject json = response.getEntity(JSONObject.class); assertEquals("incorrect number of elements", 1, json.length()); - JSONObject info = json.getJSONObject("JobTaskAttemptCounters"); + JSONObject info = json.getJSONObject("jobTaskAttemptCounters"); verifyHsJobTaskAttemptCounters(info, att); } } @@ -674,7 +674,7 @@ public class TestHsWebServicesAttempts extends JerseyTest { InputSource is = new InputSource(); is.setCharacterStream(new StringReader(xml)); Document dom = db.parse(is); - NodeList nodes = dom.getElementsByTagName("JobTaskAttemptCounters"); + NodeList nodes = dom.getElementsByTagName("jobTaskAttemptCounters"); verifyHsTaskCountersXML(nodes, att); } diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm new file mode 100644 index 00000000000..a7dda193dfa --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HistoryServerRest.apt.vm @@ -0,0 +1,2733 @@ +~~ Licensed under the Apache License, Version 2.0 (the "License"); +~~ you may not use this file except in compliance with the License. +~~ You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. See accompanying LICENSE file. + + --- + History Server REST API's. + --- + --- + ${maven.build.timestamp} + +History Server REST API's. + + \[ {{{./index.html}Go Back}} \] + +%{toc|section=1|fromDepth=0|toDepth=3} + +* Overview + + The history server REST API's allow the user to get status on finished applications. Currently it only supports MapReduce and provides information on finished jobs. + +* History Server Information API + + The history server information resource provides overall information about the history server. + +** URI + + Both of the following URI's give you the history server information, from an application id identified by the appid value. + +------ + * http:///ws/v1/history + * http:///ws/v1/history/info +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| hadoopVersion | string | Version of hadoop common | +*---------------+--------------+-------------------------------+ +| hadoopBuildVersion | string | Hadoop common build string with build version, user, and checksum | +*---------------+--------------+-------------------------------+ +| hadoopVersionBuiltOn | string | Timestamp when hadoop common was built | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/info +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "historyInfo" : { + "hadoopVersionBuiltOn" : "Wed Jan 11 21:18:36 UTC 2012", + "hadoopBuildVersion" : "0.23.1-SNAPSHOT from 1230253 by user1 source checksum bb6e554c6d50b0397d826081017437a7", + "hadoopVersion" : "0.23.1-SNAPSHOT" + } +} ++---+ + + <> + + HTTP Request: + +----- + GET http:///ws/v1/history/info + Accept: application/xml +----- + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 330 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 0.23.1-SNAPSHOT + 0.23.1-SNAPSHOT from 1230253 by user1 source checksum bb6e554c6d50b0397d826081017437a7 + Wed Jan 11 21:18:36 UTC 2012 + ++---+ + +* MapReduce API's + + The following list of resources apply to MapReduce. + +** Jobs API + + The jobs resource provides a list of the MapReduce jobs that have finished. + +*** URI + +------ + * http:///ws/v1/history/mapreduce/jobs +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + + Multiple paramters can be specified. The started and finished times have a begin and end parameter to allow you to specify ranges. For example, one could request all jobs that started between 1:00am and 2:00pm on 12/19/2011 with startedTimeBegin=1324256400&startedTimeEnd=1324303200. If the Begin parameter is not specfied, it defaults to 0, and if the End parameter is not specified, it defaults to infinity. + +------ + * user - user name + * queue - queue name + * limit - total number of app objects to be returned + * startedTimeBegin - jobs with start time beginning with this time, specified in ms since epoch + * startedTimeEnd - jobs with start time ending with this time, specified in ms since epoch + * finishedTimeBegin - jobs with finish time beginning with this time, specified in ms since epoch + * finishedTimeEnd - jobs with finish time ending with this time, specified in ms since epoch +------ + +*** Elements of the object + + When you make a request for the list of jobs, the information will be returned as an array of job objects. + See also {{Job API}} for syntax of the job object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| job | array of job objects(json)/zero or more job objects(XML) | The collection of job objects | +*---------------+--------------+-------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobs" : { + "job" : [ + { + "avgReduceTime" : 833, + "failedReduceAttempts" : 0, + "state" : "SUCCEEDED", + "successfulReduceAttempts" : 1, + "acls" : [ + { + "value" : " ", + "name" : "mapreduce.job.acl-modify-job" + }, + { + "value" : " ", + "name" : "mapreduce.job.acl-view-job" + } + ], + "user" : "user1", + "reducesTotal" : 1, + "mapsCompleted" : 1, + "startTime" : 1326381344489, + "id" : "job_1326381300833_1_1", + "avgMapTime" : 2671, + "successfulMapAttempts" : 1, + "name" : "word count", + "avgShuffleTime" : 2540, + "reducesCompleted" : 1, + "diagnostics" : "", + "failedMapAttempts" : 0, + "avgMergeTime" : 2570, + "killedReduceAttempts" : 0, + "mapsTotal" : 1, + "queue" : "default", + "uberized" : false, + "killedMapAttempts" : 0, + "finishTime" : 1326381356010 + }, + { + "avgReduceTime" : 124961, + "failedReduceAttempts" : 0, + "state" : "SUCCEEDED", + "successfulReduceAttempts" : 1, + "acls" : [ + { + "value" : " ", + "name" : "mapreduce.job.acl-modify-job" + }, + { + "value" : " ", + "name" : "mapreduce.job.acl-view-job" + } + ], + "user" : "user1", + "reducesTotal" : 1, + "mapsCompleted" : 1, + "startTime" : 1326381446529, + "id" : "job_1326381300833_2_2", + "avgMapTime" : 2638, + "successfulMapAttempts" : 1, + "name" : "Sleep job", + "avgShuffleTime" : 2540, + "reducesCompleted" : 1, + "diagnostics" : "", + "failedMapAttempts" : 0, + "avgMergeTime" : 2589, + "killedReduceAttempts" : 0, + "mapsTotal" : 1, + "queue" : "default", + "uberized" : false, + "killedMapAttempts" : 0, + "finishTime" : 1326381582106 + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 1922 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 1326381344489 + 1326381356010 + job_1326381300833_1_1 + word count + default + user1 + SUCCEEDED + 1 + 1 + 1 + 1 + false + + 2671 + 833 + 2540 + 2570 + 0 + 0 + 1 + 0 + 0 + 1 + + mapreduce.job.acl-modify-job + + + + mapreduce.job.acl-view-job + + + + + 1326381446529 + 1326381582106 + job_1326381300833_2_2 + Sleep job + default + user1 + SUCCEEDED + 1 + 1 + 1 + 1 + false + + 2638 + 124961 + 2540 + 2589 + 0 + 0 + 1 + 0 + 0 + 1 + + mapreduce.job.acl-modify-job + + + + mapreduce.job.acl-view-job + + + + ++---+ + +** {Job API} + + A Job resource contains information about a particular job identified by {jobid}. + +*** URI + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid} +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The job id| +*---------------+--------------+-------------------------------+ +| name | string | The job name | +*---------------+--------------+-------------------------------+ +| queue | string | The queue the job was submitted to| +*---------------+--------------+-------------------------------+ +| user | string | The user name | +*---------------+--------------+-------------------------------+ +| state | string | the job state - valid values are: NEW, INITED, RUNNING, SUCCEEDED, FAILED, KILL_WAIT, KILLED, ERROR| +*---------------+--------------+-------------------------------+ +| diagnostics | string | A diagnostic message | +*---------------+--------------+-------------------------------+ +| startTime | long | The time the job started (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| finishTime | long | The time the job finished (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| mapsTotal | int | The total number of maps | +*---------------+--------------+-------------------------------+ +| mapsCompleted | int | The number of completed maps | +*---------------+--------------+-------------------------------+ +| reducesTotal | int | The total number of reduces | +*---------------+--------------+-------------------------------+ +| reducesCompleted | int | The number of completed reduces| +*---------------+--------------+-------------------------------+ +| uberized | boolean | Indicates if the job was an uber job - ran completely in the application master| +*---------------+--------------+-------------------------------+ +| avgMapTime | long | The average time of a map task (in ms)| +*---------------+--------------+-------------------------------+ +| avgReduceTime | long | The average time of the reduce (in ms)| +*---------------+--------------+-------------------------------+ +| avgShuffleTime | long | The average time of the shuffle (in ms)| +*---------------+--------------+-------------------------------+ +| avgMergeTime | long | The average time of the merge (in ms)| +*---------------+--------------+-------------------------------+ +| failedReduceAttempts | int | The number of failed reduce attempts | +*---------------+--------------+-------------------------------+ +| killedReduceAttempts | int | The number of killed reduce attempts | +*---------------+--------------+-------------------------------+ +| successfulReduceAttempts | int | The number of successful reduce attempts | +*---------------+--------------+-------------------------------+ +| failedMapAttempts | int | The number of failed map attempts | +*---------------+--------------+-------------------------------+ +| killedMapAttempts | int | The number of killed map attempts | +*---------------+--------------+-------------------------------+ +| successfulMapAttempts | int | The number of successful map attempts | +*---------------+--------------+-------------------------------+ +| acls | array of acls(json)/zero or more acls objects(xml)| A collection of acls objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| value | string | The acl value| +*---------------+--------------+-------------------------------+ +| name | string | The acl name | +*---------------+--------------+-------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Server: Jetty(6.1.26) + Content-Length: 720 ++---+ + + Response Body: + ++---+ +{ + "job" : { + "avgReduceTime" : 124961, + "failedReduceAttempts" : 0, + "state" : "SUCCEEDED", + "successfulReduceAttempts" : 1, + "acls" : [ + { + "value" : " ", + "name" : "mapreduce.job.acl-modify-job" + }, + { + "value" : " ", + "name" : "mapreduce.job.acl-view-job" + } + ], + "user" : "user1", + "reducesTotal" : 1, + "mapsCompleted" : 1, + "startTime" : 1326381446529, + "id" : "job_1326381300833_2_2", + "avgMapTime" : 2638, + "successfulMapAttempts" : 1, + "name" : "Sleep job", + "avgShuffleTime" : 2540, + "reducesCompleted" : 1, + "diagnostics" : "", + "failedMapAttempts" : 0, + "avgMergeTime" : 2589, + "killedReduceAttempts" : 0, + "mapsTotal" : 1, + "queue" : "default", + "uberized" : false, + "killedMapAttempts" : 0, + "finishTime" : 1326381582106 + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 983 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 1326381446529 + 1326381582106 + job_1326381300833_2_2 + Sleep job + default + user1 + SUCCEEDED + 1 + 1 + 1 + 1 + false + + 2638 + 124961 + 2540 + 2589 + 0 + 0 + 1 + 0 + 0 + 1 + + mapreduce.job.acl-modify-job + + + + mapreduce.job.acl-view-job + + + ++---+ + +** Job Attempts API + + With the job attempts API, you can obtain a collection of resources that represent a job attempt. When you run a GET operation on this resource, you obtain a collection of Job Attempt Objects. + +*** URI + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/jobattempts +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + + When you make a request for the list of job attempts, the information will be returned as an array of job attempt objects. + + jobAttempts: + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| jobAttempt | array of job attempt objects(JSON)/zero or more job attempt objects(XML) | The collection of job attempt objects | +*---------------+--------------+--------------------------------+ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The job attempt id | +*---------------+--------------+--------------------------------+ +| nodeId | string | The node id of the node the attempt ran on| +*---------------+--------------+--------------------------------+ +| nodeHttpAddress | string | The node http address of the node the attempt ran on| +*---------------+--------------+--------------------------------+ +| logsLink | string | The http link to the job attempt logs | +*---------------+--------------+--------------------------------+ +| containerId | string | The id of the container for the job attempt | +*---------------+--------------+--------------------------------+ +| startTime | long | The start time of the attempt (in ms since epoch)| +*---------------+--------------+--------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/jobattempts +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobAttempts" : { + "jobAttempt" : [ + { + "nodeId" : "host.domain.com:45454", + "nodeHttpAddress" : "host.domain.com:9999", + "startTime" : 1326381444693, + "id" : 1, + "logsLink" : "http://host.domain.com:19888/jobhistory/logs/host.domain.com:45454/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1", + "containerId" : "container_1326381300833_0002_01_000001" + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/jobattmpts + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 575 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + host.domain.com:9999 + host.domain.com:45454 + 1 + 1326381444693 + container_1326381300833_0002_01_000001 + http://host.domain.com:19888/jobhistory/logs/host.domain.com:45454/container_1326381300833_0002_01_000001/job_1326381300833_2_2/user1 + + ++---+ + +** Job Counters API + + With the job counters API, you can object a collection of resources that represent al the counters for that job. + +*** URI + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/counters +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The job id | +*---------------+--------------+-------------------------------+ +| counterGroup | array of counterGroup objects(JSON)/zero or more counterGroup objects(XML) | A collection of counter group objects | +*---------------+--------------+-------------------------------+ + +*** Elements of the objecs + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| counterGroupName | string | The name of the counter group | +*---------------+--------------+-------------------------------+ +| counter | array of counter objects(JSON)/zero or more counter objects(XML) | A collection of counter objects | +*---------------+--------------+-------------------------------+ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| name | string | The name of the counter | +*---------------+--------------+-------------------------------+ +| reduceCounterValue | long | The counter value of reduce tasks | +*---------------+--------------+-------------------------------+ +| mapCounterValue | long | The counter value of map tasks | +*---------------+--------------+-------------------------------+ +| totalCounterValue | long | The counter value of all tasks | +*---------------+--------------+-------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/counters +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobCounters" : { + "id" : "job_1326381300833_2_2", + "counterGroup" : [ + { + "counterGroupName" : "Shuffle Errors", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "BAD_ID" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "CONNECTION" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "IO_ERROR" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "WRONG_LENGTH" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "WRONG_MAP" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "WRONG_REDUCE" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.FileSystemCounter", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2483, + "name" : "FILE_BYTES_READ" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 108525, + "name" : "FILE_BYTES_WRITTEN" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "FILE_READ_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "FILE_LARGE_READ_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "FILE_WRITE_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 48, + "name" : "HDFS_BYTES_READ" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "HDFS_BYTES_WRITTEN" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1, + "name" : "HDFS_READ_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "HDFS_LARGE_READ_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "HDFS_WRITE_OPS" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.TaskCounter", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1, + "name" : "MAP_INPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1200, + "name" : "MAP_OUTPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 4800, + "name" : "MAP_OUTPUT_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2235, + "name" : "MAP_OUTPUT_MATERIALIZED_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 48, + "name" : "SPLIT_RAW_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "COMBINE_INPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "COMBINE_OUTPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1200, + "name" : "REDUCE_INPUT_GROUPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2235, + "name" : "REDUCE_SHUFFLE_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1200, + "name" : "REDUCE_INPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "REDUCE_OUTPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2400, + "name" : "SPILLED_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1, + "name" : "SHUFFLED_MAPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "FAILED_SHUFFLE" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1, + "name" : "MERGED_MAP_OUTPUTS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 113, + "name" : "GC_TIME_MILLIS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1830, + "name" : "CPU_MILLISECONDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 478068736, + "name" : "PHYSICAL_MEMORY_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2159284224, + "name" : "VIRTUAL_MEMORY_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 378863616, + "name" : "COMMITTED_HEAP_BYTES" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "BYTES_READ" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "BYTES_WRITTEN" + } + ] + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/counters + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 7030 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + job_1326381300833_2_2 + + Shuffle Errors + + BAD_ID + 0 + 0 + 0 + + + CONNECTION + 0 + 0 + 0 + + + IO_ERROR + 0 + 0 + 0 + + + WRONG_LENGTH + 0 + 0 + 0 + + + WRONG_MAP + 0 + 0 + 0 + + + WRONG_REDUCE + 0 + 0 + 0 + + + + org.apache.hadoop.mapreduce.FileSystemCounter + + FILE_BYTES_READ + 2483 + 0 + 0 + + + FILE_BYTES_WRITTEN + 108525 + 0 + 0 + + + FILE_READ_OPS + 0 + 0 + 0 + + + FILE_LARGE_READ_OPS + 0 + 0 + 0 + + + FILE_WRITE_OPS + 0 + 0 + 0 + + + HDFS_BYTES_READ + 48 + 0 + 0 + + + HDFS_BYTES_WRITTEN + 0 + 0 + 0 + + + HDFS_READ_OPS + 1 + 0 + 0 + + + HDFS_LARGE_READ_OPS + 0 + 0 + 0 + + + HDFS_WRITE_OPS + 0 + 0 + 0 + + + + org.apache.hadoop.mapreduce.TaskCounter + + MAP_INPUT_RECORDS + 1 + 0 + 0 + + + MAP_OUTPUT_RECORDS + 1200 + 0 + 0 + + + MAP_OUTPUT_BYTES + 4800 + 0 + 0 + + + MAP_OUTPUT_MATERIALIZED_BYTES + 2235 + 0 + 0 + + + SPLIT_RAW_BYTES + 48 + 0 + 0 + + + COMBINE_INPUT_RECORDS + 0 + 0 + 0 + + + COMBINE_OUTPUT_RECORDS + 0 + 0 + 0 + + + REDUCE_INPUT_GROUPS + 1200 + 0 + 0 + + + REDUCE_SHUFFLE_BYTES + 2235 + 0 + 0 + + + REDUCE_INPUT_RECORDS + 1200 + 0 + 0 + + + REDUCE_OUTPUT_RECORDS + 0 + 0 + 0 + + + SPILLED_RECORDS + 2400 + 0 + 0 + + + SHUFFLED_MAPS + 1 + 0 + 0 + + + FAILED_SHUFFLE + 0 + 0 + 0 + + + MERGED_MAP_OUTPUTS + 1 + 0 + 0 + + + GC_TIME_MILLIS + 113 + 0 + 0 + + + CPU_MILLISECONDS + 1830 + 0 + 0 + + + PHYSICAL_MEMORY_BYTES + 478068736 + 0 + 0 + + + VIRTUAL_MEMORY_BYTES + 2159284224 + 0 + 0 + + + COMMITTED_HEAP_BYTES + 378863616 + 0 + 0 + + + + org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter + + BYTES_READ + 0 + 0 + 0 + + + + org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter + + BYTES_WRITTEN + 0 + 0 + 0 + + + ++---+ + + +** Job Conf API + + A job configuration resource contains information about the job configuration for this job. + +*** URI + + Use the following URI to obtain th job configuration information, from a job identified by the {jobid} value. + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/conf +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| path | string | The path to the job configuration file| +*---------------+--------------+-------------------------------+ +| property | array of the configuration properties(JSON)/zero or more configuration properties(XML) | Collection of configuration property objects| +*---------------+--------------+-------------------------------+ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| name | string | The name of the configuration property | +*---------------+--------------+-------------------------------+ +| value | string | The value of the configuration property | +*---------------+--------------+-------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/conf +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + + This is a small snippet of the output as the output if very large. The real output contains every property in your job configuration file. + ++---+ +{ + "conf" : { + "path" : "hdfs://host.domain.com:9000/user/user1/.staging/job_1326381300833_0002/job.xml", + "property" : [ + { + "value" : "/home/hadoop/hdfs/data", + "name" : "dfs.datanode.data.dir" + }, + { + "value" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer", + "name" : "hadoop.http.filter.initializers" + }, + { + "value" : "/home/hadoop/tmp", + "name" : "mapreduce.cluster.temp.dir" + }, + ... + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/conf + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 552 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + hdfs://host.domain.com:9000/user/user1/.staging/job_1326381300833_0002/job.xml + + dfs.datanode.data.dir + /home/hadoop/hdfs/data + + + hadoop.http.filter.initializers + org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer + + + mapreduce.cluster.temp.dir + /home/hadoop/tmp + + ... + ++---+ + +** Tasks API + + With the tasks API, you can obtain a collection of resources that represent a task within a job. When you run a GET operation on this resource, you obtain a collection of Task Objects. + +*** URI + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/tasks +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + * type - type of task, valid values are m or r. m for map task or r for reduce task. +------ + +*** Elements of the object + + When you make a request for the list of tasks , the information will be returned as an array of task objects. + See also {{Task API}} for syntax of the task object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| task | array of task objects(JSON)/zero or more task objects(XML) | The collection of task objects. | +*---------------+--------------+--------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "tasks" : { + "task" : [ + { + "progress" : 100, + "elapsedTime" : 6777, + "state" : "SUCCEEDED", + "startTime" : 1326381446541, + "id" : "task_1326381300833_2_2_m_0", + "type" : "MAP", + "successfulAttempt" : "attempt_1326381300833_2_2_m_0_0", + "finishTime" : 1326381453318 + }, + { + "progress" : 100, + "elapsedTime" : 135559, + "state" : "SUCCEEDED", + "startTime" : 1326381446544, + "id" : "task_1326381300833_2_2_r_0", + "type" : "REDUCE", + "successfulAttempt" : "attempt_1326381300833_2_2_r_0_0", + "finishTime" : 1326381582103 + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 653 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 1326381446541 + 1326381453318 + 6777 + 100.0 + task_1326381300833_2_2_m_0 + SUCCEEDED + MAP + attempt_1326381300833_2_2_m_0_0 + + + 1326381446544 + 1326381582103 + 135559 + 100.0 + task_1326381300833_2_2_r_0 + SUCCEEDED + REDUCE + attempt_1326381300833_2_2_r_0_0 + + ++---+ + +** {Task API} + + A Task resource contains information about a particular task within a job. + +*** URI + + Use the following URI to obtain an Task Object, from a task identified by the {taskid} value. + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid} +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The task id | +*---------------+--------------+--------------------------------+ +| state | string | The state of the task - valid values are: NEW, SCHEDULED, RUNNING, SUCCEEDED, FAILED, KILL_WAIT, KILLED +*---------------+--------------+--------------------------------+ +| type | string | The task type - MAP or REDUCE| +*---------------+--------------+--------------------------------+ +| successfulAttempt | string | The id of the last successful attempt | +*---------------+--------------+--------------------------------+ +| progress | float | The progress of the task as a percent| +*---------------+--------------+--------------------------------+ +| startTime | long | The time in which the task started (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| finishTime | long | The time in which the task finished (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| elapsedTime | long | The elapsed time since the application started (in ms)| +*---------------+--------------+--------------------------------+ + + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "task" : { + "progress" : 100, + "elapsedTime" : 6777, + "state" : "SUCCEEDED", + "startTime" : 1326381446541, + "id" : "task_1326381300833_2_2_m_0", + "type" : "MAP", + "successfulAttempt" : "attempt_1326381300833_2_2_m_0_0", + "finishTime" : 1326381453318 + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 299 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 1326381446541 + 1326381453318 + 6777 + 100.0 + task_1326381300833_2_2_m_0 + SUCCEEDED + MAP + attempt_1326381300833_2_2_m_0_0 + ++---+ + +** Task Counters API + + With the task counters API, you can object a collection of resources that represent al the counters for that task. + +*** URI + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/counters +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The task id | +*---------------+--------------+-------------------------------+ +| taskcounterGroup | array of counterGroup objects(JSON)/zero or more counterGroup objects(XML) | A collection of counter group objects | +*---------------+--------------+-------------------------------+ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| counterGroupName | string | The name of the counter group | +*---------------+--------------+-------------------------------+ +| counter | array of counter objects(JSON)/zero or more counter objects(XML) | A collection of counter objects | +*---------------+--------------+-------------------------------+ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| name | string | The name of the counter | +*---------------+--------------+-------------------------------+ +| value | long | The value of the counter | +*---------------+--------------+-------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0/counters +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobTaskCounters" : { + "id" : "task_1326381300833_2_2_m_0", + "taskCounterGroup" : [ + { + "counterGroupName" : "org.apache.hadoop.mapreduce.FileSystemCounter", + "counter" : [ + { + "value" : 2363, + "name" : "FILE_BYTES_READ" + }, + { + "value" : 54372, + "name" : "FILE_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "FILE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_WRITE_OPS" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_READ" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "HDFS_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_WRITE_OPS" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.TaskCounter", + "counter" : [ + { + "value" : 0, + "name" : "COMBINE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "COMBINE_OUTPUT_RECORDS" + }, + { + "value" : 460, + "name" : "REDUCE_INPUT_GROUPS" + }, + { + "value" : 2235, + "name" : "REDUCE_SHUFFLE_BYTES" + }, + { + "value" : 460, + "name" : "REDUCE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "REDUCE_OUTPUT_RECORDS" + }, + { + "value" : 0, + "name" : "SPILLED_RECORDS" + }, + { + "value" : 1, + "name" : "SHUFFLED_MAPS" + }, + { + "value" : 0, + "name" : "FAILED_SHUFFLE" + }, + { + "value" : 1, + "name" : "MERGED_MAP_OUTPUTS" + }, + { + "value" : 26, + "name" : "GC_TIME_MILLIS" + }, + { + "value" : 860, + "name" : "CPU_MILLISECONDS" + }, + { + "value" : 107839488, + "name" : "PHYSICAL_MEMORY_BYTES" + }, + { + "value" : 1123147776, + "name" : "VIRTUAL_MEMORY_BYTES" + }, + { + "value" : 57475072, + "name" : "COMMITTED_HEAP_BYTES" + } + ] + }, + { + "counterGroupName" : "Shuffle Errors", + "counter" : [ + { + "value" : 0, + "name" : "BAD_ID" + }, + { + "value" : 0, + "name" : "CONNECTION" + }, + { + "value" : 0, + "name" : "IO_ERROR" + }, + { + "value" : 0, + "name" : "WRONG_LENGTH" + }, + { + "value" : 0, + "name" : "WRONG_MAP" + }, + { + "value" : 0, + "name" : "WRONG_REDUCE" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter", + "counter" : [ + { + "value" : 0, + "name" : "BYTES_WRITTEN" + } + ] + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0/counters + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 2660 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + task_1326381300833_2_2_m_0 + + org.apache.hadoop.mapreduce.FileSystemCounter + + FILE_BYTES_READ + 2363 + + + FILE_BYTES_WRITTEN + 54372 + + + FILE_READ_OPS + 0 + + + FILE_LARGE_READ_OPS + 0 + + + FILE_WRITE_OPS + 0 + + + HDFS_BYTES_READ + 0 + + + HDFS_BYTES_WRITTEN + 0 + + + HDFS_READ_OPS + 0 + + + HDFS_LARGE_READ_OPS + 0 + + + HDFS_WRITE_OPS + 0 + + + + org.apache.hadoop.mapreduce.TaskCounter + + COMBINE_INPUT_RECORDS + 0 + + + COMBINE_OUTPUT_RECORDS + 0 + + + REDUCE_INPUT_GROUPS + 460 + + + REDUCE_SHUFFLE_BYTES + 2235 + + + REDUCE_INPUT_RECORDS + 460 + + + REDUCE_OUTPUT_RECORDS + 0 + + + SPILLED_RECORDS + 0 + + + SHUFFLED_MAPS + 1 + + + FAILED_SHUFFLE + 0 + + + MERGED_MAP_OUTPUTS + 1 + + + GC_TIME_MILLIS + 26 + + + CPU_MILLISECONDS + 860 + + + PHYSICAL_MEMORY_BYTES + 107839488 + + + VIRTUAL_MEMORY_BYTES + 1123147776 + + + COMMITTED_HEAP_BYTES + 57475072 + + + + Shuffle Errors + + BAD_ID + 0 + + + CONNECTION + 0 + + + IO_ERROR + 0 + + + WRONG_LENGTH + 0 + + + WRONG_MAP + 0 + + + WRONG_REDUCE + 0 + + + + org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter + + BYTES_WRITTEN + 0 + + + ++---+ + +** Task Attempts API + + With the task attempts API, you can obtain a collection of resources that represent a task attempt within a job. When you run a GET operation on this resource, you obtain a collection of Task Attempt Objects. + +*** URI + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempts +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + + When you make a request for the list of task attempts, the information will be returned as an array of task attempt objects. + See also {{Task Attempt API}} for syntax of the task object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| taskAttempt | array of task attempt objects(JSON)/zero or more task attempt objects(XML) | The collection of task attempt objects | +*---------------+--------------+--------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0/attempts +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "taskAttempts" : { + "taskAttempt" : [ + { + "assignedContainerId" : "container_1326381300833_0002_01_000002", + "progress" : 100, + "elapsedTime" : 2638, + "state" : "SUCCEEDED", + "diagnostics" : "", + "rack" : "/98.139.92.0", + "nodeHttpAddress" : "host.domain.com:9999", + "startTime" : 1326381450680, + "id" : "attempt_1326381300833_2_2_m_0_0", + "type" : "MAP", + "finishTime" : 1326381453318 + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0/attempts + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 537 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 1326381450680 + 1326381453318 + 2638 + 100.0 + attempt_1326381300833_2_2_m_0_0 + /98.139.92.0 + SUCCEEDED + host.domain.com:9999 + + MAP + container_1326381300833_0002_01_000002 + + ++---+ + +** {Task Attempt API} + + A Task Attempt resource contains information about a particular task attempt within a job. + +*** URI + + Use the following URI to obtain an Task Attempt Object, from a task identified by the {attemptid} value. + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempt/{attemptid} +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The task id | +*---------------+--------------+--------------------------------+ +| rack | string | The rack | +*---------------+--------------+--------------------------------+ +| state | string | The state of the task attempt - valid values are: NEW, UNASSIGNED, ASSIGNED, RUNNING, COMMIT_PENDING, SUCCESS_CONTAINER_CLEANUP, SUCCEEDED, FAIL_CONTAINER_CLEANUP, FAIL_TASK_CLEANUP, FAILED, KILL_CONTAINER_CLEANUP, KILL_TASK_CLEANUP, KILLED | +*---------------+--------------+--------------------------------+ +| type | string | The type of task | +*---------------+--------------+--------------------------------+ +| assignedContainerId | string | The container id this attempt is assigned to| +*---------------+--------------+--------------------------------+ +| nodeHttpAddress | string | The http address of the node this task attempt ran on | +*---------------+--------------+--------------------------------+ +| diagnostics| string | A diagnostics message | +*---------------+--------------+--------------------------------+ +| progress | float | The progress of the task attempt as a percent| +*---------------+--------------+--------------------------------+ +| startTime | long | The time in which the task attempt started (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| finishTime | long | The time in which the task attempt finished (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| elapsedTime | long | The elapsed time since the task attempt started (in ms)| +*---------------+--------------+--------------------------------+ + + For reduce task attempts you also have the following fields: + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| shuffleFinishTime | long | The time at which shuffle finished (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| mergeFinishTime | long | The time at which merge finished (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| elapsedShuffleTime | long | The time it took for the shuffle phase to complete (time in ms between reduce task start and shuffle finish)| +*---------------+--------------+--------------------------------+ +| elapsedMergeTime | long | The time it took for the merge phase to complete (time in ms between the shuffle finish and merge finish)| +*---------------+--------------+--------------------------------+ +| elapsedReduceTime | long | The time it took for the reduce phase to complete (time in ms between merge finish to end of reduce task)| +*---------------+--------------+--------------------------------+ + + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0/attempts/attempt_1326381300833_2_2_m_0_0 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "taskAttempt" : { + "assignedContainerId" : "container_1326381300833_0002_01_000002", + "progress" : 100, + "elapsedTime" : 2638, + "state" : "SUCCEEDED", + "diagnostics" : "", + "rack" : "/98.139.92.0", + "nodeHttpAddress" : "host.domain.com:9999", + "startTime" : 1326381450680, + "id" : "attempt_1326381300833_2_2_m_0_0", + "type" : "MAP", + "finishTime" : 1326381453318 + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0/attempts/attempt_1326381300833_2_2_m_0_0 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 691 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 1326381450680 + 1326381453318 + 2638 + 100.0 + attempt_1326381300833_2_2_m_0_0 + /98.139.92.0 + SUCCEEDED + host.domain.com:9999 + + MAP + container_1326381300833_0002_01_000002 + ++---+ + +** Task Attempt Counters API + + With the task attempt counters API, you can object a collection of resources that represent al the counters for that task attempt. + +*** URI + +------ + * http:///ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempt/{attemptid}/counters +------ + +*** HTTP Operations Supported + +------ + * GET +------ + +*** Query Parameters Supported + +------ + None +------ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The task attempt id | +*---------------+--------------+-------------------------------+ +| taskAttemptcounterGroup | array of task attempt counterGroup objects(JSON)/zero or more task attempt counterGroup objects(XML) | A collection of task attempt counter group objects | +*---------------+--------------+-------------------------------+ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| counterGroupName | string | The name of the counter group | +*---------------+--------------+-------------------------------+ +| counter | array of counter objects(JSON)/zero or more counter objects(XML) | A collection of counter objects | +*---------------+--------------+-------------------------------+ + +*** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| name | string | The name of the counter | +*---------------+--------------+-------------------------------+ +| value | long | The value of the counter | +*---------------+--------------+-------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0/attempts/attempt_1326381300833_2_2_m_0_0/counters +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobTaskAttemptCounters" : { + "taskAttemptCounterGroup" : [ + { + "counterGroupName" : "org.apache.hadoop.mapreduce.FileSystemCounter", + "counter" : [ + { + "value" : 2363, + "name" : "FILE_BYTES_READ" + }, + { + "value" : 54372, + "name" : "FILE_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "FILE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_WRITE_OPS" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_READ" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "HDFS_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_WRITE_OPS" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.TaskCounter", + "counter" : [ + { + "value" : 0, + "name" : "COMBINE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "COMBINE_OUTPUT_RECORDS" + }, + { + "value" : 460, + "name" : "REDUCE_INPUT_GROUPS" + }, + { + "value" : 2235, + "name" : "REDUCE_SHUFFLE_BYTES" + }, + { + "value" : 460, + "name" : "REDUCE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "REDUCE_OUTPUT_RECORDS" + }, + { + "value" : 0, + "name" : "SPILLED_RECORDS" + }, + { + "value" : 1, + "name" : "SHUFFLED_MAPS" + }, + { + "value" : 0, + "name" : "FAILED_SHUFFLE" + }, + { + "value" : 1, + "name" : "MERGED_MAP_OUTPUTS" + }, + { + "value" : 26, + "name" : "GC_TIME_MILLIS" + }, + { + "value" : 860, + "name" : "CPU_MILLISECONDS" + }, + { + "value" : 107839488, + "name" : "PHYSICAL_MEMORY_BYTES" + }, + { + "value" : 1123147776, + "name" : "VIRTUAL_MEMORY_BYTES" + }, + { + "value" : 57475072, + "name" : "COMMITTED_HEAP_BYTES" + } + ] + }, + { + "counterGroupName" : "Shuffle Errors", + "counter" : [ + { + "value" : 0, + "name" : "BAD_ID" + }, + { + "value" : 0, + "name" : "CONNECTION" + }, + { + "value" : 0, + "name" : "IO_ERROR" + }, + { + "value" : 0, + "name" : "WRONG_LENGTH" + }, + { + "value" : 0, + "name" : "WRONG_MAP" + }, + { + "value" : 0, + "name" : "WRONG_REDUCE" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter", + "counter" : [ + { + "value" : 0, + "name" : "BYTES_WRITTEN" + } + ] + } + ], + "id" : "attempt_1326381300833_2_2_m_0_0" + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/history/mapreduce/jobs/job_1326381300833_2_2/tasks/task_1326381300833_2_2_m_0/attempts/attempt_1326381300833_2_2_m_0_0/counters + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 2735 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + attempt_1326381300833_2_2_m_0_0 + + org.apache.hadoop.mapreduce.FileSystemCounter + + FILE_BYTES_READ + 2363 + + + FILE_BYTES_WRITTEN + 54372 + + + FILE_READ_OPS + 0 + + + FILE_LARGE_READ_OPS + 0 + + + FILE_WRITE_OPS + 0 + + + HDFS_BYTES_READ + 0 + + + HDFS_BYTES_WRITTEN + 0 + + + HDFS_READ_OPS + 0 + + + HDFS_LARGE_READ_OPS + 0 + + + HDFS_WRITE_OPS + 0 + + + + org.apache.hadoop.mapreduce.TaskCounter + + COMBINE_INPUT_RECORDS + 0 + + + COMBINE_OUTPUT_RECORDS + 0 + + + REDUCE_INPUT_GROUPS + 460 + + + REDUCE_SHUFFLE_BYTES + 2235 + + + REDUCE_INPUT_RECORDS + 460 + + + REDUCE_OUTPUT_RECORDS + 0 + + + SPILLED_RECORDS + 0 + + + SHUFFLED_MAPS + 1 + + + FAILED_SHUFFLE + 0 + + + MERGED_MAP_OUTPUTS + 1 + + + GC_TIME_MILLIS + 26 + + + CPU_MILLISECONDS + 860 + + + PHYSICAL_MEMORY_BYTES + 107839488 + + + VIRTUAL_MEMORY_BYTES + 1123147776 + + + COMMITTED_HEAP_BYTES + 57475072 + + + + Shuffle Errors + + BAD_ID + 0 + + + CONNECTION + 0 + + + IO_ERROR + 0 + + + WRONG_LENGTH + 0 + + + WRONG_MAP + 0 + + + WRONG_REDUCE + 0 + + + + org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter + + BYTES_WRITTEN + 0 + + + ++---+ + diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm new file mode 100644 index 00000000000..186f044c226 --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/MapredAppMasterRest.apt.vm @@ -0,0 +1,2701 @@ +~~ Licensed under the Apache License, Version 2.0 (the "License"); +~~ you may not use this file except in compliance with the License. +~~ You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. See accompanying LICENSE file. + + --- + MapReduce Application Master REST API's. + --- + --- + ${maven.build.timestamp} + +MapReduce Application Master REST API's. + + \[ {{{./index.html}Go Back}} \] + +%{toc|section=1|fromDepth=0|toDepth=2} + +* Overview + + The MapReduce Application Master REST API's allow the user to get status on the running MapReduce application master. Currently this is the equivalent to a running MapReduce job. The information includes the jobs the app master is running and all the job particulars like tasks, counters, configuration, attempts, etc. The application master should be accessed via the proxy. This proxy is configurable to run either on the resource manager or on a separate host. The proxy URL usually looks like: http:///proxy/{appid}. + +* Mapreduce Application Master Info API + + The MapReduce application master information resource provides overall information about that mapreduce application master. This includes application id, time it was started, user, name, etc. + +** URI + + Both of the following URI's give you the MapReduce application master information, from an application id identified by the appid value. + +------ + * http:///proxy/{appid}/ws/v1/mapreduce + * http:///proxy/{appid}/ws/v1/mapreduce/info +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + + When you make a request for the mapreduce application master information, the information will be returned as an info object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| appId | long | The application id | +*---------------+--------------+-------------------------------+ +| startedOn | long | The time the application started (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| name | string | The name of the application | +*---------------+--------------+-------------------------------+ +| user | string | The user name of the user who started the application | +*---------------+--------------+-------------------------------+ +| elapsedTime | long | The time since the application was started (in ms)| +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0003/ws/v1/mapreduce/info +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "info" : { + "appId" : "application_1326232085508_0003", + "startedOn" : 1326238244047, + "user" : "user1", + "name" : "Sleep job", + "elapsedTime" : 32374 + } +} ++---+ + + <> + + HTTP Request: + +----- + Accept: application/xml + GET http:///proxy/application_1326232085508_0003/ws/v1/mapreduce/info +----- + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 223 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + application_1326232085508_0003 + Sleep job + user1 + 1326238244047 + 32407 + ++---+ + +* Jobs API + + The jobs resource provides a list of the jobs running on this application master. See also {{Job API}} for syntax of the job object. + +** URI + +------ + * http:///proxy/{appid}/ws/v1/mapreduce/jobs +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + + When you make a request for the list of jobs, the information will be returned as a collection of job objects. See also {{Job API}} for syntax of the job object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| job | array of job objects(JSON)/Zero or more job objects(XML) | The collection of job objects | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobs" : { + "job" : [ + { + "runningReduceAttempts" : 1, + "reduceProgress" : 100, + "failedReduceAttempts" : 0, + "newMapAttempts" : 0, + "mapsRunning" : 0, + "state" : "RUNNING", + "successfulReduceAttempts" : 0, + "reducesRunning" : 1, + "acls" : [ + { + "value" : " ", + "name" : "mapreduce.job.acl-modify-job" + }, + { + "value" : " ", + "name" : "mapreduce.job.acl-view-job" + } + ], + "reducesPending" : 0, + "user" : "user1", + "reducesTotal" : 1, + "mapsCompleted" : 1, + "startTime" : 1326238769379, + "id" : "job_1326232085508_4_4", + "successfulMapAttempts" : 1, + "runningMapAttempts" : 0, + "newReduceAttempts" : 0, + "name" : "Sleep job", + "mapsPending" : 0, + "elapsedTime" : 59377, + "reducesCompleted" : 0, + "mapProgress" : 100, + "diagnostics" : "", + "failedMapAttempts" : 0, + "killedReduceAttempts" : 0, + "mapsTotal" : 1, + "uberized" : false, + "killedMapAttempts" : 0, + "finishTime" : 0 + } + ] + } + } ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 1214 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 1326238769379 + 0 + 59416 + job_1326232085508_4_4 + Sleep job + user1 + RUNNING + 1 + 1 + 1 + 0 + 100.0 + 100.0 + 0 + 0 + 0 + 1 + false + + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + + mapreduce.job.acl-modify-job + + + + mapreduce.job.acl-view-job + + + + ++---+ + +* {Job API} + + A job resource contains information about a particular job that was started by this application master. Certain fields are only accessible if user has permissions - depends on acl settings. + +** URI + + Use the following URI to obtain a job object, for a job identified by the jobid value. + +------ + * http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/{jobid} +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The job id| +*---------------+--------------+-------------------------------+ +| name | string | The job name | +*---------------+--------------+-------------------------------+ +| user | string | The user name | +*---------------+--------------+-------------------------------+ +| state | string | the job state - valid values are: NEW, INITED, RUNNING, SUCCEEDED, FAILED, KILL_WAIT, KILLED, ERROR| +*---------------+--------------+-------------------------------+ +| startTime | long | The time the job started (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| finishTime | long | The time the job finished (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| elapsedTime | long | The elapsed time since job started (in ms)| +*---------------+--------------+-------------------------------+ +| mapsTotal | int | The total number of maps | +*---------------+--------------+-------------------------------+ +| mapsCompleted | int | The number of completed maps | +*---------------+--------------+-------------------------------+ +| reducesTotal | int | The total number of reduces | +*---------------+--------------+-------------------------------+ +| reducesCompleted | int | The number of completed reduces| +*---------------+--------------+-------------------------------+ +| diagnostics | string | A diagnostic message | +*---------------+--------------+-------------------------------+ +| uberized | boolean | Indicates if the job was an uber job - ran completely in the application master| +*---------------+--------------+-------------------------------+ +| mapsPending | int | The number of maps still to be run| +*---------------+--------------+-------------------------------+ +| mapsRunning | int | The number of running maps | +*---------------+--------------+-------------------------------+ +| reducesPending | int | The number of reduces still to be run | +*---------------+--------------+-------------------------------+ +| reducesRunning | int | The number of running reduces| +*---------------+--------------+-------------------------------+ +| newReduceAttempts | int | The number of new reduce attempts | +*---------------+--------------+-------------------------------+ +| runningReduceAttempts | int | The number of running reduce attempts | +*---------------+--------------+-------------------------------+ +| failedReduceAttempts | int | The number of failed reduce attempts | +*---------------+--------------+-------------------------------+ +| killedReduceAttempts | int | The number of killed reduce attempts | +*---------------+--------------+-------------------------------+ +| successfulReduceAttempts | int | The number of successful reduce attempts | +*---------------+--------------+-------------------------------+ +| newMapAttempts | int | The number of new map attempts | +*---------------+--------------+-------------------------------+ +| runningMapAttempts | int | The number of running map attempts | +*---------------+--------------+-------------------------------+ +| failedMapAttempts | int | The number of failed map attempts | +*---------------+--------------+-------------------------------+ +| killedMapAttempts | int | The number of killed map attempts | +*---------------+--------------+-------------------------------+ +| successfulMapAttempts | int | The number of successful map attempts | +*---------------+--------------+-------------------------------+ +| acls | array of acls(json)/zero or more acls objects(xml)| A collection of acls objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| value | string | The acl value| +*---------------+--------------+-------------------------------+ +| name | string | The acl name | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Server: Jetty(6.1.26) + Content-Length: 720 ++---+ + + Response Body: + ++---+ +{ + "job" : { + "runningReduceAttempts" : 1, + "reduceProgress" : 100, + "failedReduceAttempts" : 0, + "newMapAttempts" : 0, + "mapsRunning" : 0, + "state" : "RUNNING", + "successfulReduceAttempts" : 0, + "reducesRunning" : 1, + "acls" : [ + { + "value" : " ", + "name" : "mapreduce.job.acl-modify-job" + }, + { + "value" : " ", + "name" : "mapreduce.job.acl-view-job" + } + ], + "reducesPending" : 0, + "user" : "user1", + "reducesTotal" : 1, + "mapsCompleted" : 1, + "startTime" : 1326238769379, + "id" : "job_1326232085508_4_4", + "successfulMapAttempts" : 1, + "runningMapAttempts" : 0, + "newReduceAttempts" : 0, + "name" : "Sleep job", + "mapsPending" : 0, + "elapsedTime" : 59437, + "reducesCompleted" : 0, + "mapProgress" : 100, + "diagnostics" : "", + "failedMapAttempts" : 0, + "killedReduceAttempts" : 0, + "mapsTotal" : 1, + "uberized" : false, + "killedMapAttempts" : 0, + "finishTime" : 0 + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 1201 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 1326238769379 + 0 + 59474 + job_1326232085508_4_4 + Sleep job + user1 + RUNNING + 1 + 1 + 1 + 0 + 100.0 + 100.0 + 0 + 0 + 0 + 1 + false + + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + + mapreduce.job.acl-modify-job + + + + mapreduce.job.acl-view-job + + ++---+ + +* Job Attempts API + + With the job attempts API, you can obtain a collection of resources that represent the job attempts. When you run a GET operation on this resource, you obtain a collection of Job Attempt Objects. + +** URI + +------ + * http:///ws/v1/history/jobs/{jobid}/jobattempts +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + + When you make a request for the list of job attempts, the information will be returned as an array of job attempt objects. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| jobAttempt | array of job attempt objects(JSON)/zero or more job attempt objects(XML) | The collection of job attempt objects | +*---------------+--------------+--------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The job attempt id | +*---------------+--------------+--------------------------------+ +| nodeId | string | The node id of the node the attempt ran on| +*---------------+--------------+--------------------------------+ +| nodeHttpAddress | string | The node http address of the node the attempt ran on| +*---------------+--------------+--------------------------------+ +| logsLink | string | The http link to the job attempt logs | +*---------------+--------------+--------------------------------+ +| containerId | string | The id of the container for the job attempt | +*---------------+--------------+--------------------------------+ +| startTime | long | The start time of the attempt (in ms since epoch)| +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/jobattempts +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobAttempts" : { + "jobAttempt" : [ + { + "nodeId" : "host.domain.com:45454", + "nodeHttpAddress" : "host.domain.com:9999", + "startTime" : 1326238773493, + "id" : 1, + "logsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326232085508_0004_01_000001", + "containerId" : "container_1326232085508_0004_01_000001" + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/jobattempts + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 498 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + host.domain.com:9999 + host.domain.com:45454 + 1 + 1326238773493 + container_1326232085508_0004_01_000001 + http://host.domain.com:9999/node/containerlogs/container_1326232085508_0004_01_000001 + + ++---+ + +* Job Counters API + + With the job counters API, you can object a collection of resources that represent all the counters for that job. + +** URI + +------ + * http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/{jobid}/counters +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The job id | +*---------------+--------------+-------------------------------+ +| counterGroup | array of counterGroup objects(JSON)/zero or more counterGroup objects(XML) | A collection of counter group objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| counterGroupName | string | The name of the counter group | +*---------------+--------------+-------------------------------+ +| counter | array of counter objects(JSON)/zero or more counter objects(XML) | A collection of counter objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| name | string | The name of the counter | +*---------------+--------------+-------------------------------+ +| reduceCounterValue | long | The counter value of reduce tasks | +*---------------+--------------+-------------------------------+ +| mapCounterValue | long | The counter value of map tasks | +*---------------+--------------+-------------------------------+ +| totalCounterValue | long | The counter value of all tasks | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/counters +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobCounters" : { + "id" : "job_1326232085508_4_4", + "counterGroup" : [ + { + "counterGroupName" : "Shuffle Errors", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "BAD_ID" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "CONNECTION" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "IO_ERROR" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "WRONG_LENGTH" + }, { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "WRONG_MAP" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "WRONG_REDUCE" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.FileSystemCounter", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2483, + "name" : "FILE_BYTES_READ" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 108763, + "name" : "FILE_BYTES_WRITTEN" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "FILE_READ_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "FILE_LARGE_READ_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "FILE_WRITE_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 48, + "name" : "HDFS_BYTES_READ" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "HDFS_BYTES_WRITTEN" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1, + "name" : "HDFS_READ_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "HDFS_LARGE_READ_OPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "HDFS_WRITE_OPS" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.TaskCounter", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1, + "name" : "MAP_INPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1200, + "name" : "MAP_OUTPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 4800, + "name" : "MAP_OUTPUT_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2235, + "name" : "MAP_OUTPUT_MATERIALIZED_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 48, + "name" : "SPLIT_RAW_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "COMBINE_INPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "COMBINE_OUTPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 460, + "name" : "REDUCE_INPUT_GROUPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2235, + "name" : "REDUCE_SHUFFLE_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 460, + "name" : "REDUCE_INPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "REDUCE_OUTPUT_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1200, + "name" : "SPILLED_RECORDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1, + "name" : "SHUFFLED_MAPS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "FAILED_SHUFFLE" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1, + "name" : "MERGED_MAP_OUTPUTS" + }, { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 58, + "name" : "GC_TIME_MILLIS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 1580, + "name" : "CPU_MILLISECONDS" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 462643200, + "name" : "PHYSICAL_MEMORY_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 2149728256, + "name" : "VIRTUAL_MEMORY_BYTES" + }, + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 357957632, + "name" : "COMMITTED_HEAP_BYTES" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "BYTES_READ" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter", + "counter" : [ + { + "reduceCounterValue" : 0, + "mapCounterValue" : 0, + "totalCounterValue" : 0, + "name" : "BYTES_WRITTEN" + } + ] + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/counters + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 7027 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + job_1326232085508_4_4 + + Shuffle Errors + + BAD_ID + 0 + 0 + 0 + + + CONNECTION + 0 + 0 + 0 + + + IO_ERROR + 0 + 0 + 0 + + + WRONG_LENGTH + 0 + 0 + 0 + + + WRONG_MAP + 0 + 0 + 0 + + + WRONG_REDUCE + 0 + 0 + 0 + + + + org.apache.hadoop.mapreduce.FileSystemCounter + + FILE_BYTES_READ + 2483 + 0 + 0 + + + FILE_BYTES_WRITTEN + 108763 + 0 + 0 + + + FILE_READ_OPS + 0 + 0 + 0 + + + FILE_LARGE_READ_OPS + 0 + 0 + 0 + + + FILE_WRITE_OPS + 0 + 0 + 0 + + + HDFS_BYTES_READ + 48 + 0 + 0 + + + HDFS_BYTES_WRITTEN + 0 + 0 + 0 + + + HDFS_READ_OPS + 1 + 0 + 0 + + + HDFS_LARGE_READ_OPS + 0 + 0 + 0 + + + HDFS_WRITE_OPS + 0 + 0 + 0 + + + + org.apache.hadoop.mapreduce.TaskCounter + + MAP_INPUT_RECORDS + 1 + 0 + 0 + + + MAP_OUTPUT_RECORDS + 1200 + 0 + 0 + + + MAP_OUTPUT_BYTES + 4800 + 0 + 0 + + + MAP_OUTPUT_MATERIALIZED_BYTES + 2235 + 0 + 0 + + + SPLIT_RAW_BYTES + 48 + 0 + 0 + + + COMBINE_INPUT_RECORDS + 0 + 0 + 0 + + + COMBINE_OUTPUT_RECORDS + 0 + 0 + 0 + + + REDUCE_INPUT_GROUPS + 460 + 0 + 0 + + + REDUCE_SHUFFLE_BYTES + 2235 + 0 + 0 + + + REDUCE_INPUT_RECORDS + 460 + 0 + 0 + + + REDUCE_OUTPUT_RECORDS + 0 + 0 + 0 + + + SPILLED_RECORDS + 1200 + 0 + 0 + + + SHUFFLED_MAPS + 1 + 0 + 0 + + + FAILED_SHUFFLE + 0 + 0 + 0 + + + MERGED_MAP_OUTPUTS + 1 + 0 + 0 + + + GC_TIME_MILLIS + 58 + 0 + 0 + + + CPU_MILLISECONDS + 1580 + 0 + 0 + + + PHYSICAL_MEMORY_BYTES + 462643200 + 0 + 0 + + + VIRTUAL_MEMORY_BYTES + 2149728256 + 0 + 0 + + + COMMITTED_HEAP_BYTES + 357957632 + 0 + 0 + + + + org.apache.hadoop.mapreduce.lib.input.FileInputFormatCounter + + BYTES_READ + 0 + 0 + 0 + + org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter + BYTES_WRITTEN + 0 + 0 + 0 + + + ++---+ + +* Job Conf API + + A job configuration resource contains information about the job configuration for this job. + +** URI + + Use the following URI to obtain th job configuration information, from a job identified by the {jobid} value. + +------ + * http:///proxy/{appid}/ws/v1/mapreduce/jobs/{jobid}/conf +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| path | string | The path to the job configuration file| +*---------------+--------------+-------------------------------+ +| property | array of the configuration properties(JSON)/zero or more property objects(XML) | Collection of property objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| name | string | The name of the configuration property | +*---------------+--------------+-------------------------------+ +| value | string | The value of the configuration property | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/conf +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + + This is a small snippet of the output as the output if very large. The real output contains every property in your job configuration file. + ++---+ +{ + "conf" : { + "path" : "hdfs://host.domain.com:9000/user/user1/.staging/job_1326232085508_0004/job.xml", + "property" : [ + { + "value" : "/home/hadoop/hdfs/data", + "name" : "dfs.datanode.data.dir" + }, + { + "value" : "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer", + "name" : "hadoop.http.filter.initializers" + }, + { + "value" : "/home/hadoop/tmp", + "name" : "mapreduce.cluster.temp.dir" + }, + ... + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/conf + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 552 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + hdfs://host.domain.com:9000/user/user1/.staging/job_1326232085508_0004/job.xml + + dfs.datanode.data.dir + /home/hadoop/hdfs/data + + + hadoop.http.filter.initializers + org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer + + + mapreduce.cluster.temp.dir + /home/hadoop/tmp + + ... + ++---+ + +* Tasks API + + With the tasks API, you can obtain a collection of resources that represent all the tasks for a job. When you run a GET operation on this resource, you obtain a collection of Task Objects. + +** URI + +------ + * http:///proxy/{appid}/ws/v1/mapreduce/jobs/{jobid}/tasks +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + * type - type of task, valid values are m or r. m for map task or r for reduce task. +------ + +** Elements of the object + + When you make a request for the list of tasks , the information will be returned as an array of task objects. + See also {{Task API}} for syntax of the task object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| task | array of task objects(JSON)/zero or more task objects(XML) | The collection of task objects | +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "tasks" : { + "task" : [ + { + "progress" : 100, + "elapsedTime" : 2768, + "state" : "SUCCEEDED", + "startTime" : 1326238773493, + "id" : "task_1326232085508_4_4_m_0", + "type" : "MAP", + "successfulAttempt" : "attempt_1326232085508_4_4_m_0_0", + "finishTime" : 1326238776261 + }, + { + "progress" : 100, + "elapsedTime" : 0, + "state" : "RUNNING", + "startTime" : 1326238777460, + "id" : "task_1326232085508_4_4_r_0", + "type" : "REDUCE", + "successfulAttempt" : "", + "finishTime" : 0 + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 603 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 1326238773493 + 1326238776261 + 2768 + 100.0 + task_1326232085508_4_4_m_0 + SUCCEEDED + MAP + attempt_1326232085508_4_4_m_0_0 + + + 1326238777460 + 0 + 0 + 100.0 + task_1326232085508_4_4_r_0 + RUNNING + REDUCE + + + ++---+ + +* {Task API} + + A Task resource contains information about a particular task within a job. + +** URI + + Use the following URI to obtain an Task Object, from a task identified by the {taskid} value. + +------ + * http:///proxy/{appid}/ws/v1/mapreduce/jobs/{jobid}/tasks/{taskid} +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The task id | +*---------------+--------------+--------------------------------+ +| state | string | The state of the task - valid values are: NEW, SCHEDULED, RUNNING, SUCCEEDED, FAILED, KILL_WAIT, KILLED | +*---------------+--------------+--------------------------------+ +| type | string | The task type - MAP or REDUCE| +*---------------+--------------+--------------------------------+ +| successfulAttempt | string | The the id of the last successful attempt | +*---------------+--------------+--------------------------------+ +| progress | float | The progress of the task as a percent| +*---------------+--------------+--------------------------------+ +| startTime | long | The time in which the task started (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| finishTime | long | The time in which the task finished (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| elapsedTime | long | The elapsed time since the application started (in ms)| +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "task" : { + "progress" : 100, + "elapsedTime" : 0, + "state" : "RUNNING", + "startTime" : 1326238777460, + "id" : "task_1326232085508_4_4_r_0", + "type" : "REDUCE", + "successfulAttempt" : "", + "finishTime" : 0 + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 299 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 1326238777460 + 0 + 0 + 100.0 + task_1326232085508_4_4_r_0 + RUNNING + REDUCE + + ++---+ + +* Task Counters API + + With the task counters API, you can object a collection of resources that represent all the counters for that task. + +** URI + +------ + * http:///proxy/{appid}/ws/v1/mapreduce/jobs/{jobid}/tasks/{taskid}/counters +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The task id | +*---------------+--------------+-------------------------------+ +| taskcounterGroup | array of counterGroup objects(JSON)/zero or more counterGroup objects(XML) | A collection of counter group objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| counterGroupName | string | The name of the counter group | +*---------------+--------------+-------------------------------+ +| counter | array of counter objects(JSON)/zero or more counter objects(XML) | A collection of counter objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| name | string | The name of the counter | +*---------------+--------------+-------------------------------+ +| value | long | The value of the counter | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0/counters +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobTaskCounters" : { + "id" : "task_1326232085508_4_4_r_0", + "taskCounterGroup" : [ + { + "counterGroupName" : "org.apache.hadoop.mapreduce.FileSystemCounter", + "counter" : [ + { + "value" : 2363, + "name" : "FILE_BYTES_READ" + }, + { + "value" : 54372, + "name" : "FILE_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "FILE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_WRITE_OPS" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_READ" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "HDFS_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_WRITE_OPS" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.TaskCounter", + "counter" : [ + { + "value" : 0, + "name" : "COMBINE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "COMBINE_OUTPUT_RECORDS" + }, + { + "value" : 460, + "name" : "REDUCE_INPUT_GROUPS" + }, + { + "value" : 2235, + "name" : "REDUCE_SHUFFLE_BYTES" + }, + { + "value" : 460, + "name" : "REDUCE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "REDUCE_OUTPUT_RECORDS" + }, + { + "value" : 0, + "name" : "SPILLED_RECORDS" + }, + { + "value" : 1, + "name" : "SHUFFLED_MAPS" + }, + { + "value" : 0, + "name" : "FAILED_SHUFFLE" + }, + { + "value" : 1, + "name" : "MERGED_MAP_OUTPUTS" + }, + { + "value" : 26, + "name" : "GC_TIME_MILLIS" + }, + { + "value" : 860, + "name" : "CPU_MILLISECONDS" + }, + { + "value" : 107839488, + "name" : "PHYSICAL_MEMORY_BYTES" + }, + { + "value" : 1123147776, + "name" : "VIRTUAL_MEMORY_BYTES" + }, + { + "value" : 57475072, + "name" : "COMMITTED_HEAP_BYTES" + } + ] + }, + { + "counterGroupName" : "Shuffle Errors", + "counter" : [ + { + "value" : 0, + "name" : "BAD_ID" + }, + { + "value" : 0, + "name" : "CONNECTION" + }, + { + "value" : 0, + "name" : "IO_ERROR" + }, + { + "value" : 0, + "name" : "WRONG_LENGTH" + }, + { + "value" : 0, + "name" : "WRONG_MAP" + }, + { + "value" : 0, + "name" : "WRONG_REDUCE" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter", + "counter" : [ + { + "value" : 0, + "name" : "BYTES_WRITTEN" + } + ] + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0/counters + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 2660 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + task_1326232085508_4_4_r_0 + + org.apache.hadoop.mapreduce.FileSystemCounter + + FILE_BYTES_READ + 2363 + + + FILE_BYTES_WRITTEN + 54372 + + + FILE_READ_OPS + 0 + + + FILE_LARGE_READ_OPS + 0 + + + FILE_WRITE_OPS + 0 + + + HDFS_BYTES_READ + 0 + + + HDFS_BYTES_WRITTEN + 0 + + + HDFS_READ_OPS + 0 + + + HDFS_LARGE_READ_OPS + 0 + + + HDFS_WRITE_OPS + 0 + + + + org.apache.hadoop.mapreduce.TaskCounter + + COMBINE_INPUT_RECORDS + 0 + + + COMBINE_OUTPUT_RECORDS + 0 + + + REDUCE_INPUT_GROUPS + 460 + + + REDUCE_SHUFFLE_BYTES + 2235 + + + REDUCE_INPUT_RECORDS + 460 + + + REDUCE_OUTPUT_RECORDS + 0 + + + SPILLED_RECORDS + 0 + + + SHUFFLED_MAPS + 1 + + + FAILED_SHUFFLE + 0 + + + MERGED_MAP_OUTPUTS + 1 + + + GC_TIME_MILLIS + 26 + + + CPU_MILLISECONDS + 860 + + + PHYSICAL_MEMORY_BYTES + 107839488 + + + VIRTUAL_MEMORY_BYTES + 1123147776 + + + COMMITTED_HEAP_BYTES + 57475072 + + + + Shuffle Errors + + BAD_ID + 0 + + + CONNECTION + 0 + + + IO_ERROR + 0 + + + WRONG_LENGTH + 0 + + + WRONG_MAP + 0 + + + WRONG_REDUCE + 0 + + + + org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter + + BYTES_WRITTEN + 0 + + + ++---+ + +* Task Attempts API + + With the task attempts API, you can obtain a collection of resources that represent a task attempt within a job. When you run a GET operation on this resource, you obtain a collection of Task Attempt Objects. + +** URI + +------ + * http:///proxy/{appid}/ws/v1/mapreduce/jobs/{jobid}/tasks/{taskid}/attempts +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + + When you make a request for the list of task attempts, the information will be returned as an array of task attempt objects. + See also {{Task Attempt API}} for syntax of the task object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| taskAttempt | array of task attempt objects(JSON)/zero or more task attempt objects(XML) | The collection of task attempt objects | +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0/attempts +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "taskAttempts" : { + "taskAttempt" : [ + { + "elapsedMergeTime" : 47, + "shuffleFinishTime" : 1326238780052, + "assignedContainerId" : "container_1326232085508_0004_01_000003", + "progress" : 100, + "elapsedTime" : 0, + "state" : "RUNNING", + "elapsedShuffleTime" : 2592, + "mergeFinishTime" : 1326238780099, + "rack" : "/98.139.92.0", + "elapsedReduceTime" : 0, + "nodeHttpAddress" : "host.domain.com:9999", + "type" : "REDUCE", + "startTime" : 1326238777460, + "id" : "attempt_1326232085508_4_4_r_0_0", + "finishTime" : 0 + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0/attempts + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 807 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 1326238777460 + 0 + 0 + 100.0 + attempt_1326232085508_4_4_r_0_0 + /98.139.92.0 + RUNNING + host.domain.com:9999 + REDUCE + container_1326232085508_0004_01_000003 + 1326238780052 + 1326238780099 + 2592 + 47 + 0 + + ++---+ + +* {Task Attempt API} + + A Task Attempt resource contains information about a particular task attempt within a job. + +** URI + + Use the following URI to obtain an Task Attempt Object, from a task identified by the {attemptid} value. + +------ + * http:///proxy/{appid}/ws/v1/mapreduce/jobs/{jobid}/tasks/{taskid}/attempt/{attemptid} +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The task id | +*---------------+--------------+--------------------------------+ +| rack | string | The rack | +*---------------+--------------+--------------------------------+ +| state | string | The state of the task attempt - valid values are: NEW, UNASSIGNED, ASSIGNED, RUNNING, COMMIT_PENDING, SUCCESS_CONTAINER_CLEANUP, SUCCEEDED, FAIL_CONTAINER_CLEANUP, FAIL_TASK_CLEANUP, FAILED, KILL_CONTAINER_CLEANUP, KILL_TASK_CLEANUP, KILLED| +*---------------+--------------+--------------------------------+ +| type | string | The type of task | +*---------------+--------------+--------------------------------+ +| assignedContainerId | string | The container id this attempt is assigned to| +*---------------+--------------+--------------------------------+ +| nodeHttpAddress | string | The http address of the node this task attempt ran on | +*---------------+--------------+--------------------------------+ +| diagnostics| string | The diagnostics message | +*---------------+--------------+--------------------------------+ +| progress | float | The progress of the task attempt as a percent| +*---------------+--------------+--------------------------------+ +| startTime | long | The time in which the task attempt started (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| finishTime | long | The time in which the task attempt finished (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| elapsedTime | long | The elapsed time since the task attempt started (in ms)| +*---------------+--------------+--------------------------------+ + + For reduce task attempts you also have the following fields: + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| shuffleFinishTime | long | The time at which shuffle finished (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| mergeFinishTime | long | The time at which merge finished (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| elapsedShuffleTime | long | The time it took for the shuffle phase to complete (time in ms between reduce task start and shuffle finish)| +*---------------+--------------+--------------------------------+ +| elapsedMergeTime | long | The time it took for the merge phase to complete (time in ms between the shuffle finish and merge finish)| +*---------------+--------------+--------------------------------+ +| elapsedReduceTime | long | The time it took for the reduce phase to complete (time in ms between merge finish to end of reduce task)| +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0/attempts/attempt_1326232085508_4_4_r_0_0 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "taskAttempt" : { + "elapsedMergeTime" : 47, + "shuffleFinishTime" : 1326238780052, + "assignedContainerId" : "container_1326232085508_0004_01_000003", + "progress" : 100, + "elapsedTime" : 0, + "state" : "RUNNING", + "elapsedShuffleTime" : 2592, + "mergeFinishTime" : 1326238780099, + "rack" : "/98.139.92.0", + "elapsedReduceTime" : 0, + "nodeHttpAddress" : "host.domain.com:9999", + "startTime" : 1326238777460, + "id" : "attempt_1326232085508_4_4_r_0_0", + "type" : "REDUCE", + "finishTime" : 0 + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0/attempts/attempt_1326232085508_4_4_r_0_0 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 691 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 1326238777460 + 0 + 0 + 100.0 + attempt_1326232085508_4_4_r_0_0 + /98.139.92.0 + RUNNING + host.domain.com:9999 + REDUCE + container_1326232085508_0004_01_000003 + 1326238780052 + 1326238780099 + 2592 + 47 + 0 + ++---+ + +* Task Attempt Counters API + + With the task attempt counters API, you can object a collection of resources that represent al the counters for that task attempt. + +** URI + +------ + * http:///proxy/{appid}/ws/v1/mapreduce/jobs/{jobid}/tasks/{taskid}/attempt/{attemptid}/counters +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The task attempt id | +*---------------+--------------+-------------------------------+ +| taskAttemptcounterGroup | array of task attempt counterGroup objects(JSON)/zero or more task attempt counterGroup objects(XML) | A collection of task attempt counter group objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| counterGroupName | string | The name of the counter group | +*---------------+--------------+-------------------------------+ +| counter | array of counter objects(JSON)/zero or more counter objects(XML) | A collection of counter objects | +*---------------+--------------+-------------------------------+ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| name | string | The name of the counter | +*---------------+--------------+-------------------------------+ +| value | long | The value of the counter | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0/attempts/attempt_1326232085508_4_4_r_0_0/counters +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "jobTaskAttemptCounters" : { + "taskAttemptCounterGroup" : [ + { + "counterGroupName" : "org.apache.hadoop.mapreduce.FileSystemCounter", + "counter" : [ + { + "value" : 2363, + "name" : "FILE_BYTES_READ" + }, + { + "value" : 54372, + "name" : "FILE_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "FILE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_WRITE_OPS" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_READ" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "HDFS_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_WRITE_OPS" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.TaskCounter", + "counter" : [ + { + "value" : 0, + "name" : "COMBINE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "COMBINE_OUTPUT_RECORDS" + }, + { + "value" : 460, + "name" : "REDUCE_INPUT_GROUPS" + }, + { + "value" : 2235, + "name" : "REDUCE_SHUFFLE_BYTES" + }, + { + "value" : 460, + "name" : "REDUCE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "REDUCE_OUTPUT_RECORDS" + }, + { + "value" : 0, + "name" : "SPILLED_RECORDS" + }, + { + "value" : 1, + "name" : "SHUFFLED_MAPS" + }, + { + "value" : 0, + "name" : "FAILED_SHUFFLE" + }, + { + "value" : 1, + "name" : "MERGED_MAP_OUTPUTS" + }, + { + "value" : 26, + "name" : "GC_TIME_MILLIS" + }, + { + "value" : 860, + "name" : "CPU_MILLISECONDS" + }, + { + "value" : 107839488, + "name" : "PHYSICAL_MEMORY_BYTES" + }, + { + "value" : 1123147776, + "name" : "VIRTUAL_MEMORY_BYTES" + }, + { + "value" : 57475072, + "name" : "COMMITTED_HEAP_BYTES" + } + ] + }, + { + "counterGroupName" : "Shuffle Errors", + "counter" : [ + { + "value" : 0, + "name" : "BAD_ID" + }, + { + "value" : 0, + "name" : "CONNECTION" + }, + { + "value" : 0, + "name" : "IO_ERROR" + }, + { + "value" : 0, + "name" : "WRONG_LENGTH" + }, + { + "value" : 0, + "name" : "WRONG_MAP" + }, + { + "value" : 0, + "name" : "WRONG_REDUCE" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter", + "counter" : [ + { + "value" : 0, + "name" : "BYTES_WRITTEN" + } + ] + } + ], + "id" : "attempt_1326232085508_4_4_r_0_0" + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///proxy/application_1326232085508_0004/ws/v1/mapreduce/jobs/job_1326232085508_4_4/tasks/task_1326232085508_4_4_r_0/attempts/attempt_1326232085508_4_4_r_0_0/counters + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 2735 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + attempt_1326232085508_4_4_r_0_0 + + org.apache.hadoop.mapreduce.FileSystemCounter + + FILE_BYTES_READ + 2363 + + + FILE_BYTES_WRITTEN + 54372 + + + FILE_READ_OPS + 0 + + + FILE_LARGE_READ_OPS + 0 + + + FILE_WRITE_OPS + 0 + + + HDFS_BYTES_READ + 0 + + + HDFS_BYTES_WRITTEN + 0 + + + HDFS_READ_OPS + 0 + + + HDFS_LARGE_READ_OPS + 0 + + + HDFS_WRITE_OPS + 0 + + + + org.apache.hadoop.mapreduce.TaskCounter + + COMBINE_INPUT_RECORDS + 0 + + + COMBINE_OUTPUT_RECORDS + 0 + + + REDUCE_INPUT_GROUPS + 460 + + + REDUCE_SHUFFLE_BYTES + 2235 + + + REDUCE_INPUT_RECORDS + 460 + + + REDUCE_OUTPUT_RECORDS + 0 + + + SPILLED_RECORDS + 0 + + + SHUFFLED_MAPS + 1 + + + FAILED_SHUFFLE + 0 + + + MERGED_MAP_OUTPUTS + 1 + + + GC_TIME_MILLIS + 26 + + + CPU_MILLISECONDS + 860 + + + PHYSICAL_MEMORY_BYTES + 107839488 + + + VIRTUAL_MEMORY_BYTES + 1123147776 + + + COMMITTED_HEAP_BYTES + 57475072 + + + + Shuffle Errors + + BAD_ID + 0 + + + CONNECTION + 0 + + + IO_ERROR + 0 + + + WRONG_LENGTH + 0 + + + WRONG_MAP + 0 + + + WRONG_REDUCE + 0 + + + + org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter + + BYTES_WRITTEN + 0 + + + ++---+ + diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm new file mode 100644 index 00000000000..a733d71378d --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/NodeManagerRest.apt.vm @@ -0,0 +1,635 @@ +~~ Licensed under the Apache License, Version 2.0 (the "License"); +~~ you may not use this file except in compliance with the License. +~~ You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. See accompanying LICENSE file. + + --- + NodeManager REST API's. + --- + --- + ${maven.build.timestamp} + +NodeManager REST API's. + + \[ {{{./index.html}Go Back}} \] + +%{toc|section=1|fromDepth=0|toDepth=2} + +* Overview + + The NodeManager REST API's allow the user to get status on the node and information about applications and containers running on that node. + +* NodeManager Information API + + The node information resource provides overall information about that particular node. + +** URI + + Both of the following URI's give you the cluster information. + +------ + * http:///ws/v1/node + * http:///ws/v1/node/info +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | long | The NodeManager id | +*---------------+--------------+-------------------------------+ +| nodeHostName | string | The host name of the NodeManager | +*---------------+--------------+-------------------------------+ +| totalPmemAllocatedContainersMB | long | The amount of physical memory allocated for use by containers in MB | +*---------------+--------------+-------------------------------+ +| totalVmemAllocatedContainersMB | long | The amount of virtual memory allocated for use by containers in MB | +*---------------+--------------+-------------------------------+ +| lastNodeUpdateTime | long | The last timestamp at which the health report was received (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| healthReport | string | The diagnostic health report of the node | +*---------------+--------------+-------------------------------+ +| nodeHealthy | boolean | true/false indicator of if the node is healthy| +*---------------+--------------+-------------------------------+ +| nodeManagerVersion | string | Version of the NodeManager | +*---------------+--------------+-------------------------------+ +| nodeManagerBuildVersion | string | NodeManager build string with build version, user, and checksum | +*---------------+--------------+-------------------------------+ +| nodeManagerVersionBuiltOn | string | Timestamp when NodeManager was built(in ms since epoch) | +*---------------+--------------+-------------------------------+ +| hadoopVersion | string | Version of hadoop common | +*---------------+--------------+-------------------------------+ +| hadoopBuildVersion | string | Hadoop common build string with build version, user, and checksum | +*---------------+--------------+-------------------------------+ +| hadoopVersionBuiltOn | string | Timestamp when hadoop common was built(in ms since epoch) | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/node/info +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "nodeInfo" : { + "hadoopVersionBuiltOn" : "Mon Jan 9 14:58:42 UTC 2012", + "nodeManagerBuildVersion" : "0.23.1-SNAPSHOT from 1228355 by user1 source checksum 20647f76c36430e888cc7204826a445c", + "lastNodeUpdateTime" : 1326222266126, + "totalVmemAllocatedContainersMB" : 17203, + "nodeHealthy" : true, + "healthReport" : "", + "totalPmemAllocatedContainersMB" : 8192, + "nodeManagerVersionBuiltOn" : "Mon Jan 9 15:01:59 UTC 2012", + "nodeManagerVersion" : "0.23.1-SNAPSHOT", + "id" : "host.domain.com:45454", + "hadoopBuildVersion" : "0.23.1-SNAPSHOT from 1228292 by user1 source checksum 3eba233f2248a089e9b28841a784dd00", + "nodeHostName" : "host.domain.com", + "hadoopVersion" : "0.23.1-SNAPSHOT" + } +} ++---+ + + <> + + HTTP Request: + +----- + Accept: application/xml + GET http:///ws/v1/node/info +----- + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 983 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 17203 + 8192 + 1326222386134 + true + 0.23.1-SNAPSHOT + 0.23.1-SNAPSHOT from 1228355 by user1 source checksum 20647f76c36430e888cc7204826a445c + Mon Jan 9 15:01:59 UTC 2012 + 0.23.1-SNAPSHOT + 0.23.1-SNAPSHOT from 1228292 by user1 source checksum 3eba233f2248a089e9b28841a784dd00 + Mon Jan 9 14:58:42 UTC 2012 + host.domain.com:45454 + host.domain.com + ++---+ + +* Applications API + + With the Applications API, you can obtain a collection of resources, each of which represents an application. When you run a GET operation on this resource, you obtain a collection of Application Objects. See also {{Application API}} for syntax of the application object. + +** URI + +------ + * http:///ws/v1/node/apps +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + + Multiple paramters can be specified. + +------ + * state - application state + * user - user name +------ + +** Elements of the (Applications) object + + When you make a request for the list of applications, the information will be returned as a collection of app objects. + See also {{Application API}} for syntax of the app object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| app | array of app objects(JSON)/zero or more app objects(XML) | A collection of application objects | +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/node/apps +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "apps" : { + "app" : [ + { + "containerids" : [ + "container_1326121700862_0003_01_000001", + "container_1326121700862_0003_01_000002" + ], + "user" : "user1", + "id" : "application_1326121700862_0003", + "state" : "RUNNING" + }, + { + "user" : "user1", + "id" : "application_1326121700862_0002", + "state" : "FINISHED" + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/node/apps + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 400 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + application_1326121700862_0002 + FINISHED + user1 + + + application_1326121700862_0003 + RUNNING + user1 + container_1326121700862_0003_01_000002 + container_1326121700862_0003_01_000001 + + + ++---+ + +* {Application API} + + An application resource contains information about a particular application that was run or is running on this NodeManager. + +** URI + + Use the following URI to obtain an app Object, for a application identified by the {appid} value. + +------ + * http:///ws/v1/node/apps/{appid} +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the (Application) object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The application id | +*---------------+--------------+--------------------------------+ +| user | string | The user who started the application | +*---------------+--------------+--------------------------------+ +| state | string | The state of the application - valid states are: NEW, INITING, RUNNING, FINISHING_CONTAINERS_WAIT, APPLICATION_RESOURCES_CLEANINGUP, FINISHED | +*---------------+--------------+--------------------------------+ +| containerids | array of containerids(JSON)/zero or more containerids(XML) | The list of containerids currently being used by the application on this node. If not present then no containers are currently running for this application.| +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/node/apps/application_1326121700862_0005 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "app" : { + "containerids" : [ + "container_1326121700862_0005_01_000003", + "container_1326121700862_0005_01_000001" + ], + "user" : "user1", + "id" : "application_1326121700862_0005", + "state" : "RUNNING" + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/node/apps/application_1326121700862_0005 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 281 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + application_1326121700862_0005 + RUNNING + user1 + container_1326121700862_0005_01_000003 + container_1326121700862_0005_01_000001 + ++---+ + + +* Containers API + + With the containers API, you can obtain a collection of resources, each of which represents a container. When you run a GET operation on this resource, you obtain a collection of Container Objects. See also {{Container API}} for syntax of the container object. + +** URI + +------ + * http:///ws/v1/node/containers +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + + When you make a request for the list of containers, the information will be returned as collection of container objects. + See also {{Container API}} for syntax of the container object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| containers | array of container objects(JSON)/zero or more container objects(XML) | A collection of container objects | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/node/containers +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "containers" : { + "container" : [ + { + "nodeId" : "host.domain.com:45454", + "totalMemoryNeededMB" : 2048, + "state" : "RUNNING", + "diagnostics" : "", + "containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000001/user1", + "user" : "user1", + "id" : "container_1326121700862_0006_01_000001", + "exitCode" : -1000 + }, + { + "nodeId" : "host.domain.com:45454", + "totalMemoryNeededMB" : 2048, + "state" : "RUNNING", + "diagnostics" : "", + "containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000003/user1", + "user" : "user1", + "id" : "container_1326121700862_0006_01_000003", + "exitCode" : -1000 + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/node/containers + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 988 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + container_1326121700862_0006_01_000001 + RUNNING + -1000 + + user1 + 2048 + http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000001/user1 + host.domain.com:45454 + + + container_1326121700862_0006_01_000003 + DONE + 0 + Container killed by the ApplicationMaster. + user1 + 2048 + http://host.domain.com:9999/node/containerlogs/container_1326121700862_0006_01_000003/user1 + host.domain.com:45454 + + ++---+ + + +* {Container API} + + A container resource contains information about a particular container that is running on this NodeManager. + +** URI + + Use the following URI to obtain a Container Object, from a container identified by the {containerid} value. + +------ + * http:///ws/v1/node/containers/{containerid} +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The container id | +*---------------+--------------+-------------------------------+ +| state | string | State of the container - valid states are: NEW, LOCALIZING, LOCALIZATION_FAILED, LOCALIZED, RUNNING, EXITED_WITH_SUCCESS, EXITED_WITH_FAILURE, KILLING, CONTAINER_CLEANEDUP_AFTER_KILL, CONTAINER_RESOURCES_CLEANINGUP, DONE| +*---------------+--------------+-------------------------------+ +| nodeId | string | The id of the node the container is on| +*---------------+--------------+-------------------------------+ +| containerLogsLink | string | The http link to the container logs | +*---------------+--------------+-------------------------------+ +| user | string | The user name of the user which started the container| +*---------------+--------------+-------------------------------+ +| exitCode | int | Exit code of the container | +*---------------+--------------+-------------------------------+ +| diagnostics | string | A diagnostic message for failed containers | +*---------------+--------------+-------------------------------+ +| totalMemoryNeededMB | long | Total amout of memory needed by the container (in MB) | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/nodes/containers/container_1326121700862_0007_01_000001 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "container" : { + "nodeId" : "host.domain.com:45454", + "totalMemoryNeededMB" : 2048, + "state" : "RUNNING", + "diagnostics" : "", + "containerLogsLink" : "http://host.domain.com:9999/node/containerlogs/container_1326121700862_0007_01_000001/user1", + "user" : "user1", + "id" : "container_1326121700862_0007_01_000001", + "exitCode" : -1000 + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/node/containers/container_1326121700862_0007_01_000001 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 491 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + container_1326121700862_0007_01_000001 + RUNNING + -1000 + + user1 + 2048 + http://host.domain.com:9999/node/containerlogs/container_1326121700862_0007_01_000001/user1 + host.domain.com:45454 + ++---+ + diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm new file mode 100644 index 00000000000..e762594af8e --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm @@ -0,0 +1,1469 @@ +~~ Licensed under the Apache License, Version 2.0 (the "License"); +~~ you may not use this file except in compliance with the License. +~~ You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. See accompanying LICENSE file. + + --- + ResourceManager REST API's. + --- + --- + ${maven.build.timestamp} + +ResourceManager REST API's. + + \[ {{{./index.html}Go Back}} \] + +%{toc|section=1|fromDepth=0|toDepth=2} + +* Overview + + The ResourceManager REST API's allow the user to get information about the cluster - status on the cluster, metrics on the cluster, scheduler information, information about nodes in the cluster, and information about applications on the cluster. + +* Cluster Information API + + The cluster information resource provides overall information about the cluster. + +** URI + + Both of the following URI's give you the cluster information. + +------ + * http:///ws/v1/cluster + * http:///ws/v1/cluster/info +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | long | The cluster id | +*---------------+--------------+-------------------------------+ +| startedOn | long | The time the cluster started (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| state | string | The ResourceManager state - valid values are: NOTINITED, INITED, STARTED, STOPPED| +*---------------+--------------+-------------------------------+ +| resourceManagerVersion | string | Version of the ResourceManager | +*---------------+--------------+-------------------------------+ +| resourceManagerBuildVersion | string | ResourceManager build string with build version, user, and checksum | +*---------------+--------------+-------------------------------+ +| resourceManagerVersionBuiltOn | string | Timestamp when ResourceManager was built (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| hadoopVersion | string | Version of hadoop common | +*---------------+--------------+-------------------------------+ +| hadoopBuildVersion | string | Hadoop common build string with build version, user, and checksum | +*---------------+--------------+-------------------------------+ +| hadoopVersionBuiltOn | string | Timestamp when hadoop common was built(in ms since epoch)| +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/info +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "clusterInfo": + { + "id":1324053971963, + "startedOn":1324053971963, + "state":"STARTED", + "resourceManagerVersion":"0.23.1-SNAPSHOT", + "resourceManagerBuildVersion":"0.23.1-SNAPSHOT from 1214049 by user1 source checksum 050cd664439d931c8743a6428fd6a693", + "resourceManagerVersionBuiltOn":"Tue Dec 13 22:12:48 CST 2011", + "hadoopVersion":"0.23.1-SNAPSHOT", + "hadoopBuildVersion":"0.23.1-SNAPSHOT from 1214049 by user1 source checksum 11458df3bb77342dca5f917198fad328", + "hadoopVersionBuiltOn":"Tue Dec 13 22:12:26 CST 2011" + } +} ++---+ + + <> + + HTTP Request: + +----- + Accept: application/xml + GET http:///ws/v1/cluster/info +----- + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 712 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 1324053971963 + 1324053971963 + STARTED + 0.23.1-SNAPSHOT + 0.23.1-SNAPSHOT from 1214049 by user1 source checksum 050cd664439d931c8743a6428fd6a693 + Tue Dec 13 22:12:48 CST 2011 + 0.23.1-SNAPSHOT + 0.23.1-SNAPSHOT from 1214049 by user1 source checksum 11458df3bb77342dca5f917198fad328 + Tue Dec 13 22:12:48 CST 2011 + ++---+ + +* Cluster Metrics API + + The cluster metrics resource provides some overall metrics about the cluster. More detailed metrics should be retrieved from the jmx interface. + +** URI + +------ + * http:///ws/v1/cluster/metrics +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| appsSubmitted | int | The number of applications submitted | +*---------------+--------------+-------------------------------+ +| reservedMB | long | The amount of memory reserved in MB | +*---------------+--------------+-------------------------------+ +| availableMB | long | The amount of memory available in MB | +*---------------+--------------+-------------------------------+ +| allocatedMB | long | The amount of memory allocated in MB | +*---------------+--------------+-------------------------------+ +| totalMB | long | The amount of total memory in MB | +*---------------+--------------+-------------------------------+ +| containersAllocated | int | The number of containers allocated | +*---------------+--------------+-------------------------------+ +| totalNodes | int | The total number of nodes | +*---------------+--------------+-------------------------------+ +| activeNodes | int | The number of active nodes | +*---------------+--------------+-------------------------------+ +| lostNodes | int | The number of lost nodes | +*---------------+--------------+-------------------------------+ +| unhealthyNodes | int | The number of unhealthy nodes | +*---------------+--------------+-------------------------------+ +| decommissionedNodes | int | The number of nodes decommissioned | +*---------------+--------------+-------------------------------+ +| rebootedNodes | int | The number of nodes rebooted | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/metrics +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + { + "clusterMetrics": + { + "appsSubmitted":4, + "reservedMB":0, + "availableMB":8192, + "allocatedMB":0, + "totalMB":8192, + "containersAllocated":0, + "totalNodes":1, + "activeNodes":1, + "lostNodes":0, + "unhealthyNodes":0, + "decommissionedNodes":0, + "rebootedNodes":0 + } + } ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/metrics + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 432 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + 4 + 0 + 8192 + 0 + 0 + 8192 + 1 + 1 + 0 + 0 + 0 + 0 + ++---+ + +* Cluster Scheduler API + + A scheduler resource contains information about the current scheduler configured in a cluster. It currently supports both the Fifo and Capacity Scheduler. You will get different information depending on which scheduler is configured so be sure to look at the type information. + +** URI + +------ + * http:///ws/v1/cluster/scheduler +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Capacity Scheduler API + + The capacity scheduler supports hierarchical queues. This one request will print information about all the queues and any subqueues they have. + Queues that can actually have jobs submitted to them are referred to as leaf queues. These queues have additional data associated with them. + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| type | string | Scheduler type - capacityScheduler| +*---------------+--------------+-------------------------------+ +| capacity | float | Queue capacity in percentage relative to its parent queue | +*---------------+--------------+-------------------------------+ +| usedCapacity | float | Used queue capacity in percentage relative its to parent queue | +*---------------+--------------+-------------------------------+ +| maxCapacity | float | Maximum queue capacity in percentage relative to its parent queue | +*---------------+--------------+-------------------------------+ +| queueName | string | Name of the queue | +*---------------+--------------+-------------------------------+ +| queues | array of queues(JSON)/zero or more queue objects(XML) | A collection of queue resources| +*---------------+--------------+-------------------------------+ + +** Elements of the queues/subQueues object for a Parent queue + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| capacity | float | Queue capacity in percentage relative to its parent queue | +*---------------+--------------+-------------------------------+ +| usedCapacity | float | Used queue capacity in percentage relative its to parent queue | +*---------------+--------------+-------------------------------+ +| maxCapacity | float | Maximum queue capacity in percentage relative to its parent queue | +*---------------+--------------+-------------------------------+ +| absoluteCapacity | float | Absolute capacity percentage this queue can use of entire cluster | +*---------------+--------------+-------------------------------+ +| absoluteMaxCapacity | float | Absolute maximum capacity percentage this queue can use of the entire cluster | +*---------------+--------------+-------------------------------+ +| utilization | float | Queue utilization percentage relative to the entire cluster | +*---------------+--------------+-------------------------------+ +| numApplications | int | The number of applications currently in the queue | +*---------------+--------------+-------------------------------+ +| usedResources | string | A string describing the current resources used by the queue | +*---------------+--------------+-------------------------------+ +| queueName | string | The name of the queue | +*---------------+--------------+-------------------------------+ +| state | string of QueueState | The state of the queue | +*---------------+--------------+-------------------------------+ +| subQueues | array of queues(JSON)/zero or more queue objects(XML) | A collection of sub-queue information| +*---------------+--------------+-------------------------------+ + +** Elements of the queues/subQueues object for a Leaf queue - contains all elements in parent plus the following: + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| type | String | type of the queue - capacitySchedulerLeafQueueInfo | +*---------------+--------------+-------------------------------+ +| numActiveApplications | int | The number of active applications in this queue | +*---------------+--------------+-------------------------------+ +| numPendingApplications | int | The number of pending applications in this queue | +*---------------+--------------+-------------------------------+ +| numContainers | int | The number of containers being used | +*---------------+--------------+-------------------------------+ +| maxApplications | int | The maximum number of applications this queue can have | +*---------------+--------------+-------------------------------+ +| maxApplicationsPerUser | int | The maximum number of applications per user this queue can have | +*---------------+--------------+-------------------------------+ +| maxActiveApplications | int | The maximum number of active applications this queue can have | +*---------------+--------------+-------------------------------+ +| maxActiveApplicationsPerUser | int | The maximum number of active applications per user this queue can have| +*---------------+--------------+-------------------------------+ +| userLimit | int | The minimum user limit percent set in the configuration | +*---------------+--------------+-------------------------------+ +| userLimitFactor | float | The user limit factor set in the configuration | +*---------------+--------------+-------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/scheduler +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "scheduler" : { + "schedulerInfo" : { + "queueName" : "root", + "maxCapacity" : 100, + "type" : "capacityScheduler", + "queues" : [ + { + "numPendingApplications" : 0, + "queueName" : "default", + "userLimitFactor" : 1, + "maxApplications" : 7000, + "usedCapacity" : 0, + "numContainers" : 0, + "state" : "RUNNING", + "maxCapacity" : 90, + "numApplications" : 0, + "usedResources" : "memory: 0", + "absoluteMaxCapacity" : 90, + "maxActiveApplications" : 1, + "numActiveApplications" : 0, + "utilization" : 0, + "userLimit" : 100, + "absoluteCapacity" : 70, + "maxActiveApplicationsPerUser" : 1, + "capacity" : 70, + "type" : "capacitySchedulerLeafQueueInfo", + "maxApplicationsPerUser" : 7000 + }, + { + "queueName" : "test", + "utilization" : 0, + "absoluteCapacity" : 20, + "usedCapacity" : 0, + "capacity" : 20, + "subQueues" : [ + { + "numPendingApplications" : 0, + "queueName" : "a1", + "userLimitFactor" : 1, + "maxApplications" : 1200, + "usedCapacity" : 0, + "numContainers" : 0, + "state" : "RUNNING", + "maxCapacity" : 80, + "numApplications" : 0, + "usedResources" : "memory: 0", + "absoluteMaxCapacity" : 16.000002, + "maxActiveApplications" : 1, + "numActiveApplications" : 0, + "utilization" : 0, + "userLimit" : 100, + "absoluteCapacity" : 12, + "maxActiveApplicationsPerUser" : 1, + "capacity" : 60.000004, + "type" : "capacitySchedulerLeafQueueInfo", + "maxApplicationsPerUser" : 1200 + }, + { + "numPendingApplications" : 0, + "queueName" : "a2", + "userLimitFactor" : 1, + "maxApplications" : 800, + "usedCapacity" : 0, + "numContainers" : 0, + "state" : "RUNNING", + "maxCapacity" : 100, + "numApplications" : 0, + "usedResources" : "memory: 0", + "absoluteMaxCapacity" : 100, + "maxActiveApplications" : 1, + "numActiveApplications" : 0, + "utilization" : 0, + "userLimit" : 100, + "absoluteCapacity" : 8.000001, + "maxActiveApplicationsPerUser" : 1, + "capacity" : 40, + "type" : "capacitySchedulerLeafQueueInfo", + "maxApplicationsPerUser" : 800 + } + ], + "state" : "RUNNING", + "maxCapacity" : 80, + "numApplications" : 0, + "usedResources" : "memory: 0", + "absoluteMaxCapacity" : 80 + }, + { + "queueName" : "test2", + "utilization" : 0, + "absoluteCapacity" : 10, + "usedCapacity" : 0, + "capacity" : 10, + "subQueues" : [ + { + "numPendingApplications" : 0, + "queueName" : "a5", + "userLimitFactor" : 1, + "maxApplications" : 500, + "usedCapacity" : 0, + "numContainers" : 0, + "state" : "RUNNING", + "maxCapacity" : 100, + "numApplications" : 0, + "usedResources" : "memory: 0", + "absoluteMaxCapacity" : 100, + "maxActiveApplications" : 1, + "numActiveApplications" : 0, + "utilization" : 0, + "userLimit" : 100, + "absoluteCapacity" : 5, + "maxActiveApplicationsPerUser" : 1, + "capacity" : 50, + "type" : "capacitySchedulerLeafQueueInfo", + "maxApplicationsPerUser" : 500 + }, + { + "numPendingApplications" : 0, + "queueName" : "a3", + "userLimitFactor" : 1, + "maxApplications" : 400, + "usedCapacity" : 0, + "numContainers" : 0, + "state" : "RUNNING", + "maxCapacity" : 100, + "numApplications" : 0, + "usedResources" : "memory: 0", + "absoluteMaxCapacity" : 100, + "maxActiveApplications" : 1, + "numActiveApplications" : 0, + "utilization" : 0, + "userLimit" : 100, + "absoluteCapacity" : 4.0000005, + "maxActiveApplicationsPerUser" : 1, + "capacity" : 40, + "type" : "capacitySchedulerLeafQueueInfo", + "maxApplicationsPerUser" : 400 + }, + { + "numPendingApplications" : 0, + "queueName" : "a4", + "userLimitFactor" : 1, + "maxApplications" : 100, + "usedCapacity" : 0, + "numContainers" : 0, + "state" : "RUNNING", + "maxCapacity" : 100, + "numApplications" : 0, + "usedResources" : "memory: 0", + "absoluteMaxCapacity" : 100, + "maxActiveApplications" : 1, + "numActiveApplications" : 0, + "utilization" : 0, + "userLimit" : 100, + "absoluteCapacity" : 1.0000001, + "maxActiveApplicationsPerUser" : 1, + "capacity" : 10, + "type" : "capacitySchedulerLeafQueueInfo", + "maxApplicationsPerUser" : 100 + } + ], + "state" : "RUNNING", + "maxCapacity" : 15.000001, + "numApplications" : 0, + "usedResources" : "memory: 0", + "absoluteMaxCapacity" : 15.000001 + } + ], + "usedCapacity" : 0, + "capacity" : 100 + } + } +} ++---+ + + <> + + HTTP Request: + +----- + Accept: application/xml + GET http:///ws/v1/cluster/scheduler +----- + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 5778 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 100.0 + 0.0 + 100.0 + root + + 70.0 + 0.0 + 90.0 + 70.0 + 90.0 + 0.0 + 0 + memory: 0 + default + RUNNING + 0 + 0 + 0 + 7000 + 7000 + 1 + 1 + 100 + 1.0 + + + 20.0 + 0.0 + 80.0 + 20.0 + 80.0 + 0.0 + 0 + memory: 0 + test + RUNNING + + 60.000004 + 0.0 + 80.0 + 12.0 + 16.000002 + 0.0 + 0 + memory: 0 + a1 + RUNNING + 0 + 0 + 0 + 1200 + 1200 + 1 + 1 + 100 + 1.0 + + + 40.0 + 0.0 + 100.0 + 8.000001 + 100.0 + 0.0 + 0 + memory: 0 + a2 + RUNNING + 0 + 0 + 0 + 800 + 800 + 1 + 1 + 100 + 1.0 + + + + 10.0 + 0.0 + 15.000001 + 10.0 + 15.000001 + 0.0 + 0 + memory: 0 + test2 + RUNNING + + 50.0 + 0.0 + 100.0 + 5.0 + 100.0 + 0.0 + 0 + memory: 0 + A4 + RUNNING + 0 + 0 + 0 + 500 + 500 + 1 + 1 + 100 + 1.0 + + + 40.0 + 0.0 + 100.0 + 4.0000005 + 100.0 + 0.0 + 0 + memory: 0 + a3 + RUNNING + 0 + 0 + 0 + 400 + 400 + 1 + 1 + 100 + 1.0 + + + 10.0 + 0.0 + 100.0 + 1.0000001 + 100.0 + 0.0 + 0 + memory: 0 + a4 + RUNNING + 0 + 0 + 0 + 100 + 100 + 1 + 1 + 100 + 1.0 + + + + ++---+ + +** Fifo Scheduler API + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| type | string | Scheduler type - fifoScheduler | +*---------------+--------------+-------------------------------+ +| capacity | float | Queue capacity in percentage | +*---------------+--------------+-------------------------------+ +| usedCapacity | float | Used queue capacity in percentage | +*---------------+--------------+-------------------------------+ +| qstate | string | State of the queue - valid values are: STOPPED, RUNNING| +*---------------+--------------+-------------------------------+ +| minQueueMemoryCapacity | int | Minimum queue memory capacity | +*---------------+--------------+-------------------------------+ +| maxQueueMemoryCapacity | int | Maximum queue memory capacity | +*---------------+--------------+-------------------------------+ +| numNodes | int | The total number of nodes | +*---------------+--------------+-------------------------------+ +| usedNodeCapacity | int | The used node capacity | +*---------------+--------------+-------------------------------+ +| availNodeCapacity | int | The available node capacity | +*---------------+--------------+-------------------------------+ +| totalNodeCapacity | int | The total node capacity | +*---------------+--------------+-------------------------------+ +| numContainers | int | The number of containers | +*---------------+--------------+-------------------------------+ + +*** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/scheduler +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "scheduler": + { + "schedulerInfo": + { + "type":"fifoScheduler", + "capacity":1, + "usedCapacity":"NaN", + "qstate":"RUNNING", + "minQueueMemoryCapacity":1024, + "maxQueueMemoryCapacity":10240, + "numNodes":0, + "usedNodeCapacity":0, + "availNodeCapacity":0, + "totalNodeCapacity":0, + "numContainers":0 + } + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/scheduler + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 432 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + 1.0 + NaN + RUNNING + 1024 + 10240 + 0 + 0 + 0 + 0 + 0 + + ++---+ + +* Cluster Applications API + + With the Applications API, you can obtain a collection of resources, each of which represents an application. When you run a GET operation on this resource, you obtain a collection of Application Objects. + +** URI + +------ + * http:///ws/v1/cluster/apps +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + + Multiple paramters can be specified. The started and finished times have a begin and end parameter to allow you to specify ranges. For example, one could request all applications that started between 1:00am and 2:00pm on 12/19/2011 with startedTimeBegin=1324256400&startedTimeEnd=1324303200. If the Begin parameter is not specfied, it defaults to 0, and if the End parameter is not specified, it defaults to infinity. + +------ + * state - state of the application + * user - user name + * queue - queue name + * limit - total number of app objects to be returned + * startedTimeBegin - applications with start time beginning with this time, specified in ms since epoch + * startedTimeEnd - applications with start time ending with this time, specified in ms since epoch + * finishedTimeBegin - applications with finish time beginning with this time, specified in ms since epoch + * finishedTimeEnd - applications with finish time ending with this time, specified in ms since epoch +------ + +** Elements of the (Applications) object + + When you make a request for the list of applications, the information will be returned as a collection of app objects. + See also {{Application API}} for syntax of the app object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| app | array of app objects(JSON)/zero or more application objects(XML) | The collection of application objects | +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/apps +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "apps": + { + "app": + [ + { + "finishedTime" : 1326815598530, + "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326815542473_0001_01_000001", + "trackingUI" : "History", + "state" : "FINISHED", + "user" : "user1", + "id" : "application_1326815542473_0001", + "clusterId" : 1326815542473, + "finalStatus" : "SUCCEEDED", + "amHostHttpAddress" : "host.domain.com:9999", + "progress" : 100, + "name" : "word count", + "startedTime" : 1326815573334, + "elapsedTime" : 25196, + "diagnostics" : "", + "trackingUrl" : "http://host.domain.com:8088/proxy/application_1326815542473_0001/jobhistory/job/job_1326815542473_1_1", + "queue" : "default" + }, + { + "finishedTime" : 1326815789546, + "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326815542473_0002_01_000001", + "trackingUI" : "History", + "state" : "FINISHED", + "user" : "user1", + "id" : "application_1326815542473_0002", + "clusterId" : 1326815542473, + "finalStatus" : "SUCCEEDED", + "amHostHttpAddress" : "host.domain.com:9999", + "progress" : 100, + "name" : "Sleep job", + "startedTime" : 1326815641380, + "elapsedTime" : 148166, + "diagnostics" : "", + "trackingUrl" : "http://host.domain.com:8088/proxy/application_1326815542473_0002/jobhistory/job/job_1326815542473_2_2", + "queue" : "default" + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/apps + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 2459 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + application_1326815542473_0001 + user1 + word count + default + FINISHED + SUCCEEDED + 100.0 + History + http://host.domain.com:8088/proxy/application_1326815542473_0001/jobhistory/job +/job_1326815542473_1_1 + + 1326815542473 + 1326815573334 + 1326815598530 + 25196 + http://host.domain.com:9999/node/containerlogs/container_1326815542473_0001 +_01_000001 + host.domain.com:9999 + + + application_1326815542473_0002 + user1 + Sleep job + default + FINISHED + SUCCEEDED + 100.0 + History + http://host.domain.com:8088/proxy/application_1326815542473_0002/jobhistory/job/job_1326815542473_2_2 + + 1326815542473 + 1326815641380 + 1326815789546 + 148166 + http://host.domain.com:9999/node/containerlogs/container_1326815542473_0002_01_000001 + host.domain.com:9999 + + + ++---+ + +* Cluster {Application API} + + An application resource contains information about a particular application that was submitted to a cluster. + +** URI + + Use the following URI to obtain an app object, from a application identified by the {appid} value. + +------ + * http:///ws/v1/cluster/apps/{appid} +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the (Application) object + + Note that depending on security settings a user might not be able to see all the fields. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| id | string | The application id | +*---------------+--------------+--------------------------------+ +| user | string | The user who started the application | +*---------------+--------------+--------------------------------+ +| name | string | The application name | +*---------------+--------------+--------------------------------+ +| queue | string | The queue the application was submitted to| +*---------------+--------------+--------------------------------+ +| state | string | The application state according to the ResourceManager - valid values are: NEW, SUBMITTED, ACCEPTED, RUNNING, FINISHED, FAILED, KILLED| +*---------------+--------------+--------------------------------+ +| finalStatus | string | The final status of the application if finished - reported by the application itself - valid values are: UNDEFINED, SUCCEEDED, FAILED, KILLED| +*---------------+--------------+--------------------------------+ +| progress | float | The progress of the application as a percent | +*---------------+--------------+--------------------------------+ +| trackingUI | string | Where the tracking url is currently pointing - History (for history server) or ApplicationMaster | +*---------------+--------------+--------------------------------+ +| trackingUrl | string | The web URL that can be used to track the application | +*---------------+--------------+--------------------------------+ +| diagnostics | string | Detailed diagnostics information | +*---------------+--------------+--------------------------------+ +| clusterId | long | The cluster id | +*---------------+--------------+--------------------------------+ +| startedTime | long | The time in which application started (in ms since epoch)| +*---------------+--------------+--------------------------------+ +| finishedTime | long | The time in which the application finished (in ms since epoch) | +*---------------+--------------+--------------------------------+ +| elapsedTime | long | The elapsed time since the application started (in ms)| +*---------------+--------------+--------------------------------+ +| amContainerLogs | string | The URL of the application master container logs| +*---------------+--------------+--------------------------------+ +| amHostHttpAddress | string | The nodes http address of the application master | +*---------------+--------------+--------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/apps/application_1326821518301_0005 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "app" : { + "finishedTime" : 1326824991300, + "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0005_01_000001", + "trackingUI" : "History", + "state" : "FINISHED", + "user" : "user1", + "id" : "application_1326821518301_0005", + "clusterId" : 1326821518301, + "finalStatus" : "SUCCEEDED", + "amHostHttpAddress" : "host.domain.com:9999", + "progress" : 100, + "name" : "Sleep job", + "startedTime" : 1326824544552, + "elapsedTime" : 446748, + "diagnostics" : "", + "trackingUrl" : "http://host.domain.com:8088/proxy/application_1326821518301_0005/jobhistory/job/job_1326821518301_5_5", + "queue" : "a1" + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/apps/application_1326821518301_0005 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 847 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + application_1326821518301_0005 + user1 + Sleep job + a1 + FINISHED + SUCCEEDED + 100.0 + History + http://host.domain.com:8088/proxy/application_1326821518301_0005/jobhistory/job/job_1326821518301_5_5 + + 1326821518301 + 1326824544552 + 1326824991300 + 446748 + http://host.domain.com:9999/node/containerlogs/container_1326821518301_0005_01_000001 + host.domain.com:9999 + ++---+ + +* Cluster Nodes API + + With the Nodes API, you can obtain a collection of resources, each of which represents a node. When you run a GET operation on this resource, you obtain a collection of Node Objects. + +** URI + +------ + * http:///ws/v1/cluster/nodes +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + * state - the state of the node + * healthy - true or false +------ + +** Elements of the object + + When you make a request for the list of nodes, the information will be returned as a collection of node objects. + See also {{Node API}} for syntax of the node object. + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| node | array of node objects(JSON)/zero or more node objects(XML) | A collection of node objects | +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/nodes +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "nodes": + { + "node": + [ + { + "rack":"\/default-rack", + "state":"NEW", + "id":"h2:1235", + "nodeHostName":"h2", + "nodeHTTPAddress":"h2:2", + "healthStatus":"Healthy", + "lastHealthUpdate":1324056895432, + "healthReport":"Healthy", + "numContainers":0, + "usedMemoryMB":0 + "availMemoryMB":8192 + }, + { + "rack":"\/default-rack", + "state":"NEW", + "id":"h1:1234", + "nodeHostName":"h1", + "nodeHTTPAddress":"h1:2", + "healthStatus":"Healthy", + "lastHealthUpdate":1324056895092, + "healthReport":"Healthy", + "numContainers":0, + "usedMemoryMB":0, + "availMemoryMB":8192 + } + ] + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/nodes + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 1104 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + + /default-rack + RUNNING + h2:1234 + h2 + h2:2 + Healthy + 1324333268447 + Healthy + 0 + 0 + 5120 + + + /default-rack + RUNNING + h1:1234 + h1 + h1:2 + Healthy + 1324333268447 + Healthy + 0 + 0 + 5120 + + ++---+ + + +* Cluster {Node API} + + A node resource contains information about a node in the cluster. + +** URI + + Use the following URI to obtain a Node Object, from a node identified by the {nodeid} value. + +------ + * http:///ws/v1/cluster/nodes/{nodeid} +------ + +** HTTP Operations Supported + +------ + * GET +------ + +** Query Parameters Supported + +------ + None +------ + +** Elements of the object + +*---------------+--------------+-------------------------------+ +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| rack | string | The rack location of this node | +*---------------+--------------+-------------------------------+ +| state | string | State of the node - valid values are: NEW, RUNNING, UNHEALTHY, DECOMMISSIONED, LOST, REBOOTED | +*---------------+--------------+-------------------------------+ +| id | string | The node id | +*---------------+--------------+-------------------------------+ +| nodeHostName | string | The host name of the node| +*---------------+--------------+-------------------------------+ +| nodeHTTPAddress | string | The nodes HTTP address| +*---------------+--------------+-------------------------------+ +| healthStatus | string | The health status of the node - Healthy or Unhealthy | +*---------------+--------------+-------------------------------+ +| healthReport | string | A detailed health report | +*---------------+--------------+-------------------------------+ +| lastHealthUpdate | long | The last time the node reported its health (in ms since epoch)| +*---------------+--------------+-------------------------------+ +| usedMemoryMB | long | The total about of memory currently used on the node (in MB)| +*---------------+--------------+-------------------------------+ +| availMemoryMB | long | The total amount of memory currently available on the node (in MB)| +*---------------+--------------+-------------------------------+ +| numContainers | int | The total number of containers currently running on the node| +*---------------+--------------+-------------------------------+ + +** Response Examples + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/nodes/h2:1235 +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "node": + { + "rack":"\/default-rack", + "state":"NEW", + "id":"h2:1235", + "nodeHostName":"h2", + "nodeHTTPAddress":"h2:2", + "healthStatus":"Healthy", + "lastHealthUpdate":1324056895432, + "healthReport":"Healthy", + "numContainers":0, + "usedMemoryMB":0, + "availMemoryMB":5120 + } +} ++---+ + + <> + + HTTP Request: + +------ + GET http:///ws/v1/cluster/node/h2:1235 + Accept: application/xml +------ + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/xml + Content-Length: 552 + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ + + + /default-rack + NEW + h2:1235 + h2 + h2:2 + Healthy + 1324333268447 + Healthy + 0 + 0 + 5120 + ++---+ + diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm new file mode 100644 index 00000000000..2cdbfbe472c --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebServicesIntro.apt.vm @@ -0,0 +1,595 @@ +~~ Licensed under the Apache License, Version 2.0 (the "License"); +~~ you may not use this file except in compliance with the License. +~~ You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. See accompanying LICENSE file. + + --- + Hadoop YARN - Introduction to the web services REST API's. + --- + --- + ${maven.build.timestamp} + +Hadoop YARN - Introduction to the web services REST API's. + + \[ {{{./index.html}Go Back}} \] + +%{toc|section=1|fromDepth=0} + +* Overview + + The Hadoop YARN web service REST APIs are a set of URI resources that give access to the cluster, nodes, applications, and application historical information. The URI resources are grouped into APIs based on the type of information returned. Some URI resources return collections while others return singletons. + +* URI's + + The URIs for the REST-based Web services have the following syntax: + +------ + http://{http address of service}/ws/{version}/{resourcepath} +------ + + The elements in this syntax are as follows: + +------ + {http address of service} - The http address of the service to get information about. + Currently supported are the ResourceManager, NodeManager, + MapReduce application master, and history server. + {version} - The version of the APIs. In this release, the version is v1. + {resourcepath} - A path that defines a singleton resource or a collection of resources. +------ + +* HTTP Requests + + To invoke a REST API, your application calls an HTTP operation on the URI associated with a resource. + +** Summary of HTTP operations + + Currently only GET is supported. It retrieves information about the resource specified. + +** Security + + The web service REST API's go through the same security as the web ui. If your cluster adminstrators have filters enabled you must authenticate via the mechanism they specified. + +** Headers Supported + +----- + * Accept + * Accept-Encoding +----- + + Currently the only fields used in the header is Accept and Accept-Encoding. Accept currently supports XML and JSON for the response type you accept. Accept-Encoding currently only supports gzip format and will return gzip compressed output if this is specified, otherwise output is uncompressed. All other header fields are ignored. + +* HTTP Responses + + The next few sections describe some of the syntax and other details of the HTTP Responses of the web service REST APIs. + +** Compression + + This release supports gzip compression if you specify gzip in the Accept-Encoding header of the HTTP request (Accept-Encoding: gzip). + +** Response Formats + + This release of the web service REST APIs supports responses in JSON and XML formats. JSON is the default. To set the response format, you can specify the format in the Accept header of the HTTP request. + + As specified in HTTP Response Codes, the response body can contain the data that represents the resource or an error message. In the case of success, the response body is in the selected format, either JSON or XML. In the case of error, the resonse body is in either JSON or XML based on the format requested. The Content-Type header of the response contains the format requested. If the application requests an unsupported format, the response status code is 500. +Note that the order of the fields within response body is not specified and might change. Also, additional fields might be added to a response body. Therefore, your applications should use parsing routines that can extract data from a response body in any order. + +** Response Errors + + After calling an HTTP request, an application should check the response status code to verify success or detect an error. If the response status code indicates an error, the response body contains an error message. The first field is the exception type, currently only RemoteException is returned. The following table lists the items within the RemoteException error message: + +*---------------*--------------*-------------------------------* +|| Item || Data Type || Description | +*---------------+--------------+-------------------------------+ +| exception | String | Exception type | +*---------------+--------------+-------------------------------+ +| javaClassName | String | Java class name of exception | +*---------------+--------------+-------------------------------+ +| message | String | Detailed message of exception | +*---------------+--------------+-------------------------------+ + +** Response Examples + +*** JSON response with single resource + + HTTP Request: + GET http://rmhost.domain:8088/ws/v1/cluster/app/application_1324057493980_0001 + + Response Status Line: + HTTP/1.1 200 OK + + Response Header: + ++---+ + HTTP/1.1 200 OK + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + app": + { + "id":"application_1324057493980_0001", + "user":"user1", + "name":"", + "queue":"default", + "state":"ACCEPTED", + "finalStatus":"UNDEFINED", + "progress":0, + "trackingUI":"UNASSIGNED", + "diagnostics":"", + "clusterId":1324057493980, + "startedTime":1324057495921, + "finishedTime":0, + "elapsedTime":2063, + "amContainerLogs":"http:\/\/amNM:2\/node\/containerlogs\/container_1324057493980_0001_01_000001", + "amHostHttpAddress":"amNM:2" + } +} ++---+ + +*** JSON response with Error response + + Here we request information about an application that doesn't exist yet. + + HTTP Request: + GET http://rmhost.domain:8088/ws/v1/cluster/app/application_1324057493980_9999 + + Response Status Line: + HTTP/1.1 404 Not Found + + Response Header: + ++---+ + HTTP/1.1 404 Not Found + Content-Type: application/json + Transfer-Encoding: chunked + Server: Jetty(6.1.26) ++---+ + + Response Body: + ++---+ +{ + "RemoteException" : { + "javaClassName" : "org.apache.hadoop.yarn.webapp.NotFoundException", + "exception" : "NotFoundException", + "message" : "java.lang.Exception: app with id: application_1324057493980_9999 not found" + } +} ++---+ + +* Example usage + + You can use any number of ways/languages to use the web services REST API's. This example uses the curl command line interface to do the REST GET calls. + + In this example, a user submits a MapReduce application to the ResourceManager using a command like: + ++---+ + hadoop jar hadoop-mapreduce-test.jar sleep -Dmapred.job.queue.name=a1 -m 1 -r 1 -rt 1200000 -mt 20 ++---+ + + The client prints information about the job submitted along with the application id, similar to: + ++---+ +12/01/18 04:25:15 INFO mapred.ResourceMgrDelegate: Submitted application application_1326821518301_0010 to ResourceManager at host.domain.com/10.10.10.10:8040 +12/01/18 04:25:15 INFO mapreduce.Job: Running job: job_1326821518301_0010 +12/01/18 04:25:21 INFO mapred.ClientServiceDelegate: The url to track the job: host.domain.com:8088/proxy/application_1326821518301_0010/ +12/01/18 04:25:22 INFO mapreduce.Job: Job job_1326821518301_0010 running in uber mode : false +12/01/18 04:25:22 INFO mapreduce.Job: map 0% reduce 0% ++---+ + + The user then wishes to track the application. The users starts by getting the information about the application from the ResourceManager. Use the --comopressed option to request output compressed. curl handles uncompressing on client side. + ++---+ +curl --compressed -H "Accept: application/json" -X GET "http://host.domain.com:8088/ws/v1/cluster/apps/application_1326821518301_0010" ++---+ + + Output: + ++---+ +{ + "app" : { + "finishedTime" : 0, + "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0010_01_000001", + "trackingUI" : "ApplicationMaster", + "state" : "RUNNING", + "user" : "user1", + "id" : "application_1326821518301_0010", + "clusterId" : 1326821518301, + "finalStatus" : "UNDEFINED", + "amHostHttpAddress" : "host.domain.com:9999", + "progress" : 82.44703, + "name" : "Sleep job", + "startedTime" : 1326860715335, + "elapsedTime" : 31814, + "diagnostics" : "", + "trackingUrl" : "http://host.domain.com:8088/proxy/application_1326821518301_0010/", + "queue" : "a1" + } +} ++---+ + + The user then wishes to get more details about the running application and goes directly to the MapReduce application master for this application. The ResourceManager lists the trackingUrl that can be used for this application: http://host.domain.com:8088/proxy/application_1326821518301_0010. This could either go to the web browser or use the web service REST API's. The user uses the web services REST API's to get the list of jobs this MapReduce application master is running: + ++---+ + curl --compressed -H "Accept: application/json" -X GET "http://host.domain.com:8088/proxy/application_1326821518301_0010/ws/v1/mapreduce/jobs" ++---+ + + Output: + ++---+ +{ + "jobs" : { + "job" : [ + { + "runningReduceAttempts" : 1, + "reduceProgress" : 72.104515, + "failedReduceAttempts" : 0, + "newMapAttempts" : 0, + "mapsRunning" : 0, + "state" : "RUNNING", + "successfulReduceAttempts" : 0, + "reducesRunning" : 1, + "acls" : [ + { + "value" : " ", + "name" : "mapreduce.job.acl-modify-job" + }, + { + "value" : " ", + "name" : "mapreduce.job.acl-view-job" + } + ], + "reducesPending" : 0, + "user" : "user1", + "reducesTotal" : 1, + "mapsCompleted" : 1, + "startTime" : 1326860720902, + "id" : "job_1326821518301_10_10", + "successfulMapAttempts" : 1, + "runningMapAttempts" : 0, + "newReduceAttempts" : 0, + "name" : "Sleep job", + "mapsPending" : 0, + "elapsedTime" : 64432, + "reducesCompleted" : 0, + "mapProgress" : 100, + "diagnostics" : "", + "failedMapAttempts" : 0, + "killedReduceAttempts" : 0, + "mapsTotal" : 1, + "uberized" : false, + "killedMapAttempts" : 0, + "finishTime" : 0 + } + ] + } +} ++---+ + + The user then wishes to get the task details about the job with job id job_1326821518301_10_10 that was listed above. + ++---+ + curl --compressed -H "Accept: application/json" -X GET "http://host.domain.com:8088/proxy/application_1326821518301_0010/ws/v1/mapreduce/jobs/job_1326821518301_10_10/tasks" ++---+ + + Output: + ++---+ +{ + "tasks" : { + "task" : [ + { + "progress" : 100, + "elapsedTime" : 5059, + "state" : "SUCCEEDED", + "startTime" : 1326860725014, + "id" : "task_1326821518301_10_10_m_0", + "type" : "MAP", + "successfulAttempt" : "attempt_1326821518301_10_10_m_0_0", + "finishTime" : 1326860730073 + }, + { + "progress" : 72.104515, + "elapsedTime" : 0, + "state" : "RUNNING", + "startTime" : 1326860732984, + "id" : "task_1326821518301_10_10_r_0", + "type" : "REDUCE", + "successfulAttempt" : "", + "finishTime" : 0 + } + ] + } +} ++---+ + + The map task has finished but the reduce task is still running. The users wishes to get the task attempt information for the reduce task task_1326821518301_10_10_r_0, note that the Accept header isn't really required here since JSON is the default output format: + ++---+ + curl --compressed -X GET "http://host.domain.com:8088/proxy/application_1326821518301_0010/ws/v1/mapreduce/jobs/job_1326821518301_10_10/tasks/task_1326821518301_10_10_r_0/attempts" ++---+ + + Output: + ++---+ +{ + "taskAttempts" : { + "taskAttempt" : [ + { + "elapsedMergeTime" : 158, + "shuffleFinishTime" : 1326860735378, + "assignedContainerId" : "container_1326821518301_0010_01_000003", + "progress" : 72.104515, + "elapsedTime" : 0, + "state" : "RUNNING", + "elapsedShuffleTime" : 2394, + "mergeFinishTime" : 1326860735536, + "rack" : "/10.10.10.0", + "elapsedReduceTime" : 0, + "nodeHttpAddress" : "host.domain.com:9999", + "type" : "REDUCE", + "startTime" : 1326860732984, + "id" : "attempt_1326821518301_10_10_r_0_0", + "finishTime" : 0 + } + ] + } +} ++---+ + + The reduce attempt is still running and the user wishes to see the current counter values for that attempt: + ++---+ + curl --compressed -H "Accept: application/json" -X GET "http://host.domain.com:8088/proxy/application_1326821518301_0010/ws/v1/mapreduce/jobs/job_1326821518301_10_10/tasks/task_1326821518301_10_10_r_0/attempts/attempt_1326821518301_10_10_r_0_0/counters" ++---+ + + Output: + ++---+ +{ + "JobTaskAttemptCounters" : { + "taskAttemptCounterGroup" : [ + { + "counterGroupName" : "org.apache.hadoop.mapreduce.FileSystemCounter", + "counter" : [ + { + "value" : 4216, + "name" : "FILE_BYTES_READ" + }, + { + "value" : 77151, + "name" : "FILE_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "FILE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "FILE_WRITE_OPS" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_READ" + }, + { + "value" : 0, + "name" : "HDFS_BYTES_WRITTEN" + }, + { + "value" : 0, + "name" : "HDFS_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_LARGE_READ_OPS" + }, + { + "value" : 0, + "name" : "HDFS_WRITE_OPS" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.TaskCounter", + "counter" : [ + { + "value" : 0, + "name" : "COMBINE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "COMBINE_OUTPUT_RECORDS" + }, + { + "value" : 1767, + "name" : "REDUCE_INPUT_GROUPS" + }, + { + "value" : 25104, + "name" : "REDUCE_SHUFFLE_BYTES" + }, + { + "value" : 1767, + "name" : "REDUCE_INPUT_RECORDS" + }, + { + "value" : 0, + "name" : "REDUCE_OUTPUT_RECORDS" + }, + { + "value" : 0, + "name" : "SPILLED_RECORDS" + }, + { + "value" : 1, + "name" : "SHUFFLED_MAPS" + }, + { + "value" : 0, + "name" : "FAILED_SHUFFLE" + }, + { + "value" : 1, + "name" : "MERGED_MAP_OUTPUTS" + }, + { + "value" : 50, + "name" : "GC_TIME_MILLIS" + }, + { + "value" : 1580, + "name" : "CPU_MILLISECONDS" + }, + { + "value" : 141320192, + "name" : "PHYSICAL_MEMORY_BYTES" + }, + { + "value" : 1118552064, + "name" : "VIRTUAL_MEMORY_BYTES" + }, + { + "value" : 73728000, + "name" : "COMMITTED_HEAP_BYTES" + } + ] + }, + { + "counterGroupName" : "Shuffle Errors", + "counter" : [ + { + "value" : 0, + "name" : "BAD_ID" + }, + { + "value" : 0, + "name" : "CONNECTION" + }, + { + "value" : 0, + "name" : "IO_ERROR" + }, + { + "value" : 0, + "name" : "WRONG_LENGTH" + }, + { + "value" : 0, + "name" : "WRONG_MAP" + }, + { + "value" : 0, + "name" : "WRONG_REDUCE" + } + ] + }, + { + "counterGroupName" : "org.apache.hadoop.mapreduce.lib.output.FileOutputFormatCounter", + "counter" : [ + { + "value" : 0, + "name" : "BYTES_WRITTEN" + } + ] + } + ], + "id" : "attempt_1326821518301_10_10_r_0_0" + } +} ++---+ + + The job finishes and the user wishes to get the final job information from the history server for this job. + ++---+ + curl --compressed -X GET "http://host.domain.com:19888/ws/v1/history/mapreduce/jobs/job_1326821518301_10_10" ++---+ + + Output: + ++---+ +{ + "job" : { + "avgReduceTime" : 1250784, + "failedReduceAttempts" : 0, + "state" : "SUCCEEDED", + "successfulReduceAttempts" : 1, + "acls" : [ + { + "value" : " ", + "name" : "mapreduce.job.acl-modify-job" + }, + { + "value" : " ", + "name" : "mapreduce.job.acl-view-job" + } + ], + "user" : "user1", + "reducesTotal" : 1, + "mapsCompleted" : 1, + "startTime" : 1326860720902, + "id" : "job_1326821518301_10_10", + "avgMapTime" : 5059, + "successfulMapAttempts" : 1, + "name" : "Sleep job", + "avgShuffleTime" : 2394, + "reducesCompleted" : 1, + "diagnostics" : "", + "failedMapAttempts" : 0, + "avgMergeTime" : 2552, + "killedReduceAttempts" : 0, + "mapsTotal" : 1, + "queue" : "a1", + "uberized" : false, + "killedMapAttempts" : 0, + "finishTime" : 1326861986164 + } +} ++---+ + + The user also gets the final applications information from the ResourceManager. + ++---+ + curl --compressed -H "Accept: application/json" -X GET "http://host.domain.com:8088/ws/v1/cluster/apps/application_1326821518301_0010" ++---+ + + Output: + ++---+ +{ + "app" : { + "finishedTime" : 1326861991282, + "amContainerLogs" : "http://host.domain.com:9999/node/containerlogs/container_1326821518301_0010_01_000001", + "trackingUI" : "History", + "state" : "FINISHED", + "user" : "user1", + "id" : "application_1326821518301_0010", + "clusterId" : 1326821518301, + "finalStatus" : "SUCCEEDED", + "amHostHttpAddress" : "host.domain.com:9999", + "progress" : 100, + "name" : "Sleep job", + "startedTime" : 1326860715335, + "elapsedTime" : 1275947, + "diagnostics" : "", + "trackingUrl" : "http://host.domain.com:8088/proxy/application_1326821518301_0010/jobhistory/job/job_1326821518301_10_10", + "queue" : "a1" + } +} ++---+ diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml index 6b966883e02..95c3325775d 100644 --- a/hadoop-project/src/site/site.xml +++ b/hadoop-project/src/site/site.xml @@ -62,6 +62,14 @@ + + + + + + + + From fbe394d208ec72e3bf4522f2782d50d2ad8882f2 Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Sat, 21 Jan 2012 01:17:43 +0000 Subject: [PATCH 14/14] MAPREDUCE-3705. ant build fails on 0.23 branch. (Thomas Graves via mahadev) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234228 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 + hadoop-mapreduce-project/build.xml | 2 - hadoop-mapreduce-project/ivy.xml | 2 + .../ivy/libraries.properties | 4 +- .../src/contrib/gridmix/ivy.xml | 2 + .../tools/rumen/TestConcurrentRead.java | 136 -- .../hadoop/tools/rumen/TestParsedLine.java | 105 - .../tools/rumen/TestRumenAnonymization.java | 1940 ----------------- .../hadoop/tools/rumen/TestRumenFolder.java | 196 -- .../tools/rumen/TestRumenJobTraces.java | 1259 ----------- .../hadoop/tools/rumen/TestZombieJob.java | 338 --- 11 files changed, 9 insertions(+), 3978 deletions(-) delete mode 100644 hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestConcurrentRead.java delete mode 100644 hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestParsedLine.java delete mode 100644 hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenAnonymization.java delete mode 100644 hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenFolder.java delete mode 100644 hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenJobTraces.java delete mode 100644 hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestZombieJob.java diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1cba5a6de47..6cfa1213f3b 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -481,6 +481,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3549. write api documentation for web service apis for RM, NM, mapreduce app master, and job history server (Thomas Graves via mahadev) + MAPREDUCE-3705. ant build fails on 0.23 branch. (Thomas Graves via + mahadev) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/build.xml b/hadoop-mapreduce-project/build.xml index 22f44ed44fe..40c822baedd 100644 --- a/hadoop-mapreduce-project/build.xml +++ b/hadoop-mapreduce-project/build.xml @@ -575,8 +575,6 @@ - - diff --git a/hadoop-mapreduce-project/ivy.xml b/hadoop-mapreduce-project/ivy.xml index e04da7019bb..95042252e97 100644 --- a/hadoop-mapreduce-project/ivy.xml +++ b/hadoop-mapreduce-project/ivy.xml @@ -99,6 +99,8 @@ rev="${yarn.version}" conf="compile->default"> + diff --git a/hadoop-mapreduce-project/ivy/libraries.properties b/hadoop-mapreduce-project/ivy/libraries.properties index 76d05e295df..0d693345552 100644 --- a/hadoop-mapreduce-project/ivy/libraries.properties +++ b/hadoop-mapreduce-project/ivy/libraries.properties @@ -82,5 +82,5 @@ xmlenc.version=0.52 xerces.version=1.4.4 jackson.version=1.8.2 -yarn.version=0.24.0-SNAPSHOT -hadoop-mapreduce.version=0.24.0-SNAPSHOT +yarn.version=0.23.1-SNAPSHOT +hadoop-mapreduce.version=0.23.1-SNAPSHOT diff --git a/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml b/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml index 4ab7b620659..d587a7b8752 100644 --- a/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml +++ b/hadoop-mapreduce-project/src/contrib/gridmix/ivy.xml @@ -70,6 +70,8 @@ + cachedTrace = new ArrayList(); - static final String traceFile = - "rumen/small-trace-test/job-tracker-logs-trace-output.gz"; - - static Configuration conf; - static FileSystem lfs; - static Path path; - - @BeforeClass - static public void globalSetUp() throws IOException { - conf = new Configuration(); - lfs = FileSystem.getLocal(conf); - Path rootInputDir = new Path(System.getProperty("test.tools.input.dir", "")) - .makeQualified(lfs.getUri(), lfs.getWorkingDirectory()); - path = new Path(rootInputDir, traceFile); - JobTraceReader reader = new JobTraceReader(path, conf); - try { - LoggedJob job; - while ((job = reader.getNext()) != null) { - cachedTrace.add(job); - } - } finally { - reader.close(); - } - } - - void readAndCompare() throws IOException { - JobTraceReader reader = new JobTraceReader(path, conf); - try { - for (Iterator it = cachedTrace.iterator(); it.hasNext();) { - LoggedJob jobExpected = it.next(); - LoggedJob jobRead = reader.getNext(); - assertNotNull(jobRead); - try { - jobRead.deepCompare(jobExpected, null); - } catch (DeepInequalityException e) { - fail(e.toString()); - } - } - assertNull(reader.getNext()); - } finally { - reader.close(); - } - } - - class TestThread extends Thread { - final int repeat; - final CountDownLatch startSignal, doneSignal; - final Map errors; - - TestThread(int id, int repeat, CountDownLatch startSignal, CountDownLatch doneSignal, Map errors) { - super(String.format("TestThread-%d", id)); - this.repeat = repeat; - this.startSignal = startSignal; - this.doneSignal = doneSignal; - this.errors = errors; - } - - @Override - public void run() { - try { - startSignal.await(); - for (int i = 0; i < repeat; ++i) { - try { - readAndCompare(); - } catch (Throwable e) { - errors.put(getName(), e); - break; - } - } - doneSignal.countDown(); - } catch (Throwable e) { - errors.put(getName(), e); - } - } - } - - @Test - public void testConcurrentRead() throws InterruptedException { - int nThr = conf.getInt("test.rumen.concurrent-read.threads", 4); - int repeat = conf.getInt("test.rumen.concurrent-read.repeat", 10); - CountDownLatch startSignal = new CountDownLatch(1); - CountDownLatch doneSignal = new CountDownLatch(nThr); - Map errors = Collections - .synchronizedMap(new TreeMap()); - for (int i = 0; i < nThr; ++i) { - new TestThread(i, repeat, startSignal, doneSignal, errors).start(); - } - startSignal.countDown(); - doneSignal.await(); - if (!errors.isEmpty()) { - StringBuilder sb = new StringBuilder(); - for (Map.Entry e : errors.entrySet()) { - sb.append(String.format("%s:\n%s\n", e.getKey(), e.getValue().toString())); - } - fail(sb.toString()); - } - } -} diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestParsedLine.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestParsedLine.java deleted file mode 100644 index 446484869cf..00000000000 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestParsedLine.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.tools.rumen; - -import org.apache.hadoop.util.StringUtils; -import org.junit.Test; -import static org.junit.Assert.*; - -public class TestParsedLine { - static final char[] CHARS_TO_ESCAPE = new char[]{'=', '"', '.'}; - - String buildLine(String type, String[] kvseq) { - StringBuilder sb = new StringBuilder(); - sb.append(type); - for (int i=0; i defaultSerializer = new DefaultRumenSerializer(); - - JsonSerializer anonymizingSerializer = - new DefaultAnonymizingRumenSerializer(new StatePool(), - new Configuration()); - // test username - UserName uname = new UserName("bob"); - assertEquals("Username error!", "bob", uname.getValue()); - - // test username serialization - // test with no anonymization - // test bob - testSerializer(new UserName("bob"), "bob", defaultSerializer); - // test alice - testSerializer(new UserName("alice"), "alice", defaultSerializer); - - // test user-name serialization - // test with anonymization - // test bob - testSerializer(new UserName("bob"), "user0", anonymizingSerializer); - // test alice - testSerializer(new UserName("alice"), "user1", anonymizingSerializer); - } - - /** - * Test {@link JobName}, serialization and anonymization. - */ - @Test - public void testJobNameSerialization() throws IOException { - JsonSerializer defaultSerializer = new DefaultRumenSerializer(); - - JsonSerializer anonymizingSerializer = - new DefaultAnonymizingRumenSerializer(new StatePool(), - new Configuration()); - - // test jobname - JobName jname = new JobName("job-secret"); - assertEquals("Jobname error!", "job-secret", jname.getValue()); - - // test job-name serialization - // test with no anonymization - // test job1 - testSerializer(new JobName("job-myjob"), "job-myjob", defaultSerializer); - // test job2 - testSerializer(new JobName("job-yourjob"), "job-yourjob", - defaultSerializer); - - // test job-name serialization - // test with anonymization - // test queue1 - testSerializer(new JobName("secret-job-1"), "job0", anonymizingSerializer); - // test queue2 - testSerializer(new JobName("secret-job-2"), "job1", anonymizingSerializer); - } - - /** - * Test {@link QueueName}, serialization and anonymization. - */ - @Test - public void testQueueNameSerialization() throws IOException { - JsonSerializer defaultSerializer = new DefaultRumenSerializer(); - - JsonSerializer anonymizingSerializer = - new DefaultAnonymizingRumenSerializer(new StatePool(), - new Configuration()); - - // test queuename - QueueName qname = new QueueName("queue-secret"); - assertEquals("Queuename error!", "queue-secret", qname.getValue()); - - // test queuename serialization - // test with no anonymization - // test queue1 - testSerializer(new QueueName("project1-queue"), - "project1-queue", defaultSerializer); - // test queue2 - testSerializer(new QueueName("project2-queue"), - "project2-queue", defaultSerializer); - - // test queue-name serialization - // test with anonymization - // test queue1 - testSerializer(new QueueName("project1-queue"), - "queue0", anonymizingSerializer); - // test queue2 - testSerializer(new QueueName("project2-queue"), - "queue1", anonymizingSerializer); - } - - /** - * Test {@link NodeName}. - */ - @Test - public void testNodeNameDataType() throws IOException { - // test hostname - // test only hostname - NodeName hname = new NodeName("host1.myorg.com"); - assertNull("Expected missing rack name", hname.getRackName()); - assertEquals("Hostname's test#1 hostname error!", - "host1.myorg.com", hname.getHostName()); - assertEquals("Hostname test#1 error!", "host1.myorg.com", hname.getValue()); - - // test rack/hostname - hname = new NodeName("/rack1.myorg.com/host1.myorg.com"); - assertEquals("Hostname's test#2 rackname error!", - "rack1.myorg.com", hname.getRackName()); - assertEquals("Hostname test#2 hostname error!", - "host1.myorg.com", hname.getHostName()); - assertEquals("Hostname test#2 error!", - "/rack1.myorg.com/host1.myorg.com", hname.getValue()); - - // test hostname and rackname separately - hname = new NodeName("rack1.myorg.com", "host1.myorg.com"); - assertEquals("Hostname's test#3 rackname error!", - "rack1.myorg.com", hname.getRackName()); - assertEquals("Hostname test#3 hostname error!", - "host1.myorg.com", hname.getHostName()); - assertEquals("Hostname test#3 error!", - "/rack1.myorg.com/host1.myorg.com", hname.getValue()); - - // test hostname with no rackname - hname = new NodeName(null, "host1.myorg.com"); - assertNull("Hostname's test#4 rackname error!", hname.getRackName()); - assertEquals("Hostname test#4 hostname error!", - "host1.myorg.com", hname.getHostName()); - assertEquals("Hostname test#4 error!", - "host1.myorg.com", hname.getValue()); - - // test rackname with no hostname - hname = new NodeName("rack1.myorg.com", null); - assertEquals("Hostname test#4 rackname error!", - "rack1.myorg.com", hname.getRackName()); - assertNull("Hostname's test#5 hostname error!", hname.getHostName()); - assertEquals("Hostname test#5 error!", - "rack1.myorg.com", hname.getValue()); - } - - /** - * Test {@link NodeName} serialization. - */ - @Test - public void testNodeNameDefaultSerialization() throws IOException { - JsonSerializer defaultSerializer = new DefaultRumenSerializer(); - - // test hostname serialization - // test with no anonymization - // test hostname - testSerializer(new NodeName("hostname.myorg.com"), "hostname.myorg.com", - defaultSerializer); - // test rack/hostname - testSerializer(new NodeName("/rackname.myorg.com/hostname.myorg.com"), - "/rackname.myorg.com/hostname.myorg.com", - defaultSerializer); - // test rack,hostname - testSerializer(new NodeName("rackname.myorg.com", "hostname.myorg.com"), - "/rackname.myorg.com/hostname.myorg.com", - defaultSerializer); - // test -,hostname - testSerializer(new NodeName(null, "hostname.myorg.com"), - "hostname.myorg.com", defaultSerializer); - // test rack,- - testSerializer(new NodeName("rackname.myorg.com", null), - "rackname.myorg.com", defaultSerializer); - } - - /** - * Test {@link NodeName} anonymization. - */ - @Test - public void testNodeNameAnonymization() throws IOException { - JsonSerializer anonymizingSerializer = - new DefaultAnonymizingRumenSerializer(new StatePool(), - new Configuration()); - - // test hostname serializer - // test with anonymization - // test hostname - testSerializer(new NodeName("hostname.myorg.com"), "host0", - anonymizingSerializer); - // test hostname reuse - testSerializer(new NodeName("hostname213.myorg.com"), "host1", - anonymizingSerializer); - // test rack/hostname - testSerializer(new NodeName("/rackname.myorg.com/hostname.myorg.com"), - "/rack0/host0", anonymizingSerializer); - // test rack/hostname (hostname reuse) - testSerializer(new NodeName("/rackname654.myorg.com/hostname.myorg.com"), - "/rack1/host0", anonymizingSerializer); - // test rack/hostname (rack reuse) - testSerializer(new NodeName("/rackname654.myorg.com/hostname765.myorg.com"), - "/rack1/host2", anonymizingSerializer); - // test rack,hostname (rack & hostname reuse) - testSerializer(new NodeName("rackname.myorg.com", "hostname.myorg.com"), - "/rack0/host0", anonymizingSerializer); - // test rack,hostname (rack reuse) - testSerializer(new NodeName("rackname.myorg.com", "hostname543.myorg.com"), - "/rack0/host3", anonymizingSerializer); - // test rack,hostname (hostname reuse) - testSerializer(new NodeName("rackname987.myorg.com", "hostname.myorg.com"), - "/rack2/host0", anonymizingSerializer); - // test rack,hostname (rack reuse) - testSerializer(new NodeName("rackname.myorg.com", "hostname654.myorg.com"), - "/rack0/host4", anonymizingSerializer); - // test rack,hostname (host reuse) - testSerializer(new NodeName("rackname876.myorg.com", "hostname.myorg.com"), - "/rack3/host0", anonymizingSerializer); - // test rack,hostname (rack & hostname reuse) - testSerializer(new NodeName("rackname987.myorg.com", - "hostname543.myorg.com"), - "/rack2/host3", anonymizingSerializer); - // test -,hostname (hostname reuse) - testSerializer(new NodeName(null, "hostname.myorg.com"), - "host0", anonymizingSerializer); - // test -,hostname - testSerializer(new NodeName(null, "hostname15.myorg.com"), - "host5", anonymizingSerializer); - // test rack,- (rack reuse) - testSerializer(new NodeName("rackname987.myorg.com", null), - "rack2", anonymizingSerializer); - // test rack,- - testSerializer(new NodeName("rackname15.myorg.com", null), - "rack4", anonymizingSerializer); - } - - /** - * Test {@link JobProperties}. - */ - @Test - public void testJobPropertiesDataType() throws IOException { - // test job properties - Properties properties = new Properties(); - JobProperties jp = new JobProperties(properties); - - // test empty job properties - assertEquals("Job Properties (default) store error", - 0, jp.getValue().size()); - // test by adding some data - properties.put("test-key", "test-value"); // user config - properties.put(MRJobConfig.USER_NAME, "bob"); // job config - properties.put(JobConf.MAPRED_TASK_JAVA_OPTS, "-Xmx1G"); // deprecated - jp = new JobProperties(properties); - assertEquals("Job Properties (default) store error", - 3, jp.getValue().size()); - assertEquals("Job Properties (default) key#1 error", - "test-value", jp.getValue().get("test-key")); - assertEquals("Job Properties (default) key#2 error", - "bob", jp.getValue().get(MRJobConfig.USER_NAME)); - assertEquals("Job Properties (default) key#3 error", - "-Xmx1G", jp.getValue().get(JobConf.MAPRED_TASK_JAVA_OPTS)); - } - - /** - * Test {@link JobProperties} serialization. - */ - @Test - public void testJobPropertiesSerialization() throws IOException { - JsonSerializer defaultSerializer = new DefaultRumenSerializer(); - - // test job properties - Properties properties = new Properties(); - properties.put("test-key", "test-value"); // user config - properties.put(MRJobConfig.USER_NAME, "bob"); // job config - properties.put(JobConf.MAPRED_TASK_JAVA_OPTS, "-Xmx1G"); // deprecated - JobProperties jp = new JobProperties(properties); - - testSerializer(jp, "{test-key:test-value," - + "mapreduce.job.user.name:bob," - + "mapred.child.java.opts:-Xmx1G}", defaultSerializer); - } - - /** - * Test {@link JobProperties} anonymization. - */ - @Test - public void testJobPropertiesAnonymization() throws IOException { - // test job properties - Properties properties = new Properties(); - Configuration conf = new Configuration(); - - properties.put("test-key", "test-value"); // user config - properties.put(MRJobConfig.USER_NAME, "bob"); // job config - // deprecated - properties.put("mapred.map.child.java.opts", - "-Xmx2G -Xms500m -Dsecret=secret"); - // deprecated and not supported - properties.put(JobConf.MAPRED_TASK_JAVA_OPTS, - "-Xmx1G -Xms200m -Dsecret=secret"); - JobProperties jp = new JobProperties(properties); - - // define a module - SimpleModule module = new SimpleModule("Test Anonymization Serializer", - new Version(0, 0, 0, "TEST")); - // add various serializers to the module - module.addSerializer(DataType.class, new DefaultRumenSerializer()); - module.addSerializer(AnonymizableDataType.class, - new DefaultAnonymizingRumenSerializer(new StatePool(), - conf)); - - //TODO Support deprecated and un-supported keys - testSerializer(jp, "{mapreduce.job.user.name:user0," - + "mapred.map.child.java.opts:-Xmx2G -Xms500m}", module); - } - - /** - * Test {@link ClassName}, serialization and anonymization. - */ - @Test - public void testClassNameSerialization() throws IOException { - JsonSerializer defaultSerializer = new DefaultRumenSerializer(); - - JsonSerializer anonymizingSerializer = - new DefaultAnonymizingRumenSerializer(new StatePool(), - new Configuration()); - - // test classname - ClassName cName = new ClassName(TestRumenAnonymization.class.getName()); - assertEquals("Classname error!", TestRumenAnonymization.class.getName(), - cName.getValue()); - - // test classname serialization - // test with no anonymization - // test class1 - testSerializer(new ClassName("org.apache.hadoop.Test"), - "org.apache.hadoop.Test", defaultSerializer); - // test class2 - testSerializer(new ClassName("org.apache.hadoop.Test2"), - "org.apache.hadoop.Test2", defaultSerializer); - - // test class-name serialization - // test with anonymization - // test class1 - testSerializer(new ClassName("org.apache.hadoop.Test1"), - "class0", anonymizingSerializer); - // test class2 - testSerializer(new ClassName("org.apache.hadoop.Test2"), - "class1", anonymizingSerializer); - - // test classnames with preserves - Configuration conf = new Configuration(); - conf.set(ClassName.CLASSNAME_PRESERVE_CONFIG, "org.apache.hadoop."); - anonymizingSerializer = - new DefaultAnonymizingRumenSerializer(new StatePool(), conf); - // test word with prefix - testSerializer(new ClassName("org.apache.hadoop.Test3"), - "org.apache.hadoop.Test3", anonymizingSerializer); - // test word without prefix - testSerializer(new ClassName("org.apache.hadoop2.Test4"), - "class0", anonymizingSerializer); - } - - /** - * Test {@link FileName}. - */ - @Test - public void testFileName() throws IOException { - // test file on hdfs - FileName hFile = new FileName("hdfs://testnn:123/user/test.json"); - assertEquals("Filename error!", "hdfs://testnn:123/user/test.json", - hFile.getValue()); - // test file on local-fs - hFile = new FileName("file:///user/test.json"); - assertEquals("Filename error!", "file:///user/test.json", - hFile.getValue()); - // test dir on hdfs - hFile = new FileName("hdfs://testnn:123/user/"); - assertEquals("Filename error!", "hdfs://testnn:123/user/", - hFile.getValue()); - // test dir on local-fs - hFile = new FileName("file:///user/"); - assertEquals("Filename error!", "file:///user/", hFile.getValue()); - // test absolute file - hFile = new FileName("/user/test/test.json"); - assertEquals("Filename error!", "/user/test/test.json", hFile.getValue()); - // test absolute directory - hFile = new FileName("/user/test/"); - assertEquals("Filename error!", "/user/test/", hFile.getValue()); - // test relative file - hFile = new FileName("user/test/test2.json"); - assertEquals("Filename error!", "user/test/test2.json", hFile.getValue()); - // test relative directory - hFile = new FileName("user/test/"); - assertEquals("Filename error!", "user/test/", hFile.getValue()); - // test absolute file - hFile = new FileName("user"); - assertEquals("Filename error!", "user", hFile.getValue()); - // test absolute directory - hFile = new FileName("user/"); - assertEquals("Filename error!", "user/", hFile.getValue()); - hFile = new FileName("./tmp"); - assertEquals("Filename error!","./tmp", hFile.getValue()); - hFile = new FileName("./tmp/"); - assertEquals("Filename error!","./tmp/", hFile.getValue()); - hFile = new FileName("../tmp"); - assertEquals("Filename error!","../tmp", hFile.getValue()); - hFile = new FileName("../tmp/"); - assertEquals("Filename error!","../tmp/", hFile.getValue()); - - // test comma separated filenames - // test hdfs filenames, absolute and local-fs filenames - hFile = new FileName("hdfs://testnn:123/user/test1," - + "file:///user/test2,/user/test3"); - assertEquals("Filename error!", - "hdfs://testnn:123/user/test1,file:///user/test2,/user/test3", - hFile.getValue()); - } - - /** - * Test {@link FileName} serialization. - */ - @Test - public void testFileNameSerialization() throws IOException { - JsonSerializer defaultSerializer = new DefaultRumenSerializer(); - - // test filename serialization - // test with no anonymization - // test a file on hdfs - testSerializer(new FileName("hdfs://mynn:123/home/user/test.json"), - "hdfs://mynn:123/home/user/test.json", defaultSerializer); - // test a file on local-fs - testSerializer(new FileName("file:///home/user/test.json"), - "file:///home/user/test.json", defaultSerializer); - // test directory on hdfs - testSerializer(new FileName("hdfs://mynn:123/home/user/"), - "hdfs://mynn:123/home/user/", defaultSerializer); - // test directory on local fs - testSerializer(new FileName("file:///home/user/"), - "file:///home/user/", defaultSerializer); - // test absolute file - testSerializer(new FileName("/home/user/test.json"), - "/home/user/test.json", defaultSerializer); - // test relative file - testSerializer(new FileName("home/user/test.json"), - "home/user/test.json", defaultSerializer); - // test absolute folder - testSerializer(new FileName("/home/user/"), "/home/user/", - defaultSerializer); - // test relative folder - testSerializer(new FileName("home/user/"), "home/user/", - defaultSerializer); - // relative file - testSerializer(new FileName("home"), "home", defaultSerializer); - // relative folder - testSerializer(new FileName("home/"), "home/", defaultSerializer); - // absolute file - testSerializer(new FileName("/home"), "/home", defaultSerializer); - // absolute folder - testSerializer(new FileName("/home/"), "/home/", defaultSerializer); - // relative folder - testSerializer(new FileName("./tmp"), "./tmp", defaultSerializer); - testSerializer(new FileName("./tmp/"), "./tmp/", defaultSerializer); - testSerializer(new FileName("../tmp"), "../tmp", defaultSerializer); - - // test comma separated filenames - // test hdfs filenames, absolute and local-fs filenames - FileName fileName = - new FileName("hdfs://testnn:123/user/test1,file:///user/test2," - + "/user/test3"); - testSerializer(fileName, - "hdfs://testnn:123/user/test1,file:///user/test2,/user/test3", - defaultSerializer); - } - - /** - * Test {@link FileName} anonymization. - */ - @Test - public void testFileNameAnonymization() throws IOException { - JsonSerializer anonymizingSerializer = - new DefaultAnonymizingRumenSerializer(new StatePool(), - new Configuration()); - - // test filename serialization - // test with no anonymization - // test hdfs file - testSerializer(new FileName("hdfs://mynn:123/home/user/bob/test.json"), - "hdfs://host0/home/user/dir0/test.json", anonymizingSerializer); - // test local-fs file - testSerializer(new FileName("file:///home/user/alice/test.jar"), - "file:///home/user/dir1/test.jar", anonymizingSerializer); - // test hdfs dir - testSerializer(new FileName("hdfs://mynn:123/home/user/"), - "hdfs://host0/home/user/", anonymizingSerializer); - // test local-fs dir - testSerializer(new FileName("file:///home/user/secret/more-secret/"), - "file:///home/user/dir2/dir3/", anonymizingSerializer); - // test absolute filenames - testSerializer(new FileName("/home/user/top-secret.txt"), - "/home/user/file0.txt", anonymizingSerializer); - // test relative filenames - testSerializer(new FileName("home/user/top-top-secret.zip"), - "home/user/file1.zip", anonymizingSerializer); - // test absolute dirnames - testSerializer(new FileName("/home/user/project1/"), - "/home/user/dir4/", anonymizingSerializer); - // test relative filenames - testSerializer(new FileName("home/user/project1"), - "home/user/file2", anonymizingSerializer); - // test absolute dirnames (re-use) - testSerializer(new FileName("more-secret/"), - "dir3/", anonymizingSerializer); - // test relative filenames (re-use) - testSerializer(new FileName("secret/project1"), - "dir2/file2", anonymizingSerializer); - // test absolute filenames (re-use) - testSerializer(new FileName("/top-secret.txt"), - "/file0.txt", anonymizingSerializer); - // test relative filenames (re-use) - testSerializer(new FileName("top-top-secret.tar"), - "file1.tar", anonymizingSerializer); - // test absolute dirname - testSerializer(new FileName("sensitive-projectname/"), - "dir5/", anonymizingSerializer); - // test relative filenames - testSerializer(new FileName("/real-sensitive-projectname/"), - "/dir6/", anonymizingSerializer); - // test absolute filenames - testSerializer(new FileName("/usernames.xml"), - "/file3.xml", anonymizingSerializer); - // test relative filenames - testSerializer(new FileName("passwords.zip"), - "file4.zip", anonymizingSerializer); - // test relative filenames - testSerializer(new FileName("./tmp"), - "./tmp", anonymizingSerializer); - testSerializer(new FileName("./tmp/"), - "./tmp/", anonymizingSerializer); - testSerializer(new FileName("../tmp"), - "../tmp", anonymizingSerializer); - testSerializer(new FileName("../tmp/"), - "../tmp/", anonymizingSerializer); - - // test comma separated filenames - // test hdfs filenames, absolute and local-fs filenames - FileName fileName = - new FileName("hdfs://mynn:123/home/user/bob/test.json," - + "file:///home/user/bob/test.json,/user/alice/test.json"); - testSerializer(fileName, - "hdfs://host0/home/user/dir0/test.json,file:///home/user/dir0/test.json" - + ",/user/dir1/test.json", - anonymizingSerializer); - } - - - /** - * Test {@link DefaultDataType} serialization. - */ - @Test - public void testDefaultDataTypeSerialization() throws IOException { - JsonSerializer defaultSerializer = new DefaultRumenSerializer(); - - // test default data-type - DefaultDataType dt = new DefaultDataType("test"); - assertEquals("DefaultDataType error!", "test", dt.getValue()); - - // test default data-type - // test with no anonymization - // test data - testSerializer(new DefaultDataType("test"), "test", defaultSerializer); - } - - // A faked OutputStream which stores the stream content into a StringBuffer. - private static class MyOutputStream extends OutputStream { - private StringBuffer data = new StringBuffer(); - - @Override - public void write(int b) throws IOException { - data.append((char)b); - } - - @Override - public void write(byte[] b) throws IOException { - data.append(b); - } - - @Override - public String toString() { - // remove all the '"' for ease of testing - return data.toString().trim().replaceAll("\"", ""); - } - } - - // tests the object serializing using the class of the specified object - @SuppressWarnings("unchecked") - private static void testSerializer(Object toBeSerialized, String expData, - JsonSerializer serializer) - throws IOException { - // define a module - SimpleModule module = new SimpleModule("Test Anonymization Serializer", - new Version(0, 0, 0, "TEST")); - // add various serializers to the module - module.addSerializer(toBeSerialized.getClass(), serializer); - testSerializer(toBeSerialized, expData, module); - } - - // tests the object serializing using the specified class - private static void testSerializer(Object toBeSerialized, String expData, - SimpleModule module) - throws IOException { - // define a custom generator - ObjectMapper outMapper = new ObjectMapper(); - - // register the module - outMapper.registerModule(module); - - // get the json factory - JsonFactory outFactory = outMapper.getJsonFactory(); - // define a fake output stream which will cache the data - MyOutputStream output = new MyOutputStream(); - // define the json output generator - JsonGenerator outGen = - outFactory.createJsonGenerator(output, JsonEncoding.UTF8); - - // serialize the object - outGen.writeObject(toBeSerialized); - //serializer.serialize(toBeSerialized, outGen, null); - - // close the json generator so that it flushes out the data to the output - // stream - outGen.close(); - - assertEquals("Serialization failed!", expData, output.toString()); - } - - /** - * Test {@link DefaultRumenSerializer}. - */ - @Test - public void testDefaultDataSerializers() throws Exception { - JsonSerializer defaultSer = new DefaultRumenSerializer(); - // test default data-type - // test with no anonymization - // test data - testSerializer(new DefaultDataType("test"), "test", defaultSer); - } - - @Test - public void testBlockingDataSerializers() throws Exception { - JsonSerializer blockingSerializer = new BlockingSerializer(); - - // test string serializer - testSerializer("username:password", "null", blockingSerializer); - } - - @Test - public void testObjectStringDataSerializers() throws Exception { - JsonSerializer objectStringSerializer = new ObjectStringSerializer(); - // test job/task/attempt id serializer - // test job-id - JobID jid = JobID.forName("job_1_1"); - testSerializer(jid, jid.toString(), objectStringSerializer); - // test task-id - TaskID tid = new TaskID(jid, TaskType.MAP, 1); - testSerializer(tid, tid.toString(), objectStringSerializer); - // test attempt-id - TaskAttemptID aid = new TaskAttemptID(tid, 0); - testSerializer(aid, aid.toString(), objectStringSerializer); - } - - // test anonymizer - @Test - public void testRumenAnonymization() throws Exception { - Configuration conf = new Configuration(); - - // Run a MR job - // create a MR cluster - conf.setInt(TTConfig.TT_MAP_SLOTS, 1); - conf.setInt(TTConfig.TT_REDUCE_SLOTS, 1); - - MiniDFSCluster dfsCluster = null; - MiniMRCluster mrCluster = null; - - // local filesystem for running TraceBuilder - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testRumenAnonymization"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - try { - dfsCluster = new MiniDFSCluster(conf, 1, true, null); - String[] racks = new String[] {"/rack123.myorg.com", - "/rack456.myorg.com"}; - String[] hosts = new String[] {"host1230.myorg.com", - "host4560.myorg.com"}; - mrCluster = - new MiniMRCluster(2, dfsCluster.getFileSystem().getUri().toString(), - 1, racks, hosts, new JobConf(conf)); - - // run a job - Path inDir = new Path("secret-input"); - Path outDir = new Path("secret-output"); - - JobConf jConf = mrCluster.createJobConf(); - // add some usr sensitive data in the job conf - jConf.set("user-secret-code", "abracadabra"); - - jConf.setJobName("top-secret"); - // construct a job with 1 map and 1 reduce task. - Job job = MapReduceTestUtil.createJob(jConf, inDir, outDir, 2, 2); - // wait for the job to complete - job.waitForCompletion(false); - - assertTrue("Job failed", job.isSuccessful()); - - JobID id = job.getJobID(); - Cluster cluster = new Cluster(jConf); - String user = cluster.getAllJobStatuses()[0].getUsername(); - - // get the jobhistory filepath - Path jhPath = - new Path(mrCluster.getJobTrackerRunner().getJobTracker() - .getJobHistoryDir()); - Path inputLogPath = JobHistory.getJobHistoryFile(jhPath, id, user); - Path inputConfPath = JobHistory.getConfFile(jhPath, id); - // wait for 10 secs for the jobhistory file to move into the done folder - FileSystem fs = inputLogPath.getFileSystem(jConf); - for (int i = 0; i < 100; ++i) { - if (fs.exists(inputLogPath)) { - break; - } - TimeUnit.MILLISECONDS.wait(100); - } - - assertTrue("Missing job history file", fs.exists(inputLogPath)); - - // run trace builder on the job history logs - Path goldTraceFilename = new Path(tempDir, "trace.json"); - Path goldTopologyFilename = new Path(tempDir, "topology.json"); - - // build the trace-builder command line args - String[] args = new String[] {goldTraceFilename.toString(), - goldTopologyFilename.toString(), - inputLogPath.toString(), - inputConfPath.toString()}; - Tool analyzer = new TraceBuilder(); - int result = ToolRunner.run(analyzer, args); - assertEquals("Non-zero exit", 0, result); - - // anonymize the job trace - Path anonymizedTraceFilename = new Path(tempDir, "trace-anonymized.json"); - Path anonymizedClusterTopologyFilename = - new Path(tempDir, "topology-anonymized.json"); - args = new String[] {"-trace", goldTraceFilename.toString(), - anonymizedTraceFilename.toString(), - "-topology", goldTopologyFilename.toString(), - anonymizedClusterTopologyFilename.toString()}; - Tool anonymizer = new Anonymizer(); - result = ToolRunner.run(anonymizer, args); - assertEquals("Non-zero exit", 0, result); - - JobTraceReader reader = new JobTraceReader(anonymizedTraceFilename, conf); - LoggedJob anonymizedJob = reader.getNext(); - reader.close(); // close the reader as we need only 1 job - // test - // user-name - String currentUser = UserGroupInformation.getCurrentUser().getUserName(); - assertFalse("Username not anonymized!", - currentUser.equals(anonymizedJob.getUser().getValue())); - // jobid - assertEquals("JobID mismatch!", - id.toString(), anonymizedJob.getJobID().toString()); - // queue-name - assertFalse("Queuename mismatch!", - "default".equals(anonymizedJob.getQueue().getValue())); - // job-name - assertFalse("Jobname mismatch!", - "top-secret".equals(anonymizedJob.getJobName().getValue())); - - // job properties - for (Map.Entry entry : - anonymizedJob.getJobProperties().getValue().entrySet()) { - assertFalse("User sensitive configuration key not anonymized", - entry.getKey().toString().equals("user-secret-code")); - assertFalse("User sensitive data not anonymized", - entry.getValue().toString().contains(currentUser)); - assertFalse("User sensitive data not anonymized", - entry.getValue().toString().contains("secret")); - } - - // test map tasks - testTasks(anonymizedJob.getMapTasks(), id, TaskType.MAP); - - // test reduce tasks - testTasks(anonymizedJob.getReduceTasks(), id, TaskType.REDUCE); - - // test other tasks - testTasks(anonymizedJob.getOtherTasks(), id, null); - - // test the anonymized cluster topology file - ClusterTopologyReader cReader = - new ClusterTopologyReader(anonymizedClusterTopologyFilename, conf); - LoggedNetworkTopology loggedNetworkTopology = cReader.get(); - // test the cluster topology - testClusterTopology(loggedNetworkTopology, 0, "myorg"); - } finally { - // shutdown and cleanup - if (mrCluster != null) { - mrCluster.shutdown(); - } - - if (dfsCluster != null) { - dfsCluster.formatDataNodeDirs(); - dfsCluster.shutdown(); - } - lfs.delete(tempDir, true); - } - } - - // test task level details lije - // - taskid - // - locality info - // - attempt details - // - attempt execution hostname - private static void testTasks(List tasks, JobID id, - TaskType type) { - int index = 0; - for (LoggedTask task : tasks) { - // generate the expected task id for this task - if (type != null) { - TaskID tid = new TaskID(id, type, index++); - assertEquals("TaskID mismatch!", - tid.toString(), task.getTaskID().toString()); - } - - // check locality information - if (task.getPreferredLocations() != null) { - for (LoggedLocation loc : task.getPreferredLocations()) { - for (NodeName name : loc.getLayers()) { - assertFalse("Hostname mismatch!", - name.getValue().contains("myorg")); - } - } - } - - // check execution host - for (LoggedTaskAttempt attempt : task.getAttempts()) { - // generate the expected task id for this task - TaskAttemptID aid = new TaskAttemptID(task.getTaskID(), 0); - assertEquals("TaskAttemptID mismatch!", - aid.toString(), attempt.getAttemptID().toString()); - - assertNotNull("Hostname null!", attempt.getHostName()); - assertFalse("Hostname mismatch!", - attempt.getHostName().getValue().contains("myorg")); - } - } - } - - // tests the logged network topology - private static void testClusterTopology(LoggedNetworkTopology topology, - int level, String bannedString) { - assertFalse("Cluster topology test failed!", - topology.getName().getValue().contains(bannedString)); - if (level == 0) { - assertEquals("Level-1 data mismatch!", - "", topology.getName().getValue()); - } else if (level == 1) { - assertTrue("Level-2 data mismatch!", - topology.getName().getValue().contains("rack")); - assertFalse("Level-2 data mismatch!", - topology.getName().getValue().contains("host")); - } else { - assertTrue("Level-2 data mismatch!", - topology.getName().getValue().contains("host")); - assertFalse("Level-2 data mismatch!", - topology.getName().getValue().contains("rack")); - } - - // if the current node is a rack, then test the nodes under it - if (topology.getChildren() != null) { - for (LoggedNetworkTopology child : topology.getChildren()) { - testClusterTopology(child, level + 1, bannedString); - } - } - } - - @Test - public void testCLI() throws Exception { - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testCLI"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // test no args - String[] args = new String[] {}; - testAnonymizerCLI(args, -1); - - // test with wrong args - args = new String[] {"-test"}; - testAnonymizerCLI(args, -1); - - args = new String[] {"-trace"}; - testAnonymizerCLI(args, -1); - - args = new String[] {"-topology"}; - testAnonymizerCLI(args, -1); - - args = new String[] {"-trace -topology"}; - testAnonymizerCLI(args, -1); - - Path testTraceInputFilename = new Path(tempDir, "trace-in.json"); - args = new String[] {"-trace", testTraceInputFilename.toString()}; - testAnonymizerCLI(args, -1); - - Path testTraceOutputFilename = new Path(tempDir, "trace-out.json"); - args = new String[] {"-trace", testTraceInputFilename.toString(), - testTraceOutputFilename.toString()}; - testAnonymizerCLI(args, -1); - - OutputStream out = lfs.create(testTraceInputFilename); - out.write("{\n}".getBytes()); - out.close(); - args = new String[] {"-trace", testTraceInputFilename.toString(), - testTraceOutputFilename.toString()}; - testAnonymizerCLI(args, 0); - - Path testToplogyInputFilename = new Path(tempDir, "topology-in.json"); - args = new String[] {"-topology", testToplogyInputFilename.toString()}; - testAnonymizerCLI(args, -1); - - Path testTopologyOutputFilename = new Path(tempDir, "topology-out.json"); - args = new String[] {"-topology", testToplogyInputFilename.toString(), - testTopologyOutputFilename.toString()}; - testAnonymizerCLI(args, -1); - - out = lfs.create(testToplogyInputFilename); - out.write("{\n}".getBytes()); - out.close(); - args = new String[] {"-topology", testToplogyInputFilename.toString(), - testTopologyOutputFilename.toString()}; - testAnonymizerCLI(args, 0); - - args = new String[] {"-trace", testTraceInputFilename.toString(), - "-topology", testToplogyInputFilename.toString()}; - testAnonymizerCLI(args, -1); - - args = new String[] {"-trace", testTraceInputFilename.toString(), - testTraceOutputFilename.toString(), - "-topology", testToplogyInputFilename.toString(), - testTopologyOutputFilename.toString()}; - testAnonymizerCLI(args, 0); - } - - // tests the Anonymizer CLI via the Tools interface - private static void testAnonymizerCLI(String[] args, int eExitCode) - throws Exception { - Anonymizer anonymizer = new Anonymizer(); - - int exitCode = ToolRunner.run(anonymizer, args); - assertEquals("Exit code mismatch", eExitCode, exitCode); - } - - /** - * Test {@link StatePool}'s reload and persistence feature. - */ - @Test - public void testStatePool() throws Exception { - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testStatePool"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // set the state dir - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - - StatePool pool = new StatePool(); - // test reload, persist and dir config - // test with no reload and persist - pool.initialize(conf); - - // test with reload and/or persist enabled with no dir - assertNull("Default state pool error", - pool.getState(MyState.class)); - - // try persisting - pool.persist(); - assertFalse("State pool persisted when disabled", lfs.exists(tempDir)); - - // test wrongly configured state-pool - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - conf.unset(StatePool.DIR_CONFIG); - pool = new StatePool(); - boolean success = true; - try { - pool.initialize(conf); - } catch (Exception e) { - success = false; - } - assertFalse("State pool bad configuration succeeded", success); - - // test wrongly configured state-pool - conf.setBoolean(StatePool.RELOAD_CONFIG, false); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - pool = new StatePool(); - success = true; - try { - pool.initialize(conf); - } catch (Exception e) { - success = false; - } - assertFalse("State manager bad configuration succeeded", success); - - - // test persistence - conf.setBoolean(StatePool.RELOAD_CONFIG, false); - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - pool = new StatePool(); - pool.initialize(conf); - - // add states to the state pool - MyState myState = new MyState(); - pool.addState(MyState.class, myState); - myState.setState("test-1"); - // try persisting - pool.persist(); - assertTrue("State pool persisted when enabled", lfs.exists(tempDir)); - assertEquals("State pool persisted when enabled", - 1, lfs.listStatus(tempDir).length); - - // reload - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - pool = new StatePool(); - pool.initialize(conf); - MyState pState = - (MyState) pool.getState(MyState.class); - assertEquals("State pool persistence/reload failed", "test-1", - pState.getState()); - - // try persisting with no state change - pool.persist(); - assertEquals("State pool persisted when disabled", - 1, lfs.listStatus(tempDir).length); - - // modify the state of the pool and check persistence - pState.setUpdated(true); - pool.persist(); - assertEquals("State pool persisted when disabled", - 2, lfs.listStatus(tempDir).length); - - // delete the temp directory if everything goes fine - lfs.delete(tempDir, true); - } - - /** - * Test state. - */ - static class MyState implements State { - private boolean updated = false; - private String state = "null"; - - @Override - @JsonIgnore - public String getName() { - return "test"; - } - - @Override - public void setName(String name) { - // for now, simply assert since this class has a hardcoded name - if (!getName().equals(name)) { - throw new RuntimeException("State name mismatch! Expected '" - + getName() + "' but found '" + name + "'."); - } - } - - public void setState(String state) { - this.state = state; - } - - public String getState() { - return state; - } - - void setUpdated(boolean up) { - this.updated = up; - } - - @Override - @JsonIgnore - public boolean isUpdated() { - return updated; - } - } - - @SuppressWarnings("unchecked") - private static String getValueFromDataType(Object object) { - DataType dt = (DataType) object; - return dt.getValue(); - } - - @Test - public void testJobPropertiesParser() { - // test default parser - Properties properties = new Properties(); - Configuration conf = new Configuration(); - JobProperties jp = new JobProperties(properties); - assertEquals("Job Properties (default filter) store error", - 0, jp.getAnonymizedValue(null, conf).size()); - - // define key-value pairs for job configuration - String key1 = "test-key"; - String value1 = "test-value"; - properties.put(key1, value1); // user config - String key2 = MRJobConfig.USER_NAME; - String value2 = "bob"; - properties.put(key2, value2); // job config - String key3 = JobConf.MAPRED_MAP_TASK_JAVA_OPTS; - String value3 = "-Xmx1G"; - properties.put(key3, value3); // deprecated - String key4 = MRJobConfig.REDUCE_JAVA_OPTS; - String value4 = "-Xms100m"; - properties.put(key4, value4); - - jp = new JobProperties(properties); - - // Configure the default parser - conf.set(JobProperties.PARSERS_CONFIG_KEY, - DefaultJobPropertiesParser.class.getName()); - // anonymize - Properties defaultProp = jp.getAnonymizedValue(null, conf); - assertEquals("Job Properties (all-pass filter) store error", - 4, defaultProp.size()); - assertEquals("Job Properties (default filter) key#1 error", value1, - getValueFromDataType(defaultProp.get(key1))); - assertEquals("Job Properties (default filter) key#2 error", value2, - getValueFromDataType(defaultProp.get(key2))); - assertEquals("Job Properties (default filter) key#3 error", value3, - getValueFromDataType(defaultProp.get(key3))); - assertEquals("Job Properties (default filter) key#4 error", value4, - getValueFromDataType(defaultProp.get(key4))); - - // test MR parser - conf.set(JobProperties.PARSERS_CONFIG_KEY, - MapReduceJobPropertiesParser.class.getName()); - // anonymize - Properties filteredProp = jp.getAnonymizedValue(null, conf); - assertEquals("Job Properties (MR filter) store error", - 3, filteredProp.size()); - assertNull("Job Properties (MR filter) key#1 error", - filteredProp.get(key1)); - assertEquals("Job Properties (MR filter) key#2 error", value2, - getValueFromDataType(filteredProp.get(key2))); - assertEquals("Job Properties (MR filter) key#3 error", value3, - getValueFromDataType(filteredProp.get(key3))); - assertEquals("Job Properties (MR filter) key#4 error", value4, - getValueFromDataType(filteredProp.get(key4))); - } - - /** - * Test {@link WordListAnonymizerUtility}. Test various features like - * - test known words - * - test known suffix - */ - @Test - public void testWordListBasedAnonymizer() { - String[] knownSuffixes = new String[] {".1", ".2", ".3", ".4"}; - - // test with valid suffix - assertTrue("suffix test#0 failed!", - WordListAnonymizerUtility.hasSuffix("a.1", knownSuffixes)); - String split[] = - WordListAnonymizerUtility.extractSuffix("a.1", knownSuffixes); - assertEquals("suffix test#1 failed!", 2, split.length); - assertEquals("suffix test#2 failed!", "a", split[0]); - assertEquals("suffix test#3 failed!", ".1", split[1]); - - // test with valid suffix - assertTrue("suffix test#0 failed!", - WordListAnonymizerUtility.hasSuffix("a.1", knownSuffixes)); - split = - WordListAnonymizerUtility.extractSuffix("/a/b.2", knownSuffixes); - assertEquals("suffix test#0 failed!", 2, split.length); - assertEquals("suffix test#1 failed!", "/a/b", split[0]); - assertEquals("suffix test#2 failed!", ".2", split[1]); - - // test with invalid suffix - assertFalse("suffix test#0 failed!", - WordListAnonymizerUtility.hasSuffix("a.b", knownSuffixes)); - - boolean failed = false; - try { - split = WordListAnonymizerUtility.extractSuffix("a.b", knownSuffixes); - } catch (Exception e) { - failed = true; - } - assertTrue("Exception expected!", failed); - - String[] knownWords = new String[] {"a", "b"}; - - // test with valid data - assertTrue("data test#0 failed!", - WordListAnonymizerUtility.isKnownData("a", knownWords)); - // test with valid data - assertTrue("data test#1 failed!", - WordListAnonymizerUtility.isKnownData("b", knownWords)); - // test with invalid data - assertFalse("data test#2 failed!", - WordListAnonymizerUtility.isKnownData("c", knownWords)); - - // test with valid known word - assertTrue("data test#3 failed!", - WordListAnonymizerUtility.isKnownData("job")); - // test with invalid known word - assertFalse("data test#4 failed!", - WordListAnonymizerUtility.isKnownData("bob")); - - // test numeric data - assertFalse("Numeric test failed!", - WordListAnonymizerUtility.needsAnonymization("123")); - // test numeric data (unsupported) - assertTrue("Numeric test failed!", - WordListAnonymizerUtility.needsAnonymization("123.456")); - // test text data - assertTrue("Text test failed!", - WordListAnonymizerUtility.needsAnonymization("123abc")); - } - - /** - * Test {@link WordList} features like - * - add words - * - index - * - contains - */ - @Test - public void testWordList() throws Exception { - // test features with fresh state - WordList wordList = new WordList(); - assertFalse("Word list state incorrect", wordList.isUpdated()); - - // add some special word - String test = "abbracadabra"; - wordList.add(test); - assertTrue("Word list failed to store", wordList.contains(test)); - assertEquals("Word list index failed", 0, wordList.indexOf(test)); - assertEquals("Word list size failed", 1, wordList.getSize()); - assertTrue("Word list state incorrect", wordList.isUpdated()); - - // add already added word - wordList.add(test); - assertEquals("Word list index failed", 0, wordList.indexOf(test)); - assertEquals("Word list size failed", 1, wordList.getSize()); - assertTrue("Word list state incorrect", wordList.isUpdated()); - - String test2 = "hakuna-matata"; - wordList.add(test2); - assertTrue("Word list failed to store", wordList.contains(test2)); - assertEquals("Word list index failed", 1, wordList.indexOf(test2)); - assertEquals("Word list size failed", 2, wordList.getSize()); - assertTrue("Word list state incorrect", wordList.isUpdated()); - - // test persistence - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testWordList"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // define a state pool to help persist the wordlist - StatePool pool = new StatePool(); - - try { - // set the persistence directory - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - - // initialize the state-pool - pool.initialize(conf); - - // add the wordlist to the pool - pool.addState(getClass(), wordList); - - pool.persist(); - - // now clear the pool state - pool = new StatePool(); - - // set reload to true - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - // initialize the state-pool - pool.initialize(conf); - - State state = pool.getState(getClass()); - assertNotNull("Missing state!", state); - assertEquals("Incorrect state class!", WordList.class, state.getClass()); - WordList pList = (WordList) state; - - // check size - assertEquals("Word list size on reload failed", 2, pList.getSize()); - assertFalse("Word list state incorrect", pList.isUpdated()); - - // add already added word - pList.add(test); - assertEquals("Word list index on reload failed", 0, pList.indexOf(test)); - assertEquals("Word list size on reload failed", 2, pList.getSize()); - assertFalse("Word list state on reload incorrect", pList.isUpdated()); - - String test3 = "disco-dancer"; - assertFalse("Word list failed to after reload", pList.contains(test3)); - pList.add(test3); - assertTrue("Word list failed to store on reload", pList.contains(test3)); - assertEquals("Word list index on reload failed", 2, pList.indexOf(test3)); - assertEquals("Word list size on reload failed", 3, pList.getSize()); - assertTrue("Word list state on reload incorrect", pList.isUpdated()); - - // test previously added (persisted) word - assertTrue("Word list failed to store on reload", pList.contains(test2)); - assertEquals("Word list index on reload failed", 1, pList.indexOf(test2)); - } finally { - lfs.delete(tempDir, true); - } - } - - /** - * Test {@link FileName#FileNameState} persistence with directories only. - */ - @Test - public void testFileNameStateWithDir() throws Exception { - // test persistence - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testFileNameStateWithDir"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // set the persistence directory - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - - // define a state pool to help persist the dirs - StatePool pool = new StatePool(); - - FileNameState fState = new FileNameState(); - - // define the directory names - String test1 = "test"; - String test2 = "home"; - - // test dir only - WordList dirState = new WordList("dir"); - dirState.add(test1); - dirState.add(test2); - - // set the directory state - fState.setDirectoryState(dirState); - - try { - // initialize the state-pool - pool.initialize(conf); - - // add the wordlist to the pool - pool.addState(getClass(), fState); - - // persist the state - pool.persist(); - - // now clear the pool state - pool = new StatePool(); - - // set reload to true - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - - // initialize the state-pool - pool.initialize(conf); - - State state = pool.getState(getClass()); - assertNotNull("Missing state!", state); - assertEquals("Incorrect state class!", - FileNameState.class, state.getClass()); - FileNameState newFState = (FileNameState) state; - - // check the state contents - WordList newStateWordList = newFState.getDirectoryState(); - assertTrue("File state failed to store on reload", - newStateWordList.contains(test1)); - assertEquals("File state index on reload failed", - 0, newStateWordList.indexOf(test1)); - - assertTrue("File state failed to store on reload", - newStateWordList.contains(test2)); - assertEquals("File state index on reload failed", - 1, newStateWordList.indexOf(test2)); - } finally { - lfs.delete(tempDir, true); - } - } - - /** - * Test {@link FileName#FileNameState} persistence with files only. - */ - @Test - public void testFileNameStateWithFiles() throws Exception { - // test persistence - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testFileNameStateWithFiles"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // set the persistence directory - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - - // define a state pool to help persist the filename parts - StatePool pool = new StatePool(); - - FileNameState fState = new FileNameState(); - - // define the file names - String test1 = "part-00.bzip"; - String test2 = "file1.txt"; - - // test filenames only - WordList fileNameState = new WordList("files"); - fileNameState.add(test1); - fileNameState.add(test2); - - // set the filename state - fState.setDirectoryState(fileNameState); - - try { - // initialize the state-pool - pool.initialize(conf); - - // add the wordlist to the pool - pool.addState(getClass(), fState); - - // persist the state - pool.persist(); - - // now clear the pool state - pool = new StatePool(); - - // set reload to true - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - - // initialize the state-pool - pool.initialize(conf); - - State state = pool.getState(getClass()); - assertNotNull("Missing state!", state); - assertEquals("Incorrect state class!", - FileNameState.class, state.getClass()); - FileNameState newFState = (FileNameState) state; - - // check the state contents - WordList newFileWordList = newFState.getDirectoryState(); - assertTrue("File state failed on reload", - newFileWordList.contains(test1)); - assertEquals("File state indexing on reload failed", - 0, newFileWordList.indexOf(test1)); - - assertTrue("File state failed on reload", - newFileWordList.contains(test2)); - assertEquals("File state indexing on reload failed", - 1, newFileWordList.indexOf(test2)); - } finally { - lfs.delete(tempDir, true); - } - } - - /** - * Test {@link FileName#FileNameState} persistence with files and directories. - */ - @Test - public void testFileNameState() throws Exception { - // test persistence - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testFileNameState"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // set the persistence directory - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - - // define a state pool to help persist the filename parts - StatePool pool = new StatePool(); - - FileNameState fState = new FileNameState(); - - // define the directory names - String testD1 = "test"; - String testD2 = "home"; - String testD3 = "tmp"; - - // test dir only - WordList dirState = new WordList("dir"); - dirState.add(testD1); - dirState.add(testD2); - dirState.add(testD3); - - // define the file names - String testF1 = "part-00.bzip"; - String testF2 = "file1.txt"; - String testF3 = "tmp"; - - // test filenames only - WordList fileNameState = new WordList("files"); - fileNameState.add(testF1); - fileNameState.add(testF2); - fileNameState.add(testF3); - - // set the filename state - fState.setFileNameState(fileNameState); - // set the directory state - fState.setDirectoryState(dirState); - - try { - // initialize the state-pool - pool.initialize(conf); - - // add the wordlist to the pool - pool.addState(getClass(), fState); - - // persist the state - pool.persist(); - - // now clear the pool state - pool = new StatePool(); - - // set reload to true - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - - // initialize the state-pool - pool.initialize(conf); - - State state = pool.getState(getClass()); - assertNotNull("Missing state!", state); - assertEquals("Incorrect state class!", - FileNameState.class, state.getClass()); - FileNameState newFState = (FileNameState) state; - - // test filenames - WordList newStateWordList = newFState.getFileNameState(); - assertTrue("File state failed on reload", - newStateWordList.contains(testF1)); - assertEquals("File state indexing on reload failed", - 0, newStateWordList.indexOf(testF1)); - - assertTrue("File state failed on reload", - newStateWordList.contains(testF2)); - assertEquals("File state indexing on reload failed", - 1, newStateWordList.indexOf(testF2)); - - assertTrue("File state failed on reload", - newStateWordList.contains(testF3)); - assertEquals("File state indexing on reload failed", - 2, newStateWordList.indexOf(testF3)); - - // test dirs - WordList newDirWordList = newFState.getDirectoryState(); - assertTrue("File state failed on reload", - newDirWordList.contains(testD1)); - assertEquals("File state indexing on reload failed", - 0, newDirWordList.indexOf(testD1)); - - assertTrue("File state failed on reload", - newDirWordList.contains(testD2)); - assertEquals("File state indexing on reload failed", - 1, newDirWordList.indexOf(testD2)); - assertTrue("File state failed on reload", - newDirWordList.contains(testD3)); - assertEquals("File state indexing on reload failed", - 2, newDirWordList.indexOf(testD3)); - } finally { - lfs.delete(tempDir, true); - } - } - - /** - * Test {@link NodeName#NodeName} persistence with hostnames only. - */ - @Test - public void testNodeNameStateWithHostNameOnly() throws Exception { - // test persistence - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testNodeNameStateWithHostNameOnly"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // set the persistence directory - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - - // define a state pool to help persist the hostnames - StatePool pool = new StatePool(); - - NodeNameState nState = new NodeNameState(); - - // define the host names - String test1 = "abc123"; - String test2 = "xyz789"; - - // test hostname only - WordList hostNameState = new WordList("hostname"); - hostNameState.add(test1); - hostNameState.add(test2); - - // set the directory state - nState.setHostNameState(hostNameState); - - try { - // initialize the state-pool - pool.initialize(conf); - - // add the wordlist to the pool - pool.addState(getClass(), nState); - - // persist the state - pool.persist(); - - // now clear the pool state - pool = new StatePool(); - - // set reload to true - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - - // initialize the state-pool - pool.initialize(conf); - - State state = pool.getState(getClass()); - assertNotNull("Missing state!", state); - assertEquals("Incorrect state class!", - NodeNameState.class, state.getClass()); - NodeNameState newNState = (NodeNameState) state; - - // check the state contents - WordList newStateWordList = newNState.getHostNameState(); - assertTrue("Node state failed to store on reload", - newStateWordList.contains(test1)); - assertEquals("Node state index on reload failed", - 0, newStateWordList.indexOf(test1)); - - assertTrue("Node state failed to store on reload", - newStateWordList.contains(test2)); - assertEquals("Node state index on reload failed", - 1, newStateWordList.indexOf(test2)); - } finally { - lfs.delete(tempDir, true); - } - } - - /** - * Test {@link NodeName#NodeNameState} persistence with racknames only. - */ - @Test - public void testNodeNameWithRackNamesOnly() throws Exception { - // test persistence - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testNodeNameWithRackNamesOnly"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // set the persistence directory - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - - // define a state pool to help persist the rack names - StatePool pool = new StatePool(); - - NodeNameState nState = new NodeNameState(); - - // define the rack names - String test1 = "rack1"; - String test2 = "rack2"; - - // test filenames only - WordList rackNameState = new WordList("racknames"); - rackNameState.add(test1); - rackNameState.add(test2); - - // set the rackname state - nState.setRackNameState(rackNameState); - - try { - // initialize the state-pool - pool.initialize(conf); - - // add the wordlist to the pool - pool.addState(getClass(), nState); - - // persist the state - pool.persist(); - - // now clear the pool state - pool = new StatePool(); - - // set reload to true - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - - // initialize the state-pool - pool.initialize(conf); - - State state = pool.getState(getClass()); - assertNotNull("Missing state!", state); - assertEquals("Incorrect state class!", - NodeNameState.class, state.getClass()); - NodeNameState newNState = (NodeNameState) state; - - // check the state contents - WordList newFileWordList = newNState.getRackNameState(); - assertTrue("File state failed on reload", - newFileWordList.contains(test1)); - assertEquals("File state indexing on reload failed", - 0, newFileWordList.indexOf(test1)); - - assertTrue("File state failed on reload", - newFileWordList.contains(test2)); - assertEquals("File state indexing on reload failed", - 1, newFileWordList.indexOf(test2)); - } finally { - lfs.delete(tempDir, true); - } - } - - /** - * Test {@link NodeName#NodeNameState} persistence with hosts and racks. - */ - @Test - public void testNodeNameState() throws Exception { - // test persistence - Configuration conf = new Configuration(); - FileSystem lfs = FileSystem.getLocal(conf); - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - Path tempDir = new Path(rootTempDir, "testNodeNameState"); - tempDir = lfs.makeQualified(tempDir); - lfs.delete(tempDir, true); - - // set the persistence directory - conf.set(StatePool.DIR_CONFIG, tempDir.toString()); - conf.setBoolean(StatePool.PERSIST_CONFIG, true); - - // define a state pool to help persist the node names. - StatePool pool = new StatePool(); - - NodeNameState nState = new NodeNameState(); - - // define the rack names - String testR1 = "rack1"; - String testR2 = "rack2"; - String testR3 = "rack3"; - - WordList rackState = new WordList("rack"); - rackState.add(testR1); - rackState.add(testR2); - rackState.add(testR3); - - String testH1 = "host1"; - String testH2 = "host2"; - String testH3 = "host3"; - - WordList hostNameState = new WordList("host"); - hostNameState.add(testH1); - hostNameState.add(testH2); - hostNameState.add(testH3); - - // set the filename state - nState.setHostNameState(hostNameState); - nState.setRackNameState(rackState); - - try { - // initialize the state-pool - pool.initialize(conf); - - // add the wordlist to the pool - pool.addState(getClass(), nState); - - // persist the state - pool.persist(); - - // now clear the pool state - pool = new StatePool(); - - // set reload to true - conf.setBoolean(StatePool.RELOAD_CONFIG, true); - - // initialize the state-pool - pool.initialize(conf); - - State state = pool.getState(getClass()); - assertNotNull("Missing state!", state); - assertEquals("Incorrect state class!", - NodeNameState.class, state.getClass()); - NodeNameState newNState = (NodeNameState) state; - - // test nodenames - WordList newHostWordList = newNState.getHostNameState(); - assertTrue("File state failed on reload", - newHostWordList.contains(testH1)); - assertEquals("File state indexing on reload failed", - 0, newHostWordList.indexOf(testH1)); - - assertTrue("File state failed on reload", - newHostWordList.contains(testH2)); - assertEquals("File state indexing on reload failed", - 1, newHostWordList.indexOf(testH2)); - - assertTrue("File state failed on reload", - newHostWordList.contains(testH3)); - assertEquals("File state indexing on reload failed", - 2, newHostWordList.indexOf(testH3)); - - // test racknames - WordList newRackWordList = newNState.getRackNameState(); - assertTrue("File state failed on reload", - newRackWordList.contains(testR1)); - assertEquals("File state indexing on reload failed", - 0, newRackWordList.indexOf(testR1)); - - assertTrue("File state failed on reload", - newRackWordList.contains(testR2)); - assertEquals("File state indexing on reload failed", - 1, newRackWordList.indexOf(testR2)); - assertTrue("File state failed on reload", - newRackWordList.contains(testR3)); - assertEquals("File state indexing on reload failed", - 2, newRackWordList.indexOf(testR3)); - } finally { - lfs.delete(tempDir, true); - } - } -} \ No newline at end of file diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenFolder.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenFolder.java deleted file mode 100644 index 2fe0d7194a6..00000000000 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenFolder.java +++ /dev/null @@ -1,196 +0,0 @@ -package org.apache.hadoop.tools.rumen; - -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.IOException; -import java.io.InputStream; -import java.util.LinkedList; -import java.util.List; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.io.IOUtils; -import org.apache.hadoop.util.ToolRunner; - -import org.junit.Test; -import static org.junit.Assert.*; - -public class TestRumenFolder { - @Test - public void testFoldingSmallTrace() throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - @SuppressWarnings("deprecation") - final Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")) - .makeQualified(lfs); - @SuppressWarnings("deprecation") - final Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")) - .makeQualified(lfs); - - final Path rootInputFile = new Path(rootInputDir, "rumen/small-trace-test"); - final Path tempDir = new Path(rootTempDir, "TestRumenJobTraces"); - lfs.delete(tempDir, true); - - final Path foldedTracePath = new Path(tempDir, "folded-trace.json"); - - final Path inputFile = - new Path(rootInputFile, "folder-input-trace.json.gz"); - - System.out.println("folded trace result path = " + foldedTracePath); - - String[] args = - { "-input-cycle", "100S", "-output-duration", "300S", - "-skew-buffer-length", "1", "-seed", "100", "-concentration", "2", - inputFile.toString(), foldedTracePath.toString() }; - - final Path foldedGoldFile = - new Path(rootInputFile, "goldFoldedTrace.json.gz"); - - Folder folder = new Folder(); - int result = ToolRunner.run(folder, args); - assertEquals("Non-zero exit", 0, result); - - TestRumenFolder. jsonFileMatchesGold(conf, lfs, foldedTracePath, - foldedGoldFile, LoggedJob.class, "trace"); - } - - @Test - public void testStartsAfterOption() throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - @SuppressWarnings("deprecation") - final Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")) - .makeQualified(lfs); - @SuppressWarnings("deprecation") - final Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")) - .makeQualified(lfs); - - final Path rootInputFile = new Path(rootInputDir, "rumen/small-trace-test"); - final Path tempDir = new Path(rootTempDir, "TestRumenJobTraces"); - lfs.delete(tempDir, true); - - final Path inputFile = - new Path(rootInputFile, "goldFoldedTrace.json.gz"); - - final Path foldedTracePath = new Path(tempDir, - "folded-skippedjob-trace.json"); - String[] args = - { "-input-cycle", "300S", "-output-duration", "300S", - "-starts-after", "30S", - inputFile.toString(), foldedTracePath.toString() }; - - Folder folder = new Folder(); - int result = ToolRunner.run(folder, args); - assertEquals("Non-zero exit", 0, result); - - TestRumenFolder. checkValidityAfterSkippingJobs(conf, lfs, foldedTracePath, - inputFile, LoggedJob.class, "trace", 30000, 300000); - } - - static private void - checkValidityAfterSkippingJobs(Configuration conf, - FileSystem lfs, Path result, Path inputFile, - Class clazz, String fileDescription, - long startsAfter, long duration) throws IOException { - - JsonObjectMapperParser inputFileParser = - new JsonObjectMapperParser(inputFile, clazz, conf); - InputStream resultStream = lfs.open(result); - JsonObjectMapperParser resultParser = - new JsonObjectMapperParser(resultStream, clazz); - List gpSubmitTimes = new LinkedList(); - List rpSubmitTimes = new LinkedList(); - try { - //Get submitTime of first job - LoggedJob firstJob = (LoggedJob)inputFileParser.getNext(); - gpSubmitTimes.add(firstJob.getSubmitTime()); - long absoluteStartsAfterTime = firstJob.getSubmitTime() + startsAfter; - - //total duration - long endTime = firstJob.getSubmitTime() + duration; - - //read original trace - LoggedJob oriJob = null; - while((oriJob = (LoggedJob)inputFileParser.getNext()) != null) { - gpSubmitTimes.add(oriJob.getSubmitTime()); - } - - //check if retained jobs have submittime > starts-after - LoggedJob job = null; - while((job = (LoggedJob) resultParser.getNext()) != null) { - assertTrue("job's submit time in the output trace is less " + - "than the specified value of starts-after", - (job.getSubmitTime() >= absoluteStartsAfterTime)); - rpSubmitTimes.add(job.getSubmitTime()); - } - - List skippedJobs = new LinkedList(); - skippedJobs.addAll(gpSubmitTimes); - skippedJobs.removeAll(rpSubmitTimes); - - //check if the skipped job submittime < starts-after - for(Long submitTime : skippedJobs) { - assertTrue("skipped job submit time " + submitTime + - " in the trace is greater " + - "than the specified value of starts-after " - + absoluteStartsAfterTime, - (submitTime < absoluteStartsAfterTime)); - } - } finally { - IOUtils.cleanup(null, inputFileParser, resultParser); - } - } - - static private void jsonFileMatchesGold( - Configuration conf, FileSystem lfs, Path result, Path gold, - Class clazz, String fileDescription) throws IOException { - JsonObjectMapperParser goldParser = - new JsonObjectMapperParser(gold, clazz, conf); - InputStream resultStream = lfs.open(result); - JsonObjectMapperParser resultParser = - new JsonObjectMapperParser(resultStream, clazz); - try { - while (true) { - DeepCompare goldJob = goldParser.getNext(); - DeepCompare resultJob = resultParser.getNext(); - if ((goldJob == null) || (resultJob == null)) { - assertTrue(goldJob == resultJob); - break; - } - - try { - resultJob.deepCompare(goldJob, new TreePath(null, "")); - } catch (DeepInequalityException e) { - String error = e.path.toString(); - - assertFalse(fileDescription + " mismatches: " + error, true); - } - } - } finally { - IOUtils.cleanup(null, goldParser, resultParser); - } - } -} diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenJobTraces.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenJobTraces.java deleted file mode 100644 index bb92426f5ff..00000000000 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestRumenJobTraces.java +++ /dev/null @@ -1,1259 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.tools.rumen; - -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.io.IOUtils; -import org.apache.hadoop.mapred.JobClient; -import org.apache.hadoop.mapred.JobConf; -import org.apache.hadoop.mapred.MiniMRCluster; -import org.apache.hadoop.mapreduce.Counters; -import org.apache.hadoop.mapreduce.Job; -import org.apache.hadoop.mapreduce.JobID; -import org.apache.hadoop.mapreduce.MRJobConfig; -import org.apache.hadoop.mapreduce.MapReduceTestUtil; -import org.apache.hadoop.mapreduce.TaskAttemptID; -import org.apache.hadoop.mapreduce.TaskCounter; -import org.apache.hadoop.mapreduce.TaskID; -import org.apache.hadoop.mapreduce.TaskType; -import org.apache.hadoop.mapreduce.TypeConverter; -import org.apache.hadoop.mapreduce.TestNoJobSetupCleanup.MyOutputFormat; -import org.apache.hadoop.mapreduce.jobhistory.HistoryEvent; -import org.apache.hadoop.mapreduce.jobhistory.JobHistory; -import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptFinishedEvent; -import org.apache.hadoop.mapreduce.jobhistory.TaskAttemptUnsuccessfulCompletionEvent; -import org.apache.hadoop.mapreduce.jobhistory.TaskStartedEvent; -import org.apache.hadoop.mapreduce.server.tasktracker.TTConfig; -import org.apache.hadoop.mapreduce.v2.api.records.JobId; -import org.apache.hadoop.mapreduce.v2.jobhistory.FileNameIndexUtils; -import org.apache.hadoop.mapreduce.v2.jobhistory.JobIndexInfo; -import org.apache.hadoop.tools.rumen.TraceBuilder.MyOptions; -import org.apache.hadoop.util.Tool; -import org.apache.hadoop.util.ToolRunner; - -import org.junit.Test; -import static org.junit.Assert.*; - -public class TestRumenJobTraces { - private static final Log LOG = LogFactory.getLog(TestRumenJobTraces.class); - - @Test - public void testSmallTrace() throws Exception { - performSingleTest("sample-job-tracker-logs.gz", - "job-tracker-logs-topology-output", "job-tracker-logs-trace-output.gz"); - } - - @Test - public void testTruncatedTask() throws Exception { - performSingleTest("truncated-job-tracker-log", "truncated-topology-output", - "truncated-trace-output"); - } - - private void performSingleTest(String jtLogName, String goldTopology, - String goldTrace) throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - final Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - final Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - - final Path rootInputFile = new Path(rootInputDir, "rumen/small-trace-test"); - final Path tempDir = new Path(rootTempDir, "TestRumenJobTraces"); - lfs.delete(tempDir, true); - - final Path topologyFile = new Path(tempDir, jtLogName + "-topology.json"); - final Path traceFile = new Path(tempDir, jtLogName + "-trace.json"); - - final Path inputFile = new Path(rootInputFile, jtLogName); - - System.out.println("topology result file = " + topologyFile); - System.out.println("trace result file = " + traceFile); - - String[] args = new String[6]; - - args[0] = "-v1"; - - args[1] = "-write-topology"; - args[2] = topologyFile.toString(); - - args[3] = "-write-job-trace"; - args[4] = traceFile.toString(); - - args[5] = inputFile.toString(); - - final Path topologyGoldFile = new Path(rootInputFile, goldTopology); - final Path traceGoldFile = new Path(rootInputFile, goldTrace); - - @SuppressWarnings("deprecation") - HadoopLogsAnalyzer analyzer = new HadoopLogsAnalyzer(); - int result = ToolRunner.run(analyzer, args); - assertEquals("Non-zero exit", 0, result); - - TestRumenJobTraces - . jsonFileMatchesGold(conf, topologyFile, - topologyGoldFile, LoggedNetworkTopology.class, "topology"); - TestRumenJobTraces. jsonFileMatchesGold(conf, traceFile, - traceGoldFile, LoggedJob.class, "trace"); - } - - @Test - public void testRumenViaDispatch() throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - final Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - final Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - - final Path rootInputPath = new Path(rootInputDir, "rumen/small-trace-test"); - final Path tempDir = new Path(rootTempDir, "TestRumenViaDispatch"); - lfs.delete(tempDir, true); - - final Path topologyPath = new Path(tempDir, "dispatch-topology.json"); - final Path tracePath = new Path(tempDir, "dispatch-trace.json"); - - final Path inputPath = - new Path(rootInputPath, "dispatch-sample-v20-jt-log.gz"); - - System.out.println("topology result file = " + topologyPath); - System.out.println("testRumenViaDispatch() trace result file = " + tracePath); - - String demuxerClassName = ConcatenatedInputFilesDemuxer.class.getName(); - - String[] args = - { "-demuxer", demuxerClassName, tracePath.toString(), - topologyPath.toString(), inputPath.toString() }; - - final Path topologyGoldFile = - new Path(rootInputPath, "dispatch-topology-output.json.gz"); - final Path traceGoldFile = - new Path(rootInputPath, "dispatch-trace-output.json.gz"); - - Tool analyzer = new TraceBuilder(); - int result = ToolRunner.run(analyzer, args); - assertEquals("Non-zero exit", 0, result); - - TestRumenJobTraces - . jsonFileMatchesGold(conf, topologyPath, - topologyGoldFile, LoggedNetworkTopology.class, "topology"); - TestRumenJobTraces. jsonFileMatchesGold(conf, tracePath, - traceGoldFile, LoggedJob.class, "trace"); - } - - @Test - public void testBracketedCounters() throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - final Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - final Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - - final Path rootInputPath = new Path(rootInputDir, "rumen/small-trace-test"); - final Path tempDir = new Path(rootTempDir, "TestBracketedCounters"); - lfs.delete(tempDir, true); - - final Path topologyPath = new Path(tempDir, "dispatch-topology.json"); - final Path tracePath = new Path(tempDir, "dispatch-trace.json"); - - final Path inputPath = new Path(rootInputPath, "counters-format-test-logs"); - - System.out.println("topology result file = " + topologyPath); - System.out.println("testBracketedCounters() trace result file = " + tracePath); - - final Path goldPath = - new Path(rootInputPath, "counters-test-trace.json.gz"); - - String[] args = - { tracePath.toString(), topologyPath.toString(), inputPath.toString() }; - - Tool analyzer = new TraceBuilder(); - int result = ToolRunner.run(analyzer, args); - assertEquals("Non-zero exit", 0, result); - - TestRumenJobTraces. jsonFileMatchesGold(conf, tracePath, - goldPath, LoggedJob.class, "trace"); - } - - @Test - public void testHadoop20JHParser() throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - final Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - - final Path rootInputPath = new Path(rootInputDir, "rumen/small-trace-test"); - - // history file to be parsed to get events - final Path inputPath = new Path(rootInputPath, "v20-single-input-log.gz"); - - RewindableInputStream ris = getRewindableInputStream(inputPath, conf); - assertNotNull(ris); - - Hadoop20JHParser parser = null; - - try { - assertEquals("Hadoop20JHParser can't parse the test file " + - inputPath, true, Hadoop20JHParser.canParse(ris)); - - ris.rewind(); - parser = new Hadoop20JHParser(ris); - ArrayList seenEvents = new ArrayList(150); - - // this is same as the one in input history file - String jobId = "job_200904211745_0002"; - JobBuilder builder = new JobBuilder(jobId); - - // get events into seenEvents - getHistoryEvents(parser, seenEvents, builder); - - // Validate the events seen by history parser from - // history file v20-single-input-log.gz - validateSeenHistoryEvents(seenEvents, goldLines); - - ParsedJob parsedJob = builder.build(); - // validate the obtainXXX api of ParsedJob, ParsedTask and - // ParsedTaskAttempt - validateParsedJob(parsedJob, 20, 1, true); - } finally { - if (parser != null) { - parser.close(); - } - ris.close(); - } - } - - /** - * Validate the parsing of given history file name. - * - * TODO: Also validate the history file name suffixed with old/stale file - * suffix. - * @param jhFileName job history file path - * @param jid JobID - */ - private void validateHistoryFileNameParsing(Path jhFileName, - org.apache.hadoop.mapred.JobID jid) { - JobID extractedJID = - JobID.forName(JobHistoryUtils.extractJobID(jhFileName.getName())); - assertEquals("TraceBuilder failed to parse the current JH filename" - + jhFileName, jid, extractedJID); - //TODO test jobhistory filename with old/stale file suffix - } - - /** - * Validate the parsing of given history conf file name. Also validate the - * history conf file name suffixed with old/stale file suffix. - * @param jhConfFileName job history conf file path - * @param jid JobID - */ - private void validateJHConfFileNameParsing(Path jhConfFileName, - org.apache.hadoop.mapred.JobID jid) { - assertTrue("TraceBuilder failed to parse the JH conf filename:" - + jhConfFileName, - JobHistoryUtils.isJobConfXml(jhConfFileName.getName())); - JobID extractedJID = - JobID.forName(JobHistoryUtils.extractJobID(jhConfFileName.getName())); - assertEquals("TraceBuilder failed to parse the current JH conf filename:" - + jhConfFileName, jid, extractedJID); - // Test jobhistory conf filename with old/stale file suffix - jhConfFileName = jhConfFileName.suffix(JobHistory.getOldFileSuffix("123")); - assertTrue("TraceBuilder failed to parse the current JH conf filename" - + " (old suffix):" + jhConfFileName, - JobHistoryUtils.isJobConfXml(jhConfFileName.getName())); - extractedJID = - JobID.forName(JobHistoryUtils.extractJobID(jhConfFileName.getName())); - assertEquals("TraceBuilder failed to parse the JH conf filename" - + "(old-suffix):" + jhConfFileName, - jid, extractedJID); - } - - /** - * Tests if {@link TraceBuilder} can correctly identify and parse different - * versions of jobhistory filenames. The testcase checks if - * {@link TraceBuilder} - * - correctly identifies a jobhistory filename without suffix - * - correctly parses a jobhistory filename without suffix to extract out - * the jobid - * - correctly identifies a jobhistory filename with suffix - * - correctly parses a jobhistory filename with suffix to extract out the - * jobid - * - correctly identifies a job-configuration filename stored along with the - * jobhistory files - */ - @Test - public void testJobHistoryFilenameParsing() throws IOException { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - org.apache.hadoop.mapred.JobID jid = - new org.apache.hadoop.mapred.JobID("12345", 1); - final Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")) - .makeQualified(lfs.getUri(), lfs.getWorkingDirectory()); - - // Check if current jobhistory filenames are detected properly - JobId jobId = TypeConverter.toYarn(jid); - JobIndexInfo info = new JobIndexInfo(0L, 0L, "", "", jobId, 0, 0, ""); - Path jhFilename = new Path(FileNameIndexUtils.getDoneFileName(info)); - validateHistoryFileNameParsing(jhFilename, jid); - - // Check if Pre21 V1 jophistory file names are detected properly - jhFilename = new Path("jt-identifier_" + jid + "_user-name_job-name"); - validateHistoryFileNameParsing(jhFilename, jid); - - // Check if Pre21 V2 jobhistory file names are detected properly - jhFilename = new Path(jid + "_user-name_job-name"); - validateHistoryFileNameParsing(jhFilename, jid); - - // Check if the current jobhistory conf filenames are detected properly - Path jhConfFilename = JobHistory.getConfFile(rootInputDir, jid); - validateJHConfFileNameParsing(jhConfFilename, jid); - - // Check if Pre21 V1 jobhistory conf file names are detected properly - jhConfFilename = new Path("jt-identifier_" + jid + "_conf.xml"); - validateJHConfFileNameParsing(jhConfFilename, jid); - - // Check if Pre21 V2 jobhistory conf file names are detected properly - jhConfFilename = new Path(jid + "_conf.xml"); - validateJHConfFileNameParsing(jhConfFilename, jid); - } - - /** - * Check if processing of input arguments is as expected by passing globbed - * input path - *
  • without -recursive option and - *
  • with -recursive option. - */ - @Test - public void testProcessInputArgument() throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - // define the test's root temporary directory - final Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")) - .makeQualified(lfs.getUri(), lfs.getWorkingDirectory()); - // define the test's root input directory - Path testRootInputDir = new Path(rootTempDir, "TestProcessInputArgument"); - // define the nested input directory - Path nestedInputDir = new Path(testRootInputDir, "1/2/3/4"); - // define the globbed version of the nested input directory - Path globbedInputNestedDir = - lfs.makeQualified(new Path(testRootInputDir, "*/*/*/*/*")); - try { - lfs.delete(nestedInputDir, true); - - List recursiveInputPaths = new ArrayList(); - List nonRecursiveInputPaths = new ArrayList(); - // Create input files under the given path with multiple levels of - // sub directories - createHistoryLogsHierarchy(nestedInputDir, lfs, recursiveInputPaths, - nonRecursiveInputPaths); - - // Check the case of globbed input path and without -recursive option - List inputs = MyOptions.processInputArgument( - globbedInputNestedDir.toString(), conf, false); - validateHistoryLogPaths(inputs, nonRecursiveInputPaths); - - // Check the case of globbed input path and with -recursive option - inputs = MyOptions.processInputArgument( - globbedInputNestedDir.toString(), conf, true); - validateHistoryLogPaths(inputs, recursiveInputPaths); - - } finally { - lfs.delete(testRootInputDir, true); - } - } - - /** - * Validate if the input history log paths are as expected. - * @param inputs the resultant input paths to be validated - * @param expectedHistoryFileNames the expected input history logs - * @throws IOException - */ - private void validateHistoryLogPaths(List inputs, - List expectedHistoryFileNames) throws IOException { - - System.out.println("\nExpected history files are:"); - for (String historyFile : expectedHistoryFileNames) { - System.out.println(historyFile); - } - System.out.println("\nResultant history files are:"); - List historyLogs = new ArrayList(); - for (Path p : inputs) { - historyLogs.add(p.toUri().getPath()); - System.out.println(p.toUri().getPath()); - } - - assertEquals("Number of history logs found is different from the expected.", - expectedHistoryFileNames.size(), inputs.size()); - - // Verify if all the history logs are expected ones and they are in the - // expected order - assertTrue("Some of the history log files do not match the expected.", - historyLogs.equals(expectedHistoryFileNames)); - } - - /** - * Create history logs under the given path with multiple levels of - * sub directories as shown below. - *
    - * Create a file, an empty subdirectory and a nonempty subdirectory - * <historyDir> under the given input path. - *
    - * The subdirectory <historyDir> contains the following dir structure: - *
    - *
    <historyDir>/historyFile1.txt - *
    <historyDir>/historyFile1.gz - *
    <historyDir>/subDir1/historyFile2.txt - *
    <historyDir>/subDir1/historyFile2.gz - *
    <historyDir>/subDir2/historyFile3.txt - *
    <historyDir>/subDir2/historyFile3.gz - *
    <historyDir>/subDir1/subDir11/historyFile4.txt - *
    <historyDir>/subDir1/subDir11/historyFile4.gz - *
    <historyDir>/subDir2/subDir21/ - *
    - * Create the lists of input paths that should be processed by TraceBuilder - * for recursive case and non-recursive case. - * @param nestedInputDir the input history logs directory where history files - * with nested subdirectories are created - * @param fs FileSystem of the input paths - * @param recursiveInputPaths input paths for recursive case - * @param nonRecursiveInputPaths input paths for non-recursive case - * @throws IOException - */ - private void createHistoryLogsHierarchy(Path nestedInputDir, FileSystem fs, - List recursiveInputPaths, List nonRecursiveInputPaths) - throws IOException { - List dirs = new ArrayList(); - // define a file in the nested test input directory - Path inputPath1 = new Path(nestedInputDir, "historyFile.txt"); - // define an empty sub-folder in the nested test input directory - Path emptyDir = new Path(nestedInputDir, "emptyDir"); - // define a nonempty sub-folder in the nested test input directory - Path historyDir = new Path(nestedInputDir, "historyDir"); - - fs.mkdirs(nestedInputDir); - // Create an empty input file - fs.createNewFile(inputPath1); - // Create empty subdir - fs.mkdirs(emptyDir);// let us not create any files under this dir - - fs.mkdirs(historyDir); - dirs.add(historyDir); - - Path subDir1 = new Path(historyDir, "subDir1"); - fs.mkdirs(subDir1); - dirs.add(subDir1); - Path subDir2 = new Path(historyDir, "subDir2"); - fs.mkdirs(subDir2); - dirs.add(subDir2); - - Path subDir11 = new Path(subDir1, "subDir11"); - fs.mkdirs(subDir11); - dirs.add(subDir11); - Path subDir21 = new Path(subDir2, "subDir21"); - fs.mkdirs(subDir21);// let us not create any files under this dir - - int i = 0; - for (Path dir : dirs) { - i++; - Path gzPath = new Path(dir, "historyFile" + i + ".gz"); - Path txtPath = new Path(dir, "historyFile" + i + ".txt"); - fs.createNewFile(txtPath); - fs.createNewFile(gzPath); - recursiveInputPaths.add(gzPath.toUri().getPath()); - recursiveInputPaths.add(txtPath.toUri().getPath()); - if (i == 1) { - nonRecursiveInputPaths.add(gzPath.toUri().getPath()); - nonRecursiveInputPaths.add(txtPath.toUri().getPath()); - } - } - recursiveInputPaths.add(inputPath1.toUri().getPath()); - nonRecursiveInputPaths.add(inputPath1.toUri().getPath()); - } - - /** - * Test if {@link CurrentJHParser} can read events from current JH files. - */ - @Test - public void testCurrentJHParser() throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - final Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - - final Path tempDir = new Path(rootTempDir, "TestCurrentJHParser"); - lfs.delete(tempDir, true); - - // Run a MR job - // create a MR cluster - conf.setInt(TTConfig.TT_MAP_SLOTS, 1); - conf.setInt(TTConfig.TT_REDUCE_SLOTS, 1); - MiniMRCluster mrCluster = new MiniMRCluster(1, "file:///", 1, null, null, - new JobConf(conf)); - - // run a job - Path inDir = new Path(tempDir, "input"); - Path outDir = new Path(tempDir, "output"); - JobHistoryParser parser = null; - RewindableInputStream ris = null; - ArrayList seenEvents = new ArrayList(15); - - try { - JobConf jConf = mrCluster.createJobConf(); - // construct a job with 1 map and 1 reduce task. - Job job = MapReduceTestUtil.createJob(jConf, inDir, outDir, 1, 1); - // disable setup/cleanup - job.setJobSetupCleanupNeeded(false); - // set the output format to take care of the _temporary folder - job.setOutputFormatClass(MyOutputFormat.class); - // wait for the job to complete - job.waitForCompletion(false); - - assertTrue("Job failed", job.isSuccessful()); - - JobID id = job.getJobID(); - JobClient jc = new JobClient(jConf); - String user = jc.getAllJobs()[0].getUsername(); - - // get the jobhistory filepath - Path jhPath = - new Path(mrCluster.getJobTrackerRunner().getJobTracker() - .getJobHistoryDir()); - Path inputPath = JobHistory.getJobHistoryFile(jhPath, id, user); - // wait for 10 secs for the jobhistory file to move into the done folder - for (int i = 0; i < 100; ++i) { - if (lfs.exists(inputPath)) { - break; - } - TimeUnit.MILLISECONDS.wait(100); - } - - assertTrue("Missing job history file", lfs.exists(inputPath)); - - ris = getRewindableInputStream(inputPath, conf); - - // Test if the JobHistoryParserFactory can detect the parser correctly - parser = JobHistoryParserFactory.getParser(ris); - - // create a job builder - JobBuilder builder = new JobBuilder(id.toString()); - - // get events into seenEvents and also process them using builder - getHistoryEvents(parser, seenEvents, builder); - - // Check against the gold standard - System.out.println("testCurrentJHParser validating using gold std "); - // The list of history events expected when parsing the above job's - // history log file - String[] goldLinesExpected = new String[] { - JSE, JPCE, JIE, JSCE, TSE, ASE, MFE, TFE, TSE, ASE, RFE, TFE, JFE - }; - - validateSeenHistoryEvents(seenEvents, goldLinesExpected); - - // validate resource usage metrics - // get the job counters - Counters counters = job.getTaskReports(TaskType.MAP)[0].getTaskCounters(); - - // get the parsed job - ParsedJob parsedJob = builder.build(); - // get the logged job - LoggedJob loggedJob = parsedJob; - // get the logged attempts - LoggedTaskAttempt attempt = - loggedJob.getMapTasks().get(0).getAttempts().get(0); - // get the resource usage metrics - ResourceUsageMetrics metrics = attempt.getResourceUsageMetrics(); - - // check with the actual values - testResourceUsageMetricViaDeepCompare(metrics, - counters.findCounter(TaskCounter.CPU_MILLISECONDS).getValue(), - counters.findCounter(TaskCounter.VIRTUAL_MEMORY_BYTES).getValue(), - counters.findCounter(TaskCounter.PHYSICAL_MEMORY_BYTES).getValue(), - counters.findCounter(TaskCounter.COMMITTED_HEAP_BYTES).getValue(), - true); - - // validate the obtainXXX api of ParsedJob, ParsedTask and - // ParsedTaskAttempt - validateParsedJob(parsedJob, 1, 1, false); - } finally { - // stop the MR cluster - mrCluster.shutdown(); - - if (ris != null) { - ris.close(); - } - if (parser != null) { - parser.close(); - } - - // cleanup the filesystem - lfs.delete(tempDir, true); - } - } - - /** - * Verify if the obtainXXX methods of {@link ParsedJob}, {@link ParsedTask} - * and {@link ParsedTaskAttempt} give valid info - */ - private void validateParsedJob(ParsedJob parsedJob, int numMaps, - int numReduces, boolean pre21JobHistory) { - validateParsedJobAPI(parsedJob, numMaps, numReduces, pre21JobHistory); - - List maps = parsedJob.obtainMapTasks(); - for (ParsedTask task : maps) { - validateParsedTask(task); - } - List reduces = parsedJob.obtainReduceTasks(); - for (ParsedTask task : reduces) { - validateParsedTask(task); - } - List others = parsedJob.obtainOtherTasks(); - for (ParsedTask task : others) { - validateParsedTask(task); - } - } - - /** Verify if the obtainXXX methods of {@link ParsedJob} give valid info */ - private void validateParsedJobAPI(ParsedJob parsedJob, int numMaps, - int numReduces, boolean pre21JobHistory) { - LOG.info("Validating ParsedJob.obtainXXX api... for " - + parsedJob.getJobID()); - assertNotNull("Job acls in ParsedJob is null", - parsedJob.obtainJobAcls()); - assertNotNull("Job conf path in ParsedJob is null", - parsedJob.obtainJobConfpath()); - - assertNotNull("Map Counters in ParsedJob is null", - parsedJob.obtainMapCounters()); - assertNotNull("Reduce Counters in ParsedJob is null", - parsedJob.obtainReduceCounters()); - assertNotNull("Total Counters in ParsedJob is null", - parsedJob.obtainTotalCounters()); - - assertNotNull("Map Tasks List in ParsedJob is null", - parsedJob.obtainMapTasks()); - assertNotNull("Reduce Tasks List in ParsedJob is null", - parsedJob.obtainReduceTasks()); - assertNotNull("Other Tasks List in ParsedJob is null", - parsedJob.obtainOtherTasks()); - - // 1 map and 1 reduce task should be there - assertEquals("Number of map tasks in ParsedJob is wrong", - numMaps, parsedJob.obtainMapTasks().size()); - assertEquals("Number of reduce tasks in ParsedJob is wrong", - numReduces, parsedJob.obtainReduceTasks().size(), 1); - - // old hadoop20 version history files don't have job-level-map-counters and - // job-level-reduce-counters. Only total counters exist there. - assertTrue("Total Counters in ParsedJob is empty", - parsedJob.obtainTotalCounters().size() > 0); - if (!pre21JobHistory) { - assertTrue("Map Counters in ParsedJob is empty", - parsedJob.obtainMapCounters().size() > 0); - assertTrue("Reduce Counters in ParsedJob is empty", - parsedJob.obtainReduceCounters().size() > 0); - } - } - - /** - * Verify if the obtainXXX methods of {@link ParsedTask} and - * {@link ParsedTaskAttempt} give valid info - */ - private void validateParsedTask(ParsedTask parsedTask) { - validateParsedTaskAPI(parsedTask); - - List attempts = parsedTask.obtainTaskAttempts(); - for (ParsedTaskAttempt attempt : attempts) { - validateParsedTaskAttemptAPI(attempt); - } - } - - /** Verify if the obtainXXX methods of {@link ParsedTask} give valid info */ - private void validateParsedTaskAPI(ParsedTask parsedTask) { - LOG.info("Validating ParsedTask.obtainXXX api... for " - + parsedTask.getTaskID()); - assertNotNull("Task counters in ParsedTask is null", - parsedTask.obtainCounters()); - - if (parsedTask.getTaskStatus() - == Pre21JobHistoryConstants.Values.SUCCESS) { - // task counters should not be empty - assertTrue("Task counters in ParsedTask is empty", - parsedTask.obtainCounters().size() > 0); - assertNull("Diagnostic-info is non-null for a succeeded task", - parsedTask.obtainDiagnosticInfo()); - assertNull("Failed-due-to-attemptId is non-null for a succeeded task", - parsedTask.obtainFailedDueToAttemptId()); - } else { - assertNotNull("Diagnostic-info is non-null for a succeeded task", - parsedTask.obtainDiagnosticInfo()); - assertNotNull("Failed-due-to-attemptId is non-null for a succeeded task", - parsedTask.obtainFailedDueToAttemptId()); - } - - List attempts = parsedTask.obtainTaskAttempts(); - assertNotNull("TaskAttempts list in ParsedTask is null", attempts); - assertTrue("TaskAttempts list in ParsedTask is empty", - attempts.size() > 0); - } - - /** - * Verify if the obtainXXX methods of {@link ParsedTaskAttempt} give - * valid info - */ - private void validateParsedTaskAttemptAPI( - ParsedTaskAttempt parsedTaskAttempt) { - LOG.info("Validating ParsedTaskAttempt.obtainXXX api... for " - + parsedTaskAttempt.getAttemptID()); - assertNotNull("Counters in ParsedTaskAttempt is null", - parsedTaskAttempt.obtainCounters()); - - if (parsedTaskAttempt.getResult() - == Pre21JobHistoryConstants.Values.SUCCESS) { - assertTrue("Counters in ParsedTaskAttempt is empty", - parsedTaskAttempt.obtainCounters().size() > 0); - assertNull("Diagnostic-info is non-null for a succeeded taskAttempt", - parsedTaskAttempt.obtainDiagnosticInfo()); - } else { - assertNotNull("Diagnostic-info is non-null for a succeeded taskAttempt", - parsedTaskAttempt.obtainDiagnosticInfo()); - } - assertNotNull("TrackerName in ParsedTaskAttempt is null", - parsedTaskAttempt.obtainTrackerName()); - - assertNotNull("http-port info in ParsedTaskAttempt is null", - parsedTaskAttempt.obtainHttpPort()); - assertNotNull("Shuffle-port info in ParsedTaskAttempt is null", - parsedTaskAttempt.obtainShufflePort()); - } - - @Test - public void testJobConfigurationParser() throws Exception { - - // Validate parser with old mapred config properties from - // sample-conf-file.xml - String[] oldProps1 = { "mapred.job.queue.name", "mapred.job.name", - "mapred.child.java.opts" }; - - validateJobConfParser("sample-conf.file.xml", false); - validateJobConfParser("sample-conf.file.new.xml", true); - } - - private void validateJobConfParser(String confFile, boolean newConfig) - throws Exception { - - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - @SuppressWarnings("deprecation") - final Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")) - .makeQualified(lfs); - - final Path rootInputPath = new Path(rootInputDir, "rumen/small-trace-test"); - - final Path inputPath = new Path(rootInputPath, confFile); - - InputStream inputConfStream = - new PossiblyDecompressedInputStream(inputPath, conf); - - try { - Properties props = JobConfigurationParser.parse(inputConfStream); - inputConfStream.close(); - - String oldOrNew = newConfig ? "New" : "Old"; - assertEquals(oldOrNew + " config property for job queue name is not " - + " extracted properly.", "TheQueue", - JobBuilder.extract(props, JobConfPropertyNames.QUEUE_NAMES - .getCandidates(), null)); - assertEquals(oldOrNew + " config property for job name is not " - + " extracted properly.", "MyMRJob", - JobBuilder.extract(props, JobConfPropertyNames.JOB_NAMES - .getCandidates(), null)); - - validateChildJavaOpts(newConfig, props); - - } finally { - inputConfStream.close(); - } - } - - // Validate child java opts in properties. - // newConfigProperties: boolean that specifies if the config properties to be - // validated are new OR old. - private void validateChildJavaOpts(boolean newConfigProperties, - Properties props) { - if (newConfigProperties) { - assertEquals("New config property " + MRJobConfig.MAP_JAVA_OPTS - + " is not extracted properly.", - "-server -Xmx640m -Djava.net.preferIPv4Stack=true", - JobBuilder.extract(props, JobConfPropertyNames.MAP_JAVA_OPTS_S - .getCandidates(), null)); - assertEquals("New config property " + MRJobConfig.REDUCE_JAVA_OPTS - + " is not extracted properly.", - "-server -Xmx650m -Djava.net.preferIPv4Stack=true", - JobBuilder.extract(props, JobConfPropertyNames.REDUCE_JAVA_OPTS_S - .getCandidates(), null)); - } - else { - // if old property mapred.child.java.opts is set, then extraction of all - // the following 3 properties should give that value. - assertEquals("mapred.child.java.opts is not extracted properly.", - "-server -Xmx640m -Djava.net.preferIPv4Stack=true", - JobBuilder.extract(props, JobConfPropertyNames.TASK_JAVA_OPTS_S - .getCandidates(), null)); - assertEquals("New config property " + MRJobConfig.MAP_JAVA_OPTS - + " is not extracted properly when the old config property " - + "mapred.child.java.opts is set.", - "-server -Xmx640m -Djava.net.preferIPv4Stack=true", - JobBuilder.extract(props, JobConfPropertyNames.MAP_JAVA_OPTS_S - .getCandidates(), null)); - assertEquals("New config property " + MRJobConfig.REDUCE_JAVA_OPTS - + " is not extracted properly when the old config property " - + "mapred.child.java.opts is set.", - "-server -Xmx640m -Djava.net.preferIPv4Stack=true", - JobBuilder.extract(props, JobConfPropertyNames.REDUCE_JAVA_OPTS_S - .getCandidates(), null)); - } - } - - /** - * Test if the {@link JobConfigurationParser} can correctly extract out - * key-value pairs from the job configuration. - */ - @Test - public void testJobConfigurationParsing() throws Exception { - final FileSystem lfs = FileSystem.getLocal(new Configuration()); - - final Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")).makeQualified( - lfs.getUri(), lfs.getWorkingDirectory()); - - final Path tempDir = new Path(rootTempDir, "TestJobConfigurationParser"); - lfs.delete(tempDir, true); - - // Add some configuration parameters to the conf - JobConf jConf = new JobConf(false); - String key = "test.data"; - String value = "hello world"; - jConf.set(key, value); - - // create the job conf file - Path jobConfPath = new Path(tempDir.toString(), "job.xml"); - lfs.delete(jobConfPath, false); - DataOutputStream jobConfStream = lfs.create(jobConfPath); - jConf.writeXml(jobConfStream); - jobConfStream.close(); - - // now read the job conf file using the job configuration parser - Properties properties = - JobConfigurationParser.parse(lfs.open(jobConfPath)); - - // check if the required parameter is loaded - assertEquals("Total number of extracted properties (" + properties.size() - + ") doesn't match the expected size of 1 [" - + "JobConfigurationParser]", - 1, properties.size()); - // check if the key is present in the extracted configuration - assertTrue("Key " + key + " is missing in the configuration extracted " - + "[JobConfigurationParser]", - properties.keySet().contains(key)); - // check if the desired property has the correct value - assertEquals("JobConfigurationParser couldn't recover the parameters" - + " correctly", - value, properties.get(key)); - - // Test ZombieJob - LoggedJob job = new LoggedJob(); - job.setJobProperties(properties); - - ZombieJob zjob = new ZombieJob(job, null); - Configuration zconf = zjob.getJobConf(); - // check if the required parameter is loaded - assertEquals("ZombieJob couldn't recover the parameters correctly", - value, zconf.get(key)); - } - - - /** - * Test {@link ResourceUsageMetrics}. - */ - @Test - public void testResourceUsageMetrics() throws Exception { - final long cpuUsage = 100; - final long pMemUsage = 200; - final long vMemUsage = 300; - final long heapUsage = 400; - - // test ResourceUsageMetrics's setters - ResourceUsageMetrics metrics = new ResourceUsageMetrics(); - metrics.setCumulativeCpuUsage(cpuUsage); - metrics.setPhysicalMemoryUsage(pMemUsage); - metrics.setVirtualMemoryUsage(vMemUsage); - metrics.setHeapUsage(heapUsage); - // test cpu usage value - assertEquals("Cpu usage values mismatch via set", cpuUsage, - metrics.getCumulativeCpuUsage()); - // test pMem usage value - assertEquals("Physical memory usage values mismatch via set", pMemUsage, - metrics.getPhysicalMemoryUsage()); - // test vMem usage value - assertEquals("Virtual memory usage values mismatch via set", vMemUsage, - metrics.getVirtualMemoryUsage()); - // test heap usage value - assertEquals("Heap usage values mismatch via set", heapUsage, - metrics.getHeapUsage()); - - // test deepCompare() (pass case) - testResourceUsageMetricViaDeepCompare(metrics, cpuUsage, vMemUsage, - pMemUsage, heapUsage, true); - - // test deepCompare (fail case) - // test cpu usage mismatch - testResourceUsageMetricViaDeepCompare(metrics, 0, vMemUsage, pMemUsage, - heapUsage, false); - // test pMem usage mismatch - testResourceUsageMetricViaDeepCompare(metrics, cpuUsage, vMemUsage, 0, - heapUsage, false); - // test vMem usage mismatch - testResourceUsageMetricViaDeepCompare(metrics, cpuUsage, 0, pMemUsage, - heapUsage, false); - // test heap usage mismatch - testResourceUsageMetricViaDeepCompare(metrics, cpuUsage, vMemUsage, - pMemUsage, 0, false); - - // define a metric with a fixed value of size() - ResourceUsageMetrics metrics2 = new ResourceUsageMetrics() { - @Override - public int size() { - return -1; - } - }; - metrics2.setCumulativeCpuUsage(cpuUsage); - metrics2.setPhysicalMemoryUsage(pMemUsage); - metrics2.setVirtualMemoryUsage(vMemUsage); - metrics2.setHeapUsage(heapUsage); - - // test with size mismatch - testResourceUsageMetricViaDeepCompare(metrics2, cpuUsage, vMemUsage, - pMemUsage, heapUsage, false); - } - - // test ResourceUsageMetric's deepCompare() method - private static void testResourceUsageMetricViaDeepCompare( - ResourceUsageMetrics metrics, long cpuUsage, - long vMemUsage, long pMemUsage, long heapUsage, - boolean shouldPass) { - ResourceUsageMetrics testMetrics = new ResourceUsageMetrics(); - testMetrics.setCumulativeCpuUsage(cpuUsage); - testMetrics.setPhysicalMemoryUsage(pMemUsage); - testMetrics.setVirtualMemoryUsage(vMemUsage); - testMetrics.setHeapUsage(heapUsage); - - Boolean passed = null; - try { - metrics.deepCompare(testMetrics, new TreePath(null, "")); - passed = true; - } catch (DeepInequalityException die) { - passed = false; - } - - assertEquals("ResourceUsageMetrics deepCompare() failed!", - shouldPass, passed); - } - - /** - * Testing {@link ResourceUsageMetrics} using {@link HadoopLogsAnalyzer}. - */ - @Test - @SuppressWarnings("deprecation") - public void testResourceUsageMetricsWithHadoopLogsAnalyzer() - throws IOException { - Configuration conf = new Configuration(); - // get the input trace file - Path rootInputDir = - new Path(System.getProperty("test.tools.input.dir", "")); - Path rootInputSubFolder = new Path(rootInputDir, "rumen/small-trace-test"); - Path traceFile = new Path(rootInputSubFolder, "v20-resource-usage-log.gz"); - - FileSystem lfs = FileSystem.getLocal(conf); - - // define the root test directory - Path rootTempDir = - new Path(System.getProperty("test.build.data", "/tmp")); - - // define output directory - Path outputDir = - new Path(rootTempDir, "testResourceUsageMetricsWithHadoopLogsAnalyzer"); - lfs.delete(outputDir, true); - lfs.deleteOnExit(outputDir); - - // run HadoopLogsAnalyzer - HadoopLogsAnalyzer analyzer = new HadoopLogsAnalyzer(); - analyzer.setConf(conf); - Path traceOutput = new Path(outputDir, "trace.json"); - analyzer.run(new String[] {"-write-job-trace", traceOutput.toString(), - "-v1", traceFile.toString()}); - - // test HadoopLogsAnalyzer's output w.r.t ResourceUsageMetrics - // get the logged job - JsonObjectMapperParser traceParser = - new JsonObjectMapperParser(traceOutput, LoggedJob.class, - conf); - - // get the logged job from the output trace file - LoggedJob job = traceParser.getNext(); - LoggedTaskAttempt attempt = job.getMapTasks().get(0).getAttempts().get(0); - ResourceUsageMetrics metrics = attempt.getResourceUsageMetrics(); - - // test via deepCompare() - testResourceUsageMetricViaDeepCompare(metrics, 200, 100, 75, 50, true); - } - - @Test - public void testTopologyBuilder() throws Exception { - final TopologyBuilder subject = new TopologyBuilder(); - - // This 4 comes from - // TaskInProgress.ProgressibleSplitsBlock.burst().size , which - // is invisible here. - - int[][] splits = new int[4][]; - - splits[0] = new int[12]; - splits[1] = new int[12]; - splits[2] = new int[12]; - splits[3] = new int[12]; - - for (int j = 0; j < 4; ++j) { - for (int i = 0; i < 12; ++i) { - splits[j][i] = -1; - } - } - - for (int i = 0; i < 6; ++i) { - splits[0][i] = 500000 * i; - splits[1][i] = 300000 * i; - splits[2][i] = 500000; - splits[3][i] = 700000; - } - - // currently we extract no host names from the Properties - subject.process(new Properties()); - - subject.process(new TaskAttemptFinishedEvent(TaskAttemptID - .forName("attempt_200904211745_0003_m_000004_0"), TaskType - .valueOf("MAP"), "STATUS", 1234567890L, - "/194\\.6\\.134\\.64", "cluster50261\\.secondleveldomain\\.com", - "SUCCESS", null)); - subject.process(new TaskAttemptUnsuccessfulCompletionEvent - (TaskAttemptID.forName("attempt_200904211745_0003_m_000004_1"), - TaskType.valueOf("MAP"), "STATUS", 1234567890L, - "cluster50262\\.secondleveldomain\\.com", - -1, "/194\\.6\\.134\\.80", "MACHINE_EXPLODED", splits)); - subject.process(new TaskAttemptUnsuccessfulCompletionEvent - (TaskAttemptID.forName("attempt_200904211745_0003_m_000004_2"), - TaskType.valueOf("MAP"), "STATUS", 1234567890L, - "cluster50263\\.secondleveldomain\\.com", - -1, "/194\\.6\\.134\\.80", "MACHINE_EXPLODED", splits)); - subject.process(new TaskStartedEvent(TaskID - .forName("task_200904211745_0003_m_000004"), 1234567890L, TaskType - .valueOf("MAP"), - "/194\\.6\\.134\\.80/cluster50263\\.secondleveldomain\\.com")); - - final LoggedNetworkTopology topology = subject.build(); - - List racks = topology.getChildren(); - - assertEquals("Wrong number of racks", 2, racks.size()); - - boolean sawSingleton = false; - boolean sawDoubleton = false; - - for (LoggedNetworkTopology rack : racks) { - List nodes = rack.getChildren(); - if (rack.getName().getValue().endsWith(".64")) { - assertEquals("The singleton rack has the wrong number of elements", 1, - nodes.size()); - sawSingleton = true; - } else if (rack.getName().getValue().endsWith(".80")) { - assertEquals("The doubleton rack has the wrong number of elements", 2, - nodes.size()); - sawDoubleton = true; - } else { - assertTrue("Unrecognized rack name", false); - } - } - - assertTrue("Did not see singleton rack", sawSingleton); - assertTrue("Did not see doubleton rack", sawDoubleton); - } - - static private void jsonFileMatchesGold( - Configuration conf, Path result, Path gold, Class clazz, - String fileDescription) throws IOException { - JsonObjectMapperParser goldParser = - new JsonObjectMapperParser(gold, clazz, conf); - JsonObjectMapperParser resultParser = - new JsonObjectMapperParser(result, clazz, conf); - try { - while (true) { - DeepCompare goldJob = goldParser.getNext(); - DeepCompare resultJob = resultParser.getNext(); - if ((goldJob == null) || (resultJob == null)) { - assertTrue(goldJob == resultJob); - break; - } - - try { - resultJob.deepCompare(goldJob, new TreePath(null, "")); - } catch (DeepInequalityException e) { - String error = e.path.toString(); - - assertFalse(fileDescription + " mismatches: " + error, true); - } - } - } finally { - IOUtils.cleanup(null, goldParser, resultParser); - } - } - - /** - * Creates {@link RewindableInputStream} for the given file path. - * @param inputPath the input file path - * @param conf configuration - * @return {@link RewindableInputStream} - * @throws IOException - */ - private RewindableInputStream getRewindableInputStream(Path inputPath, - Configuration conf) throws IOException { - - PossiblyDecompressedInputStream in = - new PossiblyDecompressedInputStream(inputPath, conf); - - return new RewindableInputStream(in, BUFSIZE); - } - - /** - * Allows given history parser to parse the history events and places in - * the given list - * @param parser the job history parser - * @param events the job history events seen while parsing - * @throws IOException - */ - private void getHistoryEvents(JobHistoryParser parser, - ArrayList events, JobBuilder builder) throws IOException { - HistoryEvent e; - while ((e = parser.nextEvent()) != null) { - String eventString = e.getClass().getSimpleName(); - System.out.println(eventString); - events.add(eventString); - if (builder != null) { - builder.process(e); - } - } - } - - /** - * Validate if history events seen are as expected - * @param seenEvents the list of history events seen - * @param goldLinesExpected the expected history events - */ - private void validateSeenHistoryEvents(ArrayList seenEvents, - String[] goldLinesExpected) { - - // Check the output with gold std - assertEquals("Number of events expected is different from the events seen" - + " by the history parser.", - goldLinesExpected.length, seenEvents.size()); - - int index = 0; - for (String goldLine : goldLinesExpected) { - assertEquals("History Event mismatch at line " + (index + 1), - goldLine, seenEvents.get(index)); - index++; - } - } - - final static int BUFSIZE = 8192; // 8K - - // Any Map Reduce Job History Event should be 1 of the following 16 - final static String JSE = "JobSubmittedEvent"; - final static String JPCE = "JobPriorityChangeEvent"; - final static String JSCE = "JobStatusChangedEvent"; - final static String JIE = "JobInitedEvent"; - final static String JICE = "JobInfoChangeEvent"; - static String TSE = "TaskStartedEvent"; - static String ASE = "TaskAttemptStartedEvent"; - static String AFE = "TaskAttemptFinishedEvent"; - static String MFE = "MapAttemptFinishedEvent"; - static String TUE = "TaskUpdatedEvent"; - static String TFE = "TaskFinishedEvent"; - static String JUCE = "JobUnsuccessfulCompletionEvent"; - static String RFE = "ReduceAttemptFinishedEvent"; - static String AUCE = "TaskAttemptUnsuccessfulCompletionEvent"; - static String TFLE = "TaskFailedEvent"; - static String JFE = "JobFinishedEvent"; - - // The expected job history events(in order) when parsing - // the job history file v20-single-input-log.gz - final static String[] goldLines = new String[] { - JSE, JPCE, JSCE, JIE, JICE, TSE, ASE, AFE, MFE, TUE, TFE, JSCE, TSE, - TSE, TSE, TSE, TSE, TSE, TSE, TSE, TSE, TSE, TSE, TSE, TSE, TSE, TSE, - TSE, TSE, TSE, TSE, TSE, ASE, AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, - TFE, ASE, AFE, MFE, TUE, TFE, TSE, ASE, AFE, MFE, TUE, TFE, ASE, AFE, - MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, ASE, - AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, - ASE, AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, ASE, AUCE, ASE, AFE, - MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, ASE, - AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, - ASE, AFE, MFE, TUE, TFE, ASE, AFE, MFE, TUE, TFE, ASE, AFE, RFE, TUE, - TFE, TSE, ASE, AFE, MFE, TUE, TFE, JSCE, JFE - }; - -} diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestZombieJob.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestZombieJob.java deleted file mode 100644 index 306d1ba4860..00000000000 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/tools/rumen/TestZombieJob.java +++ /dev/null @@ -1,338 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.hadoop.tools.rumen; - -import java.util.List; -import java.util.ArrayList; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.mapred.TaskStatus.State; -import org.apache.hadoop.mapreduce.TaskType; - -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; - -public class TestZombieJob { - final double epsilon = 0.01; - private final int[] attemptTimesPercentiles = new int[] { 10, 50, 90 }; - private long[] succeededCDF = new long[] { 5268, 5268, 5268, 5268, 5268 }; - private long[] failedCDF = new long[] { 18592, 18592, 18592, 18592, 18592 }; - private double[] expectedPs = new double[] { 0.000001, 0.18707660239708182, - 0.0013027618551328818, 2.605523710265763E-4 }; - - private final long[] mapTaskCounts = new long[] { 7838525L, 342277L, 100228L, - 1564L, 1234L }; - private final long[] reduceTaskCounts = new long[] { 4405338L, 139391L, - 1514383L, 139391, 1234L }; - - List loggedJobs = new ArrayList(); - List jobStories = new ArrayList(); - - @Before - public void setUp() throws Exception { - final Configuration conf = new Configuration(); - final FileSystem lfs = FileSystem.getLocal(conf); - - final Path rootInputDir = new Path( - System.getProperty("test.tools.input.dir", "")).makeQualified(lfs); - final Path rootInputFile = new Path(rootInputDir, "rumen/zombie"); - - ZombieJobProducer parser = new ZombieJobProducer(new Path(rootInputFile, - "input-trace.json"), new ZombieCluster(new Path(rootInputFile, - "input-topology.json"), null, conf), conf); - - JobStory job = null; - for (int i = 0; i < 4; i++) { - job = parser.getNextJob(); - ZombieJob zJob = (ZombieJob) job; - LoggedJob loggedJob = zJob.getLoggedJob(); - System.out.println(i + ":" + job.getNumberMaps() + "m, " - + job.getNumberReduces() + "r"); - System.out - .println(loggedJob.getOutcome() + ", " + loggedJob.getJobtype()); - - System.out.println("Input Splits -- " + job.getInputSplits().length - + ", " + job.getNumberMaps()); - - System.out.println("Successful Map CDF -------"); - for (LoggedDiscreteCDF cdf : loggedJob.getSuccessfulMapAttemptCDFs()) { - System.out.println(cdf.getNumberValues() + ": " + cdf.getMinimum() - + "--" + cdf.getMaximum()); - for (LoggedSingleRelativeRanking ranking : cdf.getRankings()) { - System.out.println(" " + ranking.getRelativeRanking() + ":" - + ranking.getDatum()); - } - } - System.out.println("Failed Map CDF -----------"); - for (LoggedDiscreteCDF cdf : loggedJob.getFailedMapAttemptCDFs()) { - System.out.println(cdf.getNumberValues() + ": " + cdf.getMinimum() - + "--" + cdf.getMaximum()); - for (LoggedSingleRelativeRanking ranking : cdf.getRankings()) { - System.out.println(" " + ranking.getRelativeRanking() + ":" - + ranking.getDatum()); - } - } - System.out.println("Successful Reduce CDF ----"); - LoggedDiscreteCDF cdf = loggedJob.getSuccessfulReduceAttemptCDF(); - System.out.println(cdf.getNumberValues() + ": " + cdf.getMinimum() + "--" - + cdf.getMaximum()); - for (LoggedSingleRelativeRanking ranking : cdf.getRankings()) { - System.out.println(" " + ranking.getRelativeRanking() + ":" - + ranking.getDatum()); - } - System.out.println("Failed Reduce CDF --------"); - cdf = loggedJob.getFailedReduceAttemptCDF(); - System.out.println(cdf.getNumberValues() + ": " + cdf.getMinimum() + "--" - + cdf.getMaximum()); - for (LoggedSingleRelativeRanking ranking : cdf.getRankings()) { - System.out.println(" " + ranking.getRelativeRanking() + ":" - + ranking.getDatum()); - } - System.out.print("map attempts to success -- "); - for (double p : loggedJob.getMapperTriesToSucceed()) { - System.out.print(p + ", "); - } - System.out.println(); - System.out.println("==============="); - - loggedJobs.add(loggedJob); - jobStories.add(job); - } - } - - @Test - public void testFirstJob() { - // 20th job seems reasonable: "totalMaps":329,"totalReduces":101 - // successful map: 80 node-local, 196 rack-local, 53 rack-remote, 2 unknown - // failed map: 0-0-0-1 - // successful reduce: 99 failed reduce: 13 - // map attempts to success -- 0.9969879518072289, 0.0030120481927710845, - JobStory job = jobStories.get(0); - assertEquals(1, job.getNumberMaps()); - assertEquals(1, job.getNumberReduces()); - - // get splits - - TaskAttemptInfo taInfo = null; - long expectedRuntime = 2423; - // get a succeeded map task attempt, expect the exact same task attempt - taInfo = job.getMapTaskAttemptInfoAdjusted(14, 0, 1); - assertEquals(expectedRuntime, taInfo.getRuntime()); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - - // get a succeeded map attempt, but reschedule with different locality. - taInfo = job.getMapTaskAttemptInfoAdjusted(14, 0, 2); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - taInfo = job.getMapTaskAttemptInfoAdjusted(14, 0, 0); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - - expectedRuntime = 97502; - // get a succeeded reduce task attempt, expect the exact same task attempt - taInfo = job.getTaskAttemptInfo(TaskType.REDUCE, 14, 0); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - - // get a failed reduce task attempt, expect the exact same task attempt - taInfo = job.getTaskAttemptInfo(TaskType.REDUCE, 14, 0); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - - // get a non-exist reduce task attempt, expect a made-up task attempt - // TODO fill in test case - } - - @Test - public void testSecondJob() { - // 7th job has many failed tasks. - // 3204 m, 0 r - // successful maps 497-586-23-1, failed maps 0-0-0-2714 - // map attempts to success -- 0.8113600833767587, 0.18707660239708182, - // 0.0013027618551328818, 2.605523710265763E-4, - JobStory job = jobStories.get(1); - assertEquals(20, job.getNumberMaps()); - assertEquals(1, job.getNumberReduces()); - - TaskAttemptInfo taInfo = null; - // get a succeeded map task attempt - taInfo = job.getMapTaskAttemptInfoAdjusted(17, 1, 1); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - - // get a succeeded map task attempt, with different locality - taInfo = job.getMapTaskAttemptInfoAdjusted(17, 1, 2); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - taInfo = job.getMapTaskAttemptInfoAdjusted(17, 1, 0); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - - // get a failed map task attempt - taInfo = job.getMapTaskAttemptInfoAdjusted(14, 0, 1); - assertEquals(1927, taInfo.getRuntime()); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - - // get a failed map task attempt, with different locality - // TODO: this test does not make sense here, because I don't have - // available data set. - } - - @Test - public void testFourthJob() { - // 7th job has many failed tasks. - // 3204 m, 0 r - // successful maps 497-586-23-1, failed maps 0-0-0-2714 - // map attempts to success -- 0.8113600833767587, 0.18707660239708182, - // 0.0013027618551328818, 2.605523710265763E-4, - JobStory job = jobStories.get(3); - assertEquals(131, job.getNumberMaps()); - assertEquals(47, job.getNumberReduces()); - - TaskAttemptInfo taInfo = null; - // get a succeeded map task attempt - long runtime = 5268; - taInfo = job.getMapTaskAttemptInfoAdjusted(113, 1, 1); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - assertEquals(runtime, taInfo.getRuntime()); - - // get a succeeded map task attempt, with different locality - taInfo = job.getMapTaskAttemptInfoAdjusted(113, 1, 2); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - assertEquals(runtime, taInfo.getRuntime() / 2); - taInfo = job.getMapTaskAttemptInfoAdjusted(113, 1, 0); - assertEquals(State.SUCCEEDED, taInfo.getRunState()); - assertEquals((long) (runtime / 1.5), taInfo.getRuntime()); - - // get a failed map task attempt - taInfo = job.getMapTaskAttemptInfoAdjusted(113, 0, 1); - assertEquals(18592, taInfo.getRuntime()); - assertEquals(State.FAILED, taInfo.getRunState()); - } - - @Test - public void testRecordIOInfo() { - JobStory job = jobStories.get(3); - - TaskInfo mapTask = job.getTaskInfo(TaskType.MAP, 113); - - TaskInfo reduceTask = job.getTaskInfo(TaskType.REDUCE, 0); - - assertEquals(mapTaskCounts[0], mapTask.getInputBytes()); - assertEquals(mapTaskCounts[1], mapTask.getInputRecords()); - assertEquals(mapTaskCounts[2], mapTask.getOutputBytes()); - assertEquals(mapTaskCounts[3], mapTask.getOutputRecords()); - assertEquals(mapTaskCounts[4], mapTask.getTaskMemory()); - - assertEquals(reduceTaskCounts[0], reduceTask.getInputBytes()); - assertEquals(reduceTaskCounts[1], reduceTask.getInputRecords()); - assertEquals(reduceTaskCounts[2], reduceTask.getOutputBytes()); - assertEquals(reduceTaskCounts[3], reduceTask.getOutputRecords()); - assertEquals(reduceTaskCounts[4], reduceTask.getTaskMemory()); - } - - @Test - public void testMakeUpInfo() { - // get many non-exist tasks - // total 3204 map tasks, 3300 is a non-exist task. - checkMakeUpTask(jobStories.get(3), 113, 1); - } - - private void checkMakeUpTask(JobStory job, int taskNumber, int locality) { - TaskAttemptInfo taInfo = null; - - Histogram sampleSucceeded = new Histogram(); - Histogram sampleFailed = new Histogram(); - List sampleAttempts = new ArrayList(); - for (int i = 0; i < 100000; i++) { - int attemptId = 0; - while (true) { - taInfo = job.getMapTaskAttemptInfoAdjusted(taskNumber, attemptId, 1); - if (taInfo.getRunState() == State.SUCCEEDED) { - sampleSucceeded.enter(taInfo.getRuntime()); - break; - } - sampleFailed.enter(taInfo.getRuntime()); - attemptId++; - } - sampleAttempts.add(attemptId); - } - - // check state distribution - int[] countTries = new int[] { 0, 0, 0, 0 }; - for (int attempts : sampleAttempts) { - assertTrue(attempts < 4); - countTries[attempts]++; - } - /* - * System.out.print("Generated map attempts to success -- "); for (int - * count: countTries) { System.out.print((double)count/sampleAttempts.size() - * + ", "); } System.out.println(); System.out.println("==============="); - */ - for (int i = 0; i < 4; i++) { - int count = countTries[i]; - double p = (double) count / sampleAttempts.size(); - assertTrue(expectedPs[i] - p < epsilon); - } - - // check succeeded attempts runtime distribution - long[] expectedCDF = succeededCDF; - LoggedDiscreteCDF cdf = new LoggedDiscreteCDF(); - cdf.setCDF(sampleSucceeded, attemptTimesPercentiles, 100); - /* - * System.out.println("generated succeeded map runtime distribution"); - * System.out.println(cdf.getNumberValues() + ": " + cdf.getMinimum() + "--" - * + cdf.getMaximum()); for (LoggedSingleRelativeRanking ranking: - * cdf.getRankings()) { System.out.println(" " + - * ranking.getRelativeRanking() + ":" + ranking.getDatum()); } - */ - assertRuntimeEqual(cdf.getMinimum(), expectedCDF[0]); - assertRuntimeEqual(cdf.getMaximum(), expectedCDF[4]); - for (int i = 0; i < 3; i++) { - LoggedSingleRelativeRanking ranking = cdf.getRankings().get(i); - assertRuntimeEqual(expectedCDF[i + 1], ranking.getDatum()); - } - - // check failed attempts runtime distribution - expectedCDF = failedCDF; - cdf = new LoggedDiscreteCDF(); - cdf.setCDF(sampleFailed, attemptTimesPercentiles, 100); - - System.out.println("generated failed map runtime distribution"); - System.out.println(cdf.getNumberValues() + ": " + cdf.getMinimum() + "--" - + cdf.getMaximum()); - for (LoggedSingleRelativeRanking ranking : cdf.getRankings()) { - System.out.println(" " + ranking.getRelativeRanking() + ":" - + ranking.getDatum()); - } - assertRuntimeEqual(cdf.getMinimum(), expectedCDF[0]); - assertRuntimeEqual(cdf.getMaximum(), expectedCDF[4]); - for (int i = 0; i < 3; i++) { - LoggedSingleRelativeRanking ranking = cdf.getRankings().get(i); - assertRuntimeEqual(expectedCDF[i + 1], ranking.getDatum()); - } - } - - private void assertRuntimeEqual(long expected, long generated) { - if (expected == 0) { - assertTrue(generated > -1000 && generated < 1000); - } else { - long epsilon = Math.max(expected / 10, 5000); - assertTrue(expected - generated > -epsilon); - assertTrue(expected - generated < epsilon); - } - } - -}