big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-12837. Intermittent failure in TestReencryptionWithKMS.

Browse Source
This commit is contained in:
Xiao Chen 2018-07-11 20:54:37 -07:00
parent 632aca5793
commit b37074be5a
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ReencryptionHandler.java
View File

@ -616,8 +616,10 @@ protected void checkPauseForTesting()
while (shouldPauseForTesting) { while (shouldPauseForTesting) {
LOG.info("Sleeping in the re-encrypt handler for unit test."); LOG.info("Sleeping in the re-encrypt handler for unit test.");
synchronized (reencryptionHandler) { synchronized (reencryptionHandler) {
if (shouldPauseForTesting) {
reencryptionHandler.wait(30000); reencryptionHandler.wait(30000);
} }
}
LOG.info("Continuing re-encrypt handler after pausing."); LOG.info("Continuing re-encrypt handler after pausing.");
} }
} }

61
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryption.java
View File

@ -68,6 +68,7 @@
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -207,8 +208,7 @@ public void testReencryptionBasic() throws Exception {
ZoneReencryptionStatus zs = it.next(); ZoneReencryptionStatus zs = it.next();
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertNotEquals(fei0.getEzKeyVersionName(), zs.getEzKeyVersionName()); assertNotEquals(fei0.getEzKeyVersionName(), zs.getEzKeyVersionName());
assertEquals(fei1.getEzKeyVersionName(), zs.getEzKeyVersionName()); assertEquals(fei1.getEzKeyVersionName(), zs.getEzKeyVersionName());
assertEquals(10, zs.getFilesReencrypted()); assertEquals(10, zs.getFilesReencrypted());
@ -600,14 +600,27 @@ private void verifyZoneStatus(final Path zone, final FileEncryptionInfo fei,
final ZoneReencryptionStatus zs = it.next(); final ZoneReencryptionStatus zs = it.next();
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
if (fei != null) { if (fei != null) {
assertNotEquals(fei.getEzKeyVersionName(), zs.getEzKeyVersionName()); assertNotEquals(fei.getEzKeyVersionName(), zs.getEzKeyVersionName());
} }
assertEquals(expectedFiles, zs.getFilesReencrypted()); assertEquals(expectedFiles, zs.getFilesReencrypted());
} }
/**
* Verify the zone status' completion time is larger than 0, and is no less
* than submission time.
*/
private void verifyZoneCompletionTime(final ZoneReencryptionStatus zs) {
assertNotNull(zs);
assertTrue("Completion time should be positive. " + zs.getCompletionTime(),
zs.getCompletionTime() > 0);
assertTrue("Completion time " + zs.getCompletionTime()
+ " should be no less than submission time "
+ zs.getSubmissionTime(),
zs.getCompletionTime() >= zs.getSubmissionTime());
}
@Test @Test
public void testReencryptLoadedFromFsimage() throws Exception { public void testReencryptLoadedFromFsimage() throws Exception {
/* /*
@ -1476,7 +1489,7 @@ class MyInjector extends EncryptionFaultInjector {
} }
@Override @Override
public void reencryptEncryptedKeys() throws IOException { public synchronized void reencryptEncryptedKeys() throws IOException {
if (exceptionCount > 0) { if (exceptionCount > 0) {
exceptionCount--; exceptionCount--;
try { try {
@ -1537,8 +1550,7 @@ public Boolean get() {
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.isCanceled()); assertTrue(zs.isCanceled());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(0, zs.getFilesReencrypted()); assertEquals(0, zs.getFilesReencrypted());
assertTrue(getUpdater().isRunning()); assertTrue(getUpdater().isRunning());
@ -1560,8 +1572,7 @@ public void testCancelFutureThenReencrypt() throws Exception {
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertFalse(zs.isCanceled()); assertFalse(zs.isCanceled());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(10, zs.getFilesReencrypted()); assertEquals(10, zs.getFilesReencrypted());
} }
@ -1579,8 +1590,7 @@ public void testCancelFutureThenRestart() throws Exception {
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.isCanceled()); assertTrue(zs.isCanceled());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(0, zs.getFilesReencrypted()); assertEquals(0, zs.getFilesReencrypted());
// verify re-encryption works after restart. // verify re-encryption works after restart.
@ -1592,8 +1602,7 @@ public void testCancelFutureThenRestart() throws Exception {
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertFalse(zs.isCanceled()); assertFalse(zs.isCanceled());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(10, zs.getFilesReencrypted()); assertEquals(10, zs.getFilesReencrypted());
} }
@ -1679,8 +1688,7 @@ public void testReencryptionWithoutProvider() throws Exception {
ZoneReencryptionStatus zs = it.next(); ZoneReencryptionStatus zs = it.next();
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(10, zs.getFilesReencrypted()); assertEquals(10, zs.getFilesReencrypted());
} }
@ -1736,7 +1744,7 @@ class MyInjector extends EncryptionFaultInjector {
} }
@Override @Override
public void reencryptEncryptedKeys() throws IOException { public synchronized void reencryptEncryptedKeys() throws IOException {
if (exceptionCount > 0) { if (exceptionCount > 0) {
--exceptionCount; --exceptionCount;
throw new IOException("Injected KMS failure"); throw new IOException("Injected KMS failure");
@ -1772,8 +1780,7 @@ public void reencryptEncryptedKeys() throws IOException {
ZoneReencryptionStatus zs = it.next(); ZoneReencryptionStatus zs = it.next();
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(5, zs.getFilesReencrypted()); assertEquals(5, zs.getFilesReencrypted());
assertEquals(5, zs.getNumReencryptionFailures()); assertEquals(5, zs.getNumReencryptionFailures());
} }
@ -1788,7 +1795,8 @@ class MyInjector extends EncryptionFaultInjector {
} }
@Override @Override
public void reencryptUpdaterProcessOneTask() throws IOException { public synchronized void reencryptUpdaterProcessOneTask()
throws IOException {
if (exceptionCount > 0) { if (exceptionCount > 0) {
--exceptionCount; --exceptionCount;
throw new IOException("Injected process task failure"); throw new IOException("Injected process task failure");
@ -1824,8 +1832,7 @@ public void reencryptUpdaterProcessOneTask() throws IOException {
ZoneReencryptionStatus zs = it.next(); ZoneReencryptionStatus zs = it.next();
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(5, zs.getFilesReencrypted()); assertEquals(5, zs.getFilesReencrypted());
assertEquals(1, zs.getNumReencryptionFailures()); assertEquals(1, zs.getNumReencryptionFailures());
} }
@ -1841,7 +1848,8 @@ class MyInjector extends EncryptionFaultInjector {
} }
@Override @Override
public void reencryptUpdaterProcessCheckpoint() throws IOException { public synchronized void reencryptUpdaterProcessCheckpoint()
throws IOException {
if (exceptionCount > 0) { if (exceptionCount > 0) {
--exceptionCount; --exceptionCount;
throw new IOException("Injected process checkpoint failure"); throw new IOException("Injected process checkpoint failure");
@ -1877,8 +1885,7 @@ public void reencryptUpdaterProcessCheckpoint() throws IOException {
ZoneReencryptionStatus zs = it.next(); ZoneReencryptionStatus zs = it.next();
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(10, zs.getFilesReencrypted()); assertEquals(10, zs.getFilesReencrypted());
assertEquals(1, zs.getNumReencryptionFailures()); assertEquals(1, zs.getNumReencryptionFailures());
} }
@ -1893,7 +1900,8 @@ class MyInjector extends EncryptionFaultInjector {
} }
@Override @Override
public void reencryptUpdaterProcessOneTask() throws IOException { public synchronized void reencryptUpdaterProcessOneTask()
throws IOException {
if (exceptionCount > 0) { if (exceptionCount > 0) {
--exceptionCount; --exceptionCount;
throw new RetriableException("Injected process task failure"); throw new RetriableException("Injected process task failure");
@ -1930,8 +1938,7 @@ public void reencryptUpdaterProcessOneTask() throws IOException {
ZoneReencryptionStatus zs = it.next(); ZoneReencryptionStatus zs = it.next();
assertEquals(zone.toString(), zs.getZoneName()); assertEquals(zone.toString(), zs.getZoneName());
assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState()); assertEquals(ZoneReencryptionStatus.State.Completed, zs.getState());
assertTrue(zs.getCompletionTime() > 0); verifyZoneCompletionTime(zs);
assertTrue(zs.getCompletionTime() > zs.getSubmissionTime());
assertEquals(10, zs.getFilesReencrypted()); assertEquals(10, zs.getFilesReencrypted());
assertEquals(0, zs.getNumReencryptionFailures()); assertEquals(0, zs.getNumReencryptionFailures());
} }