big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-2334. Add Closeable to JournalManager. Contributed by Ivan Kelly.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1195620 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jitendra Nath Pandey 2011-10-31 19:03:55 +00:00
parent b3f90c7060
commit 7cb77a3b1b
6 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,8 @@ Trunk (unreleased changes)
HDFS-2479 HDFS Client Data Types in Protocol Buffers (sanjay)
HDFS-2334. Add Closeable to JournalManager. (Ivan Kelly via jitendra)
BUG FIXES
HDFS-2287. TestParallelRead has a small off-by-one bug. (todd)

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupJournalManager.java
View File

@ -77,6 +77,9 @@ public EditLogInputStream getInputStream(long fromTxnId) throws IOException {
public void recoverUnfinalizedSegments() throws IOException {
}
@Override
public void close() throws IOException {}
public boolean matchesRegistration(NamenodeRegistration bnReg) {
return bnReg.getAddress().equals(this.bnReg.getAddress());
}

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
View File

@ -215,6 +215,12 @@ synchronized void close() {
waitForSyncToFinish();
endCurrentLogSegment(true);
}
try {
journalSet.close();
} catch (IOException ioe) {
LOG.warn("Error closing journalSet", ioe);
}
state = State.CLOSED;
}

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FileJournalManager.java
View File

@ -70,6 +70,9 @@ public FileJournalManager(StorageDirectory sd) {
this.sd = sd;
}
@Override
public void close() throws IOException {}
@Override
synchronized public EditLogOutputStream startLogSegment(long txid)
throws IOException {

8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/JournalManager.java
View File

@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hdfs.server.namenode;
import java.io.Closeable;
import java.io.IOException;
@ -27,7 +28,7 @@
* each conceptual place of storage corresponds to exactly one instance of
* this class, which is created when the EditLog is first opened.
*/
interface JournalManager {
interface JournalManager extends Closeable {
/**
* Begin writing to a new segment of the log stream, which starts at
* the given transaction ID.
@ -81,6 +82,11 @@ void purgeLogsOlderThan(long minTxIdToKeep)
*/
void recoverUnfinalizedSegments() throws IOException;
/**
* Close the journal manager, freeing any resources it may hold.
*/
void close() throws IOException;
/**
* Indicate that a journal is cannot be used to load a certain range of
* edits.

27
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/JournalSet.java
View File

@ -72,11 +72,20 @@ public void startLogSegment(long txId) throws IOException {
/**
* Closes the stream, also sets it to null.
*/
public void close() throws IOException {
public void closeStream() throws IOException {
if (stream == null) return;
stream.close();
stream = null;
}
/**
* Close the Journal and Stream
*/
public void close() throws IOException {
closeStream();
journal.close();
}
/**
* Aborts the stream, also sets it to null.
@ -145,13 +154,23 @@ public void finalizeLogSegment(final long firstTxId, final long lastTxId)
@Override
public void apply(JournalAndStream jas) throws IOException {
if (jas.isActive()) {
jas.close();
jas.closeStream();
jas.getManager().finalizeLogSegment(firstTxId, lastTxId);
}
}
}, "finalize log segment " + firstTxId + ", " + lastTxId);
}
@Override
public void close() throws IOException {
mapJournalsAndReportErrors(new JournalClosure() {
@Override
public void apply(JournalAndStream jas) throws IOException {
jas.close();
}
}, "close journal");
}
/**
* Find the best editlog input stream to read from txid.
@ -332,7 +351,7 @@ public void close() throws IOException {
mapJournalsAndReportErrors(new JournalClosure() {
@Override
public void apply(JournalAndStream jas) throws IOException {
jas.close();
jas.closeStream();
}
}, "close");
}