Author: cnauroth
Date: Wed Feb 19 17:57:26 2014
New Revision: 1569858
URL: http://svn.apache.org/r1569858
Log:
Merge trunk to HDFS-4685.
Modified:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
(props changed)
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1569848-1569857
Propchange:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1569848-1569857
Propchange:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1569848-1569857
Modified:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java?rev=1569858&r1=1569857&r2=1569858&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
(original)
+++
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
Wed Feb 19 17:57:26 2014
@@ -25,6 +25,7 @@ import java.util.HashSet;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability;
// Keeps track of which datanodes/tasktrackers are allowed to connect to the
@@ -48,13 +49,30 @@ public class HostsFileReader {
refresh();
}
+ @Private
+ public HostsFileReader(String includesFile, InputStream inFileInputStream,
+ String excludesFile, InputStream exFileInputStream) throws IOException {
+ includes = new HashSet<String>();
+ excludes = new HashSet<String>();
+ this.includesFile = includesFile;
+ this.excludesFile = excludesFile;
+ refresh(inFileInputStream, exFileInputStream);
+ }
+
public static void readFileToSet(String type,
String filename, Set<String> set) throws IOException {
File file = new File(filename);
FileInputStream fis = new FileInputStream(file);
+ readFileToSetWithFileInputStream(type, filename, fis, set);
+ }
+
+ @Private
+ public static void readFileToSetWithFileInputStream(String type,
+ String filename, InputStream fileInputStream, Set<String> set)
+ throws IOException {
BufferedReader reader = null;
try {
- reader = new BufferedReader(new InputStreamReader(fis));
+ reader = new BufferedReader(new InputStreamReader(fileInputStream));
String line;
while ((line = reader.readLine()) != null) {
String[] nodes = line.split("[ \t\n\f\r]+");
@@ -71,26 +89,63 @@ public class HostsFileReader {
}
}
}
- }
+ }
} finally {
if (reader != null) {
reader.close();
}
- fis.close();
- }
+ fileInputStream.close();
+ }
}
public synchronized void refresh() throws IOException {
LOG.info("Refreshing hosts (include/exclude) list");
+ Set<String> newIncludes = new HashSet<String>();
+ Set<String> newExcludes = new HashSet<String>();
+ boolean switchIncludes = false;
+ boolean switchExcludes = false;
if (!includesFile.isEmpty()) {
- Set<String> newIncludes = new HashSet<String>();
readFileToSet("included", includesFile, newIncludes);
- // switch the new hosts that are to be included
- includes = newIncludes;
+ switchIncludes = true;
}
if (!excludesFile.isEmpty()) {
- Set<String> newExcludes = new HashSet<String>();
readFileToSet("excluded", excludesFile, newExcludes);
+ switchExcludes = true;
+ }
+
+ if (switchIncludes) {
+ // switch the new hosts that are to be included
+ includes = newIncludes;
+ }
+ if (switchExcludes) {
+ // switch the excluded hosts
+ excludes = newExcludes;
+ }
+ }
+
+ @Private
+ public synchronized void refresh(InputStream inFileInputStream,
+ InputStream exFileInputStream) throws IOException {
+ LOG.info("Refreshing hosts (include/exclude) list");
+ Set<String> newIncludes = new HashSet<String>();
+ Set<String> newExcludes = new HashSet<String>();
+ boolean switchIncludes = false;
+ boolean switchExcludes = false;
+ if (inFileInputStream != null) {
+ readFileToSetWithFileInputStream("included", includesFile,
+ inFileInputStream, newIncludes);
+ switchIncludes = true;
+ }
+ if (exFileInputStream != null) {
+ readFileToSetWithFileInputStream("excluded", excludesFile,
+ exFileInputStream, newExcludes);
+ switchExcludes = true;
+ }
+ if (switchIncludes) {
+ // switch the new hosts that are to be included
+ includes = newIncludes;
+ }
+ if (switchExcludes) {
// switch the excluded hosts
excludes = newExcludes;
}
Propchange:
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1569848-1569857
