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

HDFS-2622. Fix TestDFSUpgrade in HA branch. Contributed by Todd Lipcon. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1209230 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-12-01 20:38:46 +00:00
parent 2033b52673
commit 4cbead8484
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-1623.txt
View File

@ -33,3 +33,5 @@ HDFS-1975. Support for sharing the namenode state from active to standby. (jiten
HDFS-1971. Send block report from datanode to both active and standby namenodes. (sanjay, todd via suresh)
HDFS-2616. Change DatanodeProtocol#sendHeartbeat() to return HeartbeatResponse. (suresh)
HDFS-2622. Fix TestDFSUpgrade in HA branch. (todd)

19
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUpgrade.java
View File

@ -34,6 +34,7 @@ import org.apache.hadoop.hdfs.server.namenode.TestParallelImageWrite;
import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getInProgressEditsFileName;
import static org.apache.hadoop.hdfs.server.namenode.NNStorage.getImageFileName;
import static org.apache.hadoop.test.GenericTestUtils.assertExists;
import org.apache.hadoop.util.StringUtils;
import org.junit.BeforeClass;
import org.junit.Ignore;
@ -51,7 +52,7 @@ import static org.junit.Assert.*;
*/
public class TestDFSUpgrade {
private static final int EXPECTED_TXID = 17;
private static final int EXPECTED_TXID = 33;
private static final Log LOG = LogFactory.getLog(TestDFSUpgrade.class.getName());
private Configuration conf;
private int testCounter = 0;
@ -80,16 +81,16 @@ public class TestDFSUpgrade {
Joiner.on(" \n").join(new File(baseDir, "current").list()));
LOG.info("==================");
assertTrue(new File(baseDir,"current").isDirectory());
assertTrue(new File(baseDir,"current/VERSION").isFile());
assertTrue(new File(baseDir,"current/"
+ getInProgressEditsFileName(imageTxId + 1)).isFile());
assertTrue(new File(baseDir,"current/"
+ getImageFileName(imageTxId)).isFile());
assertTrue(new File(baseDir,"current/seen_txid").isFile());
assertExists(new File(baseDir,"current"));
assertExists(new File(baseDir,"current/VERSION"));
assertExists(new File(baseDir,"current/"
+ getInProgressEditsFileName(imageTxId + 1)));
assertExists(new File(baseDir,"current/"
+ getImageFileName(imageTxId)));
assertExists(new File(baseDir,"current/seen_txid"));
File previous = new File(baseDir, "previous");
assertTrue(previous.isDirectory());
assertExists(previous);
assertEquals(UpgradeUtilities.checksumContents(NAME_NODE, previous),
UpgradeUtilities.checksumMasterNameNodeContents());
}