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 so...@apache.org on 2020/06/05 12:02:13 UTC
[hadoop] 01/03: Revert "HDFS-13179.
TestLazyPersistReplicaRecovery#testDnRestartWithSavedReplicas fails
intermittently. Contributed by Ahmed Hussein."
This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit b7b3164ce7cb547ee615a910443240e1e1f9a0ed
Author: S O'Donnell <so...@cloudera.com>
AuthorDate: Fri Jun 5 12:48:07 2020 +0100
Revert "HDFS-13179. TestLazyPersistReplicaRecovery#testDnRestartWithSavedReplicas fails intermittently. Contributed by Ahmed Hussein."
This reverts commit ed59412434027b133f2774af69228510f09a0264.
---
.../datanode/fsdataset/impl/FsDatasetImpl.java | 5 ---
.../impl/TestLazyPersistReplicaRecovery.java | 41 +++-------------------
2 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
index 2928a52..8ad83c8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
@@ -3207,11 +3207,6 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> {
}
@VisibleForTesting
- public int getNonPersistentReplicas() {
- return ramDiskReplicaTracker.numReplicasNotPersisted();
- }
-
- @VisibleForTesting
public void setTimer(Timer newTimer) {
this.timer = newTimer;
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistReplicaRecovery.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistReplicaRecovery.java
index 5fa470c..537f9e8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistReplicaRecovery.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistReplicaRecovery.java
@@ -19,13 +19,6 @@
package org.apache.hadoop.hdfs.server.datanode.fsdataset.impl;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hdfs.client.BlockReportOptions;
-import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
-import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeStorageInfo;
-import org.apache.hadoop.hdfs.server.datanode.DataNode;
-import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils;
-import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
-import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.Test;
@@ -34,7 +27,6 @@ import java.util.concurrent.TimeoutException;
import static org.apache.hadoop.fs.StorageType.DEFAULT;
import static org.apache.hadoop.fs.StorageType.RAM_DISK;
-import static org.junit.Assert.assertTrue;
public class TestLazyPersistReplicaRecovery extends LazyPersistTestCase {
@Test
@@ -42,10 +34,6 @@ public class TestLazyPersistReplicaRecovery extends LazyPersistTestCase {
throws IOException, InterruptedException, TimeoutException {
getClusterBuilder().build();
- FSNamesystem fsn = cluster.getNamesystem();
- final DataNode dn = cluster.getDataNodes().get(0);
- DatanodeDescriptor dnd =
- NameNodeAdapter.getDatanode(fsn, dn.getDatanodeId());
final String METHOD_NAME = GenericTestUtils.getMethodName();
Path path1 = new Path("/" + METHOD_NAME + ".01.dat");
@@ -54,17 +42,14 @@ public class TestLazyPersistReplicaRecovery extends LazyPersistTestCase {
// Sleep for a short time to allow the lazy writer thread to do its job.
// However the block replica should not be evicted from RAM_DISK yet.
- FsDatasetImpl fsDImpl = (FsDatasetImpl) DataNodeTestUtils.getFSDataset(dn);
- GenericTestUtils
- .waitFor(() -> fsDImpl.getNonPersistentReplicas() == 0, 10,
- 3 * LAZY_WRITER_INTERVAL_SEC * 1000);
+ Thread.sleep(3 * LAZY_WRITER_INTERVAL_SEC * 1000);
ensureFileReplicasOnStorageType(path1, RAM_DISK);
LOG.info("Restarting the DataNode");
- assertTrue("DN did not restart properly",
- cluster.restartDataNode(0, true));
- // wait for blockreport
- waitForBlockReport(dn, dnd);
+ cluster.restartDataNode(0, true);
+ cluster.waitActive();
+ triggerBlockReport();
+
// Ensure that the replica is now on persistent storage.
ensureFileReplicasOnStorageType(path1, DEFAULT);
}
@@ -88,20 +73,4 @@ public class TestLazyPersistReplicaRecovery extends LazyPersistTestCase {
// Ensure that the replica is still on transient storage.
ensureFileReplicasOnStorageType(path1, RAM_DISK);
}
-
- private boolean waitForBlockReport(final DataNode dn,
- final DatanodeDescriptor dnd) throws IOException, InterruptedException {
- final DatanodeStorageInfo storage = dnd.getStorageInfos()[0];
- final long lastCount = storage.getBlockReportCount();
- dn.triggerBlockReport(
- new BlockReportOptions.Factory().setIncremental(false).build());
- try {
- GenericTestUtils
- .waitFor(() -> lastCount != storage.getBlockReportCount(), 10, 10000);
- } catch (TimeoutException te) {
- LOG.error("Timeout waiting for block report for {}", dnd);
- return false;
- }
- return true;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org