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:52:49 UTC
svn commit: r1077217 -
/hadoop/common/branches/branch-0.20-security-patches/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java
Author: omalley
Date: Fri Mar 4 03:52:49 2011
New Revision: 1077217
URL: http://svn.apache.org/viewvc?rev=1077217&view=rev
Log:
commit fdcfe17f46278c988ff27deae335c488405d024c
Author: Konstantin Boudnik <co...@yahoo-inc.com>
Date: Wed Feb 24 14:26:31 2010 -0800
Revert " from
This reverts commit 3ab0f1ee92944f1ab3e0453ff9d2196f62795b29.
Modified:
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/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=1077217&r1=1077216&r2=1077217&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:52:49 2011
@@ -32,10 +32,6 @@ import org.apache.hadoop.util.Shell.Shel
*/
public class HadoopDaemonRemoteCluster implements ClusterProcessManager {
- private final static String CONF_HADOOP_MASTERSFILE_NAME="test.system.hdrc.masters.file";
- private final static String MASTERS_FILE = System.getProperty(CONF_HADOOP_MASTERSFILE_NAME, "masters");
- private final static String SLAVES_FILE = "slaves";
-
private static final Log LOG = LogFactory
.getLog(HadoopDaemonRemoteCluster.class.getName());
@@ -178,8 +174,8 @@ public class HadoopDaemonRemoteCluster i
}
private void populateDaemons(String confLocation) throws IOException {
- File mastersFile = new File(confLocation, MASTERS_FILE);
- File slavesFile = new File(confLocation, SLAVES_FILE);
+ File mastersFile = new File(confLocation, "masters");
+ File slavesFile = new File(confLocation, "slaves");
BufferedReader reader = null;
try {
reader = new BufferedReader(new FileReader(mastersFile));
@@ -187,16 +183,12 @@ public class HadoopDaemonRemoteCluster i
masterHost = reader.readLine();
if (masterHost != null && !masterHost.trim().isEmpty()) {
master = new ScriptDaemon(masterCommand, masterHost);
- } else {
- LOG.error(confLocation + System.getProperty("file.separator", "/") +
- MASTERS_FILE + " has no content");
}
} finally {
try {
reader.close();
} catch (Exception e) {
- LOG.error("Can't read masters file from " + confLocation +
- System.getProperty("file.separator", "/") + MASTERS_FILE);
+ LOG.error("Can't read masters file from " + confLocation);
}
}
@@ -209,16 +201,11 @@ public class HadoopDaemonRemoteCluster i
addr.getCanonicalHostName());
slaves.put(addr.getCanonicalHostName(), slave);
}
- if (slaves.size() == 0) {
- LOG.error(confLocation + System.getProperty("file.separator", "/") +
- SLAVES_FILE + " has no content");
- }
} finally {
try {
reader.close();
} catch (Exception e) {
- LOG.error("Can't read slaves file from " + confLocation +
- System.getProperty("file.separator", "/") + SLAVES_FILE);
+ LOG.error("Can't read slaves file from " + confLocation);
}
}
}