HDFS-4602. TestBookKeeperHACheckpoints fails. Contributed by Uma Maheswara Rao G.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1505362 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uma Maheswara Rao G 2013-07-21 12:27:38 +00:00
parent 313dd02505
commit 731a583c2b
2 changed files with 16 additions and 10 deletions

View File

@ -262,6 +262,8 @@ Release 2.3.0 - UNRELEASED
BUG FIXES BUG FIXES
HDFS-4602. TestBookKeeperHACheckpoints fails. (umamahesh)
Release 2.1.1-beta - UNRELEASED Release 2.1.1-beta - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -17,19 +17,18 @@
*/ */
package org.apache.hadoop.contrib.bkjournal; package org.apache.hadoop.contrib.bkjournal;
import org.apache.hadoop.hdfs.server.namenode.ha.TestStandbyCheckpoints;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.MiniDFSNNTopology;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.MiniDFSNNTopology;
import org.apache.hadoop.hdfs.server.namenode.ha.HATestUtil; import org.apache.hadoop.hdfs.server.namenode.ha.HATestUtil;
import org.apache.hadoop.hdfs.server.namenode.ha.TestStandbyCheckpoints;
import org.junit.Before; import org.apache.hadoop.io.compress.CompressionCodecFactory;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import com.google.common.collect.ImmutableList;
/** /**
* Runs the same tests as TestStandbyCheckpoints, but * Runs the same tests as TestStandbyCheckpoints, but
@ -40,6 +39,7 @@ public class TestBookKeeperHACheckpoints extends TestStandbyCheckpoints {
static int numBookies = 3; static int numBookies = 3;
static int journalCount = 0; static int journalCount = 0;
@SuppressWarnings("rawtypes")
@Override @Override
@Before @Before
public void setupCluster() throws Exception { public void setupCluster() throws Exception {
@ -51,7 +51,11 @@ public class TestBookKeeperHACheckpoints extends TestStandbyCheckpoints {
BKJMUtil.createJournalURI("/checkpointing" + journalCount++) BKJMUtil.createJournalURI("/checkpointing" + journalCount++)
.toString()); .toString());
BKJMUtil.addJournalManagerDefinition(conf); BKJMUtil.addJournalManagerDefinition(conf);
conf.setBoolean(DFSConfigKeys.DFS_IMAGE_COMPRESS_KEY, true);
conf.set(DFSConfigKeys.DFS_IMAGE_COMPRESSION_CODEC_KEY, SlowCodec.class
.getCanonicalName());
CompressionCodecFactory.setCodecClasses(conf, ImmutableList
.<Class> of(SlowCodec.class));
MiniDFSNNTopology topology = new MiniDFSNNTopology() MiniDFSNNTopology topology = new MiniDFSNNTopology()
.addNameservice(new MiniDFSNNTopology.NSConf("ns1") .addNameservice(new MiniDFSNNTopology.NSConf("ns1")
.addNN(new MiniDFSNNTopology.NNConf("nn1").setHttpPort(10001)) .addNN(new MiniDFSNNTopology.NNConf("nn1").setHttpPort(10001))