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

HDFS-8908. TestAppendSnapshotTruncate may fail with IOException: Failed to replace a bad datanode. (Tsz Wo Nicholas Sze via yliu)

This commit is contained in:
yliu 2015-08-19 21:56:56 +08:00
parent fc6b176e70
commit 0824fa1c4f
2 changed files with 11 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

@ -830,6 +830,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8891. HDFS concat should keep srcs order. (Yong Zhang via jing9) HDFS-8891. HDFS concat should keep srcs order. (Yong Zhang via jing9)
HDFS-8908. TestAppendSnapshotTruncate may fail with IOException: Failed to
replace a bad datanode. (Tsz Wo Nicholas Sze via yliu)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

13
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestAppendSnapshotTruncate.java
View File

@ -27,7 +27,6 @@ import java.io.RandomAccessFile;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Random;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@ -42,6 +41,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.BlockWrite.ReplaceDatanodeOnFailure;
import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.hdfs.server.namenode.TestFileTruncate; import org.apache.hadoop.hdfs.server.namenode.TestFileTruncate;
import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.GenericTestUtils;
@ -64,10 +64,10 @@ public class TestAppendSnapshotTruncate {
} }
private static final Log LOG = LogFactory.getLog(TestAppendSnapshotTruncate.class); private static final Log LOG = LogFactory.getLog(TestAppendSnapshotTruncate.class);
private static final int BLOCK_SIZE = 1024; private static final int BLOCK_SIZE = 1024;
private static final int DATANODE_NUM = 3; private static final int DATANODE_NUM = 4;
private static final short REPLICATION = 3; private static final short REPLICATION = 3;
private static final int FILE_WORKER_NUM = 3; private static final int FILE_WORKER_NUM = 10;
private static final long TEST_TIME_SECOND = 10; private static final long TEST_TIME_SECOND = 20;
private static final long TEST_TIMEOUT_SECOND = TEST_TIME_SECOND + 60; private static final long TEST_TIMEOUT_SECOND = TEST_TIME_SECOND + 60;
static final int SHORT_HEARTBEAT = 1; static final int SHORT_HEARTBEAT = 1;
@ -85,6 +85,7 @@ public class TestAppendSnapshotTruncate {
conf.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, SHORT_HEARTBEAT); conf.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, SHORT_HEARTBEAT);
conf.setLong( conf.setLong(
DFSConfigKeys.DFS_NAMENODE_REPLICATION_PENDING_TIMEOUT_SEC_KEY, 1); DFSConfigKeys.DFS_NAMENODE_REPLICATION_PENDING_TIMEOUT_SEC_KEY, 1);
conf.setBoolean(ReplaceDatanodeOnFailure.BEST_EFFORT_KEY, true);
cluster = new MiniDFSCluster.Builder(conf) cluster = new MiniDFSCluster.Builder(conf)
.format(true) .format(true)
.numDataNodes(DATANODE_NUM) .numDataNodes(DATANODE_NUM)
@ -476,7 +477,9 @@ public class TestAppendSnapshotTruncate {
} }
void pause() { void pause() {
Preconditions.checkState(state.compareAndSet(State.RUNNING, State.IDLE)); checkErrorState();
Preconditions.checkState(state.compareAndSet(State.RUNNING, State.IDLE),
"%s: state=%s != %s", name, state.get(), State.RUNNING);
} }
void stop() throws InterruptedException { void stop() throws InterruptedException {