Author: todd Date: Sat Feb 18 01:27:51 2012 New Revision: 1245834 URL: http://svn.apache.org/viewvc?rev=1245834&view=rev Log: Merge trunk into HA branch
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/ (props changed) hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemDelegation.java hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1245834&r1=1245833&r2=1245834&view=diff ============================================================================== --- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt Sat Feb 18 01:27:51 2012 @@ -201,6 +201,9 @@ Release 0.23.2 - UNRELEASED HADOOP-8083 javadoc generation for some modules is not done under target/ (tucu) + HADOOP-8036. TestViewFsTrash assumes the user's home directory is + 2 levels deep. (Colin Patrick McCabe via eli) + Release 0.23.1 - 2012-02-08 INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 18 01:27:51 2012 @@ -1,6 +1,6 @@ /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt:1243206 /hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167 -/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1245677 +/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1245833 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278 Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 18 01:27:51 2012 @@ -1,2 +1,2 @@ -/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1245677 +/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1245833 /hadoop/core/branches/branch-0.19/src/docs:713112 Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 18 01:27:51 2012 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1245677 +/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1245833 /hadoop/core/branches/branch-0.19/core/src/java:713112 /hadoop/core/trunk/src/core:776175-785643,785929-786278 Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 18 01:27:51 2012 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1245677 +/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1245833 /hadoop/core/branches/branch-0.19/core/src/test/core:713112 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278 Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java?rev=1245834&r1=1245833&r2=1245834&view=diff ============================================================================== --- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java (original) +++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestFSMainOperationsLocalFileSystem.java Sat Feb 18 01:27:51 2012 @@ -37,15 +37,15 @@ public class TestFSMainOperationsLocalFi public void setUp() throws Exception { Configuration conf = new Configuration(); fcTarget = FileSystem.getLocal(conf); - fSys = ViewFileSystemTestSetup.setupForViewFs( - ViewFileSystemTestSetup.configWithViewfsScheme(), fcTarget); + fSys = ViewFileSystemTestSetup.setupForViewFileSystem( + ViewFileSystemTestSetup.createConfig(), fcTarget); super.setUp(); } @After public void tearDown() throws Exception { super.tearDown(); - ViewFileSystemTestSetup.tearDownForViewFs(fcTarget); + ViewFileSystemTestSetup.tearDown(fcTarget); } @Test Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemDelegation.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemDelegation.java?rev=1245834&r1=1245833&r2=1245834&view=diff ============================================================================== --- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemDelegation.java (original) +++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemDelegation.java Sat Feb 18 01:27:51 2012 @@ -40,12 +40,12 @@ public class TestViewFileSystemDelegatio @BeforeClass public static void setup() throws Exception { - conf = ViewFileSystemTestSetup.configWithViewfsScheme(); + conf = ViewFileSystemTestSetup.createConfig(); fs1 = setupFileSystem(new URI("fs1:/"), FakeFileSystem.class); fs2 = setupFileSystem(new URI("fs2:/"), FakeFileSystem.class); viewFs = FileSystem.get(FsConstants.VIEWFS_URI, conf); } - + static FakeFileSystem setupFileSystem(URI uri, Class clazz) throws Exception { String scheme = uri.getScheme(); Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java?rev=1245834&r1=1245833&r2=1245834&view=diff ============================================================================== --- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java (original) +++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsTrash.java Sat Feb 18 01:27:51 2012 @@ -35,7 +35,6 @@ import org.mortbay.log.Log; public class TestViewFsTrash { FileSystem fsTarget; // the target file system - the mount will point here FileSystem fsView; - Path targetTestRoot; Configuration conf; static class TestLFS extends LocalFileSystem { @@ -55,52 +54,19 @@ public class TestViewFsTrash { @Before public void setUp() throws Exception { fsTarget = FileSystem.getLocal(new Configuration()); - targetTestRoot = FileSystemTestHelper.getAbsoluteTestRootPath(fsTarget); - // In case previous test was killed before cleanup - fsTarget.delete(targetTestRoot, true); - // cleanup trash from previous run if it stuck around - fsTarget.delete(new Path(fsTarget.getHomeDirectory(), ".Trash/Current"), - true); - - fsTarget.mkdirs(targetTestRoot); - fsTarget.mkdirs(new Path(targetTestRoot,"dir1")); - - - // Now we use the mount fs to set links to user and dir - // in the test root - - // Set up the defaultMT in the config with our mount point links - - - conf = ViewFileSystemTestSetup.configWithViewfsScheme(); - - // create a link for home directory so that trash path works - // set up viewfs's home dir root to point to home dir root on target - // But home dir is different on linux, mac etc. - // Figure it out by calling home dir on target - - String homeDirRoot = fsTarget.getHomeDirectory() - .getParent().toUri().getPath(); - ConfigUtil.addLink(conf, homeDirRoot, - fsTarget.makeQualified(new Path(homeDirRoot)).toUri()); - ConfigUtil.setHomeDirConf(conf, homeDirRoot); - Log.info("Home dir base " + homeDirRoot); - - fsView = ViewFileSystemTestSetup.setupForViewFs(conf, fsTarget); - - // set working dir so that relative paths - //fsView.setWorkingDirectory(new Path(fsTarget.getWorkingDirectory().toUri().getPath())); + fsTarget.mkdirs(new Path(FileSystemTestHelper. + getTestRootPath(fsTarget), "dir1")); + conf = ViewFileSystemTestSetup.createConfig(); + fsView = ViewFileSystemTestSetup.setupForViewFileSystem(conf, fsTarget); conf.set("fs.defaultFS", FsConstants.VIEWFS_URI.toString()); } - @After public void tearDown() throws Exception { - fsTarget.delete(targetTestRoot, true); + ViewFileSystemTestSetup.tearDown(fsTarget); fsTarget.delete(new Path(fsTarget.getHomeDirectory(), ".Trash/Current"), true); } - @Test public void testTrash() throws IOException { Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java?rev=1245834&r1=1245833&r2=1245834&view=diff ============================================================================== --- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java (original) +++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemBaseTest.java Sat Feb 18 01:27:51 2012 @@ -89,7 +89,7 @@ public class ViewFileSystemBaseTest { // Set up the defaultMT in the config with our mount point links //Configuration conf = new Configuration(); - conf = ViewFileSystemTestSetup.configWithViewfsScheme(); + conf = ViewFileSystemTestSetup.createConfig(); setupMountPoints(); fsView = FileSystem.get(FsConstants.VIEWFS_URI, conf); } Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java?rev=1245834&r1=1245833&r2=1245834&view=diff ============================================================================== --- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java (original) +++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java Sat Feb 18 01:27:51 2012 @@ -23,6 +23,7 @@ import org.apache.hadoop.fs.FileSystemTe import org.apache.hadoop.fs.FsConstants; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.viewfs.ConfigUtil; +import org.mortbay.log.Log; /** @@ -46,32 +47,21 @@ public class ViewFileSystemTestSetup { * @return return the ViewFS File context to be used for tests * @throws Exception */ - static public FileSystem setupForViewFs(Configuration conf, FileSystem fsTarget) throws Exception { + static public FileSystem setupForViewFileSystem(Configuration conf, FileSystem fsTarget) throws Exception { /** * create the test root on local_fs - the mount table will point here */ - Path targetOfTests = FileSystemTestHelper.getTestRootPath(fsTarget); - // In case previous test was killed before cleanup - fsTarget.delete(targetOfTests, true); - - fsTarget.mkdirs(targetOfTests); - + fsTarget.mkdirs(FileSystemTestHelper.getTestRootPath(fsTarget)); + + // viewFs://home => fsTarget://home + String homeDirRoot = fsTarget.getHomeDirectory() + .getParent().toUri().getPath(); + ConfigUtil.addLink(conf, homeDirRoot, + fsTarget.makeQualified(new Path(homeDirRoot)).toUri()); + ConfigUtil.setHomeDirConf(conf, homeDirRoot); + Log.info("Home dir base " + homeDirRoot); - // Now set up a link from viewfs to targetfs for the first component of - // path of testdir. For example, if testdir is /user/<userid>/xx then - // a link from /user to targetfs://user. - - String testDir = FileSystemTestHelper.getTestRootPath(fsTarget).toUri().getPath(); - int indexOf2ndSlash = testDir.indexOf('/', 1); - String testDirFirstComponent = testDir.substring(0, indexOf2ndSlash); - - - ConfigUtil.addLink(conf, testDirFirstComponent, - fsTarget.makeQualified(new Path(testDirFirstComponent)).toUri()); - FileSystem fsView = FileSystem.get(FsConstants.VIEWFS_URI, conf); - //System.out.println("SRCOfTests = "+ getTestRootPath(fs, "test")); - //System.out.println("TargetOfTests = "+ targetOfTests.toUri()); return fsView; } @@ -79,12 +69,12 @@ public class ViewFileSystemTestSetup { * * delete the test directory in the target fs */ - static public void tearDownForViewFs(FileSystem fsTarget) throws Exception { + static public void tearDown(FileSystem fsTarget) throws Exception { Path targetOfTests = FileSystemTestHelper.getTestRootPath(fsTarget); fsTarget.delete(targetOfTests, true); } - public static Configuration configWithViewfsScheme() { + public static Configuration createConfig() { Configuration conf = new Configuration(); conf.set("fs.viewfs.impl", ViewFileSystem.class.getName()); return conf;