You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by um...@apache.org on 2012/10/30 19:00:09 UTC
svn commit: r1403806 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: ./
src/contrib/bkjournal/ src/contrib/bkjournal/dev-support/
src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/
src/contrib/bkjournal/src/...
Author: umamahesh
Date: Tue Oct 30 18:00:08 2012
New Revision: 1403806
URL: http://svn.apache.org/viewvc?rev=1403806&view=rev
Log:
Revert HDFS-3809 from branch-2
Removed:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/dev-support/
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/proto/
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/CurrentInprogress.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/EditLogLedgerMetadata.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/MaxTxId.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperConfiguration.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperJournalManager.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue Oct 30 18:00:08 2012
@@ -98,9 +98,6 @@ Release 2.0.3-alpha - Unreleased
HDFS-3789. JournalManager#format() should be able to throw IOException.
(Ivan Kelly via umamahesh)
- HDFS-3809. Make BKJM use protobufs for all serialization with ZK.
- (Ivan Kelly via umamhesh)
-
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml Tue Oct 30 18:00:08 2012
@@ -89,90 +89,6 @@ http://maven.apache.org/xsd/maven-4.0.0.
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- <executions>
- <execution>
- <id>compile-proto</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echo file="target/compile-proto.sh">
- PROTO_DIR=src/main/proto
- INCLUDE_DIR=../../main/proto
- JAVA_DIR=target/generated-sources/java
- which cygpath 2> /dev/null
- if [ $? = 1 ]; then
- IS_WIN=false
- else
- IS_WIN=true
- WIN_PROTO_DIR=`cygpath --windows $PROTO_DIR`
- WIN_JAVA_DIR=`cygpath --windows $JAVA_DIR`
- WIN_INCLUDE_DIR=`cygpath --windows $INCLUDE_DIR`
- fi
- mkdir -p $JAVA_DIR 2> /dev/null
- for PROTO_FILE in `ls $PROTO_DIR/*.proto 2> /dev/null`
- do
- if [ "$IS_WIN" = "true" ]; then
- protoc -I$WIN_PROTO_DIR -I$WIN_INCLUDE_DIR --java_out=$WIN_JAVA_DIR $PROTO_FILE
- else
- protoc -I$PROTO_DIR -I$INCLUDE_DIR --java_out=$JAVA_DIR $PROTO_FILE
- fi
- done
- </echo>
- <exec executable="sh" dir="${basedir}" failonerror="true">
- <arg line="target/compile-proto.sh"/>
- </exec>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>dev-support/findbugsExcludeFile.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>dist</id>
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperEditLogInputStream.java Tue Oct 30 18:00:08 2012
@@ -70,7 +70,7 @@ class BookKeeperEditLogInputStream exten
this.lh = lh;
this.firstTxId = metadata.getFirstTxId();
this.lastTxId = metadata.getLastTxId();
- this.logVersion = metadata.getDataLayoutVersion();
+ this.logVersion = metadata.getVersion();
this.inProgress = metadata.isInProgress();
if (firstBookKeeperEntry < 0
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java Tue Oct 30 18:00:08 2012
@@ -50,11 +50,6 @@ import java.io.IOException;
import java.net.URI;
-import org.apache.hadoop.hdfs.protocolPB.PBHelper;
-import org.apache.hadoop.contrib.bkjournal.BKJournalProtos.VersionProto;
-import com.google.protobuf.TextFormat;
-import static com.google.common.base.Charsets.UTF_8;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.google.common.annotations.VisibleForTesting;
@@ -148,17 +143,36 @@ public class BookKeeperJournalManager im
private final int quorumSize;
private final String digestpw;
private final CountDownLatch zkConnectLatch;
- private final NamespaceInfo nsInfo;
+
private LedgerHandle currentLedger = null;
+ private int bytesToInt(byte[] b) {
+ assert b.length >= 4;
+ return b[0] << 24 | b[1] << 16 | b[2] << 8 | b[3];
+ }
+
+ private byte[] intToBytes(int i) {
+ return new byte[] {
+ (byte)(i >> 24),
+ (byte)(i >> 16),
+ (byte)(i >> 8),
+ (byte)(i) };
+ }
+
+ BookKeeperJournalManager(Configuration conf, URI uri) throws IOException {
+ this(conf, uri, null);
+ // TODO(ivank): update BookKeeperJournalManager to do something
+ // with the NamespaceInfo. This constructor has been added
+ // for compatibility with the old tests, and may be removed
+ // when the tests are updated.
+ }
+
/**
* Construct a Bookkeeper journal manager.
*/
public BookKeeperJournalManager(Configuration conf, URI uri,
NamespaceInfo nsInfo) throws IOException {
this.conf = conf;
- this.nsInfo = nsInfo;
-
String zkConnect = uri.getAuthority().replace(";", ",");
String zkPath = uri.getPath();
ensembleSize = conf.getInt(BKJM_BOOKKEEPER_ENSEMBLE_SIZE,
@@ -188,32 +202,10 @@ public class BookKeeperJournalManager im
Stat versionStat = zkc.exists(versionPath, false);
if (versionStat != null) {
byte[] d = zkc.getData(versionPath, false, versionStat);
- VersionProto.Builder builder = VersionProto.newBuilder();
- TextFormat.merge(new String(d, UTF_8), builder);
- if (!builder.isInitialized()) {
- throw new IOException("Invalid/Incomplete data in znode");
- }
- VersionProto vp = builder.build();
-
// There's only one version at the moment
- assert vp.getLayoutVersion() == BKJM_LAYOUT_VERSION;
-
- NamespaceInfo readns = PBHelper.convert(vp.getNamespaceInfo());
-
- if (nsInfo.getNamespaceID() != readns.getNamespaceID() ||
- !nsInfo.clusterID.equals(readns.getClusterID()) ||
- !nsInfo.getBlockPoolID().equals(readns.getBlockPoolID())) {
- String err = String.format("Environment mismatch. Running process %s"
- +", stored in ZK %s", nsInfo, readns);
- LOG.error(err);
- throw new IOException(err);
- }
- } else if (nsInfo.getNamespaceID() > 0) {
- VersionProto.Builder builder = VersionProto.newBuilder();
- builder.setNamespaceInfo(PBHelper.convert(nsInfo))
- .setLayoutVersion(BKJM_LAYOUT_VERSION);
- byte[] data = TextFormat.printToString(builder.build()).getBytes(UTF_8);
- zkc.create(versionPath, data,
+ assert bytesToInt(d) == BKJM_LAYOUT_VERSION;
+ } else {
+ zkc.create(versionPath, intToBytes(BKJM_LAYOUT_VERSION),
Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
}
@@ -222,11 +214,11 @@ public class BookKeeperJournalManager im
Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
}
prepareBookKeeperEnv();
- bkc = new BookKeeper(new ClientConfiguration(), zkc);
+ bkc = new BookKeeper(new ClientConfiguration(),
+ zkc);
} catch (KeeperException e) {
throw new IOException("Error initializing zk", e);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
throw new IOException("Interrupted while initializing bk journal manager",
ie);
}
@@ -330,14 +322,13 @@ public class BookKeeperJournalManager im
} catch (KeeperException ke) {
throw new IOException("Error in zookeeper while creating ledger", ke);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
throw new IOException("Interrupted creating ledger", ie);
}
try {
String znodePath = inprogressZNode(txId);
EditLogLedgerMetadata l = new EditLogLedgerMetadata(znodePath,
- HdfsConstants.LAYOUT_VERSION, currentLedger.getId(), txId);
+ HdfsConstants.LAYOUT_VERSION, currentLedger.getId(), txId);
/* Write the ledger metadata out to the inprogress ledger znode
* This can fail if for some reason our write lock has
* expired (@see WriteLock) and another process has managed to
@@ -365,7 +356,6 @@ public class BookKeeperJournalManager im
//log & ignore, an IOException will be thrown soon
LOG.error("Error closing ledger", bke);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
LOG.warn("Interrupted while closing ledger", ie);
}
}
@@ -435,7 +425,6 @@ public class BookKeeperJournalManager im
} catch (KeeperException e) {
throw new IOException("Error finalising ledger", e);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
throw new IOException("Error finalising ledger", ie);
}
}
@@ -465,7 +454,6 @@ public class BookKeeperJournalManager im
} catch (BKException e) {
throw new IOException("Could not open ledger for " + fromTxId, e);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
throw new IOException("Interrupted opening ledger for "
+ fromTxId, ie);
}
@@ -579,7 +567,6 @@ public class BookKeeperJournalManager im
} catch (KeeperException ke) {
throw new IOException("Couldn't get list of inprogress segments", ke);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
throw new IOException("Interrupted getting list of inprogress segments",
ie);
}
@@ -596,7 +583,6 @@ public class BookKeeperJournalManager im
zkc.delete(l.getZkPath(), stat.getVersion());
bkc.deleteLedger(l.getLedgerId());
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
LOG.error("Interrupted while purging " + l, ie);
} catch (BKException bke) {
LOG.error("Couldn't delete ledger from bookkeeper", bke);
@@ -615,7 +601,6 @@ public class BookKeeperJournalManager im
} catch (BKException bke) {
throw new IOException("Couldn't close bookkeeper client", bke);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
throw new IOException("Interrupted while closing journal manager", ie);
}
}
@@ -650,7 +635,6 @@ public class BookKeeperJournalManager im
} catch (BKException bke) {
throw new IOException("Exception opening ledger for " + l, bke);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
throw new IOException("Interrupted opening ledger for " + l, ie);
}
@@ -708,7 +692,6 @@ public class BookKeeperJournalManager im
} catch (KeeperException e) {
throw new IOException("Exception reading ledger list from zk", e);
} catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
throw new IOException("Interrupted getting list of ledgers from zk", ie);
}
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/CurrentInprogress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/CurrentInprogress.java?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/CurrentInprogress.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/CurrentInprogress.java Tue Oct 30 18:00:08 2012
@@ -29,10 +29,6 @@ import org.apache.zookeeper.KeeperExcept
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.data.Stat;
-import org.apache.hadoop.contrib.bkjournal.BKJournalProtos.CurrentInprogressProto;
-import com.google.protobuf.TextFormat;
-import static com.google.common.base.Charsets.UTF_8;
-
/**
* Distributed write permission lock, using ZooKeeper. Read the version number
* and return the current inprogress node path available in CurrentInprogress
@@ -46,28 +42,29 @@ import static com.google.common.base.Cha
*/
class CurrentInprogress {
+ private static final String CONTENT_DELIMITER = ",";
+
static final Log LOG = LogFactory.getLog(CurrentInprogress.class);
private final ZooKeeper zkc;
private final String currentInprogressNode;
private volatile int versionNumberForPermission = -1;
+ private static final int CURRENT_INPROGRESS_LAYOUT_VERSION = -1;
private final String hostName = InetAddress.getLocalHost().toString();
CurrentInprogress(ZooKeeper zkc, String lockpath) throws IOException {
this.currentInprogressNode = lockpath;
this.zkc = zkc;
try {
- Stat isCurrentInprogressNodeExists = zkc.exists(currentInprogressNode,
- false);
+ Stat isCurrentInprogressNodeExists = zkc.exists(lockpath, false);
if (isCurrentInprogressNodeExists == null) {
try {
- zkc.create(currentInprogressNode, null, Ids.OPEN_ACL_UNSAFE,
- CreateMode.PERSISTENT);
+ zkc.create(lockpath, null, Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
} catch (NodeExistsException e) {
// Node might created by other process at the same time. Ignore it.
if (LOG.isDebugEnabled()) {
- LOG.debug(currentInprogressNode + " already created by other process.",
- e);
+ LOG.debug(lockpath + " already created by other process.", e);
}
}
}
@@ -86,13 +83,10 @@ class CurrentInprogress {
* @throws IOException
*/
void update(String path) throws IOException {
- CurrentInprogressProto.Builder builder = CurrentInprogressProto.newBuilder();
- builder.setPath(path).setHostname(hostName);
-
- String content = TextFormat.printToString(builder.build());
-
+ String content = CURRENT_INPROGRESS_LAYOUT_VERSION
+ + CONTENT_DELIMITER + hostName + CONTENT_DELIMITER + path;
try {
- zkc.setData(this.currentInprogressNode, content.getBytes(UTF_8),
+ zkc.setData(this.currentInprogressNode, content.getBytes(),
this.versionNumberForPermission);
} catch (KeeperException e) {
throw new IOException("Exception when setting the data "
@@ -129,12 +123,23 @@ class CurrentInprogress {
}
this.versionNumberForPermission = stat.getVersion();
if (data != null) {
- CurrentInprogressProto.Builder builder = CurrentInprogressProto.newBuilder();
- TextFormat.merge(new String(data, UTF_8), builder);
- if (!builder.isInitialized()) {
- throw new IOException("Invalid/Incomplete data in znode");
+ String stringData = new String(data);
+ LOG.info("Read data[layout version number,hostname,inprogressNode path]"
+ + "= [" + stringData + "] from CurrentInprogress");
+ String[] contents = stringData.split(CONTENT_DELIMITER);
+ assert contents.length == 3 : "As per the current data format, "
+ + "CurrentInprogress node data should contain 3 fields. "
+ + "i.e layout version number,hostname,inprogressNode path";
+ String layoutVersion = contents[0];
+ if (Long.valueOf(layoutVersion) > CURRENT_INPROGRESS_LAYOUT_VERSION) {
+ throw new IOException(
+ "Supported layout version of CurrentInprogress node is : "
+ + CURRENT_INPROGRESS_LAYOUT_VERSION
+ + " . Layout version of CurrentInprogress node in ZK is : "
+ + layoutVersion);
}
- return builder.build().getPath();
+ String inprogressNodePath = contents[2];
+ return inprogressNodePath;
} else {
LOG.info("No data available in CurrentInprogress");
}
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/EditLogLedgerMetadata.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/EditLogLedgerMetadata.java?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/EditLogLedgerMetadata.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/EditLogLedgerMetadata.java Tue Oct 30 18:00:08 2012
@@ -29,10 +29,6 @@ import org.apache.hadoop.hdfs.protocol.H
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.contrib.bkjournal.BKJournalProtos.EditLogLedgerProto;
-import com.google.protobuf.TextFormat;
-import static com.google.common.base.Charsets.UTF_8;
-
/**
* Utility class for storing the metadata associated
* with a single edit log segment, stored in a single ledger
@@ -41,8 +37,8 @@ public class EditLogLedgerMetadata {
static final Log LOG = LogFactory.getLog(EditLogLedgerMetadata.class);
private String zkPath;
- private final int dataLayoutVersion;
private final long ledgerId;
+ private final int version;
private final long firstTxId;
private long lastTxId;
private boolean inprogress;
@@ -61,22 +57,21 @@ public class EditLogLedgerMetadata {
}
};
- EditLogLedgerMetadata(String zkPath, int dataLayoutVersion,
+ EditLogLedgerMetadata(String zkPath, int version,
long ledgerId, long firstTxId) {
this.zkPath = zkPath;
- this.dataLayoutVersion = dataLayoutVersion;
this.ledgerId = ledgerId;
+ this.version = version;
this.firstTxId = firstTxId;
this.lastTxId = HdfsConstants.INVALID_TXID;
this.inprogress = true;
}
- EditLogLedgerMetadata(String zkPath, int dataLayoutVersion,
- long ledgerId, long firstTxId,
- long lastTxId) {
+ EditLogLedgerMetadata(String zkPath, int version, long ledgerId,
+ long firstTxId, long lastTxId) {
this.zkPath = zkPath;
- this.dataLayoutVersion = dataLayoutVersion;
this.ledgerId = ledgerId;
+ this.version = version;
this.firstTxId = firstTxId;
this.lastTxId = lastTxId;
this.inprogress = false;
@@ -98,12 +93,12 @@ public class EditLogLedgerMetadata {
return ledgerId;
}
- boolean isInProgress() {
- return this.inprogress;
+ int getVersion() {
+ return version;
}
- int getDataLayoutVersion() {
- return this.dataLayoutVersion;
+ boolean isInProgress() {
+ return this.inprogress;
}
void finalizeLedger(long newLastTxId) {
@@ -116,27 +111,22 @@ public class EditLogLedgerMetadata {
throws IOException, KeeperException.NoNodeException {
try {
byte[] data = zkc.getData(path, false, null);
-
- EditLogLedgerProto.Builder builder = EditLogLedgerProto.newBuilder();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Reading " + path + " data: " + new String(data, UTF_8));
- }
- TextFormat.merge(new String(data, UTF_8), builder);
- if (!builder.isInitialized()) {
- throw new IOException("Invalid/Incomplete data in znode");
- }
- EditLogLedgerProto ledger = builder.build();
-
- int dataLayoutVersion = ledger.getDataLayoutVersion();
- long ledgerId = ledger.getLedgerId();
- long firstTxId = ledger.getFirstTxId();
- if (ledger.hasLastTxId()) {
- long lastTxId = ledger.getLastTxId();
- return new EditLogLedgerMetadata(path, dataLayoutVersion,
- ledgerId, firstTxId, lastTxId);
+ String[] parts = new String(data).split(";");
+ if (parts.length == 3) {
+ int version = Integer.valueOf(parts[0]);
+ long ledgerId = Long.valueOf(parts[1]);
+ long txId = Long.valueOf(parts[2]);
+ return new EditLogLedgerMetadata(path, version, ledgerId, txId);
+ } else if (parts.length == 4) {
+ int version = Integer.valueOf(parts[0]);
+ long ledgerId = Long.valueOf(parts[1]);
+ long firstTxId = Long.valueOf(parts[2]);
+ long lastTxId = Long.valueOf(parts[3]);
+ return new EditLogLedgerMetadata(path, version, ledgerId,
+ firstTxId, lastTxId);
} else {
- return new EditLogLedgerMetadata(path, dataLayoutVersion,
- ledgerId, firstTxId);
+ throw new IOException("Invalid ledger entry, "
+ + new String(data));
}
} catch(KeeperException.NoNodeException nne) {
throw nne;
@@ -150,17 +140,17 @@ public class EditLogLedgerMetadata {
void write(ZooKeeper zkc, String path)
throws IOException, KeeperException.NodeExistsException {
this.zkPath = path;
-
- EditLogLedgerProto.Builder builder = EditLogLedgerProto.newBuilder();
- builder.setDataLayoutVersion(dataLayoutVersion)
- .setLedgerId(ledgerId).setFirstTxId(firstTxId);
-
- if (!inprogress) {
- builder.setLastTxId(lastTxId);
+ String finalisedData;
+ if (inprogress) {
+ finalisedData = String.format("%d;%d;%d",
+ version, ledgerId, firstTxId);
+ } else {
+ finalisedData = String.format("%d;%d;%d;%d",
+ version, ledgerId, firstTxId, lastTxId);
}
try {
- zkc.create(path, TextFormat.printToString(builder.build()).getBytes(UTF_8),
- Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+ zkc.create(path, finalisedData.getBytes(), Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
} catch (KeeperException.NodeExistsException nee) {
throw nee;
} catch (KeeperException e) {
@@ -193,9 +183,9 @@ public class EditLogLedgerMetadata {
}
EditLogLedgerMetadata ol = (EditLogLedgerMetadata)o;
return ledgerId == ol.ledgerId
- && dataLayoutVersion == ol.dataLayoutVersion
&& firstTxId == ol.firstTxId
- && lastTxId == ol.lastTxId;
+ && lastTxId == ol.lastTxId
+ && version == ol.version;
}
public int hashCode() {
@@ -203,15 +193,15 @@ public class EditLogLedgerMetadata {
hash = hash * 31 + (int) ledgerId;
hash = hash * 31 + (int) firstTxId;
hash = hash * 31 + (int) lastTxId;
- hash = hash * 31 + (int) dataLayoutVersion;
+ hash = hash * 31 + (int) version;
return hash;
}
public String toString() {
return "[LedgerId:"+ledgerId +
", firstTxId:" + firstTxId +
- ", lastTxId:" + lastTxId +
- ", dataLayoutVersion:" + dataLayoutVersion + "]";
+ ", lastTxId:" + lastTxId +
+ ", version:" + version + "]";
}
}
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/MaxTxId.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/MaxTxId.java?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/MaxTxId.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/MaxTxId.java Tue Oct 30 18:00:08 2012
@@ -27,10 +27,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.data.Stat;
-import org.apache.hadoop.contrib.bkjournal.BKJournalProtos.MaxTxIdProto;
-import com.google.protobuf.TextFormat;
-import static com.google.common.base.Charsets.UTF_8;
-
/**
* Utility class for storing and reading
* the max seen txid in zookeeper
@@ -59,16 +55,14 @@ class MaxTxId {
}
synchronized void reset(long maxTxId) throws IOException {
+ String txidStr = Long.toString(maxTxId);
try {
- MaxTxIdProto.Builder builder = MaxTxIdProto.newBuilder().setTxId(maxTxId);
-
- byte[] data = TextFormat.printToString(builder.build()).getBytes(UTF_8);
if (currentStat != null) {
- currentStat = zkc.setData(path, data, currentStat
+ currentStat = zkc.setData(path, txidStr.getBytes("UTF-8"), currentStat
.getVersion());
} else {
- zkc.create(path, data, Ids.OPEN_ACL_UNSAFE,
- CreateMode.PERSISTENT);
+ zkc.create(path, txidStr.getBytes("UTF-8"), Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
}
} catch (KeeperException e) {
throw new IOException("Error writing max tx id", e);
@@ -83,16 +77,9 @@ class MaxTxId {
if (currentStat == null) {
return 0;
} else {
-
byte[] bytes = zkc.getData(path, false, currentStat);
-
- MaxTxIdProto.Builder builder = MaxTxIdProto.newBuilder();
- TextFormat.merge(new String(bytes, UTF_8), builder);
- if (!builder.isInitialized()) {
- throw new IOException("Invalid/Incomplete data in znode");
- }
-
- return builder.build().getTxId();
+ String txidString = new String(bytes, "UTF-8");
+ return Long.valueOf(txidString);
}
} catch (KeeperException e) {
throw new IOException("Error reading the max tx id from zk", e);
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperConfiguration.java?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperConfiguration.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperConfiguration.java Tue Oct 30 18:00:08 2012
@@ -23,7 +23,6 @@ import java.net.InetSocketAddress;
import java.net.URI;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import java.util.Random;
import org.apache.bookkeeper.util.LocalBookKeeper;
import org.apache.commons.logging.Log;
@@ -43,8 +42,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
-
public class TestBookKeeperConfiguration {
private static final Log LOG = LogFactory
.getLog(TestBookKeeperConfiguration.class);
@@ -76,11 +73,6 @@ public class TestBookKeeperConfiguration
return zkc;
}
- private NamespaceInfo newNSInfo() {
- Random r = new Random();
- return new NamespaceInfo(r.nextInt(), "testCluster", "TestBPID", -1);
- }
-
@BeforeClass
public static void setupZooKeeper() throws Exception {
// create a ZooKeeper server(dataDir, dataLogDir, port)
@@ -145,10 +137,8 @@ public class TestBookKeeperConfiguration
bkAvailablePath);
Assert.assertNull(bkAvailablePath + " already exists", zkc.exists(
bkAvailablePath, false));
- NamespaceInfo nsi = newNSInfo();
- bkjm = new BookKeeperJournalManager(conf,
- URI.create("bookkeeper://" + HOSTPORT + "/hdfsjournal-WithBKPath"),
- nsi);
+ bkjm = new BookKeeperJournalManager(conf, URI.create("bookkeeper://"
+ + HOSTPORT + "/hdfsjournal-WithBKPath"));
Assert.assertNotNull("Bookie available path : " + bkAvailablePath
+ " doesn't exists", zkc.exists(bkAvailablePath, false));
}
@@ -162,10 +152,8 @@ public class TestBookKeeperConfiguration
Configuration conf = new Configuration();
Assert.assertNull(BK_ROOT_PATH + " already exists", zkc.exists(
BK_ROOT_PATH, false));
- NamespaceInfo nsi = newNSInfo();
- bkjm = new BookKeeperJournalManager(conf,
- URI.create("bookkeeper://" + HOSTPORT + "/hdfsjournal-DefaultBKPath"),
- nsi);
+ new BookKeeperJournalManager(conf, URI.create("bookkeeper://" + HOSTPORT
+ + "/hdfsjournal-DefaultBKPath"));
Assert.assertNotNull("Bookie available path : " + BK_ROOT_PATH
+ " doesn't exists", zkc.exists(BK_ROOT_PATH, false));
}
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperJournalManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperJournalManager.java?rev=1403806&r1=1403805&r2=1403806&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperJournalManager.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBookKeeperJournalManager.java Tue Oct 30 18:00:08 2012
@@ -29,7 +29,6 @@ import org.mockito.Mockito;
import java.io.IOException;
import java.net.URI;
import java.util.List;
-import java.util.Random;
import org.apache.hadoop.conf.Configuration;
@@ -38,7 +37,6 @@ import org.apache.hadoop.hdfs.server.nam
import org.apache.hadoop.hdfs.server.namenode.FSEditLogOp;
import org.apache.hadoop.hdfs.server.namenode.FSEditLogTestUtil;
import org.apache.hadoop.hdfs.server.namenode.JournalManager;
-import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo;
import org.apache.bookkeeper.proto.BookieServer;
import org.apache.zookeeper.CreateMode;
@@ -80,17 +78,10 @@ public class TestBookKeeperJournalManage
zkc.close();
}
- private NamespaceInfo newNSInfo() {
- Random r = new Random();
- return new NamespaceInfo(r.nextInt(), "testCluster", "TestBPID", -1);
- }
-
@Test
public void testSimpleWrite() throws Exception {
- NamespaceInfo nsi = newNSInfo();
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-simplewrite"), nsi);
-
+ BKJMUtil.createJournalURI("/hdfsjournal-simplewrite"));
EditLogOutputStream out = bkjm.startLogSegment(1);
for (long i = 1 ; i <= 100; i++) {
FSEditLogOp op = FSEditLogTestUtil.getNoOpInstance();
@@ -108,10 +99,8 @@ public class TestBookKeeperJournalManage
@Test
public void testNumberOfTransactions() throws Exception {
- NamespaceInfo nsi = newNSInfo();
-
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-txncount"), nsi);
+ BKJMUtil.createJournalURI("/hdfsjournal-txncount"));
EditLogOutputStream out = bkjm.startLogSegment(1);
for (long i = 1 ; i <= 100; i++) {
FSEditLogOp op = FSEditLogTestUtil.getNoOpInstance();
@@ -127,10 +116,8 @@ public class TestBookKeeperJournalManage
@Test
public void testNumberOfTransactionsWithGaps() throws Exception {
- NamespaceInfo nsi = newNSInfo();
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-gaps"), nsi);
-
+ BKJMUtil.createJournalURI("/hdfsjournal-gaps"));
long txid = 1;
for (long i = 0; i < 3; i++) {
long start = txid;
@@ -164,10 +151,8 @@ public class TestBookKeeperJournalManage
@Test
public void testNumberOfTransactionsWithInprogressAtEnd() throws Exception {
- NamespaceInfo nsi = newNSInfo();
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-inprogressAtEnd"), nsi);
-
+ BKJMUtil.createJournalURI("/hdfsjournal-inprogressAtEnd"));
long txid = 1;
for (long i = 0; i < 3; i++) {
long start = txid;
@@ -205,10 +190,8 @@ public class TestBookKeeperJournalManage
*/
@Test
public void testWriteRestartFrom1() throws Exception {
- NamespaceInfo nsi = newNSInfo();
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-restartFrom1"), nsi);
-
+ BKJMUtil.createJournalURI("/hdfsjournal-restartFrom1"));
long txid = 1;
long start = txid;
EditLogOutputStream out = bkjm.startLogSegment(txid);
@@ -262,15 +245,11 @@ public class TestBookKeeperJournalManage
@Test
public void testTwoWriters() throws Exception {
long start = 1;
- NamespaceInfo nsi = newNSInfo();
-
BookKeeperJournalManager bkjm1 = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-dualWriter"), nsi);
-
+ BKJMUtil.createJournalURI("/hdfsjournal-dualWriter"));
BookKeeperJournalManager bkjm2 = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-dualWriter"), nsi);
-
-
+ BKJMUtil.createJournalURI("/hdfsjournal-dualWriter"));
+
EditLogOutputStream out1 = bkjm1.startLogSegment(start);
try {
bkjm2.startLogSegment(start);
@@ -284,11 +263,8 @@ public class TestBookKeeperJournalManage
@Test
public void testSimpleRead() throws Exception {
- NamespaceInfo nsi = newNSInfo();
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-simpleread"),
- nsi);
-
+ BKJMUtil.createJournalURI("/hdfsjournal-simpleread"));
final long numTransactions = 10000;
EditLogOutputStream out = bkjm.startLogSegment(1);
for (long i = 1 ; i <= numTransactions; i++) {
@@ -311,11 +287,8 @@ public class TestBookKeeperJournalManage
@Test
public void testSimpleRecovery() throws Exception {
- NamespaceInfo nsi = newNSInfo();
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-simplerecovery"),
- nsi);
-
+ BKJMUtil.createJournalURI("/hdfsjournal-simplerecovery"));
EditLogOutputStream out = bkjm.startLogSegment(1);
for (long i = 1 ; i <= 100; i++) {
FSEditLogOp op = FSEditLogTestUtil.getNoOpInstance();
@@ -361,10 +334,8 @@ public class TestBookKeeperJournalManage
conf.setInt(BookKeeperJournalManager.BKJM_BOOKKEEPER_QUORUM_SIZE,
ensembleSize);
long txid = 1;
- NamespaceInfo nsi = newNSInfo();
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-allbookiefailure"),
- nsi);
+ BKJMUtil.createJournalURI("/hdfsjournal-allbookiefailure"));
EditLogOutputStream out = bkjm.startLogSegment(txid);
for (long i = 1 ; i <= 3; i++) {
@@ -445,12 +416,8 @@ public class TestBookKeeperJournalManage
conf.setInt(BookKeeperJournalManager.BKJM_BOOKKEEPER_QUORUM_SIZE,
ensembleSize);
long txid = 1;
-
- NamespaceInfo nsi = newNSInfo();
BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf,
- BKJMUtil.createJournalURI("/hdfsjournal-onebookiefailure"),
- nsi);
-
+ BKJMUtil.createJournalURI("/hdfsjournal-onebookiefailure"));
EditLogOutputStream out = bkjm.startLogSegment(txid);
for (long i = 1 ; i <= 3; i++) {
FSEditLogOp op = FSEditLogTestUtil.getNoOpInstance();
@@ -497,9 +464,7 @@ public class TestBookKeeperJournalManage
@Test
public void testEmptyInprogressNode() throws Exception {
URI uri = BKJMUtil.createJournalURI("/hdfsjournal-emptyInprogress");
- NamespaceInfo nsi = newNSInfo();
- BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri,
- nsi);
+ BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri);
EditLogOutputStream out = bkjm.startLogSegment(1);
for (long i = 1; i <= 100; i++) {
@@ -516,7 +481,7 @@ public class TestBookKeeperJournalManage
String inprogressZNode = bkjm.inprogressZNode(101);
zkc.setData(inprogressZNode, new byte[0], -1);
- bkjm = new BookKeeperJournalManager(conf, uri, nsi);
+ bkjm = new BookKeeperJournalManager(conf, uri);
try {
bkjm.recoverUnfinalizedSegments();
fail("Should have failed. There should be no way of creating"
@@ -524,7 +489,7 @@ public class TestBookKeeperJournalManage
} catch (IOException e) {
// correct behaviour
assertTrue("Exception different than expected", e.getMessage().contains(
- "Invalid/Incomplete data in znode"));
+ "Invalid ledger entry,"));
} finally {
bkjm.close();
}
@@ -538,9 +503,7 @@ public class TestBookKeeperJournalManage
@Test
public void testCorruptInprogressNode() throws Exception {
URI uri = BKJMUtil.createJournalURI("/hdfsjournal-corruptInprogress");
- NamespaceInfo nsi = newNSInfo();
- BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri,
- nsi);
+ BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri);
EditLogOutputStream out = bkjm.startLogSegment(1);
for (long i = 1; i <= 100; i++) {
@@ -558,7 +521,7 @@ public class TestBookKeeperJournalManage
String inprogressZNode = bkjm.inprogressZNode(101);
zkc.setData(inprogressZNode, "WholeLottaJunk".getBytes(), -1);
- bkjm = new BookKeeperJournalManager(conf, uri, nsi);
+ bkjm = new BookKeeperJournalManager(conf, uri);
try {
bkjm.recoverUnfinalizedSegments();
fail("Should have failed. There should be no way of creating"
@@ -566,7 +529,8 @@ public class TestBookKeeperJournalManage
} catch (IOException e) {
// correct behaviour
assertTrue("Exception different than expected", e.getMessage().contains(
- "has no field named"));
+ "Invalid ledger entry,"));
+
} finally {
bkjm.close();
}
@@ -580,9 +544,7 @@ public class TestBookKeeperJournalManage
@Test
public void testEmptyInprogressLedger() throws Exception {
URI uri = BKJMUtil.createJournalURI("/hdfsjournal-emptyInprogressLedger");
- NamespaceInfo nsi = newNSInfo();
- BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri,
- nsi);
+ BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri);
EditLogOutputStream out = bkjm.startLogSegment(1);
for (long i = 1; i <= 100; i++) {
@@ -597,7 +559,7 @@ public class TestBookKeeperJournalManage
out.close();
bkjm.close();
- bkjm = new BookKeeperJournalManager(conf, uri, nsi);
+ bkjm = new BookKeeperJournalManager(conf, uri);
bkjm.recoverUnfinalizedSegments();
out = bkjm.startLogSegment(101);
for (long i = 1; i <= 100; i++) {
@@ -619,9 +581,7 @@ public class TestBookKeeperJournalManage
public void testRefinalizeAlreadyFinalizedInprogress() throws Exception {
URI uri = BKJMUtil
.createJournalURI("/hdfsjournal-refinalizeInprogressLedger");
- NamespaceInfo nsi = newNSInfo();
- BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri,
- nsi);
+ BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri);
EditLogOutputStream out = bkjm.startLogSegment(1);
for (long i = 1; i <= 100; i++) {
@@ -641,7 +601,7 @@ public class TestBookKeeperJournalManage
byte[] inprogressData = zkc.getData(inprogressZNode, false, null);
// finalize
- bkjm = new BookKeeperJournalManager(conf, uri, nsi);
+ bkjm = new BookKeeperJournalManager(conf, uri);
bkjm.recoverUnfinalizedSegments();
bkjm.close();
@@ -653,7 +613,7 @@ public class TestBookKeeperJournalManage
CreateMode.PERSISTENT);
// should work fine
- bkjm = new BookKeeperJournalManager(conf, uri, nsi);
+ bkjm = new BookKeeperJournalManager(conf, uri);
bkjm.recoverUnfinalizedSegments();
bkjm.close();
}
@@ -666,10 +626,7 @@ public class TestBookKeeperJournalManage
@Test
public void testEditLogFileNotExistsWhenReadingMetadata() throws Exception {
URI uri = BKJMUtil.createJournalURI("/hdfsjournal-editlogfile");
- NamespaceInfo nsi = newNSInfo();
- BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri,
- nsi);
-
+ BookKeeperJournalManager bkjm = new BookKeeperJournalManager(conf, uri);
try {
// start new inprogress log segment with txid=1
// and write transactions till txid=50