svn commit: r1034091 - in /hadoop/mapreduce/trunk: .gitignore CHANGES.txt src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java

[cos]

Author: cos
Date: Thu Nov 11 20:01:54 2010
New Revision: 1034091

URL: http://svn.apache.org/viewvc?rev=1034091&view=rev
Log:
MAPREDUCE-2093. Herriot JT and TT clients should vend statistics. Contributed 
by Konstantin Boudnik.

Modified:
    hadoop/mapreduce/trunk/.gitignore
    hadoop/mapreduce/trunk/CHANGES.txt
    
hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
    
hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java

Modified: hadoop/mapreduce/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/.gitignore?rev=1034091&r1=1034090&r2=1034091&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/.gitignore (original)
+++ hadoop/mapreduce/trunk/.gitignore Thu Nov 11 20:01:54 2010
@@ -20,6 +20,7 @@
 .settings
 .svn
 build/
+build-fi/
 build.properties
 conf/masters
 conf/slaves

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1034091&r1=1034090&r2=1034091&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Nov 11 20:01:54 2010
@@ -166,6 +166,8 @@ Trunk (unreleased changes)
     MAPREDUCE-2073. TestTrackerDistributedCacheManager should be up-front
     about requirements on build environment. (Todd Lipcon via tomwhite)
 
+    MAPREDUCE-2093. Herriot JT and TT clients should vend statistics. (cos)
+
   OPTIMIZATIONS
 
     MAPREDUCE-1354. Enhancements to JobTracker for better performance and

Modified: 
hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java?rev=1034091&r1=1034090&r2=1034091&view=diff
==============================================================================
--- 
hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
 (original)
+++ 
hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
 Thu Nov 11 20:01:54 2010
@@ -45,6 +45,7 @@ import static org.junit.Assert.*;
 public class JTClient extends MRDaemonClient<JTProtocol> {
   static final Log LOG = LogFactory.getLog(JTClient.class);
   private JobClient client;
+  private static final String HADOOP_JT_OPTS_ENV = "HADOOP_JOBTRACKER_OPTS";
 
   /**
    * Create JobTracker client to talk to {...@link JobTracker} specified in the
@@ -327,4 +328,21 @@ public class JTClient extends MRDaemonCl
     }
     LOG.info("Verified the job history for the jobId : " + jobId);
   }
+
+  @Override
+  public String getHadoopOptsEnvName() {
+    return HADOOP_JT_OPTS_ENV;
+  }
+
+  /**
+   * Concrete implementation of abstract super class method
+   *
+   * @param attributeName name of the attribute to be retrieved
+   * @return Object value of the given attribute
+   * @throws IOException is thrown in case of communication errors
+   */
+  @Override
+  public Object getDaemonAttribute(String attributeName) throws IOException {
+    return getJmxAttribute("JobTracker", "JobTrackerInfo", attributeName);
+  }
 }

Modified: 
hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java?rev=1034091&r1=1034090&r2=1034091&view=diff
==============================================================================
--- 
hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java
 (original)
+++ 
hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java
 Thu Nov 11 20:01:54 2010
@@ -39,6 +39,7 @@ public class TTClient extends MRDaemonCl
 
   TTProtocol proxy;
   private static final String SYSTEM_TEST_FILE = "system-test.xml";
+  private static final String HADOOP_TT_OPTS_ENV = "HADOOP_TASKTRACKER_OPTS";
 
   public TTClient(Configuration conf, RemoteProcess daemon) 
       throws IOException {
@@ -89,4 +90,20 @@ public class TTClient extends MRDaemonCl
     return getProxy().getStatus();
   }
 
+  @Override
+  public String getHadoopOptsEnvName() {
+    return HADOOP_TT_OPTS_ENV;
+  }
+
+  /**
+   * Concrete implementation of abstract super class method
+   *
+   * @param attributeName name of the attribute to be retrieved
+   * @return Object value of the given attribute
+   * @throws IOException is thrown in case of communication errors
+   */
+  @Override
+  public Object getDaemonAttribute(String attributeName) throws IOException {
+    return getJmxAttribute("TaskTracker", "TaskTrackerInfo", attributeName);
+  }
 }