HDFS-3462. TestDFSClientRetries.busyTest() should restore default xceiver count in the config. Contributed by Madhukara Phatak. (harsh)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1343798 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-05-29 16:01:44 +00:00
parent 45be2c085d
commit 5cf21e4383
2 changed files with 5 additions and 1 deletions

View File

@ -151,6 +151,9 @@ Trunk (unreleased changes)
HDFS-3368. Missing blocks due to bad DataNodes coming up and down. (shv) HDFS-3368. Missing blocks due to bad DataNodes coming up and down. (shv)
HDFS-3462. TestDFSClientRetries.busyTest() should restore default
xceiver count in the config. (Madhukara Phatak via harsh)
Release 2.0.1-alpha - UNRELEASED Release 2.0.1-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -526,7 +526,7 @@ public class TestDFSClientRetries extends TestCase {
short replicationFactor = 1; short replicationFactor = 1;
long blockSize = 128*1024*1024; // DFS block size long blockSize = 128*1024*1024; // DFS block size
int bufferSize = 4096; int bufferSize = 4096;
int originalXcievers = conf.getInt(DFSConfigKeys.DFS_DATANODE_MAX_RECEIVER_THREADS_KEY,0);
conf.setInt(DFSConfigKeys.DFS_DATANODE_MAX_RECEIVER_THREADS_KEY, xcievers); conf.setInt(DFSConfigKeys.DFS_DATANODE_MAX_RECEIVER_THREADS_KEY, xcievers);
conf.setInt(DFSConfigKeys.DFS_CLIENT_MAX_BLOCK_ACQUIRE_FAILURES_KEY, conf.setInt(DFSConfigKeys.DFS_CLIENT_MAX_BLOCK_ACQUIRE_FAILURES_KEY,
retries); retries);
@ -605,6 +605,7 @@ public class TestDFSClientRetries extends TestCase {
e.printStackTrace(); e.printStackTrace();
ret = false; ret = false;
} finally { } finally {
conf.setInt(DFSConfigKeys.DFS_DATANODE_MAX_RECEIVER_THREADS_KEY,originalXcievers);
fs.delete(file1, false); fs.delete(file1, false);
cluster.shutdown(); cluster.shutdown();
} }