svn commit: r1390616 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java src/test/java/org/apache/hadoop/fs/TestTrash.
Author: jlowe
Date: Wed Sep 26 17:14:27 2012
New Revision: 1390616
URL: http://svn.apache.org/viewvc?rev=1390616view=rev
Log:
HADOOP-8843. Old trash directories are never deleted on upgrade from 1.x.
Contributed by Jason Lowe
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1390616r1=1390615r2=1390616view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Sep
26 17:14:27 2012
@@ -995,6 +995,9 @@ Release 0.23.4 - UNRELEASED
BUG FIXES
+HADOOP-8843. Old trash directories are never deleted on upgrade
+from 1.x (jlowe)
+
Release 0.23.3 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java?rev=1390616r1=1390615r2=1390616view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
Wed Sep 26 17:14:27 2012
@@ -61,6 +61,9 @@ public class TrashPolicyDefault extends
new FsPermission(FsAction.ALL, FsAction.NONE, FsAction.NONE);
private static final DateFormat CHECKPOINT = new
SimpleDateFormat(yyMMddHHmmss);
+ /** Format of checkpoint directories used prior to Hadoop 0.23. */
+ private static final DateFormat OLD_CHECKPOINT =
+ new SimpleDateFormat(yyMMddHHmm);
private static final int MSECS_PER_MINUTE = 60*1000;
private Path current;
@@ -202,9 +205,7 @@ public class TrashPolicyDefault extends
long time;
try {
-synchronized (CHECKPOINT) {
- time = CHECKPOINT.parse(name).getTime();
-}
+time = getTimeFromCheckpoint(name);
} catch (ParseException e) {
LOG.warn(Unexpected item in trash: +dir+. Ignoring.);
continue;
@@ -304,4 +305,22 @@ public class TrashPolicyDefault extends
return (time / interval) * interval;
}
}
+
+ private long getTimeFromCheckpoint(String name) throws ParseException {
+long time;
+
+try {
+ synchronized (CHECKPOINT) {
+time = CHECKPOINT.parse(name).getTime();
+ }
+} catch (ParseException pe) {
+ // Check for old-style checkpoint directories left over
+ // after an upgrade from Hadoop 1.x
+ synchronized (OLD_CHECKPOINT) {
+time = OLD_CHECKPOINT.parse(name).getTime();
+ }
+}
+
+return time;
+ }
}
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java?rev=1390616r1=1390615r2=1390616view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
Wed Sep 26 17:14:27 2012
@@ -26,6 +26,8 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.net.URI;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.HashSet;
import java.util.Set;
@@ -434,6 +436,36 @@ public class TestTrash extends TestCase
output.indexOf(Failed to determine server trash configuration) !=
-1);
}
+// Verify old checkpoint format is recognized
+{
+ // emulate two old trash checkpoint directories, one that is old enough
+ // to be deleted on the next expunge and one that isn't.
+ long trashInterval = conf.getLong(FS_TRASH_INTERVAL_KEY,
+ FS_TRASH_INTERVAL_DEFAULT);
+ long now = Time.now();
+ DateFormat oldCheckpointFormat = new SimpleDateFormat(yyMMddHHmm);
+ Path dirToDelete = new Path(trashRoot.getParent(),
+ oldCheckpointFormat.format(now - (trashInterval * 60 * 1000) - 1));
+ Path dirToKeep = new Path(trashRoot.getParent(),
+ oldCheckpointFormat.format
svn commit: r1390621 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java src/test/java/org/apache/hadoop/f
Author: jlowe
Date: Wed Sep 26 17:23:34 2012
New Revision: 1390621
URL: http://svn.apache.org/viewvc?rev=1390621view=rev
Log:
svn merge -c 1390616 to fix HADOOP-8843. Old trash directories are never
deleted on upgrade from 1.x. Contributed by Jason Lowe
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1390621r1=1390620r2=1390621view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Sep 26 17:23:34 2012
@@ -747,6 +747,9 @@ Release 0.23.4 - UNRELEASED
BUG FIXES
+HADOOP-8843. Old trash directories are never deleted on upgrade
+from 1.x (jlowe)
+
Release 0.23.3 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java?rev=1390621r1=1390620r2=1390621view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
Wed Sep 26 17:23:34 2012
@@ -61,6 +61,9 @@ public class TrashPolicyDefault extends
new FsPermission(FsAction.ALL, FsAction.NONE, FsAction.NONE);
private static final DateFormat CHECKPOINT = new
SimpleDateFormat(yyMMddHHmmss);
+ /** Format of checkpoint directories used prior to Hadoop 0.23. */
+ private static final DateFormat OLD_CHECKPOINT =
+ new SimpleDateFormat(yyMMddHHmm);
private static final int MSECS_PER_MINUTE = 60*1000;
private Path current;
@@ -202,9 +205,7 @@ public class TrashPolicyDefault extends
long time;
try {
-synchronized (CHECKPOINT) {
- time = CHECKPOINT.parse(name).getTime();
-}
+time = getTimeFromCheckpoint(name);
} catch (ParseException e) {
LOG.warn(Unexpected item in trash: +dir+. Ignoring.);
continue;
@@ -304,4 +305,22 @@ public class TrashPolicyDefault extends
return (time / interval) * interval;
}
}
+
+ private long getTimeFromCheckpoint(String name) throws ParseException {
+long time;
+
+try {
+ synchronized (CHECKPOINT) {
+time = CHECKPOINT.parse(name).getTime();
+ }
+} catch (ParseException pe) {
+ // Check for old-style checkpoint directories left over
+ // after an upgrade from Hadoop 1.x
+ synchronized (OLD_CHECKPOINT) {
+time = OLD_CHECKPOINT.parse(name).getTime();
+ }
+}
+
+return time;
+ }
}
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java?rev=1390621r1=1390620r2=1390621view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
Wed Sep 26 17:23:34 2012
@@ -26,6 +26,8 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.net.URI;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.HashSet;
import java.util.Set;
@@ -434,6 +436,36 @@ public class TestTrash extends TestCase
output.indexOf(Failed to determine server trash configuration) !=
-1);
}
+// Verify old checkpoint format is recognized
+{
+ // emulate two old trash checkpoint directories, one that is old enough
+ // to be deleted on the next expunge and one that isn't.
+ long trashInterval = conf.getLong(FS_TRASH_INTERVAL_KEY,
+ FS_TRASH_INTERVAL_DEFAULT);
+ long now = Time.now();
+ DateFormat oldCheckpointFormat = new SimpleDateFormat(yyMMddHHmm);
+ Path
svn commit: r1390623 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java src/test/java/org/apache/hadoo
Author: jlowe
Date: Wed Sep 26 17:38:55 2012
New Revision: 1390623
URL: http://svn.apache.org/viewvc?rev=1390623view=rev
Log:
svn merge -c 1390616 to fix HADOOP-8843. Old trash directories are never
deleted on upgrade from 1.x. Contributed by Jason Lowe
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1390623r1=1390622r2=1390623view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Sep 26 17:38:55 2012
@@ -14,6 +14,9 @@ Release 0.23.4 - UNRELEASED
BUG FIXES
+HADOOP-8843. Old trash directories are never deleted on upgrade
+from 1.x (jlowe)
+
Release 0.23.3 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java?rev=1390623r1=1390622r2=1390623view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
Wed Sep 26 17:38:55 2012
@@ -61,6 +61,9 @@ public class TrashPolicyDefault extends
new FsPermission(FsAction.ALL, FsAction.NONE, FsAction.NONE);
private static final DateFormat CHECKPOINT = new
SimpleDateFormat(yyMMddHHmmss);
+ /** Format of checkpoint directories used prior to Hadoop 0.23. */
+ private static final DateFormat OLD_CHECKPOINT =
+ new SimpleDateFormat(yyMMddHHmm);
private static final int MSECS_PER_MINUTE = 60*1000;
private Path current;
@@ -197,9 +200,7 @@ public class TrashPolicyDefault extends
long time;
try {
-synchronized (CHECKPOINT) {
- time = CHECKPOINT.parse(name).getTime();
-}
+time = getTimeFromCheckpoint(name);
} catch (ParseException e) {
LOG.warn(Unexpected item in trash: +dir+. Ignoring.);
continue;
@@ -300,4 +301,22 @@ public class TrashPolicyDefault extends
return (time / interval) * interval;
}
}
+
+ private long getTimeFromCheckpoint(String name) throws ParseException {
+long time;
+
+try {
+ synchronized (CHECKPOINT) {
+time = CHECKPOINT.parse(name).getTime();
+ }
+} catch (ParseException pe) {
+ // Check for old-style checkpoint directories left over
+ // after an upgrade from Hadoop 1.x
+ synchronized (OLD_CHECKPOINT) {
+time = OLD_CHECKPOINT.parse(name).getTime();
+ }
+}
+
+return time;
+ }
}
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java?rev=1390623r1=1390622r2=1390623view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
Wed Sep 26 17:38:55 2012
@@ -26,6 +26,8 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.net.URI;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.HashSet;
import java.util.Set;
@@ -431,6 +433,36 @@ public class TestTrash extends TestCase
output.indexOf((Consider using -skipTrash option)) != -1 );
}
+// Verify old checkpoint format is recognized
+{
+ // emulate two old trash checkpoint directories, one that is old enough
+ // to be deleted on the next expunge and one that isn't.
+ long trashInterval = conf.getLong(FS_TRASH_INTERVAL_KEY,
+ FS_TRASH_INTERVAL_DEFAULT);
+ long now = System.currentTimeMillis();
+ DateFormat oldCheckpointFormat = new
svn commit: r1391276 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop
Author: jlowe
Date: Fri Sep 28 01:00:40 2012
New Revision: 1391276
URL: http://svn.apache.org/viewvc?rev=1391276view=rev
Log:
svn merge -c 1366126 FIXES: HADOOP-8623. hadoop jar command should respect
HADOOP_OPTS. Contributed by Steven Willis.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1391276r1=1391275r2=1391276view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Sep 28 01:00:40 2012
@@ -22,6 +22,9 @@ Release 0.23.4 - UNRELEASED
HADOOP-8183. Stop using mapred.used.genericoptions.parser (harsh)
+HADOOP-8623. hadoop jar command should respect HADOOP_OPTS.
+(Steven Willis via suresh)
+
Release 0.23.3 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop?rev=1391276r1=1391275r2=1391276view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop
Fri Sep 28 01:00:40 2012
@@ -94,33 +94,30 @@ case $COMMAND in
# the core commands
if [ $COMMAND = fs ] ; then
CLASS=org.apache.hadoop.fs.FsShell
- HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
elif [ $COMMAND = version ] ; then
CLASS=org.apache.hadoop.util.VersionInfo
- HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
elif [ $COMMAND = jar ] ; then
CLASS=org.apache.hadoop.util.RunJar
elif [ $COMMAND = distcp ] ; then
CLASS=org.apache.hadoop.tools.DistCp
CLASSPATH=${CLASSPATH}:${TOOL_PATH}
- HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
elif [ $COMMAND = daemonlog ] ; then
CLASS=org.apache.hadoop.log.LogLevel
- HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
elif [ $COMMAND = archive ] ; then
CLASS=org.apache.hadoop.tools.HadoopArchives
CLASSPATH=${CLASSPATH}:${TOOL_PATH}
- HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
elif [[ $COMMAND = -* ]] ; then
# class and package names cannot begin with a -
echo Error: No command named \`$COMMAND' was found. Perhaps you meant
\`hadoop ${COMMAND#-}'
exit 1
else
- HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
CLASS=$COMMAND
fi
shift
+# Always respect HADOOP_OPTS and HADOOP_CLIENT_OPTS
+HADOOP_OPTS=$HADOOP_OPTS $HADOOP_CLIENT_OPTS
+
#make sure security appender is turned off
HADOOP_OPTS=$HADOOP_OPTS
-Dhadoop.security.logger=${HADOOP_SECURITY_LOGGER:-INFO,NullAppender}
svn commit: r1392557 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/
Author: jlowe Date: Mon Oct 1 19:56:35 2012 New Revision: 1392557 URL: http://svn.apache.org/viewvc?rev=1392557view=rev Log: Added jlowe to committer list Modified: hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml hadoop/common/site/main/publish/bylaws.html hadoop/common/site/main/publish/bylaws.pdf hadoop/common/site/main/publish/index.html hadoop/common/site/main/publish/index.pdf hadoop/common/site/main/publish/issue_tracking.html hadoop/common/site/main/publish/issue_tracking.pdf hadoop/common/site/main/publish/linkmap.html hadoop/common/site/main/publish/linkmap.pdf hadoop/common/site/main/publish/mailing_lists.html hadoop/common/site/main/publish/mailing_lists.pdf hadoop/common/site/main/publish/privacy_policy.html hadoop/common/site/main/publish/privacy_policy.pdf hadoop/common/site/main/publish/releases.html hadoop/common/site/main/publish/releases.pdf hadoop/common/site/main/publish/version_control.html hadoop/common/site/main/publish/version_control.pdf hadoop/common/site/main/publish/who.html hadoop/common/site/main/publish/who.pdf Modified: hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml URL: http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml?rev=1392557r1=1392556r2=1392557view=diff == --- hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml (original) +++ hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml Mon Oct 1 19:56:35 2012 @@ -533,6 +533,14 @@ /tr tr + tdjlowe/td + tdJason Lowe/td + tdYahoo!/td + td/td + td-6/td + /tr + + tr tdjohan/td tda href=http://people.apache.org/~johan;Johan Oskarsson/a/td tdTwitter/td Modified: hadoop/common/site/main/publish/bylaws.html URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.html?rev=1392557r1=1392556r2=1392557view=diff == --- hadoop/common/site/main/publish/bylaws.html (original) +++ hadoop/common/site/main/publish/bylaws.html Mon Oct 1 19:56:35 2012 @@ -3,7 +3,7 @@ head META http-equiv=Content-Type content=text/html; charset=UTF-8 meta content=Apache Forrest name=Generator -meta name=Forrest-version content=0.8 +meta name=Forrest-version content=0.9 meta name=Forrest-skin-name content=hadoop-pelt titleApache Hadoop Project Bylaws/title link type=text/css href=skin/basic.css rel=stylesheet @@ -238,7 +238,7 @@ document.write(Last Published: + docu /div -a name=N1000C/aa name=Introduction/a +a name=N1000D/aa name=Introduction/a h2 class=h3Introduction/h2 div class=section pThis document defines the bylaws under which the Apache Hadoop project @@ -256,7 +256,7 @@ document.write(Last Published: + docu /div -a name=N10027/aa name=Roles+and+Responsibilities/a +a name=N10028/aa name=Roles+and+Responsibilities/a h2 class=h3Roles and Responsibilities/h2 div class=section pApache projects define a set of roles with associated rights and @@ -393,7 +393,7 @@ document.write(Last Published: + docu /div -a name=N10081/aa name=Decision+Making/a +a name=N10082/aa name=Decision+Making/a h2 class=h3Decision Making/h2 div class=section pWithin the Hadoop project, different types of decisions require Modified: hadoop/common/site/main/publish/bylaws.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.pdf?rev=1392557r1=1392556r2=1392557view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/index.html URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/index.html?rev=1392557r1=1392556r2=1392557view=diff == --- hadoop/common/site/main/publish/index.html (original) +++ hadoop/common/site/main/publish/index.html Mon Oct 1 19:56:35 2012 @@ -3,7 +3,7 @@ head META http-equiv=Content-Type content=text/html; charset=UTF-8 meta content=Apache Forrest name=Generator -meta name=Forrest-version content=0.8 +meta name=Forrest-version content=0.9 meta name=Forrest-skin-name content=hadoop-pelt titleWelcome to Apachetrade; Hadoopreg;!/title link type=text/css href=skin/basic.css rel=stylesheet @@ -276,7 +276,7 @@ document.write(Last Published: + docu /div -a name=N1000C/aa name=What+Is+Apache+Hadoop%3F/a +a name=N1000D/aa name=What+Is+Apache+Hadoop%3F/a h2 class=h3What Is Apache Hadoop?/h2 div class=section p @@ -371,7 +371,7 @@ document.write(Last Published: + docu /div -a name=N10071/aa name=Getting+Started/a +a name=N10072/aa name=Getting+Started/a h2 class=h3Getting Started /h2 div class=section
svn commit: r1392622 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java src/test/java/org/apache/hadoo
Author: jlowe
Date: Mon Oct 1 21:24:24 2012
New Revision: 1392622
URL: http://svn.apache.org/viewvc?rev=1392622view=rev
Log:
svn merge -c 1331007 FIXES: HADOOP-8310. FileContext#checkPath should handle
URIs with no port. Contributed by Aaron T. Myers.
Added:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.java
- copied, changed from r1331007,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1392622r1=1392621r2=1392622view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Oct 1 21:24:24 2012
@@ -34,6 +34,8 @@ Release 0.23.5 - UNRELEASED
HADOOP-8775. MR2 distcp permits non-positive value to -bandwidth option
which causes job never to complete. (Sandy Ryza via atm)
+HADOOP-8310. FileContext#checkPath should handle URIs with no port. (atm)
+
Release 0.23.4 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java?rev=1392622r1=1392621r2=1392622view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
Mon Oct 1 21:24:24 2012
@@ -352,20 +352,23 @@ public abstract class AbstractFileSystem
}
}
String thisScheme = this.getUri().getScheme();
-String thisAuthority = this.getUri().getAuthority();
+String thisHost = this.getUri().getHost();
+String thatHost = uri.getHost();
-// Schemes and authorities must match.
+// Schemes and hosts must match.
// Allow for null Authority for file:///
if (!thisScheme.equalsIgnoreCase(thatScheme) ||
- (thisAuthority != null
-!thisAuthority.equalsIgnoreCase(thatAuthority)) ||
- (thisAuthority == null thatAuthority != null)) {
+ (thisHost != null
+!thisHost.equalsIgnoreCase(thatHost)) ||
+ (thisHost == null thatHost != null)) {
throw new InvalidPathException(Wrong FS: + path + , expected:
+ this.getUri());
}
+// Ports must match, unless this FS instance is using the default port, in
+// which case the port may be omitted from the given URI
int thisPort = this.getUri().getPort();
-int thatPort = path.toUri().getPort();
+int thatPort = uri.getPort();
if (thatPort == -1) { // -1 = defaultPort of Uri scheme
thatPort = this.getUriDefaultPort();
}
Copied:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.java
(from r1331007,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.java)
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.java?p2=hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.javap1=hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.javar1=1331007r2=1392622rev=1392622view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestAfsCheckPath.java
Mon Oct 1 21:24:24 2012
@@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import java.util.EnumSet;
import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.fs.Options.ChecksumOpt;
import org.apache.hadoop.security.AccessControlException;
import
svn commit: r1397704 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FileSystem.java
Author: jlowe
Date: Fri Oct 12 19:49:40 2012
New Revision: 1397704
URL: http://svn.apache.org/viewvc?rev=1397704view=rev
Log:
HADOOP-8906. paths with multiple globs are unreliable. Contributed by Daryn
Sharp.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1397704r1=1397703r2=1397704view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Oct
12 19:49:40 2012
@@ -1054,6 +1054,9 @@ Release 0.23.5 - UNRELEASED
BUG FIXES
+HADOOP-8906. paths with multiple globs are unreliable. (Daryn Sharp via
+jlowe)
+
Release 0.23.4 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java?rev=1397704r1=1397703r2=1397704view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
Fri Oct 12 19:49:40 2012
@@ -24,6 +24,7 @@ import java.net.URI;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -1574,120 +1575,113 @@ public abstract class FileSystem extends
public FileStatus[] globStatus(Path pathPattern, PathFilter filter)
throws IOException {
String filename = pathPattern.toUri().getPath();
+ListFileStatus allMatches = null;
+
ListString filePatterns = GlobExpander.expand(filename);
-if (filePatterns.size() == 1) {
- return globStatusInternal(pathPattern, filter);
-} else {
- ListFileStatus results = new ArrayListFileStatus();
- for (String filePattern : filePatterns) {
-FileStatus[] files = globStatusInternal(new Path(filePattern), filter);
-for (FileStatus file : files) {
- results.add(file);
+for (String filePattern : filePatterns) {
+ Path path = new Path(filePattern.isEmpty() ? Path.CUR_DIR : filePattern);
+ ListFileStatus matches = globStatusInternal(path, filter);
+ if (matches != null) {
+if (allMatches == null) {
+ allMatches = matches;
+} else {
+ allMatches.addAll(matches);
}
}
- return results.toArray(new FileStatus[results.size()]);
}
+
+FileStatus[] results = null;
+if (allMatches != null) {
+ results = allMatches.toArray(new FileStatus[allMatches.size()]);
+} else if (filePatterns.size() 1) {
+ // no matches with multiple expansions is a non-matching glob
+ results = new FileStatus[0];
+}
+return results;
}
- private FileStatus[] globStatusInternal(Path pathPattern, PathFilter filter)
- throws IOException {
-Path[] parents = new Path[1];
+ // sort gripes because FileStatus Comparable isn't parameterized...
+ @SuppressWarnings(unchecked)
+ private ListFileStatus globStatusInternal(Path pathPattern,
+ PathFilter filter) throws IOException {
+boolean patternHasGlob = false; // pathPattern has any globs
+ListFileStatus matches = new ArrayListFileStatus();
+
+// determine starting point
int level = 0;
-String filename = pathPattern.toUri().getPath();
+String baseDir = Path.CUR_DIR;
+if (pathPattern.isAbsolute()) {
+ level = 1; // need to skip empty item at beginning of split list
+ baseDir = Path.SEPARATOR;
+}
-// path has only zero component
-if (filename.isEmpty() || Path.SEPARATOR.equals(filename)) {
- return getFileStatus(new Path[]{pathPattern});
+// parse components and determine if it's a glob
+String[] components = null;
+GlobFilter[] filters = null;
+String filename = pathPattern.toUri().getPath();
+if (!filename.isEmpty() !Path.SEPARATOR.equals(filename)) {
+ components = filename.split(Path.SEPARATOR);
+ filters = new GlobFilter[components.length];
+ for (int i=level; i components.length; i++) {
+filters[i] = new GlobFilter(components[i]);
+patternHasGlob |= filters[i].hasPattern();
+ }
+ if (!patternHasGlob) {
+baseDir = unquotePathComponent(filename
svn commit: r1408604 - /hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java
Author: jlowe Date: Tue Nov 13 05:53:26 2012 New Revision: 1408604 URL: http://svn.apache.org/viewvc?rev=1408604view=rev Log: HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing. Contributed by Jonathan Eagles Modified: hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java Modified: hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java?rev=1408604r1=1408603r2=1408604view=diff == --- hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java (original) +++ hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java Tue Nov 13 05:53:26 2012 @@ -131,8 +131,8 @@ public class TestCopyListing extends Sim fs = FileSystem.get(getConf()); ListPath srcPaths = new ArrayListPath(); srcPaths.add(new Path(/tmp/in/*/*)); - TestDistCpUtils.createFile(fs, /tmp/in/1.txt); - TestDistCpUtils.createFile(fs, /tmp/in/src/1.txt); + TestDistCpUtils.createFile(fs, /tmp/in/src1/1.txt); + TestDistCpUtils.createFile(fs, /tmp/in/src2/1.txt); Path target = new Path(/tmp/out); Path listingFile = new Path(/tmp/list); DistCpOptions options = new DistCpOptions(srcPaths, target);
svn commit: r1408604 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Tue Nov 13 05:53:26 2012 New Revision: 1408604 URL: http://svn.apache.org/viewvc?rev=1408604view=rev Log: HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing. Contributed by Jonathan Eagles Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1408604r1=1408603r2=1408604view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov 13 05:53:26 2012 @@ -1146,6 +1146,9 @@ Release 0.23.5 - UNRELEASED HADOOP-9022. Hadoop distcp tool fails to copy file if -m 0 specified (Jonathan Eagles vai bobby) +HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing (Jonathan +Eagles via jlowe) + Release 0.23.4 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1408605 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Tue Nov 13 05:55:51 2012 New Revision: 1408605 URL: http://svn.apache.org/viewvc?rev=1408605view=rev Log: svn merge -c 1408604 FIXES: HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing. Contributed by Jonathan Eagles Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1408605r1=1408604r2=1408605view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov 13 05:55:51 2012 @@ -863,6 +863,9 @@ Release 0.23.5 - UNRELEASED HADOOP-9022. Hadoop distcp tool fails to copy file if -m 0 specified (Jonathan Eagles vai bobby) +HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing (Jonathan +Eagles via jlowe) + Release 0.23.4 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1408605 - /hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java
Author: jlowe Date: Tue Nov 13 05:55:51 2012 New Revision: 1408605 URL: http://svn.apache.org/viewvc?rev=1408605view=rev Log: svn merge -c 1408604 FIXES: HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing. Contributed by Jonathan Eagles Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java?rev=1408605r1=1408604r2=1408605view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java Tue Nov 13 05:55:51 2012 @@ -131,8 +131,8 @@ public class TestCopyListing extends Sim fs = FileSystem.get(getConf()); ListPath srcPaths = new ArrayListPath(); srcPaths.add(new Path(/tmp/in/*/*)); - TestDistCpUtils.createFile(fs, /tmp/in/1.txt); - TestDistCpUtils.createFile(fs, /tmp/in/src/1.txt); + TestDistCpUtils.createFile(fs, /tmp/in/src1/1.txt); + TestDistCpUtils.createFile(fs, /tmp/in/src2/1.txt); Path target = new Path(/tmp/out); Path listingFile = new Path(/tmp/list); DistCpOptions options = new DistCpOptions(srcPaths, target);
svn commit: r1408606 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Tue Nov 13 05:56:39 2012 New Revision: 1408606 URL: http://svn.apache.org/viewvc?rev=1408606view=rev Log: svn merge -c 1408604 FIXES: HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing. Contributed by Jonathan Eagles Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1408606r1=1408605r2=1408606view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Tue Nov 13 05:56:39 2012 @@ -58,6 +58,9 @@ Release 0.23.5 - UNRELEASED HADOOP-9022. Hadoop distcp tool fails to copy file if -m 0 specified (Jonathan Eagles vai bobby) +HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing (Jonathan +Eagles via jlowe) + Release 0.23.4 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1408606 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java
Author: jlowe Date: Tue Nov 13 05:56:39 2012 New Revision: 1408606 URL: http://svn.apache.org/viewvc?rev=1408606view=rev Log: svn merge -c 1408604 FIXES: HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing. Contributed by Jonathan Eagles Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java?rev=1408606r1=1408605r2=1408606view=diff == --- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java Tue Nov 13 05:56:39 2012 @@ -131,8 +131,8 @@ public class TestCopyListing extends Sim fs = FileSystem.get(getConf()); ListPath srcPaths = new ArrayListPath(); srcPaths.add(new Path(/tmp/in/*/*)); - TestDistCpUtils.createFile(fs, /tmp/in/1.txt); - TestDistCpUtils.createFile(fs, /tmp/in/src/1.txt); + TestDistCpUtils.createFile(fs, /tmp/in/src1/1.txt); + TestDistCpUtils.createFile(fs, /tmp/in/src2/1.txt); Path target = new Path(/tmp/out); Path listingFile = new Path(/tmp/list); DistCpOptions options = new DistCpOptions(srcPaths, target);
svn commit: r1409274 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Wed Nov 14 17:49:02 2012 New Revision: 1409274 URL: http://svn.apache.org/viewvc?rev=1409274view=rev Log: HADOOP-9037. Bug in test-patch.sh and precommit build process. Contributed by Kihwal Lee Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1409274r1=1409273r2=1409274view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Nov 14 17:49:02 2012 @@ -277,6 +277,9 @@ Trunk (Unreleased) HADOOP-8974. TestDFVariations fails on Windows. (Chris Nauroth via suresh) +HADOOP-9037. Bug in test-patch.sh and precommit build process (Kihwal Lee +via jlowe) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd)
svn commit: r1425177 - /hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Author: jlowe
Date: Fri Dec 21 23:05:54 2012
New Revision: 1425177
URL: http://svn.apache.org/viewvc?rev=1425177view=rev
Log:
MAPREDUCE-4793. Problem with adding resources when using both -files and -file
to hadoop streaming. Contributed by Jason Lowe
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1425177r1=1425176r2=1425177view=diff
==
---
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
(original)
+++
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Fri Dec 21 23:05:54 2012
@@ -306,7 +306,13 @@ public class StreamJob implements Tool {
throw new IllegalArgumentException(e);
}
}
-config_.set(tmpfiles, config_.get(tmpfiles, ) + fileList);
+String tmpFiles = config_.get(tmpfiles, );
+if (tmpFiles.isEmpty()) {
+ tmpFiles = fileList.toString();
+} else {
+ tmpFiles = tmpFiles + , + fileList;
+}
+config_.set(tmpfiles, tmpFiles);
validate(packageFiles_);
}
svn commit: r1425181 - /hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Author: jlowe
Date: Fri Dec 21 23:12:44 2012
New Revision: 1425181
URL: http://svn.apache.org/viewvc?rev=1425181view=rev
Log:
svn merge -c 1425177 FIXES: MAPREDUCE-4793. Problem with adding resources when
using both -files and -file to hadoop streaming. Contributed by Jason Lowe
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1425181r1=1425180r2=1425181view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Fri Dec 21 23:12:44 2012
@@ -306,7 +306,13 @@ public class StreamJob implements Tool {
throw new IllegalArgumentException(e);
}
}
-config_.set(tmpfiles, config_.get(tmpfiles, ) + fileList);
+String tmpFiles = config_.get(tmpfiles, );
+if (tmpFiles.isEmpty()) {
+ tmpFiles = fileList.toString();
+} else {
+ tmpFiles = tmpFiles + , + fileList;
+}
+config_.set(tmpfiles, tmpFiles);
validate(packageFiles_);
}
svn commit: r1425182 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Author: jlowe
Date: Fri Dec 21 23:13:35 2012
New Revision: 1425182
URL: http://svn.apache.org/viewvc?rev=1425182view=rev
Log:
svn merge -c 1425177 FIXES: MAPREDUCE-4793. Problem with adding resources when
using both -files and -file to hadoop streaming. Contributed by Jason Lowe
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1425182r1=1425181r2=1425182view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
Fri Dec 21 23:13:35 2012
@@ -306,7 +306,13 @@ public class StreamJob implements Tool {
throw new IllegalArgumentException(e);
}
}
-config_.set(tmpfiles, config_.get(tmpfiles, ) + fileList);
+String tmpFiles = config_.get(tmpfiles, );
+if (tmpFiles.isEmpty()) {
+ tmpFiles = fileList.toString();
+} else {
+ tmpFiles = tmpFiles + , + fileList;
+}
+config_.set(tmpfiles, tmpFiles);
validate(packageFiles_);
}
svn commit: r1426014 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/ExitUtil.java
Author: jlowe
Date: Wed Dec 26 20:34:39 2012
New Revision: 1426014
URL: http://svn.apache.org/viewvc?rev=1426014view=rev
Log:
HADOOP-9169. Bring branch-0.23 ExitUtil up to same level as branch-2.
Contributed by Robert Joseph Evans
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1426014r1=1426013r2=1426014view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Dec 26 20:34:39 2012
@@ -42,6 +42,9 @@ Release 0.23.6 - UNRELEASED
HADOOP-9152. HDFS can report negative DFS Used on clusters with very
small amounts of data (Brock Noland via tgraves)
+HADOOP-9169. Bring branch-0.23 ExitUtil up to same level as branch-2
+(Robert Joseph Evans via jlowe)
+
Release 0.23.5 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java?rev=1426014r1=1426013r2=1426014view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
Wed Dec 26 20:34:39 2012
@@ -30,7 +30,7 @@ import org.apache.hadoop.classification.
public final class ExitUtil {
private final static Log LOG = LogFactory.getLog(ExitUtil.class.getName());
private static volatile boolean systemExitDisabled = false;
- private static volatile boolean terminateCalled = false;
+ private static volatile ExitException firstExitException;
public static class ExitException extends RuntimeException {
private static final long serialVersionUID = 1L;
@@ -50,17 +50,34 @@ public final class ExitUtil {
}
/**
- * Clear the previous exit record.
+ * @return true if terminate has been called
*/
- public static void clearTerminateCalled() {
-terminateCalled = false;
+ public static boolean terminateCalled() {
+// Either we set this member or we actually called System#exit
+return firstExitException != null;
}
/**
- * @return true if terminate has been called
+ * @return the first ExitException thrown, null if none thrown yet
*/
- public static boolean terminateCalled() {
-return terminateCalled;
+ public static ExitException getFirstExitException() {
+return firstExitException;
+ }
+
+ /**
+ * Reset the tracking of process termination. This is for use
+ * in unit tests where one test in the suite expects an exit
+ * but others do not.
+ */
+ public static void resetFirstExitException() {
+firstExitException = null;
+ }
+
+ /**
+ * Clear the previous exit record.
+ */
+ public static void clearTerminateCalled() {
+resetFirstExitException();
}
/**
@@ -72,17 +89,32 @@ public final class ExitUtil {
*/
public static void terminate(int status, String msg) throws ExitException {
LOG.info(Exiting with status + status);
-terminateCalled = true;
if (systemExitDisabled) {
- throw new ExitException(status, msg);
+ ExitException ee = new ExitException(status, msg);
+ LOG.fatal(Terminate called, ee);
+ if (null == firstExitException) {
+firstExitException = ee;
+ }
+ throw ee;
}
System.exit(status);
}
/**
+ * Like {@link terminate(int, String)} but uses the given throwable to
+ * initialize the ExitException.
+ * @param status
+ * @param t throwable used to create the ExitException
+ * @throws ExitException if System.exit is disabled for test purposes
+ */
+ public static void terminate(int status, Throwable t) throws ExitException {
+terminate(status, StringUtils.stringifyException(t));
+ }
+
+ /**
* Like {@link terminate(int, String)} without a message.
* @param status
- * @throws ExitException
+ * @throws ExitException if System.exit is disabled for test purposes
*/
public static void terminate(int status) throws ExitException {
terminate(status, ExitException);
svn commit: r1434412 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/conf/Configuration.java
Author: jlowe
Date: Wed Jan 16 21:26:04 2013
New Revision: 1434412
URL: http://svn.apache.org/viewvc?rev=1434412view=rev
Log:
svn merge -c 1303634 FIXES: HADOOP-8157. Fix race condition in Configuration
that could cause spurious ClassNotFoundExceptions after a GC. Contributed by
Todd Lipcon.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434412r1=1434411r2=1434412view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jan 16 21:26:04 2013
@@ -12,6 +12,9 @@ Release 0.23.7 - UNRELEASED
BUG FIXES
+ HADOOP-8157. Fix race condition in Configuration that could cause spurious
+ ClassNotFoundExceptions after a GC. (todd)
+
Release 0.23.6 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1434412r1=1434411r2=1434412view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Wed Jan 16 21:26:04 2013
@@ -223,6 +223,12 @@ public class Configuration implements It
CACHE_CLASSES = new WeakHashMapClassLoader, MapString, Class?();
/**
+ * Sentinel value to store negative cache results in {@link #CACHE_CLASSES}.
+ */
+ private static final Class? NEGATIVE_CACHE_SENTINEL =
+NegativeCacheSentinel.class;
+
+ /**
* Stores the mapping of key to the resource which modifies or loads
* the key most recently
*/
@@ -1474,24 +1480,24 @@ public class Configuration implements It
}
}
-Class? clazz = null;
-if (!map.containsKey(name)) {
+Class? clazz = map.get(name);
+if (clazz == null) {
try {
clazz = Class.forName(name, true, classLoader);
} catch (ClassNotFoundException e) {
-map.put(name, null); //cache negative that class is not found
+// Leave a marker that the class isn't found
+map.put(name, NEGATIVE_CACHE_SENTINEL);
return null;
}
// two putters can race here, but they'll put the same class
map.put(name, clazz);
-} else { // check already performed on this class name
- clazz = map.get(name);
- if (clazz == null) { // found the negative
-return null;
- }
+ return clazz;
+} else if (clazz == NEGATIVE_CACHE_SENTINEL) {
+ return null; // not found
+} else {
+ // cache hit
+ return clazz;
}
-
-return clazz;
}
/**
@@ -2248,4 +2254,10 @@ public class Configuration implements It
Configuration.addDeprecation(dfs.umaskmode,
new String[]{CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY});
}
+
+ /**
+ * A unique class which is used as a sentinel value in the caching
+ * for getClassByName. {@see Configuration#getClassByNameOrNull(String)}
+ */
+ private static abstract class NegativeCacheSentinel {}
}
svn commit: r1439620 - /hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
Author: jlowe
Date: Mon Jan 28 20:52:14 2013
New Revision: 1439620
URL: http://svn.apache.org/viewvc?rev=1439620view=rev
Log:
HADOOP-9246. Execution phase for hadoop-maven-plugin should be
process-resources. Contributed by Karthik Kambatla and Chris Nauroth
Modified:
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
Modified:
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java?rev=1439620r1=1439619r2=1439620view=diff
==
---
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
(original)
+++
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
Mon Jan 28 20:52:14 2013
@@ -46,7 +46,7 @@ import java.util.TimeZone;
* build. The version information includes build time, SCM URI, SCM branch,
SCM
* commit, and an MD5 checksum of the contents of the files in the codebase.
*/
-@Mojo(name=version-info, defaultPhase=LifecyclePhase.INITIALIZE)
+@Mojo(name=version-info)
public class VersionInfoMojo extends AbstractMojo {
@Parameter(defaultValue=${project})
svn commit: r1439620 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml
Author: jlowe Date: Mon Jan 28 20:52:14 2013 New Revision: 1439620 URL: http://svn.apache.org/viewvc?rev=1439620view=rev Log: HADOOP-9246. Execution phase for hadoop-maven-plugin should be process-resources. Contributed by Karthik Kambatla and Chris Nauroth Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1439620r1=1439619r2=1439620view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jan 28 20:52:14 2013 @@ -328,6 +328,9 @@ Trunk (Unreleased) HADOOP-8589 ViewFs tests fail when tests and home dirs are nested (sanjay Radia) +HADOOP-9246 Execution phase for hadoop-maven-plugin should be +process-resources (Karthik Kambatla and Chris Nauroth via jlowe) + Release 2.0.3-alpha - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml?rev=1439620r1=1439619r2=1439620view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Mon Jan 28 20:52:14 2013 @@ -274,7 +274,7 @@ executions execution idversion-info/id -phasecompile/phase +phasegenerate-resources/phase goals goalversion-info/goal /goals
svn commit: r1441239 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
Author: jlowe Date: Thu Jan 31 22:46:05 2013 New Revision: 1441239 URL: http://svn.apache.org/viewvc?rev=1441239view=rev Log: YARN-364. AggregatedLogDeletionService can take too long to delete logs. Contributed by Jason Lowe Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm?rev=1441239r1=1441238r2=1441239view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Thu Jan 31 22:46:05 2013 @@ -325,6 +325,13 @@ Hadoop MapReduce Next Generation - Clust | | | How long to keep aggregation logs before deleting them. -1 disables. | | | | Be careful, set this too small and you will spam the name node. | *-+-++ +| yarn.log-aggregation.retain-check-interval-seconds | | | +| | -1 | | +| | | Time between checks for aggregated log retention. If set to 0 or a | +| | | negative value then the value is computed as one-tenth of the | +| | | aggregated log retention time. | +| | | Be careful, set this too small and you will spam the name node. | +*-+-++
svn commit: r1441244 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
Author: jlowe Date: Thu Jan 31 22:51:49 2013 New Revision: 1441244 URL: http://svn.apache.org/viewvc?rev=1441244view=rev Log: svn merge -c 1441239 FIXES: YARN-364. AggregatedLogDeletionService can take too long to delete logs. Contributed by Jason Lowe Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm?rev=1441244r1=1441243r2=1441244view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Thu Jan 31 22:51:49 2013 @@ -325,6 +325,13 @@ Hadoop MapReduce Next Generation - Clust | | | How long to keep aggregation logs before deleting them. -1 disables. | | | | Be careful, set this too small and you will spam the name node. | *-+-++ +| yarn.log-aggregation.retain-check-interval-seconds | | | +| | -1 | | +| | | Time between checks for aggregated log retention. If set to 0 or a | +| | | negative value then the value is computed as one-tenth of the | +| | | aggregated log retention time. | +| | | Be careful, set this too small and you will spam the name node. | +*-+-++
svn commit: r1441246 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
Author: jlowe Date: Thu Jan 31 22:55:00 2013 New Revision: 1441246 URL: http://svn.apache.org/viewvc?rev=1441246view=rev Log: svn merge -c 1441239 FIXES: YARN-364. AggregatedLogDeletionService can take too long to delete logs. Contributed by Jason Lowe Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm?rev=1441246r1=1441245r2=1441246view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Thu Jan 31 22:55:00 2013 @@ -325,6 +325,13 @@ Hadoop MapReduce Next Generation - Clust | | | How long to keep aggregation logs before deleting them. -1 disables. | | | | Be careful, set this too small and you will spam the name node. | *-+-++ +| yarn.log-aggregation.retain-check-interval-seconds | | | +| | -1 | | +| | | Time between checks for aggregated log retention. If set to 0 or a | +| | | negative value then the value is computed as one-tenth of the | +| | | aggregated log retention time. | +| | | Be careful, set this too small and you will spam the name node. | +*-+-++
svn commit: r1442639 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Tue Feb 5 16:02:52 2013 New Revision: 1442639 URL: http://svn.apache.org/viewvc?rev=1442639view=rev Log: HADOOP-9260. Hadoop version may be not correct when starting name node or data node. Contributed by Chris Nauroth Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1442639r1=1442638r2=1442639view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Feb 5 16:02:52 2013 @@ -602,6 +602,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-9252. In StringUtils, humanReadableInt(..) has a race condition and the synchronization of limitDecimalTo2(double) can be avoided. (szetszwo) +HADOOP-9260. Hadoop version may be not correct when starting name node or +data node. (Chris Nauroth via jlowe) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES
svn commit: r1442639 - /hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Author: jlowe
Date: Tue Feb 5 16:02:52 2013
New Revision: 1442639
URL: http://svn.apache.org/viewvc?rev=1442639view=rev
Log:
HADOOP-9260. Hadoop version may be not correct when starting name node or data
node. Contributed by Chris Nauroth
Modified:
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Modified:
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1442639r1=1442638r2=1442639view=diff
==
---
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Tue Feb 5 16:02:52 2013
@@ -91,14 +91,20 @@
includes
include${project.artifactId}-${project.version}.jar/include
include${project.artifactId}-${project.version}-tests.jar/include
-include${project.artifactId}-${project.version}-sources.jar/include
-
include${project.artifactId}-${project.version}-test-sources.jar/include
/includes
excludes
excludehadoop-tools-dist-*.jar/exclude
/excludes
/fileSet
fileSet
+ directory${project.build.directory}/directory
+
outputDirectory/share/hadoop/${hadoop.component}/sources/outputDirectory
+ includes
+include${project.artifactId}-${project.version}-sources.jar/include
+
include${project.artifactId}-${project.version}-test-sources.jar/include
+ /includes
+/fileSet
+fileSet
directory${basedir}/dev-support/jdiff/directory
outputDirectory/share/hadoop/${hadoop.component}/jdiff/outputDirectory
/fileSet
svn commit: r1442641 - /hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Author: jlowe
Date: Tue Feb 5 16:06:58 2013
New Revision: 1442641
URL: http://svn.apache.org/viewvc?rev=1442641view=rev
Log:
svn merge -c 1442639 FIXES: HADOOP-9260. Hadoop version may be not correct when
starting name node or data node. Contributed by Chris Nauroth
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Modified:
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1442641r1=1442640r2=1442641view=diff
==
---
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Tue Feb 5 16:06:58 2013
@@ -91,14 +91,20 @@
includes
include${project.artifactId}-${project.version}.jar/include
include${project.artifactId}-${project.version}-tests.jar/include
-include${project.artifactId}-${project.version}-sources.jar/include
-
include${project.artifactId}-${project.version}-test-sources.jar/include
/includes
excludes
excludehadoop-tools-dist-*.jar/exclude
/excludes
/fileSet
fileSet
+ directory${project.build.directory}/directory
+
outputDirectory/share/hadoop/${hadoop.component}/sources/outputDirectory
+ includes
+include${project.artifactId}-${project.version}-sources.jar/include
+
include${project.artifactId}-${project.version}-test-sources.jar/include
+ /includes
+/fileSet
+fileSet
directory${basedir}/dev-support/jdiff/directory
outputDirectory/share/hadoop/${hadoop.component}/jdiff/outputDirectory
/fileSet
svn commit: r1442641 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Tue Feb 5 16:06:58 2013 New Revision: 1442641 URL: http://svn.apache.org/viewvc?rev=1442641view=rev Log: svn merge -c 1442639 FIXES: HADOOP-9260. Hadoop version may be not correct when starting name node or data node. Contributed by Chris Nauroth Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1442641r1=1442640r2=1442641view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Feb 5 16:06:58 2013 @@ -283,6 +283,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-9252. In StringUtils, humanReadableInt(..) has a race condition and the synchronization of limitDecimalTo2(double) can be avoided. (szetszwo) +HADOOP-9260. Hadoop version may be not correct when starting name node or +data node. (Chris Nauroth via jlowe) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES
svn commit: r1453410 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/
Author: jlowe Date: Wed Mar 6 16:37:32 2013 New Revision: 1453410 URL: http://svn.apache.org/r1453410 Log: Add jlowe to PMC list Modified: hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml hadoop/common/site/main/publish/bylaws.pdf hadoop/common/site/main/publish/index.pdf hadoop/common/site/main/publish/issue_tracking.pdf hadoop/common/site/main/publish/linkmap.pdf hadoop/common/site/main/publish/mailing_lists.pdf hadoop/common/site/main/publish/privacy_policy.pdf hadoop/common/site/main/publish/releases.pdf hadoop/common/site/main/publish/version_control.pdf hadoop/common/site/main/publish/who.html hadoop/common/site/main/publish/who.pdf Modified: hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml URL: http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml?rev=1453410r1=1453409r2=1453410view=diff == --- hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml (original) +++ hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml Wed Mar 6 16:37:32 2013 @@ -159,6 +159,14 @@ td-8/td /tr + tr + tdjlowe/td + tdJason Lowe/td + tdYahoo!/td + td/td + td-6/td + /tr + tr tdmahadev/td tdMahadev Konar/td Modified: hadoop/common/site/main/publish/bylaws.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.pdf?rev=1453410r1=1453409r2=1453410view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/index.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/index.pdf?rev=1453410r1=1453409r2=1453410view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/issue_tracking.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/issue_tracking.pdf?rev=1453410r1=1453409r2=1453410view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/linkmap.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/linkmap.pdf?rev=1453410r1=1453409r2=1453410view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/mailing_lists.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/mailing_lists.pdf?rev=1453410r1=1453409r2=1453410view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/privacy_policy.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/privacy_policy.pdf?rev=1453410r1=1453409r2=1453410view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/releases.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/releases.pdf?rev=1453410r1=1453409r2=1453410view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/version_control.pdf URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/version_control.pdf?rev=1453410r1=1453409r2=1453410view=diff == Binary files - no diff available. Modified: hadoop/common/site/main/publish/who.html URL: http://svn.apache.org/viewvc/hadoop/common/site/main/publish/who.html?rev=1453410r1=1453409r2=1453410view=diff == --- hadoop/common/site/main/publish/who.html (original) +++ hadoop/common/site/main/publish/who.html Wed Mar 6 16:37:32 2013 @@ -436,6 +436,17 @@ document.write(Last Published: + docu /tr + +tr + +td colspan=1 rowspan=1jlowe/td + td colspan=1 rowspan=1Jason Lowe/td + td colspan=1 rowspan=1Yahoo!/td + td colspan=1 rowspan=1/td + td colspan=1 rowspan=1-6/td + +/tr + tr @@ -662,7 +673,7 @@ document.write(Last Published: + docu /div -a name=N103FE/aa name=Emeritus+Hadoop+PMC+Members/a +a name=N10419/aa name=Emeritus+Hadoop+PMC+Members/a h2 class=h3Emeritus Hadoop PMC Members/h2 div class=section ul @@ -677,7 +688,7 @@ document.write(Last Published: + docu /div -a name=N10411/aa name=Hadoop+Committers/a +a name=N1042C/aa name=Hadoop+Committers/a h2 class=h3Hadoop Committers/h2 div class=section
svn commit: r1456212 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Wed Mar 13 22:25:47 2013 New Revision: 1456212 URL: http://svn.apache.org/r1456212 Log: HADOOP-9397. Incremental dist tar build fails. Contributed by Chris Nauroth Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1456212r1=1456211r2=1456212view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Mar 13 22:25:47 2013 @@ -348,6 +348,8 @@ Trunk (Unreleased) HADOOP-9099. NetUtils.normalizeHostName fails on domains where UnknownHost resolves to an IP address. (Ivan Mitic via suresh) +HADOOP-9397. Incremental dist tar build fails (Chris Nauroth via jlowe) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd)
svn commit: r1456212 - /hadoop/common/trunk/hadoop-dist/pom.xml
Author: jlowe
Date: Wed Mar 13 22:25:47 2013
New Revision: 1456212
URL: http://svn.apache.org/r1456212
Log:
HADOOP-9397. Incremental dist tar build fails. Contributed by Chris Nauroth
Modified:
hadoop/common/trunk/hadoop-dist/pom.xml
Modified: hadoop/common/trunk/hadoop-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-dist/pom.xml?rev=1456212r1=1456211r2=1456212view=diff
==
--- hadoop/common/trunk/hadoop-dist/pom.xml (original)
+++ hadoop/common/trunk/hadoop-dist/pom.xml Wed Mar 13 22:25:47 2013
@@ -152,7 +152,7 @@
}
run tar cf hadoop-${project.version}.tar
hadoop-${project.version}
- run gzip hadoop-${project.version}.tar
+ run gzip -f hadoop-${project.version}.tar
echo
echo Hadoop dist tar available at:
${project.build.directory}/hadoop-${project.version}.tar.gz
echo
svn commit: r1467072 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/compress/lz4/ src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4
Author: jlowe
Date: Thu Apr 11 20:16:49 2013
New Revision: 1467072
URL: http://svn.apache.org/r1467072
Log:
HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests.
Contributed by Vadim Bondarev
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1467072r1=1467071r2=1467072view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Apr
11 20:16:49 2013
@@ -620,6 +620,9 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9471. hadoop-client wrongfully excludes jetty-util JAR,
breaking webhdfs. (tucu)
+HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests (Vadim
+Bondarev via jlowe)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
@@ -1621,6 +1624,9 @@ Release 0.23.8 - UNRELEASED
BUG FIXES
+HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests (Vadim
+Bondarev via jlowe)
+
Release 0.23.7 - UNRELEASED
INCOMPATIBLE CHANGES
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java?rev=1467072view=auto
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java
(added)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java
Thu Apr 11 20:16:49 2013
@@ -0,0 +1,316 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.io.compress.lz4;
+
+import static org.junit.Assert.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+import org.apache.hadoop.io.DataInputBuffer;
+import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.io.compress.BlockCompressorStream;
+import org.apache.hadoop.io.compress.BlockDecompressorStream;
+import org.apache.hadoop.io.compress.CompressionInputStream;
+import org.apache.hadoop.io.compress.CompressionOutputStream;
+import org.apache.hadoop.io.compress.Lz4Codec;
+import org.apache.hadoop.io.compress.lz4.Lz4Compressor;
+import org.apache.hadoop.io.compress.lz4.Lz4Decompressor;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assume.*;
+
+public class TestLz4CompressorDecompressor {
+
+ private static final Random rnd = new Random(12345l);
+
+ @Before
+ public void before() {
+assumeTrue(Lz4Codec.isNativeCodeLoaded());
+ }
+
+ //test on NullPointerException in {@code compressor.setInput()}
+ @Test
+ public void testCompressorSetInputNullPointerException() {
+try {
+ Lz4Compressor compressor = new Lz4Compressor();
+ compressor.setInput(null, 0, 10);
+ fail(testCompressorSetInputNullPointerException error !!!);
+} catch (NullPointerException ex) {
+ // expected
+} catch (Exception e) {
+ fail(testCompressorSetInputNullPointerException ex error !!!);
+}
+ }
+
+ //test on NullPointerException in {@code decompressor.setInput()}
+ @Test
+ public void testDecompressorSetInputNullPointerException() {
+try {
+ Lz4Decompressor decompressor
svn commit: r1467080 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/compress/lz4/ src/test/java/org/apache/hadoop/io/compr
Author: jlowe Date: Thu Apr 11 20:38:32 2013 New Revision: 1467080 URL: http://svn.apache.org/r1467080 Log: svn merge -c 1467072 FIXES: HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests. Contributed by Vadim Bondarev Added: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/ - copied from r1467072, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java - copied unchanged from r1467072, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1467080r1=1467079r2=1467080view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Thu Apr 11 20:38:32 2013 @@ -12,6 +12,9 @@ Release 0.23.8 - UNRELEASED BUG FIXES +HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests (Vadim +Bondarev via jlowe) + Release 0.23.7 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1467090 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/test/java/org/apache/hadoop/io/compress/ src/test/java/org/apache/hadoop/io/compress/zlib/
Author: jlowe
Date: Thu Apr 11 21:17:56 2013
New Revision: 1467090
URL: http://svn.apache.org/r1467090
Log:
HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit tests.
Contributed by Vadim Bondarev
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1467090r1=1467089r2=1467090view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Apr
11 21:17:56 2013
@@ -623,6 +623,9 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests (Vadim
Bondarev via jlowe)
+HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit
+tests (Vadim Bondarev via jlowe)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
@@ -1627,6 +1630,9 @@ Release 0.23.8 - UNRELEASED
HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests (Vadim
Bondarev via jlowe)
+HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit
+tests (Vadim Bondarev via jlowe)
+
Release 0.23.7 - UNRELEASED
INCOMPATIBLE CHANGES
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java?rev=1467090view=auto
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java
(added)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java
Thu Apr 11 21:17:56 2013
@@ -0,0 +1,524 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.io.compress;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.compress.lz4.Lz4Compressor;
+import org.apache.hadoop.io.compress.snappy.SnappyCompressor;
+import org.apache.hadoop.io.compress.zlib.BuiltInZlibDeflater;
+import org.apache.hadoop.io.compress.zlib.ZlibCompressor;
+import org.apache.hadoop.io.compress.zlib.ZlibFactory;
+import org.apache.hadoop.util.NativeCodeLoader;
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import static org.junit.Assert.*;
+
+public class CompressDecompressTesterT extends Compressor, E extends
Decompressor {
+
+ private static final Logger logger = Logger
+ .getLogger(CompressDecompressTester.class);
+
+ private final byte[] originalRawData;
+
+ private ImmutableListTesterPairT, E pairs = ImmutableList.of();
+ private ImmutableList.BuilderTesterPairT, E builder =
ImmutableList.builder
svn commit: r1467099 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ src/test/java/org/apache/hadoop/io/compress/ src/test/java/org/apache/hadoop/io/compress/zlib/
Author: jlowe Date: Thu Apr 11 21:25:10 2013 New Revision: 1467099 URL: http://svn.apache.org/r1467099 Log: svn merge -c 1467090 FIXES: HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit tests. Contributed by Vadim Bondarev Added: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java - copied unchanged from r1467090, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java - copied unchanged from r1467090, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/ - copied from r1467090, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java - copied unchanged from r1467090, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1467099r1=1467098r2=1467099view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Apr 11 21:25:10 2013 @@ -116,6 +116,9 @@ Release 2.0.5-beta - UNRELEASED HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests (Vadim Bondarev via jlowe) +HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit +tests (Vadim Bondarev via jlowe) + Release 2.0.4-alpha - UNRELEASED INCOMPATIBLE CHANGES @@ -1142,6 +1145,9 @@ Release 0.23.8 - UNRELEASED HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests (Vadim Bondarev via jlowe) +HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit +tests (Vadim Bondarev via jlowe) + Release 0.23.7 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1467102 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: ./ src/test/java/org/apache/hadoop/io/compress/ src/test/java/org/apache/hadoop/io/compress/zlib/
Author: jlowe Date: Thu Apr 11 21:27:15 2013 New Revision: 1467102 URL: http://svn.apache.org/r1467102 Log: svn merge -c 1467090 FIXES: HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit tests. Contributed by Vadim Bondarev Added: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java - copied unchanged from r1467090, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java - copied unchanged from r1467090, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/ - copied from r1467090, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java - copied unchanged from r1467090, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1467102r1=1467101r2=1467102view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Thu Apr 11 21:27:15 2013 @@ -15,6 +15,9 @@ Release 0.23.8 - UNRELEASED HADOOP-9222. Cover package with org.apache.hadoop.io.lz4 unit tests (Vadim Bondarev via jlowe) +HADOOP-9233. Cover package org.apache.hadoop.io.compress.zlib with unit +tests (Vadim Bondarev via jlowe) + Release 0.23.7 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1476487 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Author: jlowe
Date: Sat Apr 27 04:11:23 2013
New Revision: 1476487
URL: http://svn.apache.org/r1476487
Log:
HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo.
Contributed by Liang Xie
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1476487r1=1476486r2=1476487view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Sat Apr
27 04:11:23 2013
@@ -644,6 +644,9 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9473. Typo in FileUtil copy() method. (Glen Mazza via suresh)
+HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in
+createMBeanInfo (Liang Xie via jlowe)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
@@ -1657,6 +1660,9 @@ Release 0.23.8 - UNRELEASED
HADOOP-9469. mapreduce/yarn source jars not included in dist tarball
(Robert Parker via tgraves)
+HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in
+createMBeanInfo (Liang Xie via jlowe)
+
Release 0.23.7 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java?rev=1476487r1=1476486r2=1476487view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Sat Apr 27 04:11:23 2013
@@ -18,9 +18,9 @@
package org.apache.hadoop.metrics.util;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.management.Attribute;
import javax.management.AttributeList;
@@ -69,6 +69,7 @@ public abstract class MetricsDynamicMBea
protected MetricsDynamicMBeanBase(final MetricsRegistry mr, final String
aMBeanDescription) {
metricsRegistry = mr;
mbeanDescription = aMBeanDescription;
+metricsRateAttributeMod = new ConcurrentHashMapString, MetricsBase();
createMBeanInfo();
}
@@ -78,7 +79,6 @@ public abstract class MetricsDynamicMBea
}
private void createMBeanInfo() {
-metricsRateAttributeMod = new HashMapString, MetricsBase();
boolean needsMinMaxResetOperation = false;
ListMBeanAttributeInfo attributesInfo = new
ArrayListMBeanAttributeInfo();
MBeanOperationInfo[] operationsInfo = null;
svn commit: r1476488 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Author: jlowe
Date: Sat Apr 27 04:13:04 2013
New Revision: 1476488
URL: http://svn.apache.org/r1476488
Log:
svn merge -c 1476487 FIXES: HADOOP-9504. MetricsDynamicMBeanBase has
concurrency issues in createMBeanInfo. Contributed by Liang Xie
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1476488r1=1476487r2=1476488view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Sat Apr 27 04:13:04 2013
@@ -127,6 +127,9 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9473. Typo in FileUtil copy() method. (Glen Mazza via suresh)
+HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in
+createMBeanInfo (Liang Xie via jlowe)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES
@@ -1162,6 +1165,9 @@ Release 0.23.8 - UNRELEASED
HADOOP-9469. mapreduce/yarn source jars not included in dist tarball
(Robert Parker via tgraves)
+HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in
+createMBeanInfo (Liang Xie via jlowe)
+
Release 0.23.7 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java?rev=1476488r1=1476487r2=1476488view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Sat Apr 27 04:13:04 2013
@@ -18,9 +18,9 @@
package org.apache.hadoop.metrics.util;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.management.Attribute;
import javax.management.AttributeList;
@@ -69,6 +69,7 @@ public abstract class MetricsDynamicMBea
protected MetricsDynamicMBeanBase(final MetricsRegistry mr, final String
aMBeanDescription) {
metricsRegistry = mr;
mbeanDescription = aMBeanDescription;
+metricsRateAttributeMod = new ConcurrentHashMapString, MetricsBase();
createMBeanInfo();
}
@@ -78,7 +79,6 @@ public abstract class MetricsDynamicMBea
}
private void createMBeanInfo() {
-metricsRateAttributeMod = new HashMapString, MetricsBase();
boolean needsMinMaxResetOperation = false;
ListMBeanAttributeInfo attributesInfo = new
ArrayListMBeanAttributeInfo();
MBeanOperationInfo[] operationsInfo = null;
svn commit: r1476489 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Author: jlowe
Date: Sat Apr 27 04:19:47 2013
New Revision: 1476489
URL: http://svn.apache.org/r1476489
Log:
svn merge -c 1476487 FIXES: HADOOP-9504. MetricsDynamicMBeanBase has
concurrency issues in createMBeanInfo. Contributed by Liang Xie
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1476489r1=1476488r2=1476489view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Sat Apr 27 04:19:47 2013
@@ -21,6 +21,9 @@ Release 0.23.8 - UNRELEASED
HADOOP-9469. mapreduce/yarn source jars not included in dist tarball
(Robert Parker via tgraves)
+HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in
+createMBeanInfo (Liang Xie via jlowe)
+
Release 0.23.7 - 2013-04-18
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java?rev=1476489r1=1476488r2=1476489view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
Sat Apr 27 04:19:47 2013
@@ -18,9 +18,9 @@
package org.apache.hadoop.metrics.util;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.management.Attribute;
import javax.management.AttributeList;
@@ -69,6 +69,7 @@ public abstract class MetricsDynamicMBea
protected MetricsDynamicMBeanBase(final MetricsRegistry mr, final String
aMBeanDescription) {
metricsRegistry = mr;
mbeanDescription = aMBeanDescription;
+metricsRateAttributeMod = new ConcurrentHashMapString, MetricsBase();
createMBeanInfo();
}
@@ -78,7 +79,6 @@ public abstract class MetricsDynamicMBea
}
private void createMBeanInfo() {
-metricsRateAttributeMod = new HashMapString, MetricsBase();
boolean needsMinMaxResetOperation = false;
ListMBeanAttributeInfo attributesInfo = new
ArrayListMBeanAttributeInfo();
MBeanOperationInfo[] operationsInfo = null;
svn commit: r1487117 - /hadoop/common/branches/branch-2/hadoop-dist/pom.xml
Author: jlowe
Date: Tue May 28 20:58:39 2013
New Revision: 1487117
URL: http://svn.apache.org/r1487117
Log:
svn merge -c 1456212 FIXES: HADOOP-9397. Incremental dist tar build fails.
Contributed by Chris Nauroth
Modified:
hadoop/common/branches/branch-2/hadoop-dist/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-dist/pom.xml?rev=1487117r1=1487116r2=1487117view=diff
==
--- hadoop/common/branches/branch-2/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-dist/pom.xml Tue May 28 20:58:39 2013
@@ -152,7 +152,7 @@
}
run tar cf hadoop-${project.version}.tar
hadoop-${project.version}
- run gzip hadoop-${project.version}.tar
+ run gzip -f hadoop-${project.version}.tar
echo
echo Hadoop dist tar available at:
${project.build.directory}/hadoop-${project.version}.tar.gz
echo
svn commit: r1487117 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Tue May 28 20:58:39 2013 New Revision: 1487117 URL: http://svn.apache.org/r1487117 Log: svn merge -c 1456212 FIXES: HADOOP-9397. Incremental dist tar build fails. Contributed by Chris Nauroth Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1487117r1=1487116r2=1487117view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue May 28 20:58:39 2013 @@ -367,6 +367,8 @@ Release 2.0.5-beta - UNRELEASED HADOOP-9553. TestAuthenticationToken fails on Windows. (Arpit Agarwal via suresh) +HADOOP-9397. Incremental dist tar build fails. (Chris Nauroth via jlowe) + Release 2.0.4-alpha - 2013-04-25 INCOMPATIBLE CHANGES
svn commit: r1488040 - in /hadoop/common/trunk: hadoop-project/pom.xml hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Author: jlowe
Date: Thu May 30 22:43:16 2013
New Revision: 1488040
URL: http://svn.apache.org/r1488040
Log:
HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov
Modified:
hadoop/common/trunk/hadoop-project/pom.xml
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1488040r1=1488039r2=1488040view=diff
==
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Thu May 30 22:43:16 2013
@@ -36,6 +36,9 @@
test.exclude_/test.exclude
test.exclude.pattern_/test.exclude.pattern
+!-- number of threads/forks to use when running tests in parallel, see
parallel-tests profile --
+testsThreadCount4/testsThreadCount
+
!-- platform encoding override --
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
@@ -967,5 +970,23 @@
/plugins
/build
/profile
+!-- Copied into specific modules supporting parallel testing. Will be
uncommented as soon as all modules support this.
+profile
+ idparallel-tests/id
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+configuration
+ forkModeperthread/forkMode
+ threadCount${testsThreadCount}/threadCount
+ parallelclasses/parallel
+/configuration
+ /plugin
+/plugins
+ /build
+/profile
+--
/profiles
/project
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java?rev=1488040r1=1488039r2=1488040view=diff
==
---
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
(original)
+++
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Thu May 30 22:43:16 2013
@@ -56,14 +56,14 @@ public class TestDistCpViewFs {
public static void setup() throws URISyntaxException{
try {
Path fswd = FileSystem.get(getConf()).getWorkingDirectory();
- Configuration vConf = ViewFileSystemTestSetup.createConfig();
- ConfigUtil.addLink(vConf, /usr, new URI(fswd.toString()));
+ Configuration vConf = ViewFileSystemTestSetup.createConfig(false);
+ ConfigUtil.addLink(vConf, /usr, new URI(fswd.toString()));
fs = FileSystem.get(FsConstants.VIEWFS_URI, vConf);
fs.setWorkingDirectory(new Path(/usr));
listFile = new Path(target/tmp/listing).makeQualified(fs.getUri(),
fs.getWorkingDirectory());
target = new Path(target/tmp/target).makeQualified(fs.getUri(),
- fs.getWorkingDirectory());
+ fs.getWorkingDirectory());
root = new Path(target/tmp).makeQualified(fs.getUri(),
fs.getWorkingDirectory()).toString();
TestDistCpUtils.delete(fs, root);
svn commit: r1489026 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Mon Jun 3 15:27:28 2013 New Revision: 1489026 URL: http://svn.apache.org/r1489026 Log: Move HADOOP-9397 to 2.1.0-beta after merging it into branch-2. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489026r1=1489025r2=1489026view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 3 15:27:28 2013 @@ -334,8 +334,6 @@ Trunk (Unreleased) HADOOP-9099. NetUtils.normalizeHostName fails on domains where UnknownHost resolves to an IP address. (Ivan Mitic via suresh) -HADOOP-9397. Incremental dist tar build fails (Chris Nauroth via jlowe) - HADOOP-9431 TestSecurityUtil#testLocalHostNameForNullOrWild on systems where hostname contains capital letters (Chris Nauroth via sanjay) @@ -739,6 +737,8 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9553. TestAuthenticationToken fails on Windows. (Arpit Agarwal via suresh) +HADOOP-9397. Incremental dist tar build fails (Chris Nauroth via jlowe) + HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos) HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
svn commit: r1489250 - in /hadoop/common/branches/branch-2: hadoop-project/pom.xml hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Author: jlowe
Date: Tue Jun 4 00:29:37 2013
New Revision: 1489250
URL: http://svn.apache.org/r1489250
Log:
HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1489250r1=1489249r2=1489250view=diff
==
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Tue Jun 4 00:29:37
2013
@@ -36,6 +36,9 @@
test.exclude_/test.exclude
test.exclude.pattern_/test.exclude.pattern
+!-- number of threads/forks to use when running tests in parallel, see
parallel-tests profile --
+testsThreadCount4/testsThreadCount
+
!-- platform encoding override --
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
@@ -1004,5 +1007,23 @@
/plugins
/build
/profile
+!-- Copied into specific modules supporting parallel testing. Will be
uncommented as soon as all modules support this.
+profile
+ idparallel-tests/id
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+configuration
+ forkModeperthread/forkMode
+ threadCount${testsThreadCount}/threadCount
+ parallelclasses/parallel
+/configuration
+ /plugin
+/plugins
+ /build
+/profile
+--
/profiles
/project
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java?rev=1489250r1=1489249r2=1489250view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Tue Jun 4 00:29:37 2013
@@ -56,14 +56,14 @@ public class TestDistCpViewFs {
public static void setup() throws URISyntaxException{
try {
Path fswd = FileSystem.get(getConf()).getWorkingDirectory();
- Configuration vConf = ViewFileSystemTestSetup.createConfig();
- ConfigUtil.addLink(vConf, /usr, new URI(fswd.toString()));
+ Configuration vConf = ViewFileSystemTestSetup.createConfig(false);
+ ConfigUtil.addLink(vConf, /usr, new URI(fswd.toString()));
fs = FileSystem.get(FsConstants.VIEWFS_URI, vConf);
fs.setWorkingDirectory(new Path(/usr));
listFile = new Path(target/tmp/listing).makeQualified(fs.getUri(),
fs.getWorkingDirectory());
target = new Path(target/tmp/target).makeQualified(fs.getUri(),
- fs.getWorkingDirectory());
+ fs.getWorkingDirectory());
root = new Path(target/tmp).makeQualified(fs.getUri(),
fs.getWorkingDirectory()).toString();
TestDistCpUtils.delete(fs, root);
svn commit: r1489258 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Tue Jun 4 00:34:42 2013 New Revision: 1489258 URL: http://svn.apache.org/r1489258 Log: Move HADOOP-9287 in CHANGES.txt after committing to branch-2 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489258r1=1489257r2=1489258view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 4 00:34:42 2013 @@ -145,8 +145,6 @@ Trunk (Unreleased) HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations for Unit testing. (Hari via stevel) -HADOOP-9287. Parallel-testing hadoop-common (Andrey Klochkov via jlowe) - BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled. @@ -453,6 +451,8 @@ Release 2.1.0-beta - UNRELEASED HADOOP-7391 Document Interface Classification from HADOOP-5073 (sanjay Radia) +HADOOP-9287. Parallel-testing hadoop-common (Andrey Klochkov via jlowe) + OPTIMIZATIONS HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs
svn commit: r1491548 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop-config.sh
Author: jlowe Date: Mon Jun 10 18:12:36 2013 New Revision: 1491548 URL: http://svn.apache.org/r1491548 Log: HADOOP-9581. hadoop --config non-existent directory should result in error. Contributed by Ashwin Shankar Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491548r1=1491547r2=1491548view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 10 18:12:36 2013 @@ -571,6 +571,9 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos) +HADOOP-9581. hadoop --config non-existent directory should result in error +(Ashwin Shankar via jlowe) + BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS HADOOP-8924. Hadoop Common creating package-info.java must not depend on Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1491548r1=1491547r2=1491548view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Mon Jun 10 18:12:36 2013 @@ -60,6 +60,10 @@ then then shift confdir=$1 + if [ ! -d $confdir ]; then +echo Error: Cannot find configuration directory: $confdir +exit 1 + fi shift HADOOP_CONF_DIR=$confdir fi
svn commit: r1491549 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop-config.sh
Author: jlowe Date: Mon Jun 10 18:14:16 2013 New Revision: 1491549 URL: http://svn.apache.org/r1491549 Log: svn merge -c 1491548 FIXES: HADOOP-9581. hadoop --config non-existent directory should result in error. Contributed by Ashwin Shankar Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491549r1=1491548r2=1491549view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 10 18:14:16 2013 @@ -246,6 +246,9 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos) +HADOOP-9581. hadoop --config non-existent directory should result in error +(Ashwin Shankar via jlowe) + BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS HADOOP-8924. Hadoop Common creating package-info.java must not depend on Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1491549r1=1491548r2=1491549view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Mon Jun 10 18:14:16 2013 @@ -60,6 +60,10 @@ then then shift confdir=$1 + if [ ! -d $confdir ]; then +echo Error: Cannot find configuration directory: $confdir +exit 1 + fi shift HADOOP_CONF_DIR=$confdir fi
svn commit: r1491550 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop-config.sh
Author: jlowe Date: Mon Jun 10 18:14:27 2013 New Revision: 1491550 URL: http://svn.apache.org/r1491550 Log: svn merge -c 1491548 FIXES: HADOOP-9581. hadoop --config non-existent directory should result in error. Contributed by Ashwin Shankar Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491550r1=1491549r2=1491550view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 10 18:14:27 2013 @@ -222,6 +222,9 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos) +HADOOP-9581. hadoop --config non-existent directory should result in error +(Ashwin Shankar via jlowe) + BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS HADOOP-8924. Hadoop Common creating package-info.java must not depend on Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1491550r1=1491549r2=1491550view=diff == --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Mon Jun 10 18:14:27 2013 @@ -60,6 +60,10 @@ then then shift confdir=$1 + if [ ! -d $confdir ]; then +echo Error: Cannot find configuration directory: $confdir +exit 1 + fi shift HADOOP_CONF_DIR=$confdir fi
svn commit: r1491554 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop-config.sh
Author: jlowe Date: Mon Jun 10 18:20:17 2013 New Revision: 1491554 URL: http://svn.apache.org/r1491554 Log: svn merge -c 1491548 FIXES: HADOOP-9581. hadoop --config non-existent directory should result in error. Contributed by Ashwin Shankar Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491554r1=1491553r2=1491554view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 10 18:20:17 2013 @@ -12,6 +12,9 @@ Release 0.23.9 - UNRELEASED BUG FIXES +HADOOP-9581. hadoop --config non-existent directory should result in error +(Ashwin Shankar via jlowe) + Release 0.23.8 - 2013-06-05 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1491554r1=1491553r2=1491554view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Mon Jun 10 18:20:17 2013 @@ -60,6 +60,10 @@ then then shift confdir=$1 + if [ ! -d $confdir ]; then +echo Error: Cannot find configuration directory: $confdir +exit 1 + fi shift HADOOP_CONF_DIR=$confdir fi
svn commit: r1494331 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/conf/Configuration.java src/main/java/org/apache/hadoop/fs/FsShell.java
Author: jlowe
Date: Tue Jun 18 21:56:25 2013
New Revision: 1494331
URL: http://svn.apache.org/r1494331
Log:
HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error.
Contributed by Ashwin Shankar
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1494331r1=1494330r2=1494331view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun
18 21:56:25 2013
@@ -354,6 +354,33 @@ Trunk (Unreleased)
HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
+Release 2.3.0 - UNRELEASED
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
+HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error
+(Ashwin Shankar via jlowe)
+
+Release 2.2.0 - UNRELEASED
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
Release 2.1.0-beta - UNRELEASED
INCOMPATIBLE CHANGES
@@ -1804,6 +1831,12 @@ Release 0.23.9 - UNRELEASED
BUG FIXES
+HADOOP-9581. hadoop --config non-existent directory should result in error
+(Ashwin Shankar via jlowe)
+
+HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error
+(Ashwin Shankar via jlowe)
+
Release 0.23.8 - 2013-06-05
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1494331r1=1494330r2=1494331view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Tue Jun 18 21:56:25 2013
@@ -1970,7 +1970,7 @@ public class Configuration implements It
private Document parse(DocumentBuilder builder, URL url)
throws IOException, SAXException {
if (!quietmode) {
- LOG.info(parsing URL + url);
+ LOG.debug(parsing URL + url);
}
if (url == null) {
return null;
@@ -1981,7 +1981,7 @@ public class Configuration implements It
private Document parse(DocumentBuilder builder, InputStream is,
String systemId) throws IOException, SAXException {
if (!quietmode) {
- LOG.info(parsing input stream + is);
+ LOG.debug(parsing input stream + is);
}
if (is == null) {
return null;
@@ -2054,7 +2054,7 @@ public class Configuration implements It
.getAbsoluteFile();
if (file.exists()) {
if (!quiet) {
-LOG.info(parsing File + file);
+LOG.debug(parsing File + file);
}
doc = parse(builder, new BufferedInputStream(
new FileInputStream(file)), ((Path)resource).toString());
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java?rev=1494331r1=1494330r2=1494331view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
Tue Jun 18 21:56:25 2013
@@ -300,6 +300,9 @@ public class FsShell extends Configured
*/
public static void main(String argv[]) throws Exception {
FsShell shell = newShellInstance();
+Configuration conf = new Configuration();
+conf.setQuietMode(false);
+shell.setConf(conf);
int res;
try {
res = ToolRunner.run(shell, argv);
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java?rev=1494331view=auto
svn commit: r1494336 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/conf/ src/main/java/org/apache/hadoop/fs/ src/test/java/org/apache/ha
Author: jlowe
Date: Tue Jun 18 22:04:41 2013
New Revision: 1494336
URL: http://svn.apache.org/r1494336
Log:
svn merge -c 1494331 FIXES: HADOOP-9582. Non-existent file to hadoop fs -conf
doesn't throw error. Contributed by Ashwin Shankar
Added:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java
- copied unchanged from r1494331,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1494336r1=1494335r2=1494336view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Jun 18 22:04:41 2013
@@ -12,6 +12,9 @@ Release 2.3.0 - UNRELEASED
BUG FIXES
+HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error
+(Ashwin Shankar via jlowe)
+
Release 2.2.0 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -1504,6 +1507,12 @@ Release 0.23.9 - UNRELEASED
BUG FIXES
+HADOOP-9581. hadoop --config non-existent directory should result in error
+(Ashwin Shankar via jlowe)
+
+HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error
+(Ashwin Shankar via jlowe)
+
Release 0.23.8 - 2013-06-05
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1494336r1=1494335r2=1494336view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Tue Jun 18 22:04:41 2013
@@ -1874,7 +1874,7 @@ public class Configuration implements It
private Document parse(DocumentBuilder builder, URL url)
throws IOException, SAXException {
if (!quietmode) {
- LOG.info(parsing URL + url);
+ LOG.debug(parsing URL + url);
}
if (url == null) {
return null;
@@ -1885,7 +1885,7 @@ public class Configuration implements It
private Document parse(DocumentBuilder builder, InputStream is,
String systemId) throws IOException, SAXException {
if (!quietmode) {
- LOG.info(parsing input stream + is);
+ LOG.debug(parsing input stream + is);
}
if (is == null) {
return null;
@@ -1958,7 +1958,7 @@ public class Configuration implements It
.getAbsoluteFile();
if (file.exists()) {
if (!quiet) {
-LOG.info(parsing File + file);
+LOG.debug(parsing File + file);
}
doc = parse(builder, new BufferedInputStream(
new FileInputStream(file)), ((Path)resource).toString());
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java?rev=1494336r1=1494335r2=1494336view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
Tue Jun 18 22:04:41 2013
@@ -300,6 +300,9 @@ public class FsShell extends Configured
*/
public static void main(String argv[]) throws Exception {
FsShell shell = newShellInstance();
+Configuration conf = new Configuration();
+conf.setQuietMode(false);
+shell.setConf(conf);
int res;
try {
res = ToolRunner.run(shell, argv);
svn commit: r1494338 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/conf/ src/main/java/org/apache/hadoop/fs/ src/test/java/org/apache
Author: jlowe
Date: Tue Jun 18 22:12:11 2013
New Revision: 1494338
URL: http://svn.apache.org/r1494338
Log:
HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error.
Contributed by Ashwin Shankar
Added:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1494338r1=1494337r2=1494338view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Jun 18 22:12:11 2013
@@ -15,6 +15,9 @@ Release 0.23.9 - UNRELEASED
HADOOP-9581. hadoop --config non-existent directory should result in error
(Ashwin Shankar via jlowe)
+HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error
+(Ashwin Shankar via jlowe)
+
Release 0.23.8 - 2013-06-05
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1494338r1=1494337r2=1494338view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Tue Jun 18 22:12:11 2013
@@ -1844,7 +1844,7 @@ public class Configuration implements It
URL url = (URL)resource;
if (url != null) {
if (!quiet) {
-LOG.info(parsing + url);
+LOG.debug(parsing + url);
}
doc = builder.parse(url.toString());
}
@@ -1852,7 +1852,7 @@ public class Configuration implements It
URL url = getResource((String)resource);
if (url != null) {
if (!quiet) {
-LOG.info(parsing + url);
+LOG.debug(parsing + url);
}
doc = builder.parse(url.toString());
}
@@ -1863,7 +1863,7 @@ public class Configuration implements It
.getAbsoluteFile();
if (file.exists()) {
if (!quiet) {
-LOG.info(parsing + file);
+LOG.debug(parsing + file);
}
InputStream in = new BufferedInputStream(new FileInputStream(file));
try {
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java?rev=1494338r1=1494337r2=1494338view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
Tue Jun 18 22:12:11 2013
@@ -299,6 +299,9 @@ public class FsShell extends Configured
*/
public static void main(String argv[]) throws Exception {
FsShell shell = newShellInstance();
+Configuration conf = new Configuration();
+conf.setQuietMode(false);
+shell.setConf(conf);
int res;
try {
res = ToolRunner.run(shell, argv);
Added:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java?rev=1494338view=auto
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java
(added)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java
Tue Jun 18 22:12:11 2013
@@ -0,0 +1,42
svn commit: r1503954 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/security/protocolPB/ src/main/java/org/apache/hadoop/tools/protocolP
Author: jlowe Date: Wed Jul 17 00:06:48 2013 New Revision: 1503954 URL: http://svn.apache.org/r1503954 Log: HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe Added: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolClientSideTranslatorPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolServerSideTranslatorPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolClientSideTranslatorPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolServerSideTranslatorPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolClientSideTranslatorPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolServerSideTranslatorPB.java (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/RefreshUserMappingsProtocol.proto Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1503954r1=1503953r2=1503954view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jul 17 00:06:48 2013 @@ -474,6 +474,9 @@ Release 2.1.0-beta - 2013-07-02 HADOOP-9720. Rename Client#uuid to Client#clientId. (Arpit Agarwal via suresh) +HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, +RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol (jlowe) + OPTIMIZATIONS HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1503954r1=1503953r2=1503954view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml Wed Jul 17 00:06:48 2013 @@ -19,6 +19,12 @@ Package name=org.apache.hadoop.record.compiler.generated / /Match Match + Package name=org.apache.hadoop.security.proto / + /Match + Match + Package name=org.apache.hadoop.tools.proto / + /Match + Match Bug pattern=EI_EXPOSE_REP / /Match Match Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml?rev=1503954r1=1503953r2=1503954view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Wed Jul 17 00:06:48 2013 @@ -321,6 +321,9
svn commit: r1503955 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/security/protocolPB/ src/main/java/org/apache/hadoop/too
Author: jlowe Date: Wed Jul 17 00:12:05 2013 New Revision: 1503955 URL: http://svn.apache.org/r1503955 Log: svn merge -c 1503954 FIXES: HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe Added: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/ - copied from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolClientSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolClientSideTranslatorPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolServerSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolServerSideTranslatorPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolClientSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolClientSideTranslatorPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolServerSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolServerSideTranslatorPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/ - copied from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolClientSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolClientSideTranslatorPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolServerSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolServerSideTranslatorPB.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/proto/RefreshUserMappingsProtocol.proto - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/RefreshUserMappingsProtocol.proto Modified
svn commit: r1503956 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/security/protocolPB/ src/main/java/org/apache/had
Author: jlowe Date: Wed Jul 17 00:15:03 2013 New Revision: 1503956 URL: http://svn.apache.org/r1503956 Log: svn merge -c 1503954 FIXES: HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe Added: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/ - copied from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolClientSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolClientSideTranslatorPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolServerSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshAuthorizationPolicyProtocolServerSideTranslatorPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolClientSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolClientSideTranslatorPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolServerSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/protocolPB/RefreshUserMappingsProtocolServerSideTranslatorPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/ - copied from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolClientSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolClientSideTranslatorPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolServerSideTranslatorPB.java - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/protocolPB/GetUserMappingsProtocolServerSideTranslatorPB.java hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto - copied unchanged from r1503954, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/proto/RefreshUserMappingsProtocol.proto - copied unchanged from r1503954, hadoop/common/trunk
svn commit: r1504645 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
Author: jlowe
Date: Thu Jul 18 20:41:14 2013
New Revision: 1504645
URL: http://svn.apache.org/r1504645
Log:
MAPREDUCE-5265. History server admin service to refresh user and superuser
group mappings. Contributed by Ashwin Shankar
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties?rev=1504645r1=1504644r2=1504645view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
Thu Jul 18 20:41:14 2013
@@ -222,3 +222,13 @@ log4j.appender.RMSUMMARY.MaxFileSize=256
log4j.appender.RMSUMMARY.MaxBackupIndex=20
log4j.appender.RMSUMMARY.layout=org.apache.log4j.PatternLayout
log4j.appender.RMSUMMARY.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
+
+# HS audit log configs
+#mapreduce.hs.audit.logger=INFO,HSAUDIT
+#log4j.logger.org.apache.hadoop.mapreduce.v2.hs.HSAuditLogger=${mapreduce.hs.audit.logger}
+#log4j.additivity.org.apache.hadoop.mapreduce.v2.hs.HSAuditLogger=false
+#log4j.appender.HSAUDIT=org.apache.log4j.DailyRollingFileAppender
+#log4j.appender.HSAUDIT.File=${hadoop.log.dir}/hs-audit.log
+#log4j.appender.HSAUDIT.layout=org.apache.log4j.PatternLayout
+#log4j.appender.HSAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
+#log4j.appender.HSAUDIT.DatePattern=.-MM-dd
\ No newline at end of file
svn commit: r1504653 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
Author: jlowe
Date: Thu Jul 18 20:47:58 2013
New Revision: 1504653
URL: http://svn.apache.org/r1504653
Log:
svn merge -c 1504645 FIXES: MAPREDUCE-5265. History server admin service to
refresh user and superuser group mappings. Contributed by Ashwin Shankar
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties?rev=1504653r1=1504652r2=1504653view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
Thu Jul 18 20:47:58 2013
@@ -222,3 +222,13 @@ log4j.appender.RMSUMMARY.MaxFileSize=256
log4j.appender.RMSUMMARY.MaxBackupIndex=20
log4j.appender.RMSUMMARY.layout=org.apache.log4j.PatternLayout
log4j.appender.RMSUMMARY.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
+
+# HS audit log configs
+#mapreduce.hs.audit.logger=INFO,HSAUDIT
+#log4j.logger.org.apache.hadoop.mapreduce.v2.hs.HSAuditLogger=${mapreduce.hs.audit.logger}
+#log4j.additivity.org.apache.hadoop.mapreduce.v2.hs.HSAuditLogger=false
+#log4j.appender.HSAUDIT=org.apache.log4j.DailyRollingFileAppender
+#log4j.appender.HSAUDIT.File=${hadoop.log.dir}/hs-audit.log
+#log4j.appender.HSAUDIT.layout=org.apache.log4j.PatternLayout
+#log4j.appender.HSAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
+#log4j.appender.HSAUDIT.DatePattern=.-MM-dd
\ No newline at end of file
svn commit: r1508471 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/fs/local/ src/main/java/org/apach
Author: jlowe
Date: Tue Jul 30 14:42:59 2013
New Revision: 1508471
URL: http://svn.apache.org/r1508471
Log:
Revert HADOOP-9652 from branch-2
Removed:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Stat.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestStat.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/local/RawLocalFs.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1508471r1=1508470r2=1508471view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Jul 30 14:42:59 2013
@@ -33,9 +33,6 @@ Release 2.3.0 - UNRELEASED
HADOOP-9582. Non-existent file to hadoop fs -conf doesn't throw error
(Ashwin Shankar via jlowe)
-HADOOP-9652. RawLocalFs#getFileLinkStatus does not fill in the link owner
-and mode. (Andrew Wang via Colin Patrick McCabe)
-
Release 2.1.1-beta - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java?rev=1508471r1=1508470r2=1508471view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java
Tue Jul 30 14:42:59 2013
@@ -113,14 +113,7 @@ public abstract class DelegateToFileSyst
@Override
public FileStatus getFileLinkStatus(final Path f) throws IOException {
-FileStatus status = fsImpl.getFileLinkStatus(f);
-// FileSystem#getFileLinkStatus qualifies the link target
-// AbstractFileSystem needs to return it plain since it's qualified
-// in FileContext, so re-get and set the plain target
-if (status.isSymlink()) {
- status.setSymlink(fsImpl.getLinkTarget(f));
-}
-return status;
+return getFileStatus(f);
}
@Override
@@ -206,18 +199,22 @@ public abstract class DelegateToFileSyst
@Override
public boolean supportsSymlinks() {
-return fsImpl.supportsSymlinks();
+return false;
}
@Override
public void createSymlink(Path target, Path link, boolean createParent)
throws IOException {
-fsImpl.createSymlink(target, link, createParent);
+throw new IOException(File system does not support symlinks);
}
@Override
public Path getLinkTarget(final Path f) throws IOException {
-return fsImpl.getLinkTarget(f);
+/* We should never get here. Any file system that threw an
+ * UnresolvedLinkException, causing this function to be called,
+ * should override getLinkTarget.
+ */
+throw new AssertionError();
}
@Override //AbstractFileSystem
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java?rev=1508471r1=1508470r2=1508471view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org
svn commit: r1509900 - /hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Author: jlowe
Date: Fri Aug 2 22:51:34 2013
New Revision: 1509900
URL: http://svn.apache.org/r1509900
Log:
MAPREDUCE-5440. TestCopyCommitter Fails on JDK7. Contributed by Robert Parker
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1509900r1=1509899r2=1509900view=diff
==
---
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
(original)
+++
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Fri Aug 2 22:51:34 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail(Preserve status failure);
} finally {
TestDistCpUtils.delete(fs, /tmp1);
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
svn commit: r1509901 - /hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Author: jlowe
Date: Fri Aug 2 22:53:52 2013
New Revision: 1509901
URL: http://svn.apache.org/r1509901
Log:
svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7.
Contributed by Robert Parker
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1509901r1=1509900r2=1509901view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Fri Aug 2 22:53:52 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail(Preserve status failure);
} finally {
TestDistCpUtils.delete(fs, /tmp1);
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
svn commit: r1509902 - /hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Author: jlowe
Date: Fri Aug 2 22:54:26 2013
New Revision: 1509902
URL: http://svn.apache.org/r1509902
Log:
svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7.
Contributed by Robert Parker
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1509902r1=1509901r2=1509902view=diff
==
---
hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Fri Aug 2 22:54:26 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail(Preserve status failure);
} finally {
TestDistCpUtils.delete(fs, /tmp1);
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
svn commit: r1509903 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Author: jlowe
Date: Fri Aug 2 22:56:50 2013
New Revision: 1509903
URL: http://svn.apache.org/r1509903
Log:
svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7.
Contributed by Robert Parker
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java?rev=1509903r1=1509902r2=1509903view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
Fri Aug 2 22:56:50 2013
@@ -169,6 +169,7 @@ public class TestCopyCommitter {
Assert.fail(Preserve status failure);
} finally {
TestDistCpUtils.delete(fs, /tmp1);
+ conf.unset(DistCpConstants.CONF_LABEL_PRESERVE_STATUS);
}
}
svn commit: r1528502 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Author: jlowe
Date: Wed Oct 2 14:48:12 2013
New Revision: 1528502
URL: http://svn.apache.org/r1528502
Log:
HADOOP-9063. enhance unit-test coverage of class org.apache.hadoop.fs.FileUtil.
Contributed by Ivan A. Veselovsky
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1528502r1=1528501r2=1528502view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Oct
2 14:48:12 2013
@@ -339,6 +339,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-10006. Compilation failure in trunk for
o.a.h.fs.swift.util.JSONUtil (Junping Du via stevel)
+HADOOP-9063. enhance unit-test coverage of class
+org.apache.hadoop.fs.FileUtil (Ivan A. Veselovsky via jlowe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java?rev=1528502r1=1528501r2=1528502view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Wed Oct 2 14:48:12 2013
@@ -24,6 +24,8 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,15 +34,20 @@ import java.util.List;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.Shell;
import org.apache.hadoop.util.StringUtils;
+import org.apache.tools.tar.TarEntry;
+import org.apache.tools.tar.TarOutputStream;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.*;
public class TestFileUtil {
private static final Log LOG = LogFactory.getLog(TestFileUtil.class);
@@ -48,14 +55,14 @@ public class TestFileUtil {
private static final String TEST_ROOT_DIR = System.getProperty(
test.build.data, /tmp) + /fu;
private static final File TEST_DIR = new File(TEST_ROOT_DIR);
- private static String FILE = x;
- private static String LINK = y;
- private static String DIR = dir;
- private File del = new File(TEST_DIR, del);
- private File tmp = new File(TEST_DIR, tmp);
- private File dir1 = new File(del, DIR + 1);
- private File dir2 = new File(del, DIR + 2);
- private File partitioned = new File(TEST_DIR, partitioned);
+ private static final String FILE = x;
+ private static final String LINK = y;
+ private static final String DIR = dir;
+ private final File del = new File(TEST_DIR, del);
+ private final File tmp = new File(TEST_DIR, tmp);
+ private final File dir1 = new File(del, DIR + 1);
+ private final File dir2 = new File(del, DIR + 2);
+ private final File partitioned = new File(TEST_DIR, partitioned);
/**
* Creates multiple directories for testing.
@@ -116,17 +123,17 @@ public class TestFileUtil {
* @param contents String non-null file contents.
* @throws IOException if an I/O error occurs.
*/
- private void createFile(File directory, String name, String contents)
+ private File createFile(File directory, String name, String contents)
throws IOException {
File newFile = new File(directory, name);
PrintWriter pw = new PrintWriter(newFile);
-
try {
pw.println(contents);
}
finally {
pw.close();
}
+return newFile;
}
@Test (timeout = 3)
@@ -553,14 +560,283 @@ public class TestFileUtil {
* @throws IOException
*/
@Test (timeout = 3)
- public void testGetDU() throws IOException {
+ public void testGetDU() throws Exception {
setupDirs();
long du = FileUtil.getDU(TEST_DIR);
// Only two files (in partitioned). Each has 3 characters +
system-specific
// line separator.
-long expected = 2 * (3 + System.getProperty(line.separator).length());
+final
svn commit: r1528506 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Author: jlowe
Date: Wed Oct 2 14:53:28 2013
New Revision: 1528506
URL: http://svn.apache.org/r1528506
Log:
svn merge -c 1528502 FIXES: HADOOP-9063. enhance unit-test coverage of class
org.apache.hadoop.fs.FileUtil. Contributed by Ivan A. Veselovsky
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1528506r1=1528505r2=1528506view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Oct 2 14:53:28 2013
@@ -52,6 +52,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping.
(Junping Du via Colin Patrick McCabe)
+HADOOP-9063. enhance unit-test coverage of class
+org.apache.hadoop.fs.FileUtil (Ivan A. Veselovsky via jlowe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java?rev=1528506r1=1528505r2=1528506view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Wed Oct 2 14:53:28 2013
@@ -24,6 +24,8 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,15 +34,20 @@ import java.util.List;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.Shell;
import org.apache.hadoop.util.StringUtils;
+import org.apache.tools.tar.TarEntry;
+import org.apache.tools.tar.TarOutputStream;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
+import static org.junit.Assert.*;
public class TestFileUtil {
private static final Log LOG = LogFactory.getLog(TestFileUtil.class);
@@ -48,14 +55,14 @@ public class TestFileUtil {
private static final String TEST_ROOT_DIR = System.getProperty(
test.build.data, /tmp) + /fu;
private static final File TEST_DIR = new File(TEST_ROOT_DIR);
- private static String FILE = x;
- private static String LINK = y;
- private static String DIR = dir;
- private File del = new File(TEST_DIR, del);
- private File tmp = new File(TEST_DIR, tmp);
- private File dir1 = new File(del, DIR + 1);
- private File dir2 = new File(del, DIR + 2);
- private File partitioned = new File(TEST_DIR, partitioned);
+ private static final String FILE = x;
+ private static final String LINK = y;
+ private static final String DIR = dir;
+ private final File del = new File(TEST_DIR, del);
+ private final File tmp = new File(TEST_DIR, tmp);
+ private final File dir1 = new File(del, DIR + 1);
+ private final File dir2 = new File(del, DIR + 2);
+ private final File partitioned = new File(TEST_DIR, partitioned);
/**
* Creates multiple directories for testing.
@@ -116,17 +123,17 @@ public class TestFileUtil {
* @param contents String non-null file contents.
* @throws IOException if an I/O error occurs.
*/
- private void createFile(File directory, String name, String contents)
+ private File createFile(File directory, String name, String contents)
throws IOException {
File newFile = new File(directory, name);
PrintWriter pw = new PrintWriter(newFile);
-
try {
pw.println(contents);
}
finally {
pw.close();
}
+return newFile;
}
@Test (timeout = 3)
@@ -553,14 +560,283 @@ public class TestFileUtil {
* @throws IOException
*/
@Test (timeout = 3)
- public void testGetDU() throws IOException {
+ public void testGetDU() throws Exception {
setupDirs();
long du = FileUtil.getDU(TEST_DIR);
// Only two files
svn commit: r1528621 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ src/test/java/org/apache/hadoop/util/bloom/ src/test/java/org/apache/hadoop/util/hash/
Author: jlowe Date: Wed Oct 2 20:55:26 2013 New Revision: 1528621 URL: http://svn.apache.org/r1528621 Log: svn merge -c 1528620 FIXES: HADOOP-9254. Cover packages org.apache.hadoop.util.bloom, org.apache.hadoop.util.hash. Contributed by Vadim Bondarev Added: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/ - copied from r1528620, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java - copied unchanged from r1528620, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/TestBloomFilters.java - copied unchanged from r1528620, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/TestBloomFilters.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/hash/ - copied from r1528620, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/hash/ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/hash/TestHash.java - copied unchanged from r1528620, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/hash/TestHash.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1528621r1=1528620r2=1528621view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Oct 2 20:55:26 2013 @@ -55,6 +55,9 @@ Release 2.3.0 - UNRELEASED HADOOP-9063. enhance unit-test coverage of class org.apache.hadoop.fs.FileUtil (Ivan A. Veselovsky via jlowe) +HADOOP-9254. Cover packages org.apache.hadoop.util.bloom, +org.apache.hadoop.util.hash (Vadim Bondarev via jlowe) + OPTIMIZATIONS HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
svn commit: r1528620 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/test/java/org/apache/hadoop/util/bloom/ src/test/java/org/apache/hadoop/util/hash/
Author: jlowe
Date: Wed Oct 2 20:50:42 2013
New Revision: 1528620
URL: http://svn.apache.org/r1528620
Log:
HADOOP-9254. Cover packages org.apache.hadoop.util.bloom,
org.apache.hadoop.util.hash. Contributed by Vadim Bondarev
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java
(with props)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/TestBloomFilters.java
(with props)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/hash/
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/hash/TestHash.java
(with props)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1528620r1=1528619r2=1528620view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Oct
2 20:50:42 2013
@@ -342,6 +342,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-9063. enhance unit-test coverage of class
org.apache.hadoop.fs.FileUtil (Ivan A. Veselovsky via jlowe)
+HADOOP-9254. Cover packages org.apache.hadoop.util.bloom,
+org.apache.hadoop.util.hash (Vadim Bondarev via jlowe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java?rev=1528620view=auto
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java
(added)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java
Wed Oct 2 20:50:42 2013
@@ -0,0 +1,533 @@
+package org.apache.hadoop.util.bloom;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Random;
+
+import org.junit.Assert;
+import org.apache.hadoop.io.DataInputBuffer;
+import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.util.hash.Hash;
+import org.apache.log4j.Logger;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
+public class BloomFilterCommonTesterT extends Filter {
+
+ private static final double LN2 = Math.log(2);
+ private static final double LN2_SQUARED = LN2 * LN2;
+
+ private final int hashType;
+ private final int numInsertions;
+
+ private final ImmutableList.BuilderT builder = ImmutableList.builder();
+
+ private ImmutableSetBloomFilterTestStrategy filterTestStrateges;
+
+ private final PreAssertionHelper preAssertionHelper;
+
+ static int optimalNumOfBits(int n, double p) {
+return (int) (-n * Math.log(p) / LN2_SQUARED);
+ }
+
+ public static T extends Filter BloomFilterCommonTesterT of(int hashId,
+ int numInsertions) {
+return new BloomFilterCommonTesterT(hashId, numInsertions);
+ }
+
+ public BloomFilterCommonTesterT withFilterInstance(T filter) {
+builder.add(filter);
+return this;
+ }
+
+ private BloomFilterCommonTester(int hashId, int numInsertions) {
+this.hashType = hashId;
+this.numInsertions = numInsertions;
+
+this.preAssertionHelper = new PreAssertionHelper() {
+
+ @Override
svn commit: r1529296 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/compress/snappy/ src/test/java/org/apache/hadoop/io/compress/snappy/T
Author: jlowe
Date: Fri Oct 4 20:56:21 2013
New Revision: 1529296
URL: http://svn.apache.org/r1529296
Log:
HADOOP-9225. Cover package org.apache.hadoop.compress.Snappy. Contributed by
Vadim Bondarev, Andrey Klochkov and Nathan Roberts
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java
(with props)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1529296r1=1529295r2=1529296view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Oct
4 20:56:21 2013
@@ -345,6 +345,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-9254. Cover packages org.apache.hadoop.util.bloom,
org.apache.hadoop.util.hash (Vadim Bondarev via jlowe)
+HADOOP-9225. Cover package org.apache.hadoop.compress.Snappy (Vadim
+Bondarev, Andrey Klochkov and Nathan Roberts via jlowe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java?rev=1529296view=auto
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java
(added)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java
Fri Oct 4 20:56:21 2013
@@ -0,0 +1,342 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.io.compress.snappy;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.util.Random;
+
+import org.apache.hadoop.io.DataInputBuffer;
+import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.io.compress.BlockCompressorStream;
+import org.apache.hadoop.io.compress.BlockDecompressorStream;
+import org.apache.hadoop.io.compress.CompressionInputStream;
+import org.apache.hadoop.io.compress.CompressionOutputStream;
+import org.apache.hadoop.io.compress.SnappyCodec;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assume.*;
+
+public class TestSnappyCompressorDecompressor {
+
+ @Before
+ public void before() {
+assumeTrue(SnappyCodec.isNativeCodeLoaded());
+ }
+
+ @Test
+ public void testSnappyCompressorSetInputNullPointerException() {
+try {
+ SnappyCompressor compressor = new SnappyCompressor();
+ compressor.setInput(null, 0, 10);
+ fail(testSnappyCompressorSetInputNullPointerException error !!!);
+} catch (NullPointerException ex) {
+ // excepted
+} catch (Exception ex) {
+ fail(testSnappyCompressorSetInputNullPointerException ex error !!!);
+}
+ }
+
+ @Test
+ public void testSnappyDecompressorSetInputNullPointerException() {
+try {
+ SnappyDecompressor decompressor = new SnappyDecompressor();
+ decompressor.setInput(null, 0, 10);
+ fail(testSnappyDecompressorSetInputNullPointerException error !!!);
+} catch (NullPointerException ex
svn commit: r1529301 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/compress/snappy/ src/test/java/org/apache/hadoop/io/compr
Author: jlowe Date: Fri Oct 4 21:03:16 2013 New Revision: 1529301 URL: http://svn.apache.org/r1529301 Log: svn merge -c 1529296 FIXES: HADOOP-9225. Cover package org.apache.hadoop.compress.Snappy. Contributed by Vadim Bondarev, Andrey Klochkov and Nathan Roberts Added: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/ - copied from r1529296, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java - copied unchanged from r1529296, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1529301r1=1529300r2=1529301view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Fri Oct 4 21:03:16 2013 @@ -58,6 +58,9 @@ Release 2.3.0 - UNRELEASED HADOOP-9254. Cover packages org.apache.hadoop.util.bloom, org.apache.hadoop.util.hash (Vadim Bondarev via jlowe) +HADOOP-9225. Cover package org.apache.hadoop.compress.Snappy (Vadim +Bondarev, Andrey Klochkov and Nathan Roberts via jlowe) + OPTIMIZATIONS HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
svn commit: r1530710 - in /hadoop/common/branches/branch-1: CHANGES.txt src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java src/test/org/apache/hadoop/mapreduce/lib/db/TestSplitters.java
Author: jlowe
Date: Wed Oct 9 16:53:52 2013
New Revision: 1530710
URL: http://svn.apache.org/r1530710
Log:
MAPREDUCE-5569. FloatSplitter is not generating correct splits. Contributed by
Nathan Roberts
Added:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestSplitters.java
(with props)
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1530710r1=1530709r2=1530710view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Oct 9 16:53:52 2013
@@ -148,6 +148,9 @@ Release 1.3.0 - unreleased
HADOOP-10009. Backport HADOOP-7808 to branch-1: fix NPE in
SecurityUtil::setTokenService(). (Haohui Mai via jing9)
+MAPREDUCE-5569. FloatSplitter is not generating correct splits (Nathan
+Roberts via jlowe)
+
Release 1.2.2 - unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java?rev=1530710r1=1530709r2=1530710view=diff
==
---
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java
(original)
+++
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java
Wed Oct 9 16:53:52 2013
@@ -89,7 +89,7 @@ public class FloatSplitter implements DB
// Catch any overage and create the closed interval for the last split.
if (curLower = maxVal || splits.size() == 1) {
splits.add(new DataDrivenDBInputFormat.DataDrivenDBInputSplit(
- lowClausePrefix + Double.toString(curUpper),
+ lowClausePrefix + Double.toString(curLower),
colName + = + Double.toString(maxVal)));
}
Added:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestSplitters.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestSplitters.java?rev=1530710view=auto
==
---
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestSplitters.java
(added)
+++
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestSplitters.java
Wed Oct 9 16:53:52 2013
@@ -0,0 +1,163 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.mapreduce.lib.db;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapreduce.InputSplit;
+import
org.apache.hadoop.mapreduce.lib.db.DataDrivenDBInputFormat.DataDrivenDBInputSplit;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test Splitters. Splitters should build parts of sql sentences for split
result.
+ */
+public class TestSplitters {
+
+ private Configuration configuration;
+
+ @Before
+ public void setup() {
+configuration = new Configuration();
+configuration.setInt(mapred.map.tasks, 2);
+ }
+
+ @Test(timeout=2000)
+ public void testBooleanSplitter() throws Exception{
+BooleanSplitter splitter = new BooleanSplitter();
+ResultSet result = mock(ResultSet.class);
+when(result.getString(1)).thenReturn(result1);
+
+ListInputSplit splits=splitter.split(configuration, result, column);
+assertSplits(new String[] {column = FALSE column = FALSE,
+column IS NULL column IS NULL}, splits
svn commit: r1541566 - in /hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src: main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Author: jlowe
Date: Wed Nov 13 15:49:29 2013
New Revision: 1541566
URL: http://svn.apache.org/r1541566
Log:
MAPREDUCE-5610. TestSleepJob fails in jdk7. Contributed by Jonathan Eagles
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java?rev=1541566r1=1541565r2=1541566view=diff
==
---
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
(original)
+++
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
Wed Nov 13 15:49:29 2013
@@ -63,8 +63,8 @@ public enum JobCreator {
Configuration conf, long submissionMillis, JobStory jobdesc, Path
outRoot,
UserGroupInformation ugi, int seq) throws IOException {
int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
- if (numLocations 0) numLocations=0;
- if ((numLocations 0) (hosts == null)) {
+ if (numLocations 0) numLocations = 0;
+ if (hosts == null) {
final JobClient client = new JobClient(new JobConf(conf));
ClusterStatus stat = client.getClusterStatus(true);
final int nTrackers = stat.getTaskTrackers();
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java?rev=1541566r1=1541565r2=1541566view=diff
==
---
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
(original)
+++
hadoop/common/trunk/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Wed Nov 13 15:49:29 2013
@@ -58,17 +58,6 @@ public class TestSleepJob extends Common
}
- /*
- * test RandomLocation
- */
- @Test
- public void testRandomLocation() throws Exception {
-UserGroupInformation ugi = UserGroupInformation.getLoginUser();
-
-testRandomLocation(1, 10, ugi);
-testRandomLocation(2, 10, ugi);
- }
-
@Test
public void testMapTasksOnlySleepJobs() throws Exception {
Configuration configuration = GridmixTestUtils.mrvl.getConfig();
@@ -90,6 +79,17 @@ public class TestSleepJob extends Common
assertEquals(6, seq);
}
+ /*
+ * test RandomLocation
+ */
+ @Test
+ public void testRandomLocation() throws Exception {
+UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+
+testRandomLocation(1, 10, ugi);
+testRandomLocation(2, 10, ugi);
+ }
+
// test Serial submit
@Test
public void testSerialSubmit() throws Exception {
svn commit: r1541583 - in /hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src: main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java test/java/org/apache/hadoop/mapred/gridmix/TestSl
Author: jlowe
Date: Wed Nov 13 16:19:21 2013
New Revision: 1541583
URL: http://svn.apache.org/r1541583
Log:
svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7.
Contributed by Jonathan Eagles
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java?rev=1541583r1=1541582r2=1541583view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
Wed Nov 13 16:19:21 2013
@@ -63,8 +63,8 @@ public enum JobCreator {
Configuration conf, long submissionMillis, JobStory jobdesc, Path
outRoot,
UserGroupInformation ugi, int seq) throws IOException {
int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
- if (numLocations 0) numLocations=0;
- if ((numLocations 0) (hosts == null)) {
+ if (numLocations 0) numLocations = 0;
+ if (hosts == null) {
final JobClient client = new JobClient(new JobConf(conf));
ClusterStatus stat = client.getClusterStatus(true);
final int nTrackers = stat.getTaskTrackers();
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java?rev=1541583r1=1541582r2=1541583view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Wed Nov 13 16:19:21 2013
@@ -58,17 +58,6 @@ public class TestSleepJob extends Common
}
- /*
- * test RandomLocation
- */
- @Test (timeout=60)
- public void testRandomLocation() throws Exception {
-UserGroupInformation ugi = UserGroupInformation.getLoginUser();
-
-testRandomLocation(1, 10, ugi);
-testRandomLocation(2, 10, ugi);
- }
-
@Test (timeout=60)
public void testMapTasksOnlySleepJobs() throws Exception {
Configuration configuration = GridmixTestUtils.mrvl.getConfig();
@@ -90,6 +79,17 @@ public class TestSleepJob extends Common
assertEquals(6, seq);
}
+ /*
+ * test RandomLocation
+ */
+ @Test (timeout=60)
+ public void testRandomLocation() throws Exception {
+UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+
+testRandomLocation(1, 10, ugi);
+testRandomLocation(2, 10, ugi);
+ }
+
// test Serial submit
@Test (timeout=60)
public void testSerialSubmit() throws Exception {
svn commit: r1541590 - in /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src: main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java test/java/org/apache/hadoop/mapred/gridmix/Tes
Author: jlowe
Date: Wed Nov 13 16:26:06 2013
New Revision: 1541590
URL: http://svn.apache.org/r1541590
Log:
svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7.
Contributed by Jonathan Eagles
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java?rev=1541590r1=1541589r2=1541590view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/JobCreator.java
Wed Nov 13 16:26:06 2013
@@ -63,8 +63,8 @@ public enum JobCreator {
Configuration conf, long submissionMillis, JobStory jobdesc, Path
outRoot,
UserGroupInformation ugi, int seq) throws IOException {
int numLocations = conf.getInt(SLEEPJOB_RANDOM_LOCATIONS, 0);
- if (numLocations 0) numLocations=0;
- if ((numLocations 0) (hosts == null)) {
+ if (numLocations 0) numLocations = 0;
+ if (hosts == null) {
final JobClient client = new JobClient(new JobConf(conf));
ClusterStatus stat = client.getClusterStatus(true);
final int nTrackers = stat.getTaskTrackers();
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java?rev=1541590r1=1541589r2=1541590view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/TestSleepJob.java
Wed Nov 13 16:26:06 2013
@@ -58,17 +58,6 @@ public class TestSleepJob extends Common
}
- /*
- * test RandomLocation
- */
- @Test (timeout=10)
- public void testRandomLocation() throws Exception {
-UserGroupInformation ugi = UserGroupInformation.getLoginUser();
-
-testRandomLocation(1, 10, ugi);
-testRandomLocation(2, 10, ugi);
- }
-
@Test (timeout=50)
public void testMapTasksOnlySleepJobs() throws Exception {
Configuration configuration = GridmixTestUtils.mrvl.getConfig();
@@ -90,6 +79,17 @@ public class TestSleepJob extends Common
assertEquals(6, seq);
}
+ /*
+ * test RandomLocation
+ */
+ @Test (timeout=10)
+ public void testRandomLocation() throws Exception {
+UserGroupInformation ugi = UserGroupInformation.getLoginUser();
+
+testRandomLocation(1, 10, ugi);
+testRandomLocation(2, 10, ugi);
+ }
+
// test Serial submit
@Test (timeout=50)
public void testSerialSubmit() throws Exception {
svn commit: r1541758 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/test/java/org/apache/hadoop/fs/ src/test/resources/test.ha
Author: jlowe
Date: Wed Nov 13 23:23:00 2013
New Revision: 1541758
URL: http://svn.apache.org/r1541758
Log:
HADOOP-10091. Job with a har archive as input fails on 0.23. Contributed by
Jason Dere and Jason Lowe
Added:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/.part-0.crc
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/_SUCCESS
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/_index
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/_masterindex
(with props)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/resources/test.har/part-0
(with props)
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestHarFileSystemBasics.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1541758r1=1541757r2=1541758view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Nov 13 23:23:00 2013
@@ -26,6 +26,9 @@ Release 0.23.10 - UNRELEASED
HADOOP-9757. Har metadata cache can grow without limit (Cristina Abad via
daryn)
+HADOOP-10091. Job with a har archive as input fails on 0.23 (Jason Dere
+and Jason Lowe via jlowe)
+
Release 0.23.9 - 2013-07-08
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml?rev=1541758r1=1541757r2=1541758view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
Wed Nov 13 23:23:00 2013
@@ -486,6 +486,10 @@
excludesrc/test/all-tests/exclude
excludesrc/test/resources/kdc/ldif/users.ldif/exclude
excludesrc/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c/exclude
+excludesrc/test/resources/test.har/_SUCCESS/exclude
+excludesrc/test/resources/test.har/_index/exclude
+excludesrc/test/resources/test.har/_masterindex/exclude
+excludesrc/test/resources/test.har/part-0/exclude
/excludes
/configuration
/plugin
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java?rev=1541758r1=1541757r2=1541758view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
Wed Nov 13 23:23:00 2013
@@ -1329,7 +1329,7 @@ public abstract class FileSystem extends
return new ContentSummary(summary[0], summary[1], summary[2]);
}
- final private static PathFilter DEFAULT_FILTER = new PathFilter() {
+ final protected static PathFilter DEFAULT_FILTER = new PathFilter() {
public boolean accept(Path file) {
return true;
}
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java?rev=1541758r1=1541757r2=1541758view=diff
==
---
hadoop/common/branches/branch-0.23
svn commit: r1548179 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java
Author: jlowe
Date: Thu Dec 5 16:00:40 2013
New Revision: 1548179
URL: http://svn.apache.org/r1548179
Log:
HADOOP-10081. Client.setupIOStreams can leak socket resources on exception or
error. Contributed by Tsuyoshi OZAWA
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1548179r1=1548178r2=1548179view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Dec
5 16:00:40 2013
@@ -529,6 +529,9 @@ Release 2.3.0 - UNRELEASED
HDFS-5560. Trash configuration log statements prints incorrect units.
(Josh Elser via Andrew Wang)
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1548179r1=1548178r2=1548179view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Dec 5 16:00:40 2013
@@ -1158,6 +1158,7 @@ public class Client {
// cleanup calls
cleanupCalls();
}
+ closeConnection();
if (LOG.isDebugEnabled())
LOG.debug(getName() + : closed);
}
svn commit: r1548181 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java
Author: jlowe
Date: Thu Dec 5 16:06:09 2013
New Revision: 1548181
URL: http://svn.apache.org/r1548181
Log:
svn merge -c 1548179 FIXES: HADOOP-10081. Client.setupIOStreams can leak socket
resources on exception or error. Contributed by Tsuyoshi OZAWA
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1548181r1=1548180r2=1548181view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Dec 5 16:06:09 2013
@@ -238,6 +238,9 @@ Release 2.3.0 - UNRELEASED
HDFS-5560. Trash configuration log statements prints incorrect units.
(Josh Elser via Andrew Wang)
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1548181r1=1548180r2=1548181view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Dec 5 16:06:09 2013
@@ -1158,6 +1158,7 @@ public class Client {
// cleanup calls
cleanupCalls();
}
+ closeConnection();
if (LOG.isDebugEnabled())
LOG.debug(getName() + : closed);
}
svn commit: r1548184 - in /hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java
Author: jlowe
Date: Thu Dec 5 16:09:38 2013
New Revision: 1548184
URL: http://svn.apache.org/r1548184
Log:
svn merge -c 1548179 FIXES: HADOOP-10081. Client.setupIOStreams can leak socket
resources on exception or error. Contributed by Tsuyoshi OZAWA
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1548184r1=1548183r2=1548184view=diff
==
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Dec 5 16:09:38 2013
@@ -70,6 +70,9 @@ Release 2.3.0 - UNRELEASED
HDFS-5560. Trash configuration log statements prints incorrect units.
(Josh Elser via Andrew Wang)
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1548184r1=1548183r2=1548184view=diff
==
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Dec 5 16:09:38 2013
@@ -1104,6 +1104,7 @@ public class Client {
// cleanup calls
cleanupCalls();
}
+ closeConnection();
if (LOG.isDebugEnabled())
LOG.debug(getName() + : closed);
}
svn commit: r1548190 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java
Author: jlowe
Date: Thu Dec 5 16:14:45 2013
New Revision: 1548190
URL: http://svn.apache.org/r1548190
Log:
svn merge -c 1548179 FIXES: HADOOP-10081. Client.setupIOStreams can leak socket
resources on exception or error. Contributed by Tsuyoshi OZAWA
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1548190r1=1548189r2=1548190view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Dec 5 16:14:45 2013
@@ -12,6 +12,9 @@ Release 0.23.11 - UNRELEASED
BUG FIXES
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
Release 0.23.10 - 2013-12-09
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1548190r1=1548189r2=1548190view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Dec 5 16:14:45 2013
@@ -894,6 +894,7 @@ public class Client {
// cleanup calls
cleanupCalls();
}
+ closeConnection();
if (LOG.isDebugEnabled())
LOG.debug(getName() + : closed);
}
svn commit: r1549705 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
Author: jlowe
Date: Mon Dec 9 23:31:30 2013
New Revision: 1549705
URL: http://svn.apache.org/r1549705
Log:
MAPREDUCE-5656. bzip2 codec can drop records when reading data in splits.
Contributed by Jason Lowe
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java?rev=1549705r1=1549704r2=1549705view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
Mon Dec 9 23:31:30 2013
@@ -175,6 +175,11 @@ public class LineReader implements Close
}
}
+ protected int fillBuffer(InputStream in, byte[] buffer, boolean inDelimiter)
+ throws IOException {
+return in.read(buffer);
+ }
+
/**
* Read a line terminated by one of CR, LF, or CRLF.
*/
@@ -208,7 +213,7 @@ public class LineReader implements Close
if (prevCharCR) {
++bytesConsumed; //account for CR from previous read
}
-bufferLength = in.read(buffer);
+bufferLength = fillBuffer(in, buffer, prevCharCR);
if (bufferLength = 0) {
break; // EOF
}
@@ -296,7 +301,7 @@ public class LineReader implements Close
int startPosn = bufferPosn; // Start from previous end position
if (bufferPosn = bufferLength) {
startPosn = bufferPosn = 0;
-bufferLength = in.read(buffer);
+bufferLength = fillBuffer(in, buffer, ambiguousByteCount 0);
if (bufferLength = 0) {
str.append(recordDelimiterBytes, 0, ambiguousByteCount);
break; // EOF
svn commit: r1549710 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
Author: jlowe
Date: Mon Dec 9 23:42:36 2013
New Revision: 1549710
URL: http://svn.apache.org/r1549710
Log:
svn merge -c 1549705 FIXES: MAPREDUCE-5656. bzip2 codec can drop records when
reading data in splits. Contributed by Jason Lowe
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java?rev=1549710r1=1549709r2=1549710view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
Mon Dec 9 23:42:36 2013
@@ -175,6 +175,11 @@ public class LineReader implements Close
}
}
+ protected int fillBuffer(InputStream in, byte[] buffer, boolean inDelimiter)
+ throws IOException {
+return in.read(buffer);
+ }
+
/**
* Read a line terminated by one of CR, LF, or CRLF.
*/
@@ -208,7 +213,7 @@ public class LineReader implements Close
if (prevCharCR) {
++bytesConsumed; //account for CR from previous read
}
-bufferLength = in.read(buffer);
+bufferLength = fillBuffer(in, buffer, prevCharCR);
if (bufferLength = 0) {
break; // EOF
}
@@ -296,7 +301,7 @@ public class LineReader implements Close
int startPosn = bufferPosn; // Start from previous end position
if (bufferPosn = bufferLength) {
startPosn = bufferPosn = 0;
-bufferLength = in.read(buffer);
+bufferLength = fillBuffer(in, buffer, ambiguousByteCount 0);
if (bufferLength = 0) {
str.append(recordDelimiterBytes, 0, ambiguousByteCount);
break; // EOF
svn commit: r1561038 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java src/test/java/org/apache/hadoop/fs/TestSymlin
Author: jlowe
Date: Fri Jan 24 15:45:28 2014
New Revision: 1561038
URL: http://svn.apache.org/r1561038
Log:
Addendum patch for HADOOP-9652 to fix performance problems. Contributed by
Andrew Wang
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1561038r1=1561037r2=1561038view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Jan
24 15:45:28 2014
@@ -424,6 +424,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-10143 replace WritableFactories's hashmap with ConcurrentHashMap
(Liang Xie via stack)
+HADOOP-9652. Allow RawLocalFs#getFileLinkStatus to fill in the link owner
+and mode if requested. (Andrew Wang via Colin Patrick McCabe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
@@ -450,9 +453,6 @@ Release 2.4.0 - UNRELEASED
HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work
with symlinks. (Colin Patrick McCabe via Andrew Wang)
-HADOOP-9652. RawLocalFs#getFileLinkStatus does not fill in the link owner
-and mode. (Andrew Wang via Colin Patrick McCabe)
-
HADOOP-9875. TestDoAsEffectiveUser can fail on JDK 7. (Aaron T. Myers via
Colin Patrick McCabe)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=1561038r1=1561037r2=1561038view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
Fri Jan 24 15:45:28 2014
@@ -16,8 +16,11 @@
* limitations under the License.
*/
+
package org.apache.hadoop.fs;
+import com.google.common.annotations.VisibleForTesting;
+
import java.io.BufferedOutputStream;
import java.io.DataOutput;
import java.io.File;
@@ -51,7 +54,13 @@ import org.apache.hadoop.util.StringUtil
public class RawLocalFileSystem extends FileSystem {
static final URI NAME = URI.create(file:///);
private Path workingDir;
- private static final boolean useDeprecatedFileStatus = !Stat.isAvailable();
+ // Temporary workaround for HADOOP-9652.
+ private static boolean useDeprecatedFileStatus = true;
+
+ @VisibleForTesting
+ public static void useStatIfAvailable() {
+useDeprecatedFileStatus = !Stat.isAvailable();
+ }
public RawLocalFileSystem() {
workingDir = getInitialWorkingDirectory();
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java?rev=1561038r1=1561037r2=1561038view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Fri Jan 24 15:45:28 2014
@@ -38,6 +38,11 @@ import org.junit.Test;
* Test symbolic links using LocalFs.
*/
abstract public class TestSymlinkLocalFS extends SymlinkBaseTest {
+
+ // Workaround for HADOOP-9652
+ static {
+RawLocalFileSystem.useStatIfAvailable();
+ }
@Override
protected String getScheme() {
svn commit: r1561043 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java src/test/java/org/apache/hadoop/f
Author: jlowe
Date: Fri Jan 24 15:49:14 2014
New Revision: 1561043
URL: http://svn.apache.org/r1561043
Log:
svn merge -c 1561038 FIXES: Addendum patch for HADOOP-9652 to fix performance
problems. Contributed by Andrew Wang
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1561043r1=1561042r2=1561043view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Jan 24 15:49:14 2014
@@ -121,6 +121,9 @@ Release 2.4.0 - UNRELEASED
HADOOP-9420. Add percentile or max metric for rpcQueueTime, processing
time.
(Liang Xie via wang)
+HADOOP-9652. Allow RawLocalFs#getFileLinkStatus to fill in the link owner
+and mode if requested. (Andrew Wang via Colin Patrick McCabe)
+
OPTIMIZATIONS
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
@@ -150,9 +153,6 @@ Release 2.4.0 - UNRELEASED
HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work
with symlinks. (Colin Patrick McCabe via Andrew Wang)
-HADOOP-9652. RawLocalFs#getFileLinkStatus does not fill in the link owner
-and mode. (Andrew Wang via Colin Patrick McCabe)
-
HADOOP-9875. TestDoAsEffectiveUser can fail on JDK 7. (Aaron T. Myers via
Colin Patrick McCabe)
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=1561043r1=1561042r2=1561043view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
Fri Jan 24 15:49:14 2014
@@ -16,8 +16,11 @@
* limitations under the License.
*/
+
package org.apache.hadoop.fs;
+import com.google.common.annotations.VisibleForTesting;
+
import java.io.BufferedOutputStream;
import java.io.DataOutput;
import java.io.File;
@@ -51,7 +54,13 @@ import org.apache.hadoop.util.StringUtil
public class RawLocalFileSystem extends FileSystem {
static final URI NAME = URI.create(file:///);
private Path workingDir;
- private static final boolean useDeprecatedFileStatus = !Stat.isAvailable();
+ // Temporary workaround for HADOOP-9652.
+ private static boolean useDeprecatedFileStatus = true;
+
+ @VisibleForTesting
+ public static void useStatIfAvailable() {
+useDeprecatedFileStatus = !Stat.isAvailable();
+ }
public RawLocalFileSystem() {
workingDir = getInitialWorkingDirectory();
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java?rev=1561043r1=1561042r2=1561043view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFS.java
Fri Jan 24 15:49:14 2014
@@ -38,6 +38,11 @@ import org.junit.Test;
* Test symbolic links using LocalFs.
*/
abstract public class TestSymlinkLocalFS extends SymlinkBaseTest {
+
+ // Workaround for HADOOP-9652
+ static {
+RawLocalFileSystem.useStatIfAvailable();
+ }
@Override
protected String getScheme() {
svn commit: r1565474 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/HarFileSystem.java
Author: jlowe
Date: Thu Feb 6 23:09:41 2014
New Revision: 1565474
URL: http://svn.apache.org/r1565474
Log:
HADOOP-10112. har file listing doesn't work with wild card. Contributed by
Brandon Li
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1565474r1=1565473r2=1565474view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Feb 6 23:09:41 2014
@@ -21,6 +21,9 @@ Release 0.23.11 - UNRELEASED
HADOOP-10146. Workaround JDK7 Process fd close bug (daryn)
+HADOOP-10112. har file listing doesn't work with wild card (Brandon Li via
+jlowe)
+
Release 0.23.10 - 2013-12-09
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java?rev=1565474r1=1565473r2=1565474view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
Thu Feb 6 23:09:41 2014
@@ -614,15 +614,20 @@ public class HarFileSystem extends Filte
*/
@Override
public FileStatus getFileStatus(Path f) throws IOException {
-HarStatus hstatus = getFileHarStatus(f);
+Path p = makeQualified(f);
+if (p.toUri().getPath().length() archivePath.toString().length()) {
+ // still in the source file system
+ return fs.getFileStatus(new Path(p.toUri().getPath()));
+}
+
+HarStatus hstatus = getFileHarStatus(p);
return toFileStatus(hstatus, null);
}
private HarStatus getFileHarStatus(Path f) throws IOException {
// get the fs DataInputStream for the underlying file
// look up the index.
-Path p = makeQualified(f);
-Path harPath = getPathInHar(p);
+Path harPath = getPathInHar(f);
if (harPath == null) {
throw new IOException(Invalid file name: + f + in + uri);
}
@@ -716,6 +721,11 @@ public class HarFileSystem extends Filte
// to the client
ListFileStatus statuses = new ArrayListFileStatus();
Path tmpPath = makeQualified(f);
+if (tmpPath.toUri().getPath().length() archivePath.toString().length()) {
+ // still in the source file system
+ return fs.listStatus(new Path(tmpPath.toUri().getPath()));
+}
+
Path harPath = getPathInHar(tmpPath);
HarStatus hstatus = metadata.archive.get(harPath);
if (hstatus == null) {
svn commit: r1565474 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
Author: jlowe
Date: Thu Feb 6 23:09:41 2014
New Revision: 1565474
URL: http://svn.apache.org/r1565474
Log:
HADOOP-10112. har file listing doesn't work with wild card. Contributed by
Brandon Li
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java?rev=1565474r1=1565473r2=1565474view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java
Thu Feb 6 23:09:41 2014
@@ -18,7 +18,10 @@
package org.apache.hadoop.tools;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.net.URI;
@@ -34,6 +37,7 @@ import org.apache.hadoop.fs.FSDataOutput
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FsShell;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.util.JarFinder;
@@ -111,7 +115,14 @@ public class TestHadoopArchives {
System.err.println(e);
}
}
-
+ static Path writeFile(FileSystem fs, Path f) throws IOException {
+DataOutputStream out = fs.create(f);
+out.writeBytes(dhruba: + f);
+out.close();
+assertTrue(fs.exists(f));
+return f;
+ }
+
@Test
public void testRelativePath() throws Exception {
fs.delete(archivePath, true);
@@ -222,4 +233,64 @@ public class TestHadoopArchives {
.println(lsr paths = + paths.toString().replace(, , ,\n ));
return paths;
}
+
+ // Make sure har file system works with wildcards
+ @Test
+ public void testHar() throws IOException {
+assertTrue(Not a HDFS: + fs.getUri(),
+fs instanceof DistributedFileSystem);
+PrintStream psBackup = System.out;
+ByteArrayOutputStream out = new ByteArrayOutputStream();
+PrintStream psOut = new PrintStream(out);
+System.setOut(psOut);
+HadoopArchives archiveShell = new HadoopArchives(conf);
+archiveShell.setConf(conf);
+
+FsShell fsShell = new FsShell();
+fsShell.setConf(conf);
+
+try {
+ Path myPath = new Path(/test/dir);
+ assertTrue(fs.mkdirs(myPath));
+ assertTrue(fs.exists(myPath));
+ myPath = new Path(/test/dir/dir2);
+ assertTrue(fs.mkdirs(myPath));
+ assertTrue(fs.exists(myPath));
+ Path myFile = new Path(/test/dir/dir2/file);
+ writeFile(fs, myFile);
+ assertTrue(fs.exists(myFile));
+
+ String[] args = new String[5];
+ args[0] = -archiveName;
+ args[1] = foo.har;
+ args[2] = -p;
+ args[3] = /test/dir;
+ args[4] = /test;
+ int val = -1;
+ try {
+val = archiveShell.run(args);
+ } catch (Exception e) {
+System.err.println(Exception raised from HadoopArchives.run
++ e.getLocalizedMessage());
+ }
+ assertTrue(val == 0);
+
+ args = new String[2];
+ args[0] = -ls;
+ args[1] = har:///test/foo.har/d*;
+ val = -1;
+ try {
+val = fsShell.run(args);
+ } catch (Exception e) {
+System.err.println(Exception raised from HadoopArchives.run
++ e.getLocalizedMessage());
+ }
+
+ String returnString = out.toString();
+ out.reset();
+ assertTrue(returnString.contains(har:///test/foo.har/dir2/file));
+} finally {
+ System.setOut(psBackup);
+}
+ }
}
svn commit: r1575972 - in /hadoop/common/branches/branch-0.23/hadoop-common-project: hadoop-auth/pom.xml hadoop-common/CHANGES.txt
Author: jlowe Date: Mon Mar 10 15:29:07 2014 New Revision: 1575972 URL: http://svn.apache.org/r1575972 Log: svn merge -c 1543190 FIXES: HADOOP-10110. hadoop-auth has a build break due to missing dependency. Contributed by Chuan Liu Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml?rev=1575972r1=1575971r2=1575972view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml Mon Mar 10 15:29:07 2014 @@ -54,6 +54,11 @@ /dependency dependency groupIdorg.mortbay.jetty/groupId + artifactIdjetty-util/artifactId + scopetest/scope +/dependency +dependency + groupIdorg.mortbay.jetty/groupId artifactIdjetty/artifactId scopetest/scope /dependency Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1575972r1=1575971r2=1575972view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Mon Mar 10 15:29:07 2014 @@ -24,6 +24,9 @@ Release 0.23.11 - UNRELEASED HADOOP-10112. har file listing doesn't work with wild card (Brandon Li via jlowe) +HADOOP-10110. hadoop-auth has a build break due to missing dependency. +(Chuan Liu via arp) + Release 0.23.10 - 2013-12-09 INCOMPATIBLE CHANGES
svn commit: r1588470 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
Author: jlowe
Date: Fri Apr 18 13:40:19 2014
New Revision: 1588470
URL: http://svn.apache.org/r1588470
Log:
svn merge -c 1451291 FIXES: HADOOP-9230. TestUniformSizeInputFormat fails
intermittently. Contributed by Karthik Kambatla
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java?rev=1588470r1=1588469r2=1588470view=diff
==
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestUniformSizeInputFormat.java
Fri Apr 18 13:40:19 2014
@@ -33,8 +33,6 @@ import org.apache.hadoop.tools.CopyListi
import org.apache.hadoop.tools.DistCpOptions;
import org.apache.hadoop.tools.StubContext;
import org.apache.hadoop.security.Credentials;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -48,9 +46,6 @@ import java.util.Random;
public class TestUniformSizeInputFormat {
- private static final Log LOG
-= LogFactory.getLog(TestUniformSizeInputFormat.class);
-
private static MiniDFSCluster cluster;
private static final int N_FILES = 20;
private static final int SIZEOF_EACH_FILE=1024;
@@ -118,12 +113,9 @@ public class TestUniformSizeInputFormat
ListInputSplit splits
= uniformSizeInputFormat.getSplits(jobContext);
-ListInputSplit legacySplits = legacyGetSplits(listFile, nMaps);
-
int sizePerMap = totalFileSize/nMaps;
checkSplits(listFile, splits);
-checkAgainstLegacy(splits, legacySplits);
int doubleCheckedTotalSize = 0;
int previousSplitSize = -1;
@@ -155,57 +147,6 @@ public class TestUniformSizeInputFormat
Assert.assertEquals(totalFileSize, doubleCheckedTotalSize);
}
- // From
- //
http://svn.apache.org/repos/asf/hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/DistCp.java
- private ListInputSplit legacyGetSplits(Path listFile, int numSplits)
- throws IOException {
-
-FileSystem fs = cluster.getFileSystem();
-FileStatus srcst = fs.getFileStatus(listFile);
-Configuration conf = fs.getConf();
-
-ArrayListInputSplit splits = new ArrayListInputSplit(numSplits);
-FileStatus value = new FileStatus();
-Text key = new Text();
-final long targetsize = totalFileSize / numSplits;
-long pos = 0L;
-long last = 0L;
-long acc = 0L;
-long cbrem = srcst.getLen();
-SequenceFile.Reader sl = null;
-
-LOG.info(Average bytes per map: + targetsize +
-, Number of maps: + numSplits + , total size: + totalFileSize);
-
-try {
- sl = new SequenceFile.Reader(conf, SequenceFile.Reader.file(listFile));
- for (; sl.next(key, value); last = sl.getPosition()) {
-// if adding this split would put this split past the target size,
-// cut the last split and put this next file in the next split.
-if (acc + value.getLen() targetsize acc != 0) {
- long splitsize = last - pos;
- FileSplit fileSplit = new FileSplit(listFile, pos, splitsize, null);
- LOG.info (Creating split : + fileSplit + , bytes in split: +
splitsize);
- splits.add(fileSplit);
- cbrem -= splitsize;
- pos = last;
- acc = 0L;
-}
-acc += value.getLen();
- }
-}
-finally {
- IOUtils.closeStream(sl);
-}
-if (cbrem != 0) {
- FileSplit fileSplit = new FileSplit(listFile, pos, cbrem, null);
- LOG.info (Creating split : + fileSplit + , bytes in split: +
cbrem);
- splits.add(fileSplit);
-}
-
-return splits;
- }
-
private void checkSplits(Path listFile, ListInputSplit splits) throws
IOException {
long lastEnd = 0;
@@ -233,18 +174,6 @@ public class TestUniformSizeInputFormat
}
}
- private void checkAgainstLegacy(ListInputSplit splits,
- ListInputSplit legacySplits)
- throws IOException, InterruptedException {
-
-Assert.assertEquals(legacySplits.size(), splits.size());
-for (int index = 0; index splits.size(); index++) {
- FileSplit fileSplit = (FileSplit) splits.get(index);
- FileSplit legacyFileSplit = (FileSplit) legacySplits.get(index);
- Assert.assertEquals(fileSplit.getStart(), legacyFileSplit.getStart());
-}
- }
-
@Test
public void
svn commit: r1588470 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Fri Apr 18 13:40:19 2014 New Revision: 1588470 URL: http://svn.apache.org/r1588470 Log: svn merge -c 1451291 FIXES: HADOOP-9230. TestUniformSizeInputFormat fails intermittently. Contributed by Karthik Kambatla Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1588470r1=1588469r2=1588470view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Fri Apr 18 13:40:19 2014 @@ -35,6 +35,9 @@ Release 0.23.11 - UNRELEASED HADOOP-10332. HttpServer's jetty audit log always logs 200 OK (jeagles) +HADOOP-9230. TestUniformSizeInputFormat fails intermittently. +(kkambatl via jlowe) + Release 0.23.10 - 2013-12-09 INCOMPATIBLE CHANGES
svn commit: r1596041 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Mon May 19 20:13:14 2014 New Revision: 1596041 URL: http://svn.apache.org/r1596041 Log: Reverting HADOOP-10485 from branch-2. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1596041r1=1596040r2=1596041view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Mon May 19 20:13:14 2014 @@ -23,8 +23,6 @@ Release 2.5.0 - UNRELEASED HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) -HADOOP-10485. Remove dead classes in hadoop-streaming. (wheat9) - HADOOP-10503. Move junit up to v 4.11. (cnauroth) HADOOP-10535. Make the retry numbers in ActiveStandbyElector configurable.
svn commit: r1596041 - in /hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming: ./ dev-support/ src/main/java/org/apache/hadoop/record/ src/main/java/org/apache/hadoop/record/compiler/ src/m
Author: jlowe Date: Mon May 19 20:13:14 2014 New Revision: 1596041 URL: http://svn.apache.org/r1596041 Log: Reverting HADOOP-10485 from branch-2. Added: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordInput.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/CsvRecordInput.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordInput.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordInput.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/ - copied from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/Consts.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/Consts.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JByte.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JByte.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JCompType.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JCompType.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JDouble.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JDouble.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JField.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JField.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFile.java - copied unchanged from r1586059, hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFile.java hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/compiler/JFloat.java - copied unchanged from r1586059, hadoop/common
svn commit: r1596048 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ dev-support/ src/main/java/org/apache/hadoop/record/ src/main/java/org/apache/hadoop/record/compiler/
Author: jlowe Date: Mon May 19 20:31:40 2014 New Revision: 1596048 URL: http://svn.apache.org/r1596048 Log: Reverted HADOOP-10474 from branch-2. Added: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Index.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Index.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordInput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordInput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordOutput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordOutput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Utils.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Utils.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java - copied unchanged from r1585886, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeGenerator.java hadoop/common/branches/branch-2/hadoop-common-project
svn commit: r1596048 - in /hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming: dev-support/findbugs-exclude.xml pom.xml src/main/java/org/apache/hadoop/record/
Author: jlowe Date: Mon May 19 20:31:40 2014 New Revision: 1596048 URL: http://svn.apache.org/r1596048 Log: Reverted HADOOP-10474 from branch-2. Removed: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/record/ Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml?rev=1596048r1=1596047r2=1596048view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/dev-support/findbugs-exclude.xml Mon May 19 20:31:40 2014 @@ -16,19 +16,6 @@ limitations under the License. -- FindBugsFilter - !-- Workaround bugs in findbugs 1.3.9. See http://sourceforge.net/p/findbugs/bugs/918 for more details. -- - Match -Or - Package name=org.apache.hadoop.streaming / - Class name=org.apache.hadoop.record.compiler.JFile / -/Or -Bug pattern=NP_ALWAYS_NULL/ - /Match - Match -Class name=org.apache.hadoop.streaming.JarBuilder / -Bug pattern=NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS/ - /Match - Match Or Class name=org.apache.hadoop.streaming.PipeMapper / @@ -40,32 +27,4 @@ /Or Bug pattern=EI_EXPOSE_REP/ /Match - - Match -Package name=org.apache.hadoop.record.compiler.generated / - /Match - - Match -Package name=org.apache.hadoop.record / -Or - Bug pattern=EI_EXPOSE_REP / - Bug pattern=EI_EXPOSE_REP2 / - Bug pattern=MS_PKGPROTECT / -/Or - /Match - - Match -Class name=org.apache.hadoop.record.meta.Utils / -Method name=skip / -Bug pattern=BC_UNCONFIRMED_CAST / - /Match - - !-- - The compareTo method is actually a dummy method that just - throws excpetions. So, no need to override equals. Ignore - -- - Match -Class name=org.apache.hadoop.record.meta.RecordTypeInfo / -Bug pattern=EQ_COMPARETO_USE_OBJECT_EQUALS / - /Match /FindBugsFilter Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml?rev=1596048r1=1596047r2=1596048view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/pom.xml Mon May 19 20:31:40 2014 @@ -42,11 +42,6 @@ scopetest/scope /dependency dependency - groupIdorg.apache.ant/groupId - artifactIdant/artifactId - scopeprovided/scope -/dependency -dependency groupIdorg.apache.hadoop/groupId artifactIdhadoop-annotations/artifactId scopeprovided/scope
svn commit: r1596049 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Mon May 19 20:37:49 2014 New Revision: 1596049 URL: http://svn.apache.org/r1596049 Log: Updated CHANGES.txt to reflect revert of HADOOP 10474 and 10485 from branch-2 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1596049r1=1596048r2=1596049view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon May 19 20:37:49 2014 @@ -7,6 +7,8 @@ Trunk (Unreleased) HADOOP-8124. Remove the deprecated FSDataOutputStream constructor, FSDataOutputStream.sync() and Syncable.sync(). (szetszwo) +HADOOP-10474 Move o.a.h.record to hadoop-streaming. (wheat9) + NEW FEATURES HADOOP-10433. Key Management Server based on KeyProvider API. (tucu) @@ -148,6 +150,8 @@ Trunk (Unreleased) HADOOP-10563. Remove the dependency of jsp in trunk. (wheat9) +HADOOP-10485. Remove dead classes in hadoop-streaming. (wheat9) + BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled. @@ -340,8 +344,6 @@ Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES -HADOOP-10474 Move o.a.h.record to hadoop-streaming. (wheat9) - NEW FEATURES HADOOP-10498. Add support for proxy server. (daryn) @@ -359,8 +361,6 @@ Release 2.5.0 - UNRELEASED HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) -HADOOP-10485. Remove dead classes in hadoop-streaming. (wheat9) - HADOOP-10503. Move junit up to v 4.11. (cnauroth) HADOOP-10535. Make the retry numbers in ActiveStandbyElector configurable.
svn commit: r1602033 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/Shell.java
Author: jlowe
Date: Wed Jun 11 22:05:04 2014
New Revision: 1602033
URL: http://svn.apache.org/r1602033
Log:
HADOOP-10622. Shell.runCommand can deadlock. Contributed by Gera Shegalov
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1602033r1=1602032r2=1602033view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jun
11 22:05:04 2014
@@ -532,6 +532,8 @@ Release 2.5.0 - UNRELEASED
HADOOP-10656. The password keystore file is not picked by LDAP group
mapping
(brandonli)
+HADOOP-10622. Shell.runCommand can deadlock (Gera Shegalov via jlowe)
+
BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
HADOOP-10520. Extended attributes definition and FileSystem APIs for
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java?rev=1602033r1=1602032r2=1602033view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
Wed Jun 11 22:05:04 2014
@@ -526,12 +526,8 @@ abstract public class Shell {
}
// wait for the process to finish and check the exit code
exitCode = process.waitFor();
- try {
-// make sure that the error thread exits
-errThread.join();
- } catch (InterruptedException ie) {
-LOG.warn(Interrupted while reading the error stream, ie);
- }
+ // make sure that the error thread exits
+ joinThread(errThread);
completed.set(true);
//the timeout thread handling
//taken care in finally block
@@ -560,13 +556,9 @@ abstract public class Shell {
} catch (IOException ioe) {
LOG.warn(Error while closing the input stream, ioe);
}
- try {
-if (!completed.get()) {
- errThread.interrupt();
- errThread.join();
-}
- } catch (InterruptedException ie) {
-LOG.warn(Interrupted while joining errThread);
+ if (!completed.get()) {
+errThread.interrupt();
+joinThread(errThread);
}
try {
InputStream stderr = process.getErrorStream();
@@ -581,6 +573,19 @@ abstract public class Shell {
}
}
+ private static void joinThread(Thread t) {
+while (t.isAlive()) {
+ try {
+t.join();
+ } catch (InterruptedException ie) {
+if (LOG.isWarnEnabled()) {
+ LOG.warn(Interrupted while joining on: + t, ie);
+}
+t.interrupt(); // propagate interrupt
+ }
+}
+ }
+
/** return an array containing the command name its parameters */
protected abstract String[] getExecString();
svn commit: r1602034 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/Shell.java
Author: jlowe
Date: Wed Jun 11 22:06:12 2014
New Revision: 1602034
URL: http://svn.apache.org/r1602034
Log:
svn merge -c 1602033 FIXES: HADOOP-10622. Shell.runCommand can deadlock.
Contributed by Gera Shegalov
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1602034r1=1602033r2=1602034view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jun 11 22:06:12 2014
@@ -195,6 +195,8 @@ Release 2.5.0 - UNRELEASED
HADOOP-10656. The password keystore file is not picked by LDAP group
mapping
(brandonli)
+HADOOP-10622. Shell.runCommand can deadlock (Gera Shegalov via jlowe)
+
BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
HADOOP-10520. Extended attributes definition and FileSystem APIs for
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java?rev=1602034r1=1602033r2=1602034view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
Wed Jun 11 22:06:12 2014
@@ -526,12 +526,8 @@ abstract public class Shell {
}
// wait for the process to finish and check the exit code
exitCode = process.waitFor();
- try {
-// make sure that the error thread exits
-errThread.join();
- } catch (InterruptedException ie) {
-LOG.warn(Interrupted while reading the error stream, ie);
- }
+ // make sure that the error thread exits
+ joinThread(errThread);
completed.set(true);
//the timeout thread handling
//taken care in finally block
@@ -560,13 +556,9 @@ abstract public class Shell {
} catch (IOException ioe) {
LOG.warn(Error while closing the input stream, ioe);
}
- try {
-if (!completed.get()) {
- errThread.interrupt();
- errThread.join();
-}
- } catch (InterruptedException ie) {
-LOG.warn(Interrupted while joining errThread);
+ if (!completed.get()) {
+errThread.interrupt();
+joinThread(errThread);
}
try {
InputStream stderr = process.getErrorStream();
@@ -581,6 +573,19 @@ abstract public class Shell {
}
}
+ private static void joinThread(Thread t) {
+while (t.isAlive()) {
+ try {
+t.join();
+ } catch (InterruptedException ie) {
+if (LOG.isWarnEnabled()) {
+ LOG.warn(Interrupted while joining on: + t, ie);
+}
+t.interrupt(); // propagate interrupt
+ }
+}
+ }
+
/** return an array containing the command name its parameters */
protected abstract String[] getExecString();
svn commit: r1603042 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
Author: jlowe
Date: Tue Jun 17 02:23:58 2014
New Revision: 1603042
URL: http://svn.apache.org/r1603042
Log:
HADOOP-10699. Fix build native library on mac osx. Contributed by Binglin Chang
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1603042r1=1603041r2=1603042view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun
17 02:23:58 2014
@@ -562,6 +562,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10702. KerberosAuthenticationHandler does not log the principal
names
correctly. (Benoy Antony via cnauroth)
+HADOOP-10699. Fix build native library on mac osx (Binglin Chang via
+jlowe)
+
BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
HADOOP-10520. Extended attributes definition and FileSystem APIs for
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c?rev=1603042r1=1603041r2=1603042view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
Tue Jun 17 02:23:58 2014
@@ -73,7 +73,10 @@ Java_org_apache_hadoop_security_JniBased
// was successful or not (as long as it was called we need to call
// endnetgrent)
setnetgrentCalledFlag = 1;
-#ifndef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MACH__)
+ setnetgrent(cgroup);
+ {
+#else
if(setnetgrent(cgroup) == 1) {
#endif
current = NULL;
@@ -90,9 +93,7 @@ Java_org_apache_hadoop_security_JniBased
userListSize++;
}
}
-#ifndef __FreeBSD__
}
-#endif
//--
// build return data (java array)
svn commit: r1603043 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
Author: jlowe
Date: Tue Jun 17 02:25:13 2014
New Revision: 1603043
URL: http://svn.apache.org/r1603043
Log:
svn merge -c 1603042 FIXES: HADOOP-10699. Fix build native library on mac osx.
Contributed by Binglin Chang
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1603043r1=1603042r2=1603043view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Tue Jun 17 02:25:13 2014
@@ -225,6 +225,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10702. KerberosAuthenticationHandler does not log the principal
names
correctly. (Benoy Antony via cnauroth)
+HADOOP-10699. Fix build native library on mac osx (Binglin Chang via
+jlowe)
+
BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
HADOOP-10520. Extended attributes definition and FileSystem APIs for
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c?rev=1603043r1=1603042r2=1603043view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c
Tue Jun 17 02:25:13 2014
@@ -73,7 +73,10 @@ Java_org_apache_hadoop_security_JniBased
// was successful or not (as long as it was called we need to call
// endnetgrent)
setnetgrentCalledFlag = 1;
-#ifndef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__MACH__)
+ setnetgrent(cgroup);
+ {
+#else
if(setnetgrent(cgroup) == 1) {
#endif
current = NULL;
@@ -90,9 +93,7 @@ Java_org_apache_hadoop_security_JniBased
userListSize++;
}
}
-#ifndef __FreeBSD__
}
-#endif
//--
// build return data (java array)
svn commit: r1606267 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java src/test/java/org/apache/hadoop/fs/shell/Test
Author: jlowe
Date: Fri Jun 27 23:22:35 2014
New Revision: 1606267
URL: http://svn.apache.org/r1606267
Log:
HADOOP-10739. Renaming a file into a directory containing the same filename
results in a confusing I/O error. Contributed by chang li
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestMove.java
(with props)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1606267r1=1606266r2=1606267view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Jun
27 23:22:35 2014
@@ -632,6 +632,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-9705. FsShell cp -p does not preserve directory attibutes.
(Akira AJISAKA via cnauroth)
+HADOOP-10739. Renaming a file into a directory containing the same
+filename results in a confusing I/O error (chang li via jlowe)
+
BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
HADOOP-10520. Extended attributes definition and FileSystem APIs for
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java?rev=1606267r1=1606266r2=1606267view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
Fri Jun 27 23:22:35 2014
@@ -104,6 +104,9 @@ class MoveCommands {
throw new PathIOException(src.toString(),
Does not match target filesystem);
}
+ if (target.exists) {
+throw new PathExistsException(target.toString());
+ }
if (!target.fs.rename(src.path, target.path)) {
// we have no way to know the actual error...
throw new PathIOException(src.toString());
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestMove.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestMove.java?rev=1606267view=auto
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestMove.java
(added)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestMove.java
Fri Jun 27 23:22:35 2014
@@ -0,0 +1,123 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.fs.shell;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FilterFileSystem;
+import org.apache.hadoop.fs.PathExistsException;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class TestMove {
+ static Configuration conf;
+ static FileSystem mockFs;
+
+ @BeforeClass
+ public static void setup() throws IOException, URISyntaxException {
+mockFs = mock(FileSystem.class);
+conf = new Configuration();
+conf.setClass(fs.mockfs.impl, MockFileSystem.class, FileSystem.class);
+ }
+
+ @Before
+ public void
svn commit: r1606268 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java src/test/java/org/apache/hadoop/f
Author: jlowe
Date: Fri Jun 27 23:23:39 2014
New Revision: 1606268
URL: http://svn.apache.org/r1606268
Log:
HADOOP-10739. Renaming a file into a directory containing the same filename
results in a confusing I/O error. Contributed by chang li
Added:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestMove.java
- copied unchanged from r1606267,
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestMove.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1606268r1=1606267r2=1606268view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Fri Jun 27 23:23:39 2014
@@ -274,6 +274,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-9705. FsShell cp -p does not preserve directory attibutes.
(Akira AJISAKA via cnauroth)
+HADOOP-10739. Renaming a file into a directory containing the same
+filename results in a confusing I/O error (chang li via jlowe)
+
BREAKDOWN OF HADOOP-10514 SUBTASKS AND RELATED JIRAS
HADOOP-10520. Extended attributes definition and FileSystem APIs for
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java?rev=1606268r1=1606267r2=1606268view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/MoveCommands.java
Fri Jun 27 23:23:39 2014
@@ -104,6 +104,9 @@ class MoveCommands {
throw new PathIOException(src.toString(),
Does not match target filesystem);
}
+ if (target.exists) {
+throw new PathExistsException(target.toString());
+ }
if (!target.fs.rename(src.path, target.path)) {
// we have no way to know the actual error...
throw new PathIOException(src.toString());
svn commit: r1610829 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common/src: main/java/org/apache/hadoop/metrics2/impl/ test/java/org/apache/hadoop/metrics2/impl/
Author: jlowe
Date: Tue Jul 15 19:51:55 2014
New Revision: 1610829
URL: http://svn.apache.org/r1610829
Log:
Addendum patch for HADOOP-10468 TestMetricsSystemImpl.testMultiThreadedPublish
fails intermediately. Contributed by Akira AJISAKA
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java?rev=1610829r1=1610828r2=1610829view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
Tue Jul 15 19:51:55 2014
@@ -85,7 +85,7 @@ class MetricsConfig extends SubsetConfig
private ClassLoader pluginLoader;
MetricsConfig(Configuration c, String prefix) {
-super(c, prefix, .);
+super(c, prefix.toLowerCase(Locale.US), .);
}
static MetricsConfig create(String prefix) {
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java?rev=1610829r1=1610828r2=1610829view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
Tue Jul 15 19:51:55 2014
@@ -60,12 +60,12 @@ public class TestGangliaMetrics {
@Test
public void testTagsForPrefix() throws Exception {
ConfigBuilder cb = new ConfigBuilder()
- .add(Test.sink.ganglia.tagsForPrefix.all, *)
- .add(Test.sink.ganglia.tagsForPrefix.some, NumActiveSinks, +
+ .add(test.sink.ganglia.tagsForPrefix.all, *)
+ .add(test.sink.ganglia.tagsForPrefix.some, NumActiveSinks, +
NumActiveSources)
- .add(Test.sink.ganglia.tagsForPrefix.none, );
+ .add(test.sink.ganglia.tagsForPrefix.none, );
GangliaSink30 sink = new GangliaSink30();
-sink.init(cb.subset(Test.sink.ganglia));
+sink.init(cb.subset(test.sink.ganglia));
ListMetricsTag tags = new ArrayListMetricsTag();
tags.add(new MetricsTag(MsInfo.Context, all));
@@ -98,8 +98,8 @@ public class TestGangliaMetrics {
@Test public void testGangliaMetrics2() throws Exception {
ConfigBuilder cb = new ConfigBuilder().add(default.period, 10)
-.add(Test.sink.gsink30.context, test) // filter out only test
-.add(Test.sink.gsink31.context, test) // filter out only test
+.add(test.sink.gsink30.context, test) // filter out only test
+.add(test.sink.gsink31.context, test) // filter out only test
.save(TestMetricsConfig.getTestFilename(hadoop-metrics2-test));
MetricsSystemImpl ms = new MetricsSystemImpl(Test);
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java?rev=1610829r1=1610828r2=1610829view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
Tue Jul 15 19:51:55 2014
@@ -88,11 +88,11 @@ public class TestMetricsSystemImpl {
DefaultMetricsSystem.shutdown();
new ConfigBuilder().add(*.period, 8)
//.add(test.sink.plugin.urls, getPluginUrlsAsString())
-.add(Test.sink.test.class, TestSink.class.getName())
-.add(Test.*.source.filter.exclude, s0)
-.add(Test.source.s1.metric.filter.exclude, X*)
-.add(Test.sink.sink1.metric.filter.exclude, Y*)
-.add(Test.sink.sink2.metric.filter.exclude, Y*)
+.add(test.sink.test.class
svn commit: r1610830 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src: main/java/org/apache/hadoop/metrics2/impl/ test/java/org/apache/hadoop/metrics2/impl/
Author: jlowe
Date: Tue Jul 15 19:57:43 2014
New Revision: 1610830
URL: http://svn.apache.org/r1610830
Log:
svn merge -c 1610829 FIXES: Addendum patch for HADOOP-10468
TestMetricsSystemImpl.testMultiThreadedPublish fails intermediately.
Contributed by Akira AJISAKA
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java?rev=1610830r1=1610829r2=1610830view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
Tue Jul 15 19:57:43 2014
@@ -85,7 +85,7 @@ class MetricsConfig extends SubsetConfig
private ClassLoader pluginLoader;
MetricsConfig(Configuration c, String prefix) {
-super(c, prefix, .);
+super(c, prefix.toLowerCase(Locale.US), .);
}
static MetricsConfig create(String prefix) {
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java?rev=1610830r1=1610829r2=1610830view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
Tue Jul 15 19:57:43 2014
@@ -60,12 +60,12 @@ public class TestGangliaMetrics {
@Test
public void testTagsForPrefix() throws Exception {
ConfigBuilder cb = new ConfigBuilder()
- .add(Test.sink.ganglia.tagsForPrefix.all, *)
- .add(Test.sink.ganglia.tagsForPrefix.some, NumActiveSinks, +
+ .add(test.sink.ganglia.tagsForPrefix.all, *)
+ .add(test.sink.ganglia.tagsForPrefix.some, NumActiveSinks, +
NumActiveSources)
- .add(Test.sink.ganglia.tagsForPrefix.none, );
+ .add(test.sink.ganglia.tagsForPrefix.none, );
GangliaSink30 sink = new GangliaSink30();
-sink.init(cb.subset(Test.sink.ganglia));
+sink.init(cb.subset(test.sink.ganglia));
ListMetricsTag tags = new ArrayListMetricsTag();
tags.add(new MetricsTag(MsInfo.Context, all));
@@ -98,8 +98,8 @@ public class TestGangliaMetrics {
@Test public void testGangliaMetrics2() throws Exception {
ConfigBuilder cb = new ConfigBuilder().add(default.period, 10)
-.add(Test.sink.gsink30.context, test) // filter out only test
-.add(Test.sink.gsink31.context, test) // filter out only test
+.add(test.sink.gsink30.context, test) // filter out only test
+.add(test.sink.gsink31.context, test) // filter out only test
.save(TestMetricsConfig.getTestFilename(hadoop-metrics2-test));
MetricsSystemImpl ms = new MetricsSystemImpl(Test);
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java?rev=1610830r1=1610829r2=1610830view=diff
==
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
Tue Jul 15 19:57:43 2014
@@ -88,11 +88,11 @@ public class TestMetricsSystemImpl {
DefaultMetricsSystem.shutdown();
new ConfigBuilder().add(*.period, 8)
//.add(test.sink.plugin.urls, getPluginUrlsAsString())
-.add(Test.sink.test.class, TestSink.class.getName())
-.add(Test.*.source.filter.exclude, s0)
-.add
svn commit: r1610831 - in /hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src: main/java/org/apache/hadoop/metrics2/impl/ test/java/org/apache/hadoop/metrics2/impl/
Author: jlowe
Date: Tue Jul 15 20:00:54 2014
New Revision: 1610831
URL: http://svn.apache.org/r1610831
Log:
svn merge -c 1610829 FIXES: Addendum patch for HADOOP-10468
TestMetricsSystemImpl.testMultiThreadedPublish fails intermediately.
Contributed by Akira AJISAKA
Modified:
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
Modified:
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java?rev=1610831r1=1610830r2=1610831view=diff
==
---
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
(original)
+++
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
Tue Jul 15 20:00:54 2014
@@ -85,7 +85,7 @@ class MetricsConfig extends SubsetConfig
private ClassLoader pluginLoader;
MetricsConfig(Configuration c, String prefix) {
-super(c, prefix, .);
+super(c, prefix.toLowerCase(Locale.US), .);
}
static MetricsConfig create(String prefix) {
Modified:
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java?rev=1610831r1=1610830r2=1610831view=diff
==
---
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
(original)
+++
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
Tue Jul 15 20:00:54 2014
@@ -60,12 +60,12 @@ public class TestGangliaMetrics {
@Test
public void testTagsForPrefix() throws Exception {
ConfigBuilder cb = new ConfigBuilder()
- .add(Test.sink.ganglia.tagsForPrefix.all, *)
- .add(Test.sink.ganglia.tagsForPrefix.some, NumActiveSinks, +
+ .add(test.sink.ganglia.tagsForPrefix.all, *)
+ .add(test.sink.ganglia.tagsForPrefix.some, NumActiveSinks, +
NumActiveSources)
- .add(Test.sink.ganglia.tagsForPrefix.none, );
+ .add(test.sink.ganglia.tagsForPrefix.none, );
GangliaSink30 sink = new GangliaSink30();
-sink.init(cb.subset(Test.sink.ganglia));
+sink.init(cb.subset(test.sink.ganglia));
ListMetricsTag tags = new ArrayListMetricsTag();
tags.add(new MetricsTag(MsInfo.Context, all));
@@ -98,8 +98,8 @@ public class TestGangliaMetrics {
@Test public void testGangliaMetrics2() throws Exception {
ConfigBuilder cb = new ConfigBuilder().add(default.period, 10)
-.add(Test.sink.gsink30.context, test) // filter out only test
-.add(Test.sink.gsink31.context, test) // filter out only test
+.add(test.sink.gsink30.context, test) // filter out only test
+.add(test.sink.gsink31.context, test) // filter out only test
.save(TestMetricsConfig.getTestFilename(hadoop-metrics2-test));
MetricsSystemImpl ms = new MetricsSystemImpl(Test);
Modified:
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java?rev=1610831r1=1610830r2=1610831view=diff
==
---
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
(original)
+++
hadoop/common/branches/branch-2.5/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
Tue Jul 15 20:00:54 2014
@@ -88,11 +88,11 @@ public class TestMetricsSystemImpl {
DefaultMetricsSystem.shutdown();
new ConfigBuilder().add(*.period, 8)
//.add(test.sink.plugin.urls, getPluginUrlsAsString())
-.add(Test.sink.test.class, TestSink.class.getName())
-.add(Test
