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

HDFS-7115. TestEncryptionZones assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao. 

(cherry picked from commit 26cba7f35f)
This commit is contained in:
cnauroth 2014-09-22 09:07:07 -07:00
parent f4534746fb
commit 39bcc57c3e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,6 +575,9 @@ Release 2.6.0 - UNRELEASED
HDFS-7110. Skip tests related to short-circuit read on platforms that do not HDFS-7110. Skip tests related to short-circuit read on platforms that do not
currently implement short-circuit read. (cnauroth) currently implement short-circuit read. (cnauroth)
HDFS-7115. TestEncryptionZones assumes Unix path separator for KMS key store
path. (Xiaoyu Yao via cnauroth)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java
View File

@ -116,8 +116,8 @@ public class TestEncryptionZones {
protected FileContextTestWrapper fcWrapper; protected FileContextTestWrapper fcWrapper;
protected String getKeyProviderURI() { protected String getKeyProviderURI() {
return JavaKeyStoreProvider.SCHEME_NAME + "://file" + testRootDir + return JavaKeyStoreProvider.SCHEME_NAME + "://file" +
"/test.jks"; new Path(testRootDir.toString(), "test.jks").toUri();
} }
@Before @Before
@ -1043,7 +1043,7 @@ public class TestEncryptionZones {
dfsAdmin.createEncryptionZone(zone, TEST_KEY); dfsAdmin.createEncryptionZone(zone, TEST_KEY);
DFSTestUtil.createFile(fs, zoneFile, len, (short) 1, 0xFEED); DFSTestUtil.createFile(fs, zoneFile, len, (short) 1, 0xFEED);
String contents = DFSTestUtil.readFile(fs, zoneFile); String contents = DFSTestUtil.readFile(fs, zoneFile);
final Path snap1 = fs.createSnapshot(zoneParent); final Path snap1 = fs.createSnapshot(zoneParent, "snap1");
final Path snap1Zone = new Path(snap1, zone.getName()); final Path snap1Zone = new Path(snap1, zone.getName());
assertEquals("Got unexpected ez path", zone.toString(), assertEquals("Got unexpected ez path", zone.toString(),
dfsAdmin.getEncryptionZoneForPath(snap1Zone).getPath().toString()); dfsAdmin.getEncryptionZoneForPath(snap1Zone).getPath().toString());
@ -1052,14 +1052,14 @@ public class TestEncryptionZones {
// snapshot // snapshot
fsWrapper.delete(zone, true); fsWrapper.delete(zone, true);
fsWrapper.mkdir(zone, FsPermission.getDirDefault(), true); fsWrapper.mkdir(zone, FsPermission.getDirDefault(), true);
final Path snap2 = fs.createSnapshot(zoneParent); final Path snap2 = fs.createSnapshot(zoneParent, "snap2");
final Path snap2Zone = new Path(snap2, zone.getName()); final Path snap2Zone = new Path(snap2, zone.getName());
assertNull("Expected null ez path", assertNull("Expected null ez path",
dfsAdmin.getEncryptionZoneForPath(snap2Zone)); dfsAdmin.getEncryptionZoneForPath(snap2Zone));
// Create the encryption zone again // Create the encryption zone again
dfsAdmin.createEncryptionZone(zone, TEST_KEY2); dfsAdmin.createEncryptionZone(zone, TEST_KEY2);
final Path snap3 = fs.createSnapshot(zoneParent); final Path snap3 = fs.createSnapshot(zoneParent, "snap3");
final Path snap3Zone = new Path(snap3, zone.getName()); final Path snap3Zone = new Path(snap3, zone.getName());
// Check that snap3's EZ has the correct settings // Check that snap3's EZ has the correct settings
EncryptionZone ezSnap3 = dfsAdmin.getEncryptionZoneForPath(snap3Zone); EncryptionZone ezSnap3 = dfsAdmin.getEncryptionZoneForPath(snap3Zone);