svn commit: r1374477 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/Trash.java
Author: eli Date: Fri Aug 17 23:27:50 2012 New Revision: 1374477 URL: http://svn.apache.org/viewvc?rev=1374477&view=rev Log: HADOOP-8710. Remove ability for users to easily run the trash emptier. Contributed by Eli Collins 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/Trash.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=1374477&r1=1374476&r2=1374477&view=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 Aug 17 23:27:50 2012 @@ -9,6 +9,8 @@ Release 2.0.1-alpha - UNRELEASED HADOOP-8689. Make trash a server side configuration option. (eli) +HADOOP-8710. Remove ability for users to easily run the trash emptier. (eli) + NEW FEATURES HDFS-3042. Automatic failover support for NameNode HA (todd) Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java?rev=1374477&r1=1374476&r2=1374477&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java Fri Aug 17 23:27:50 2012 @@ -117,9 +117,4 @@ public class Trash extends Configured { public Runnable getEmptier() throws IOException { return trashPolicy.getEmptier(); } - - /** Run an emptier.*/ - public static void main(String[] args) throws Exception { -new Trash(new Configuration()).getEmptier().run(); - } }
svn commit: r1374476 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/Trash.java
Author: eli Date: Fri Aug 17 23:26:55 2012 New Revision: 1374476 URL: http://svn.apache.org/viewvc?rev=1374476&view=rev Log: HADOOP-8710. Remove ability for users to easily run the trash emptire. Contributed by Eli Collins 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/Trash.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=1374476&r1=1374475&r2=1374476&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 23:26:55 2012 @@ -200,6 +200,8 @@ Branch-2 ( Unreleased changes ) HADOOP-8689. Make trash a server side configuration option. (eli) +HADOOP-8710. Remove ability for users to easily run the trash emptire. (eli) + NEW FEATURES HDFS-3042. Automatic failover support for NameNode HA (todd) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java?rev=1374476&r1=1374475&r2=1374476&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Trash.java Fri Aug 17 23:26:55 2012 @@ -117,9 +117,4 @@ public class Trash extends Configured { public Runnable getEmptier() throws IOException { return trashPolicy.getEmptier(); } - - /** Run an emptier.*/ - public static void main(String[] args) throws Exception { -new Trash(new Configuration()).getEmptier().run(); - } }
svn commit: r1374474 - 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/ftp/ src/main/java/org/apache/
Author: eli Date: Fri Aug 17 23:24:36 2012 New Revision: 1374474 URL: http://svn.apache.org/viewvc?rev=1374474&view=rev Log: HADOOP-8689. Make trash a server side configuration option. Contributed by Eli Collins 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/FileSystem.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java 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/main/java/org/apache/hadoop/fs/ftp/FtpConfigKeys.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/local/LocalConfigKeys.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml 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=1374474&r1=1374473&r2=1374474&view=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 Aug 17 23:24:36 2012 @@ -7,6 +7,8 @@ Release 2.0.1-alpha - UNRELEASED HADOOP-8388. Remove unused BlockLocation serialization. (Colin Patrick McCabe via eli) +HADOOP-8689. Make trash a server side configuration option. (eli) + NEW FEATURES HDFS-3042. Automatic failover support for NameNode HA (todd) Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java?rev=1374474&r1=1374473&r2=1374474&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java Fri Aug 17 23:24:36 2012 @@ -661,7 +661,9 @@ public abstract class FileSystem extends 64 * 1024, getDefaultReplication(), conf.getInt("io.file.buffer.size", 4096), -false); +false, +// NB: ignoring the client trash configuration +CommonConfigurationKeysPublic.FS_TRASH_INTERVAL_DEFAULT); } /** Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java?rev=1374474&r1=1374473&r2=1374474&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java Fri Aug 17 23:24:36 2012 @@ -49,19 +49,21 @@ public class FsServerDefaults implements private short replication; private int fileBufferSize; private boolean encryptDataTransfer; + private long trashInterval; public FsServerDefaults() { } public FsServerDefaults(long blockSize, int bytesPerChecksum, int writePacketSize, short replication, int fileBufferSize, - boolean encryptDataTransfer) { + boolean encryptDataTransfer, long trashInterval) { this.blockSize = blockSize; this.bytesPerChecksum = bytesPerChecksum; this.writePacketSize = writePacketSize; this.replication = replication; this.fileBufferSize = fileBufferSize; this.encryptDataTransfer = encryptDataTransfer; +this.trashInterval = trashInterval; } public long getBlockSize() { @@ -88,6 +90,10 @@ public class FsServerDefaults implements return encryptDataTransfer; } + public long getTrashInterval() { +return trashInterval; + } + // / // Writable // / Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault
svn commit: r1374472 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/fs/ftp/ src/main/java/org/apache/hadoop/fs/lo
Author: eli Date: Fri Aug 17 23:22:17 2012 New Revision: 1374472 URL: http://svn.apache.org/viewvc?rev=1374472&view=rev Log: HADOOP-8689. Make trash a server side configuration option. Contributed by Eli Collins 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 hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java 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/main/java/org/apache/hadoop/fs/ftp/FtpConfigKeys.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/local/LocalConfigKeys.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml 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=1374472&r1=1374471&r2=1374472&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 23:22:17 2012 @@ -198,6 +198,8 @@ Branch-2 ( Unreleased changes ) HADOOP-8388. Remove unused BlockLocation serialization. (Colin Patrick McCabe via eli) +HADOOP-8689. Make trash a server side configuration option. (eli) + NEW FEATURES HDFS-3042. Automatic failover support for NameNode HA (todd) 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=1374472&r1=1374471&r2=1374472&view=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 Aug 17 23:22:17 2012 @@ -661,7 +661,9 @@ public abstract class FileSystem extends 64 * 1024, getDefaultReplication(), conf.getInt("io.file.buffer.size", 4096), -false); +false, +// NB: ignoring the client trash configuration +CommonConfigurationKeysPublic.FS_TRASH_INTERVAL_DEFAULT); } /** Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java?rev=1374472&r1=1374471&r2=1374472&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java Fri Aug 17 23:22:17 2012 @@ -49,19 +49,21 @@ public class FsServerDefaults implements private short replication; private int fileBufferSize; private boolean encryptDataTransfer; + private long trashInterval; public FsServerDefaults() { } public FsServerDefaults(long blockSize, int bytesPerChecksum, int writePacketSize, short replication, int fileBufferSize, - boolean encryptDataTransfer) { + boolean encryptDataTransfer, long trashInterval) { this.blockSize = blockSize; this.bytesPerChecksum = bytesPerChecksum; this.writePacketSize = writePacketSize; this.replication = replication; this.fileBufferSize = fileBufferSize; this.encryptDataTransfer = encryptDataTransfer; +this.trashInterval = trashInterval; } public long getBlockSize() { @@ -88,6 +90,10 @@ public class FsServerDefaults implements return encryptDataTransfer; } + public long getTrashInterval() { +return trashInterval; + } + // / // Writable // / 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=1374472&r1=1374471&r2=1374472&view=diff
svn commit: r1374451 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
Author: tgraves Date: Fri Aug 17 21:46:05 2012 New Revision: 1374451 URL: http://svn.apache.org/viewvc?rev=1374451&view=rev Log: merge -r 1374448:1374449 from branch-2. FIXES: HADOOP-8695 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/test/java/org/apache/hadoop/fs/shell/TestPathData.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=1374451&r1=1374450&r2=1374451&view=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 Aug 17 21:46:05 2012 @@ -168,6 +168,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8695. TestPathData fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.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/shell/TestPathData.java?rev=1374451&r1=1374450&r2=1374451&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java Fri Aug 17 21:46:05 2012 @@ -26,23 +26,17 @@ import java.util.Arrays; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.junit.BeforeClass; +import org.junit.After; +import org.junit.Before; import org.junit.Test; public class TestPathData { - protected static Configuration conf; - protected static FileSystem fs; - protected static String dirString; - protected static Path testDir; - protected static PathData item; - - protected static String[] d1Paths = -new String[] { "d1/f1", "d1/f1.1", "d1/f2" }; - protected static String[] d2Paths = -new String[] { "d2/f3" }; - - @BeforeClass - public static void initialize() throws Exception { + protected Configuration conf; + protected FileSystem fs; + protected Path testDir; + + @Before + public void initialize() throws Exception { conf = new Configuration(); fs = FileSystem.getLocal(conf); testDir = new Path( @@ -60,23 +54,28 @@ public class TestPathData { fs.create(new Path("d2","f3")); } + @After + public void cleanup() throws Exception { +fs.close(); + } + @Test public void testWithDirStringAndConf() throws Exception { -dirString = "d1"; -item = new PathData(dirString, conf); -checkPathData(); +String dirString = "d1"; +PathData item = new PathData(dirString, conf); +checkPathData(dirString, item); // properly implementing symlink support in various commands will require // trailing slashes to be retained dirString = "d1/"; item = new PathData(dirString, conf); -checkPathData(); +checkPathData(dirString, item); } @Test public void testUnqualifiedUriContents() throws Exception { -dirString = "d1"; -item = new PathData(dirString, conf); +String dirString = "d1"; +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString("d1/f1", "d1/f1.1", "d1/f2"), @@ -86,8 +85,8 @@ public class TestPathData { @Test public void testQualifiedUriContents() throws Exception { -dirString = fs.makeQualified(new Path("d1")).toString(); -item = new PathData(dirString, conf); +String dirString = fs.makeQualified(new Path("d1")).toString(); +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString(dirString+"/f1", dirString+"/f1.1", dirString+"/f2"), @@ -97,8 +96,8 @@ public class TestPathData { @Test public void testCwdContents() throws Exception { -dirString = Path.CUR_DIR; -item = new PathData(dirString, conf); +String dirString = Path.CUR_DIR; +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString("d1", "d2"), @@ -106,17 +105,16 @@ public class TestPathData { ); } - - @Test - public void
svn commit: r1374450 - in /hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
Author: tgraves Date: Fri Aug 17 21:45:41 2012 New Revision: 1374450 URL: http://svn.apache.org/viewvc?rev=1374450&view=rev Log: merge -r 1374446:1374447 from trunk. FIXES: HADOOP-8695 Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374450&r1=1374449&r2=1374450&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 21:45:41 2012 @@ -665,6 +665,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8695. TestPathData fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java?rev=1374450&r1=1374449&r2=1374450&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java Fri Aug 17 21:45:41 2012 @@ -26,23 +26,17 @@ import java.util.Arrays; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.junit.BeforeClass; +import org.junit.After; +import org.junit.Before; import org.junit.Test; public class TestPathData { - protected static Configuration conf; - protected static FileSystem fs; - protected static String dirString; - protected static Path testDir; - protected static PathData item; - - protected static String[] d1Paths = -new String[] { "d1/f1", "d1/f1.1", "d1/f2" }; - protected static String[] d2Paths = -new String[] { "d2/f3" }; - - @BeforeClass - public static void initialize() throws Exception { + protected Configuration conf; + protected FileSystem fs; + protected Path testDir; + + @Before + public void initialize() throws Exception { conf = new Configuration(); fs = FileSystem.getLocal(conf); testDir = new Path( @@ -60,23 +54,28 @@ public class TestPathData { fs.create(new Path("d2","f3")); } + @After + public void cleanup() throws Exception { +fs.close(); + } + @Test public void testWithDirStringAndConf() throws Exception { -dirString = "d1"; -item = new PathData(dirString, conf); -checkPathData(); +String dirString = "d1"; +PathData item = new PathData(dirString, conf); +checkPathData(dirString, item); // properly implementing symlink support in various commands will require // trailing slashes to be retained dirString = "d1/"; item = new PathData(dirString, conf); -checkPathData(); +checkPathData(dirString, item); } @Test public void testUnqualifiedUriContents() throws Exception { -dirString = "d1"; -item = new PathData(dirString, conf); +String dirString = "d1"; +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString("d1/f1", "d1/f1.1", "d1/f2"), @@ -86,8 +85,8 @@ public class TestPathData { @Test public void testQualifiedUriContents() throws Exception { -dirString = fs.makeQualified(new Path("d1")).toString(); -item = new PathData(dirString, conf); +String dirString = fs.makeQualified(new Path("d1")).toString(); +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString(dirString+"/f1", dirString+"/f1.1", dirString+"/f2"), @@ -97,8 +96,8 @@ public class TestPathData { @Test public void testCwdContents() throws Exception { -dirString = Path.CUR_DIR; -item = new PathData(dirString, conf); +String dirString = Path.CUR_DIR; +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString("d1", "d2"), @@ -106,17 +105,16 @@ public clas
svn commit: r1374449 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
Author: tgraves Date: Fri Aug 17 21:44:35 2012 New Revision: 1374449 URL: http://svn.apache.org/viewvc?rev=1374449&view=rev Log: merge -r 1374446:1374447 from trunk. FIXES: HADOOP-8695 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/shell/TestPathData.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=1374449&r1=1374448&r2=1374449&view=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 Aug 17 21:44:35 2012 @@ -747,6 +747,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8695. TestPathData fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java?rev=1374449&r1=1374448&r2=1374449&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java Fri Aug 17 21:44:35 2012 @@ -26,23 +26,17 @@ import java.util.Arrays; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.junit.BeforeClass; +import org.junit.After; +import org.junit.Before; import org.junit.Test; public class TestPathData { - protected static Configuration conf; - protected static FileSystem fs; - protected static String dirString; - protected static Path testDir; - protected static PathData item; - - protected static String[] d1Paths = -new String[] { "d1/f1", "d1/f1.1", "d1/f2" }; - protected static String[] d2Paths = -new String[] { "d2/f3" }; - - @BeforeClass - public static void initialize() throws Exception { + protected Configuration conf; + protected FileSystem fs; + protected Path testDir; + + @Before + public void initialize() throws Exception { conf = new Configuration(); fs = FileSystem.getLocal(conf); testDir = new Path( @@ -60,23 +54,28 @@ public class TestPathData { fs.create(new Path("d2","f3")); } + @After + public void cleanup() throws Exception { +fs.close(); + } + @Test public void testWithDirStringAndConf() throws Exception { -dirString = "d1"; -item = new PathData(dirString, conf); -checkPathData(); +String dirString = "d1"; +PathData item = new PathData(dirString, conf); +checkPathData(dirString, item); // properly implementing symlink support in various commands will require // trailing slashes to be retained dirString = "d1/"; item = new PathData(dirString, conf); -checkPathData(); +checkPathData(dirString, item); } @Test public void testUnqualifiedUriContents() throws Exception { -dirString = "d1"; -item = new PathData(dirString, conf); +String dirString = "d1"; +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString("d1/f1", "d1/f1.1", "d1/f2"), @@ -86,8 +85,8 @@ public class TestPathData { @Test public void testQualifiedUriContents() throws Exception { -dirString = fs.makeQualified(new Path("d1")).toString(); -item = new PathData(dirString, conf); +String dirString = fs.makeQualified(new Path("d1")).toString(); +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString(dirString+"/f1", dirString+"/f1.1", dirString+"/f2"), @@ -97,8 +96,8 @@ public class TestPathData { @Test public void testCwdContents() throws Exception { -dirString = Path.CUR_DIR; -item = new PathData(dirString, conf); +String dirString = Path.CUR_DIR; +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString("d1", "d2"), @@ -106,17 +105,16 @@ public class TestPathData { ); } - - @Test - public void testToFile() throws Exception {
svn commit: r1374447 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/shell/TestPathData.java
Author: tgraves Date: Fri Aug 17 21:43:31 2012 New Revision: 1374447 URL: http://svn.apache.org/viewvc?rev=1374447&view=rev Log: HADOOP-8695. TestPathData fails intermittently with JDK7 (Trevor Robinson via tgraves) 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/shell/TestPathData.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=1374447&r1=1374446&r2=1374447&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 21:43:31 2012 @@ -925,6 +925,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8695. TestPathData fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java?rev=1374447&r1=1374446&r2=1374447&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestPathData.java Fri Aug 17 21:43:31 2012 @@ -26,23 +26,17 @@ import java.util.Arrays; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.junit.BeforeClass; +import org.junit.After; +import org.junit.Before; import org.junit.Test; public class TestPathData { - protected static Configuration conf; - protected static FileSystem fs; - protected static String dirString; - protected static Path testDir; - protected static PathData item; - - protected static String[] d1Paths = -new String[] { "d1/f1", "d1/f1.1", "d1/f2" }; - protected static String[] d2Paths = -new String[] { "d2/f3" }; - - @BeforeClass - public static void initialize() throws Exception { + protected Configuration conf; + protected FileSystem fs; + protected Path testDir; + + @Before + public void initialize() throws Exception { conf = new Configuration(); fs = FileSystem.getLocal(conf); testDir = new Path( @@ -60,23 +54,28 @@ public class TestPathData { fs.create(new Path("d2","f3")); } + @After + public void cleanup() throws Exception { +fs.close(); + } + @Test public void testWithDirStringAndConf() throws Exception { -dirString = "d1"; -item = new PathData(dirString, conf); -checkPathData(); +String dirString = "d1"; +PathData item = new PathData(dirString, conf); +checkPathData(dirString, item); // properly implementing symlink support in various commands will require // trailing slashes to be retained dirString = "d1/"; item = new PathData(dirString, conf); -checkPathData(); +checkPathData(dirString, item); } @Test public void testUnqualifiedUriContents() throws Exception { -dirString = "d1"; -item = new PathData(dirString, conf); +String dirString = "d1"; +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString("d1/f1", "d1/f1.1", "d1/f2"), @@ -86,8 +85,8 @@ public class TestPathData { @Test public void testQualifiedUriContents() throws Exception { -dirString = fs.makeQualified(new Path("d1")).toString(); -item = new PathData(dirString, conf); +String dirString = fs.makeQualified(new Path("d1")).toString(); +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString(dirString+"/f1", dirString+"/f1.1", dirString+"/f2"), @@ -97,8 +96,8 @@ public class TestPathData { @Test public void testCwdContents() throws Exception { -dirString = Path.CUR_DIR; -item = new PathData(dirString, conf); +String dirString = Path.CUR_DIR; +PathData item = new PathData(dirString, conf); PathData[] items = item.getDirectoryContents(); assertEquals( sortedString("d1", "d2"), @@ -106,17 +105,16 @@ public class TestPathData { ); } - - @Test - public void testToFile() throws Exception { -item = new PathData(".", conf); + @Test + public void testToFile() throws Exc
svn commit: r1374403 - in /hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/fs/viewfs/ src/main/jav
Author: daryn Date: Fri Aug 17 19:25:53 2012 New Revision: 1374403 URL: http://svn.apache.org/viewvc?rev=1374403&view=rev Log: svn merge -c 1374346 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn) Added: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemTokens.java - copied unchanged from r1374346, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemTokens.java Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemDelegationTokenSupport.java hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374403&r1=1374402&r2=1374403&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 19:25:53 2012 @@ -575,6 +575,8 @@ Release 0.23.3 - UNRELEASED INCOMPATIBLE CHANGES +HADOOP-7967. Need generalized multi-token filesystem support (daryn) + NEW FEATURES IMPROVEMENTS Modified: hadoop/common/branches/branch-2.1.0-alpha/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.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java?rev=1374403&r1=1374402&r2=1374403&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java Fri Aug 17 19:25:53 2012 @@ -21,6 +21,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.util.Arrays; import java.util.EnumSet; import java.util.List; @@ -217,6 +218,6 @@ public abstract class DelegateToFileSyst @Override //AbstractFileSystem public List> getDelegationTokens(String renewer) throws IOException { -return fsImpl.getDelegationTokens(renewer); +return Arrays.asList(fsImpl.addDelegationTokens(renewer, null)); } } \ No newline at end of file Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java?rev=1374403&r1=1374402&r2=1374403&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java Fri Aug 17 19:25:53 2012 @@ -110,7 +11
svn commit: r1374352 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/TestWritableName.java
Author: tgraves Date: Fri Aug 17 16:41:31 2012 New Revision: 1374352 URL: http://svn.apache.org/viewvc?rev=1374352&view=rev Log: merge -r 1374349:1374350 from branch-2. FIXES: HADOOP-8697 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/test/java/org/apache/hadoop/io/TestWritableName.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=1374352&r1=1374351&r2=1374352&view=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 Aug 17 16:41:31 2012 @@ -165,6 +165,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java?rev=1374352&r1=1374351&r2=1374352&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java Fri Aug 17 16:41:31 2012 @@ -83,6 +83,7 @@ public class TestWritableName extends Te Configuration conf = new Configuration(); String altName = testName + ".alt"; +WritableName.setName(SimpleWritable.class, testName); WritableName.addName(SimpleWritable.class, altName); Class test = WritableName.getClass(altName, conf);
svn commit: r1374351 - in /hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/TestWritableName.java
Author: tgraves Date: Fri Aug 17 16:41:26 2012 New Revision: 1374351 URL: http://svn.apache.org/viewvc?rev=1374351&view=rev Log: merge -r 1374348:1374349 from trunk. FIXES: HADOOP-8697 Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374351&r1=1374350&r2=1374351&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 16:41:26 2012 @@ -660,6 +660,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java?rev=1374351&r1=1374350&r2=1374351&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java Fri Aug 17 16:41:26 2012 @@ -83,6 +83,7 @@ public class TestWritableName extends Te Configuration conf = new Configuration(); String altName = testName + ".alt"; +WritableName.setName(SimpleWritable.class, testName); WritableName.addName(SimpleWritable.class, altName); Class test = WritableName.getClass(altName, conf);
svn commit: r1374350 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/TestWritableName.java
Author: tgraves Date: Fri Aug 17 16:40:29 2012 New Revision: 1374350 URL: http://svn.apache.org/viewvc?rev=1374350&view=rev Log: merge -r 1374348:1374349 from trunk. FIXES: HADOOP-8697 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/io/TestWritableName.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=1374350&r1=1374349&r2=1374350&view=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 Aug 17 16:40:29 2012 @@ -744,6 +744,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java?rev=1374350&r1=1374349&r2=1374350&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java Fri Aug 17 16:40:29 2012 @@ -83,6 +83,7 @@ public class TestWritableName extends Te Configuration conf = new Configuration(); String altName = testName + ".alt"; +WritableName.setName(SimpleWritable.class, testName); WritableName.addName(SimpleWritable.class, altName); Class test = WritableName.getClass(altName, conf);
svn commit: r1374349 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/io/TestWritableName.java
Author: tgraves Date: Fri Aug 17 16:38:53 2012 New Revision: 1374349 URL: http://svn.apache.org/viewvc?rev=1374349&view=rev Log: HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor Robinson via tgraves) 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/io/TestWritableName.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=1374349&r1=1374348&r2=1374349&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 16:38:53 2012 @@ -922,6 +922,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8697. TestWritableName fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java?rev=1374349&r1=1374348&r2=1374349&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestWritableName.java Fri Aug 17 16:38:53 2012 @@ -83,6 +83,7 @@ public class TestWritableName extends Te Configuration conf = new Configuration(); String altName = testName + ".alt"; +WritableName.setName(SimpleWritable.class, testName); WritableName.addName(SimpleWritable.class, altName); Class test = WritableName.getClass(altName, conf);
svn commit: r1374346 - 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/viewfs/ src/main/java/org/apac
Author: daryn Date: Fri Aug 17 16:26:01 2012 New Revision: 1374346 URL: http://svn.apache.org/viewvc?rev=1374346&view=rev Log: svn merge -c 1374271 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn) Added: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemTokens.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/DelegationTokenRenewer.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemDelegationTokenSupport.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.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=1374346&r1=1374345&r2=1374346&view=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 Aug 17 16:26:01 2012 @@ -626,6 +626,8 @@ Release 0.23.3 - UNRELEASED INCOMPATIBLE CHANGES +HADOOP-7967. Need generalized multi-token filesystem support (daryn) + NEW FEATURES IMPROVEMENTS 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=1374346&r1=1374345&r2=1374346&view=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 Fri Aug 17 16:26:01 2012 @@ -21,6 +21,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.util.Arrays; import java.util.EnumSet; import java.util.List; @@ -217,6 +218,6 @@ public abstract class DelegateToFileSyst @Override //AbstractFileSystem public List> getDelegationTokens(String renewer) throws IOException { -return fsImpl.getDelegationTokens(renewer); +return Arrays.asList(fsImpl.addDelegationTokens(renewer, null)); } } \ No newline at end of file Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java?rev=1374346&r1=1374345&r2=1374346&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java Fri Aug 17 16:26:01 2012 @@ -110,7 +110,11 @@ public class DelegationTokenRenewer[] tokens = fs.addDelegationTokens(null, null); + if (tokens.length == 0) { +throw new IOException("addDelegationTokens returned no tokens"); + } + fs.setDelegationToken(tokens[0]); } catch (IOException ie2) { throw new IOException("Can't renew or get new delegation token ", ie);
svn commit: r1374325 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
Author: tgraves Date: Fri Aug 17 15:38:10 2012 New Revision: 1374325 URL: http://svn.apache.org/viewvc?rev=1374325&view=rev Log: merge -r 1374322:1374323 from branch-2. FIXES: HADOOP-8693 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/test/java/org/apache/hadoop/security/TestSecurityUtil.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=1374325&r1=1374324&r2=1374325&view=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 Aug 17 15:38:10 2012 @@ -162,6 +162,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java?rev=1374325&r1=1374324&r2=1374325&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java Fri Aug 17 15:38:10 2012 @@ -137,6 +137,7 @@ public class TestSecurityUtil { @Test public void testBuildDTServiceName() { +SecurityUtil.setTokenServiceUseIp(true); assertEquals("127.0.0.1:123", SecurityUtil.buildDTServiceName(URI.create("test://LocalHost"), 123) ); @@ -153,6 +154,7 @@ public class TestSecurityUtil { @Test public void testBuildTokenServiceSockAddr() { +SecurityUtil.setTokenServiceUseIp(true); assertEquals("127.0.0.1:123", SecurityUtil.buildTokenService(new InetSocketAddress("LocalHost", 123)).toString() );
svn commit: r1374324 - in /hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
Author: tgraves Date: Fri Aug 17 15:38:07 2012 New Revision: 1374324 URL: http://svn.apache.org/viewvc?rev=1374324&view=rev Log: merge -r 1374321:1374322 from trunk. FIXES: HADOOP-8693 Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374324&r1=1374323&r2=1374324&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 15:38:07 2012 @@ -657,6 +657,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java?rev=1374324&r1=1374323&r2=1374324&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java Fri Aug 17 15:38:07 2012 @@ -137,6 +137,7 @@ public class TestSecurityUtil { @Test public void testBuildDTServiceName() { +SecurityUtil.setTokenServiceUseIp(true); assertEquals("127.0.0.1:123", SecurityUtil.buildDTServiceName(URI.create("test://LocalHost"), 123) ); @@ -153,6 +154,7 @@ public class TestSecurityUtil { @Test public void testBuildTokenServiceSockAddr() { +SecurityUtil.setTokenServiceUseIp(true); assertEquals("127.0.0.1:123", SecurityUtil.buildTokenService(new InetSocketAddress("LocalHost", 123)).toString() );
svn commit: r1374323 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
Author: tgraves Date: Fri Aug 17 15:37:00 2012 New Revision: 1374323 URL: http://svn.apache.org/viewvc?rev=1374323&view=rev Log: merge -r 1374321:1374322 from trunk. FIXES: HADOOP-8693 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/security/TestSecurityUtil.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=1374323&r1=1374322&r2=1374323&view=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 Aug 17 15:37:00 2012 @@ -739,6 +739,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java?rev=1374323&r1=1374322&r2=1374323&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java Fri Aug 17 15:37:00 2012 @@ -137,6 +137,7 @@ public class TestSecurityUtil { @Test public void testBuildDTServiceName() { +SecurityUtil.setTokenServiceUseIp(true); assertEquals("127.0.0.1:123", SecurityUtil.buildDTServiceName(URI.create("test://LocalHost"), 123) ); @@ -153,6 +154,7 @@ public class TestSecurityUtil { @Test public void testBuildTokenServiceSockAddr() { +SecurityUtil.setTokenServiceUseIp(true); assertEquals("127.0.0.1:123", SecurityUtil.buildTokenService(new InetSocketAddress("LocalHost", 123)).toString() );
svn commit: r1374322 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/security/TestSecurityUtil.java
Author: tgraves Date: Fri Aug 17 15:32:50 2012 New Revision: 1374322 URL: http://svn.apache.org/viewvc?rev=1374322&view=rev Log: HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor Robinson via tgraves) 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/security/TestSecurityUtil.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=1374322&r1=1374321&r2=1374322&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 15:32:50 2012 @@ -919,6 +919,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 (Trevor Robinson via tgraves) +HADOOP-8693. TestSecurityUtil fails intermittently with JDK7 (Trevor +Robinson via tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java?rev=1374322&r1=1374321&r2=1374322&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestSecurityUtil.java Fri Aug 17 15:32:50 2012 @@ -137,6 +137,7 @@ public class TestSecurityUtil { @Test public void testBuildDTServiceName() { +SecurityUtil.setTokenServiceUseIp(true); assertEquals("127.0.0.1:123", SecurityUtil.buildDTServiceName(URI.create("test://LocalHost"), 123) ); @@ -153,6 +154,7 @@ public class TestSecurityUtil { @Test public void testBuildTokenServiceSockAddr() { +SecurityUtil.setTokenServiceUseIp(true); assertEquals("127.0.0.1:123", SecurityUtil.buildTokenService(new InetSocketAddress("LocalHost", 123)).toString() );
svn commit: r1374316 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java
Author: tgraves Date: Fri Aug 17 15:21:48 2012 New Revision: 1374316 URL: http://svn.apache.org/viewvc?rev=1374316&view=rev Log: merge -r 1374312:1374313 from branch-2. FIXES: HADOOP-8692 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/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.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=1374316&r1=1374315&r2=1374316&view=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 Aug 17 15:21:48 2012 @@ -159,6 +159,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8390. TestFileSystemCanonicalization fails with JDK7 (Trevor Robinson via tgraves) +HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 +(Trevor Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.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/TestLocalDirAllocator.java?rev=1374316&r1=1374315&r2=1374316&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java Fri Aug 17 15:21:48 2012 @@ -340,14 +340,18 @@ public class TestLocalDirAllocator { @Test public void testRemoveContext() throws IOException { String dir = buildBufferDir(ROOT, 0); -String contextCfgItemName = "application_1340842292563_0004.app.cache.dirs"; -conf.set(contextCfgItemName, dir); -LocalDirAllocator localDirAllocator = new LocalDirAllocator( -contextCfgItemName); -localDirAllocator.getLocalPathForWrite("p1/x", SMALL_FILE_SIZE, conf); -assertTrue(LocalDirAllocator.isContextValid(contextCfgItemName)); -LocalDirAllocator.removeContext(contextCfgItemName); -assertFalse(LocalDirAllocator.isContextValid(contextCfgItemName)); +try { + String contextCfgItemName = "application_1340842292563_0004.app.cache.dirs"; + conf.set(contextCfgItemName, dir); + LocalDirAllocator localDirAllocator = new LocalDirAllocator( + contextCfgItemName); + localDirAllocator.getLocalPathForWrite("p1/x", SMALL_FILE_SIZE, conf); + assertTrue(LocalDirAllocator.isContextValid(contextCfgItemName)); + LocalDirAllocator.removeContext(contextCfgItemName); + assertFalse(LocalDirAllocator.isContextValid(contextCfgItemName)); +} finally { + rmBufferDirs(); +} } }
svn commit: r1374314 - in /hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java
Author: tgraves Date: Fri Aug 17 15:20:03 2012 New Revision: 1374314 URL: http://svn.apache.org/viewvc?rev=1374314&view=rev Log: merge -r 1374311:1374312 from trunk. FIXES: HADOOP-8692 Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374314&r1=1374313&r2=1374314&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 15:20:03 2012 @@ -654,6 +654,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8390. TestFileSystemCanonicalization fails with JDK7 (Trevor Robinson via tgraves) +HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 +(Trevor Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java?rev=1374314&r1=1374313&r2=1374314&view=diff == --- hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java (original) +++ hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java Fri Aug 17 15:20:03 2012 @@ -343,14 +343,18 @@ public class TestLocalDirAllocator { @Test public void testRemoveContext() throws IOException { String dir = buildBufferDir(ROOT, 0); -String contextCfgItemName = "application_1340842292563_0004.app.cache.dirs"; -conf.set(contextCfgItemName, dir); -LocalDirAllocator localDirAllocator = new LocalDirAllocator( -contextCfgItemName); -localDirAllocator.getLocalPathForWrite("p1/x", SMALL_FILE_SIZE, conf); -assertTrue(LocalDirAllocator.isContextValid(contextCfgItemName)); -LocalDirAllocator.removeContext(contextCfgItemName); -assertFalse(LocalDirAllocator.isContextValid(contextCfgItemName)); +try { + String contextCfgItemName = "application_1340842292563_0004.app.cache.dirs"; + conf.set(contextCfgItemName, dir); + LocalDirAllocator localDirAllocator = new LocalDirAllocator( + contextCfgItemName); + localDirAllocator.getLocalPathForWrite("p1/x", SMALL_FILE_SIZE, conf); + assertTrue(LocalDirAllocator.isContextValid(contextCfgItemName)); + LocalDirAllocator.removeContext(contextCfgItemName); + assertFalse(LocalDirAllocator.isContextValid(contextCfgItemName)); +} finally { + rmBufferDirs(); +} } }
svn commit: r1374313 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java
Author: tgraves Date: Fri Aug 17 15:19:39 2012 New Revision: 1374313 URL: http://svn.apache.org/viewvc?rev=1374313&view=rev Log: merge -r 1374311:1374312 from trunk. FIXES: HADOOP-8692 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/TestLocalDirAllocator.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=1374313&r1=1374312&r2=1374313&view=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 Aug 17 15:19:39 2012 @@ -736,6 +736,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8390. TestFileSystemCanonicalization fails with JDK7 (Trevor Robinson via tgraves) +HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 +(Trevor Robinson via tgraves) + Release 0.23.2 - UNRELEASED NEW FEATURES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java?rev=1374313&r1=1374312&r2=1374313&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java Fri Aug 17 15:19:39 2012 @@ -343,14 +343,18 @@ public class TestLocalDirAllocator { @Test public void testRemoveContext() throws IOException { String dir = buildBufferDir(ROOT, 0); -String contextCfgItemName = "application_1340842292563_0004.app.cache.dirs"; -conf.set(contextCfgItemName, dir); -LocalDirAllocator localDirAllocator = new LocalDirAllocator( -contextCfgItemName); -localDirAllocator.getLocalPathForWrite("p1/x", SMALL_FILE_SIZE, conf); -assertTrue(LocalDirAllocator.isContextValid(contextCfgItemName)); -LocalDirAllocator.removeContext(contextCfgItemName); -assertFalse(LocalDirAllocator.isContextValid(contextCfgItemName)); +try { + String contextCfgItemName = "application_1340842292563_0004.app.cache.dirs"; + conf.set(contextCfgItemName, dir); + LocalDirAllocator localDirAllocator = new LocalDirAllocator( + contextCfgItemName); + localDirAllocator.getLocalPathForWrite("p1/x", SMALL_FILE_SIZE, conf); + assertTrue(LocalDirAllocator.isContextValid(contextCfgItemName)); + LocalDirAllocator.removeContext(contextCfgItemName); + assertFalse(LocalDirAllocator.isContextValid(contextCfgItemName)); +} finally { + rmBufferDirs(); +} } }
svn commit: r1374312 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java
Author: tgraves Date: Fri Aug 17 15:18:53 2012 New Revision: 1374312 URL: http://svn.apache.org/viewvc?rev=1374312&view=rev Log: HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 (Trevor Robinson via tgraves) 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/TestLocalDirAllocator.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=1374312&r1=1374311&r2=1374312&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 15:18:53 2012 @@ -916,6 +916,9 @@ Release 0.23.3 - UNRELEASED HADOOP-8390. TestFileSystemCanonicalization fails with JDK7 (Trevor Robinson via tgraves) +HADOOP-8692. TestLocalDirAllocator fails intermittently with JDK7 +(Trevor Robinson via tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java?rev=1374312&r1=1374311&r2=1374312&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java Fri Aug 17 15:18:53 2012 @@ -343,14 +343,18 @@ public class TestLocalDirAllocator { @Test public void testRemoveContext() throws IOException { String dir = buildBufferDir(ROOT, 0); -String contextCfgItemName = "application_1340842292563_0004.app.cache.dirs"; -conf.set(contextCfgItemName, dir); -LocalDirAllocator localDirAllocator = new LocalDirAllocator( -contextCfgItemName); -localDirAllocator.getLocalPathForWrite("p1/x", SMALL_FILE_SIZE, conf); -assertTrue(LocalDirAllocator.isContextValid(contextCfgItemName)); -LocalDirAllocator.removeContext(contextCfgItemName); -assertFalse(LocalDirAllocator.isContextValid(contextCfgItemName)); +try { + String contextCfgItemName = "application_1340842292563_0004.app.cache.dirs"; + conf.set(contextCfgItemName, dir); + LocalDirAllocator localDirAllocator = new LocalDirAllocator( + contextCfgItemName); + localDirAllocator.getLocalPathForWrite("p1/x", SMALL_FILE_SIZE, conf); + assertTrue(LocalDirAllocator.isContextValid(contextCfgItemName)); + LocalDirAllocator.removeContext(contextCfgItemName); + assertFalse(LocalDirAllocator.isContextValid(contextCfgItemName)); +} finally { + rmBufferDirs(); +} } }
svn commit: r1374271 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/fs/viewfs/ src/main/java/org/apache/hadoop/se
Author: daryn Date: Fri Aug 17 14:05:11 2012 New Revision: 1374271 URL: http://svn.apache.org/viewvc?rev=1374271&view=rev Log: HADOOP-7967. Need generalized multi-token filesystem support (daryn) Added: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemTokens.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/fs/DelegateToFileSystem.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemTestHelper.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemDelegationTokenSupport.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.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=1374271&r1=1374270&r2=1374271&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 17 14:05:11 2012 @@ -806,6 +806,8 @@ Release 0.23.3 - UNRELEASED INCOMPATIBLE CHANGES +HADOOP-7967. Need generalized multi-token filesystem support (daryn) + NEW FEATURES IMPROVEMENTS Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java?rev=1374271&r1=1374270&r2=1374271&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegateToFileSystem.java Fri Aug 17 14:05:11 2012 @@ -21,6 +21,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import java.util.Arrays; import java.util.EnumSet; import java.util.List; @@ -217,6 +218,6 @@ public abstract class DelegateToFileSyst @Override //AbstractFileSystem public List> getDelegationTokens(String renewer) throws IOException { -return fsImpl.getDelegationTokens(renewer); +return Arrays.asList(fsImpl.addDelegationTokens(renewer, null)); } } \ No newline at end of file Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java?rev=1374271&r1=1374270&r2=1374271&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java Fri Aug 17 14:05:11 2012 @@ -110,7 +110,11 @@ public class DelegationTokenRenewer[] tokens = fs.addDelegationTokens(null, null); + if (tokens.length == 0) { +throw new IOException("addDelegationTokens returned no tokens"); + } + fs.setDelegationToken(tokens[0]); } catch (IOException ie2) { throw new IOException("Can't renew or get new delegation token ", ie); } 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=1374271&r1=1374270&r2=1374271&view=diff ==