You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 04:59:33 UTC
svn commit: r1077282 - in
/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop:
mapreduce/test/system/MRCluster.java
test/system/process/HadoopDaemonRemoteCluster.java
Author: omalley
Date: Fri Mar 4 03:59:33 2011
New Revision: 1077282
URL: http://svn.apache.org/viewvc?rev=1077282&view=rev
Log:
commit 701e9fd7470328d4c9c111ea1417d3b34ee89bee
Author: Konstantin Boudnik <co...@goodenter-lm.local>
Date: Wed Mar 3 19:48:02 2010 -0800
from
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRCluster.java
hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRCluster.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRCluster.java?rev=1077282&r1=1077281&r2=1077282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRCluster.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRCluster.java Fri Mar 4 03:59:33 2011
@@ -43,6 +43,20 @@ public class MRCluster extends AbstractD
public static final String CLUSTER_PROCESS_MGR_IMPL =
"test.system.mr.clusterprocess.impl.class";
+ /**
+ * Key is used to to point to the file containing hostname of the jobtracker
+ */
+ public static final String CONF_HADOOP_JT_HOSTFILE_NAME =
+ "test.system.hdrc.jt.hostfile";
+ /**
+ * Key is used to to point to the file containing hostnames of tasktrackers
+ */
+ public static final String CONF_HADOOP_TT_HOSTFILE_NAME =
+ "test.system.hdrc.tt.hostfile";
+
+ private static String JT_hostFileName;
+ private static String TT_hostFileName;
+
protected enum Role {JT, TT};
private MRCluster(Configuration conf, ClusterProcessManager rCluster)
@@ -60,6 +74,12 @@ public class MRCluster extends AbstractD
*/
public static MRCluster createCluster(Configuration conf)
throws Exception {
+ JT_hostFileName = conf.get(CONF_HADOOP_JT_HOSTFILE_NAME,
+ System.getProperty(CONF_HADOOP_JT_HOSTFILE_NAME,
+ "clusterControl.masters.jt"));
+ TT_hostFileName = conf.get(CONF_HADOOP_TT_HOSTFILE_NAME,
+ System.getProperty(CONF_HADOOP_TT_HOSTFILE_NAME, "slaves"));
+
String implKlass = conf.get(CLUSTER_PROCESS_MGR_IMPL, System
.getProperty(CLUSTER_PROCESS_MGR_IMPL));
if (implKlass == null || implKlass.isEmpty()) {
@@ -127,8 +147,8 @@ public class MRCluster extends AbstractD
public static class MRProcessManager extends HadoopDaemonRemoteCluster{
private static final List<HadoopDaemonInfo> mrDaemonInfos =
Arrays.asList(new HadoopDaemonInfo[]{
- new HadoopDaemonInfo("jobtracker", Role.JT, "masters"),
- new HadoopDaemonInfo("tasktracker", Role.TT, "slaves")});
+ new HadoopDaemonInfo("jobtracker", Role.JT, JT_hostFileName),
+ new HadoopDaemonInfo("tasktracker", Role.TT, TT_hostFileName)});
public MRProcessManager() {
super(mrDaemonInfos);
}
Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java?rev=1077282&r1=1077281&r2=1077282&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java Fri Mar 4 03:59:33 2011
@@ -88,6 +88,7 @@ public abstract class HadoopDaemonRemote
this.cmd = cmd;
this.role = role;
this.hostFile = hostFile;
+ LOG.info("Created HadoopDaemonInfo for " + cmd + " " + role + " from " + hostFile);
}
}