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

HDFS-5186. Merging change r1526615 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526617 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-09-26 17:34:29 +00:00
parent ee97d95c33
commit 16794494d3
2 changed files with 19 additions and 13 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

@ -110,6 +110,9 @@ Release 2.1.2 - UNRELEASED
HDFS-5258. Skip tests in TestHDFSCLI that are not applicable on Windows. HDFS-5258. Skip tests in TestHDFSCLI that are not applicable on Windows.
(Chuan Liu via cnauroth) (Chuan Liu via cnauroth)
HDFS-5186. TestFileJournalManager fails on Windows due to file handle leaks.
(Chuan Liu via cnauroth)
Release 2.1.1-beta - 2013-09-23 Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

29
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileJournalManager.java
View File

@ -87,24 +87,27 @@ public class TestFileJournalManager {
EditLogInputStream elis = null; EditLogInputStream elis = null;
try { try {
while ((elis = allStreams.poll()) != null) { while ((elis = allStreams.poll()) != null) {
elis.skipUntil(txId); try {
while (true) { elis.skipUntil(txId);
FSEditLogOp op = elis.readOp(); while (true) {
if (op == null) { FSEditLogOp op = elis.readOp();
break; if (op == null) {
break;
}
if (abortOnGap && (op.getTransactionId() != txId)) {
LOG.info("getNumberOfTransactions: detected gap at txId "
+ fromTxId);
return numTransactions;
}
txId = op.getTransactionId() + 1;
numTransactions++;
} }
if (abortOnGap && (op.getTransactionId() != txId)) { } finally {
LOG.info("getNumberOfTransactions: detected gap at txId " + IOUtils.cleanup(LOG, elis);
fromTxId);
return numTransactions;
}
txId = op.getTransactionId() + 1;
numTransactions++;
} }
} }
} finally { } finally {
IOUtils.cleanup(LOG, allStreams.toArray(new EditLogInputStream[0])); IOUtils.cleanup(LOG, allStreams.toArray(new EditLogInputStream[0]));
IOUtils.cleanup(LOG, elis);
} }
return numTransactions; return numTransactions;
} }