You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2017/10/02 18:11:12 UTC
[09/26] hadoop git commit: HDFS-12458. TestReencryptionWithKMS fails
regularly. Contributed by Xiao Chen.
HDFS-12458. TestReencryptionWithKMS fails regularly. Contributed by Xiao Chen.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/74ba6213
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/74ba6213
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/74ba6213
Branch: refs/heads/HDFS-7240
Commit: 74ba62133a5f076b8cca4f0e39c7de8de9f3b5ed
Parents: 29ea705
Author: Wei-Chiu Chuang <we...@apache.org>
Authored: Thu Sep 28 05:09:37 2017 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Mon Oct 2 11:00:33 2017 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/server/namenode/TestReencryption.java | 13 +++++++------
.../hdfs/server/namenode/TestReencryptionHandler.java | 7 ++++---
2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/74ba6213/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryption.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryption.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryption.java
index 33c52bf..4bf6aa4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryption.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryption.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -129,11 +128,9 @@ public class TestReencryption {
conf.setInt(DFSConfigKeys.DFS_LIST_LIMIT, 3);
// Adjust configs for re-encrypt test cases
conf.setInt(DFSConfigKeys.DFS_NAMENODE_REENCRYPT_BATCH_SIZE_KEY, 5);
- conf.setTimeDuration(
- DFSConfigKeys.DFS_NAMENODE_REENCRYPT_SLEEP_INTERVAL_KEY, 1,
- TimeUnit.SECONDS);
cluster = new MiniDFSCluster.Builder(conf).numDataNodes(1).build();
cluster.waitActive();
+ cluster.waitClusterUp();
fs = cluster.getFileSystem();
fsn = cluster.getNamesystem();
fsWrapper = new FileSystemTestWrapper(fs);
@@ -1284,6 +1281,7 @@ public class TestReencryption {
fsn = cluster.getNamesystem();
getEzManager().pauseReencryptForTesting();
cluster.waitActive();
+ cluster.waitClusterUp();
}
private void waitForReencryptedZones(final int expected)
@@ -1519,6 +1517,7 @@ public class TestReencryption {
getEzManager().pauseReencryptForTesting();
dfsAdmin.reencryptEncryptionZone(zone, ReencryptAction.START);
waitForQueuedZones(1);
+ getEzManager().pauseReencryptUpdaterForTesting();
getEzManager().resumeReencryptForTesting();
LOG.info("Waiting for re-encrypt callables to run");
@@ -1529,7 +1528,6 @@ public class TestReencryption {
}
}, 100, 10000);
- getEzManager().pauseReencryptUpdaterForTesting();
dfsAdmin.reencryptEncryptionZone(zone, ReencryptAction.CANCEL);
// now resume updater and verify status.
@@ -1609,7 +1607,7 @@ public class TestReencryption {
cluster.getConfiguration(0)
.unset(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH);
cluster.restartNameNodes();
- cluster.waitActive();
+ cluster.waitClusterUp();
// test re-encrypt should fail
try {
@@ -1673,6 +1671,9 @@ public class TestReencryption {
}
fs.setSafeMode(SafeModeAction.SAFEMODE_LEAVE);
+ // trigger the background thread to run, without having to
+ // wait for DFS_NAMENODE_REENCRYPT_SLEEP_INTERVAL_KEY
+ getHandler().notifyNewSubmission();
waitForReencryptedFiles(zone.toString(), 10);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/74ba6213/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java
index f0dd92c..e2035ed 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReencryptionHandler.java
@@ -101,9 +101,9 @@ public class TestReencryptionHandler {
final StopWatch sw = new StopWatch().start();
rh.throttle();
sw.stop();
- assertTrue("should have throttled for at least 4 second",
+ assertTrue("should have throttled for at least 8 second",
sw.now(TimeUnit.MILLISECONDS) > 8000);
- assertTrue("should have throttled for at most 6 second",
+ assertTrue("should have throttled for at most 12 second",
sw.now(TimeUnit.MILLISECONDS) < 12000);
}
@@ -191,7 +191,8 @@ public class TestReencryptionHandler {
removeTaskThread.start();
rh.throttle();
sw.stop();
+ LOG.info("Throttle completed, consumed {}", sw.now(TimeUnit.MILLISECONDS));
assertTrue("should have throttled for at least 3 second",
- sw.now(TimeUnit.MILLISECONDS) > 3000);
+ sw.now(TimeUnit.MILLISECONDS) >= 3000);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org