Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport of HADOOP-3450. svn merge -c 1355789 from trunk. (harsh) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355791 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-06-30 18:53:00 +00:00
parent 1ddedb6345
commit d8409ef981
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -54,6 +54,9 @@ Release 2.0.1-alpha - UNRELEASED
from CommonConfigurationKeys.java (not used, deprecated) from CommonConfigurationKeys.java (not used, deprecated)
(Sho Shimauchi via harsh) (Sho Shimauchi via harsh)
HADOOP-3450. Add tests to Local Directory Allocator for
asserting their URI-returning capability (Sho Shimauchi via harsh)
BUG FIXES BUG FIXES
HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname HADOOP-8372. NetUtils.normalizeHostName() incorrectly handles hostname

37
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalDirAllocator.java
View File

@ -72,8 +72,11 @@ public class TestLocalDirAllocator {
System.exit(-1); System.exit(-1);
} }
// absolute path in test environment
// /home/testuser/src/hadoop-common-project/hadoop-common/build/test/temp
ABSOLUTE_DIR_ROOT = new Path(localFs.getWorkingDirectory(), ABSOLUTE_DIR_ROOT = new Path(localFs.getWorkingDirectory(),
BUFFER_DIR_ROOT).toUri().getPath(); BUFFER_DIR_ROOT).toUri().getPath();
// file:/home/testuser/src/hadoop-common-project/hadoop-common/build/test/temp
QUALIFIED_DIR_ROOT = new Path(localFs.getWorkingDirectory(), QUALIFIED_DIR_ROOT = new Path(localFs.getWorkingDirectory(),
BUFFER_DIR_ROOT).toUri().toString(); BUFFER_DIR_ROOT).toUri().toString();
} }
@ -145,7 +148,7 @@ public class TestLocalDirAllocator {
* @throws Exception * @throws Exception
*/ */
@Test @Test
public void test1() throws Exception { public void testROBufferDirAndRWBufferDir() throws Exception {
if (isWindows) return; if (isWindows) return;
String dir1 = buildBufferDir(ROOT, 1); String dir1 = buildBufferDir(ROOT, 1);
String dir2 = buildBufferDir(ROOT, 2); String dir2 = buildBufferDir(ROOT, 2);
@ -164,7 +167,7 @@ public class TestLocalDirAllocator {
* Check if tmp dirs are allocated in a round-robin * Check if tmp dirs are allocated in a round-robin
*/ */
@Test @Test
public void test2() throws Exception { public void testDirsNotExist() throws Exception {
if (isWindows) return; if (isWindows) return;
String dir2 = buildBufferDir(ROOT, 2); String dir2 = buildBufferDir(ROOT, 2);
String dir3 = buildBufferDir(ROOT, 3); String dir3 = buildBufferDir(ROOT, 3);
@ -190,7 +193,7 @@ public class TestLocalDirAllocator {
* @throws Exception * @throws Exception
*/ */
@Test @Test
public void test3() throws Exception { public void testRWBufferDirBecomesRO() throws Exception {
if (isWindows) return; if (isWindows) return;
String dir3 = buildBufferDir(ROOT, 3); String dir3 = buildBufferDir(ROOT, 3);
String dir4 = buildBufferDir(ROOT, 4); String dir4 = buildBufferDir(ROOT, 4);
@ -228,7 +231,7 @@ public class TestLocalDirAllocator {
*/ */
static final int TRIALS = 100; static final int TRIALS = 100;
@Test @Test
public void test4() throws Exception { public void testCreateManyFiles() throws Exception {
if (isWindows) return; if (isWindows) return;
String dir5 = buildBufferDir(ROOT, 5); String dir5 = buildBufferDir(ROOT, 5);
String dir6 = buildBufferDir(ROOT, 6); String dir6 = buildBufferDir(ROOT, 6);
@ -311,4 +314,30 @@ public class TestLocalDirAllocator {
rmBufferDirs(); rmBufferDirs();
} }
} }
/**
* Test getLocalPathToRead() returns correct filename and "file" schema.
*
* @throws IOException
*/
@Test
public void testGetLocalPathToRead() throws IOException {
if (isWindows)
return;
String dir = buildBufferDir(ROOT, 0);
try {
conf.set(CONTEXT, dir);
assertTrue(localFs.mkdirs(new Path(dir)));
File f1 = dirAllocator.createTmpFileForWrite(FILENAME, SMALL_FILE_SIZE,
conf);
Path p1 = dirAllocator.getLocalPathToRead(f1.getName(), conf);
assertEquals(f1.getName(), p1.getName());
assertEquals("file", p1.getFileSystem(conf).getUri().getScheme());
} finally {
Shell.execCommand(new String[] { "chmod", "u+w", BUFFER_DIR_ROOT });
rmBufferDirs();
}
}
} }