hadoop-mapreduce-commits mailing list archives

Author: omalley
Date: Tue Mar  8 05:53:09 2011
New Revision: 1079185

URL: http://svn.apache.org/viewvc?rev=1079185&view=rev
Log:
commit 25a7bb5cd8570fce56e6062d9dad11a05dc22e86
Author: Krishna Ramachandran <ramach@yahoo-inc.com>
Date:   Tue Nov 16 17:43:49 2010 -0800

    Fix for
    
    +++ b/YAHOO-CHANGES.txt
    +   - 0.22 y-trunk mapreduce builds are failing

Modified:
    hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
    hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java

Modified: hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java?rev=1079185&r1=1079184&r2=1079185&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
Tue Mar  8 05:53:09 2011
@@ -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/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java?rev=1079185&r1=1079184&r2=1079185&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java
(original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java
Tue Mar  8 05:53:09 2011
@@ -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);
+  }
 }