Author: fpj
Date: Sat Dec 8 10:18:30 2012
New Revision: 1418637
URL: http://svn.apache.org/viewvc?rev=1418637&view=rev
Log:
BOOKKEEPER-431: Duplicate definition of COOKIES_NODE (uma via fpj)
Added:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/BookieLedgerIndexer.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Dec 8 10:18:30 2012
@@ -124,6 +124,8 @@ Trunk (unreleased changes)
BOOKKEEPER-475:
BookieRecoveryTest#testSyncBookieRecoveryToRandomBookiesCheckForDupes()
iterates too much (ivank via fpj)
+ BOOKKEEPER-431: Duplicate definition of COOKIES_NODE (uma via fpj)
+
hedwig-protocol:
BOOKKEEPER-394: CompositeException message is not useful (Stu Hood via
sijie)
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
Sat Dec 8 10:18:30 2012
@@ -48,6 +48,7 @@ import org.apache.bookkeeper.conf.Server
import org.apache.bookkeeper.jmx.BKMBeanInfo;
import org.apache.bookkeeper.jmx.BKMBeanRegistry;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteCallback;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.IOUtils;
import org.apache.bookkeeper.util.MathUtils;
import org.apache.bookkeeper.util.ZkUtils;
@@ -73,8 +74,6 @@ import com.google.common.annotations.Vis
*/
public class Bookie extends Thread {
- public static final String INSTANCEID = "INSTANCEID";
- public static final String READONLY = "readonly";
static Logger LOG = LoggerFactory.getLogger(Bookie.class);
@@ -93,7 +92,6 @@ public class Bookie extends Thread {
// ZK registration path for this bookie
private final String bookieRegistrationPath;
- static final String CURRENT_DIR = "current";
private LedgerDirsManager ledgerDirsManager;
@@ -262,7 +260,8 @@ public class Bookie extends Thread {
public static void checkDirectoryStructure(File dir) throws IOException {
if (!dir.exists()) {
File parent = dir.getParentFile();
- File preV3versionFile = new File(dir.getParent(),
Cookie.VERSION_FILENAME);
+ File preV3versionFile = new File(dir.getParent(),
+ BookKeeperConstants.VERSION_FILENAME);
final AtomicBoolean oldDataExists = new AtomicBoolean(false);
parent.list(new FilenameFilter() {
@@ -376,7 +375,7 @@ public class Bookie extends Thread {
String instanceId = null;
try {
byte[] data = zk.getData(conf.getZkLedgersRootPath() + "/"
- + INSTANCEID, false, null);
+ + BookKeeperConstants.INSTANCEID, false, null);
instanceId = new String(data);
} catch (KeeperException.NoNodeException e) {
LOG.warn("INSTANCEID not exists in zookeeper. Not considering it
for data verification");
@@ -389,7 +388,7 @@ public class Bookie extends Thread {
}
public static File getCurrentDirectory(File dir) {
- return new File(dir, CURRENT_DIR);
+ return new File(dir, BookKeeperConstants.CURRENT_DIR);
}
public static File[] getCurrentDirectories(File[] dirs) {
@@ -675,19 +674,20 @@ public class Bookie extends Thread {
LOG.info("Transitioning Bookie to ReadOnly mode,"
+ " and will serve only read requests from clients!");
try {
- if (null == zk
- .exists(this.bookieRegistrationPath + READONLY, false)) {
+ if (null == zk.exists(this.bookieRegistrationPath
+ + BookKeeperConstants.READONLY, false)) {
try {
- zk.create(this.bookieRegistrationPath + READONLY,
- new byte[0], Ids.OPEN_ACL_UNSAFE,
- CreateMode.PERSISTENT);
+ zk.create(this.bookieRegistrationPath
+ + BookKeeperConstants.READONLY, new byte[0],
+ Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
} catch (NodeExistsException e) {
// this node is just now created by someone.
}
}
// Create the readonly node
- zk.create(this.bookieRegistrationPath + READONLY + "/" +
getMyId(), new byte[0], Ids.OPEN_ACL_UNSAFE,
- CreateMode.EPHEMERAL);
+ zk.create(this.bookieRegistrationPath
+ + BookKeeperConstants.READONLY + "/" + getMyId(),
+ new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
// Clear the current registered node
zk.delete(zkBookieRegPath, -1);
} catch (IOException e) {
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Cookie.java
Sat Dec 8 10:18:30 2012
@@ -1,4 +1,4 @@
-/*
+/**
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -30,7 +30,6 @@ import java.io.BufferedWriter;
import java.io.IOException;
import java.io.StringReader;
-import java.net.InetAddress;
import java.net.UnknownHostException;
import org.apache.zookeeper.ZooKeeper;
@@ -39,6 +38,7 @@ import org.apache.zookeeper.KeeperExcept
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.ZooDefs.Ids;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.StringUtils;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.proto.DataFormats.CookieFormat;
@@ -65,8 +65,6 @@ class Cookie {
static Logger LOG = LoggerFactory.getLogger(Cookie.class);
static final int CURRENT_COOKIE_LAYOUT_VERSION = 4;
- static final String COOKIE_NODE = "cookies";
- static final String VERSION_FILENAME = "VERSION";
private int layoutVersion = 0;
private String bookieHost = null;
private String journalDir = null;
@@ -155,7 +153,8 @@ class Cookie {
}
void writeToDirectory(File directory) throws IOException {
- File versionFile = new File(directory, VERSION_FILENAME);
+ File versionFile = new File(directory,
+ BookKeeperConstants.VERSION_FILENAME);
FileOutputStream fos = new FileOutputStream(versionFile);
BufferedWriter bw = null;
@@ -172,7 +171,8 @@ class Cookie {
void writeToZooKeeper(ZooKeeper zk, ServerConfiguration conf)
throws KeeperException, InterruptedException, UnknownHostException
{
- String bookieCookiePath = conf.getZkLedgersRootPath() + "/" +
COOKIE_NODE;
+ String bookieCookiePath = conf.getZkLedgersRootPath() + "/"
+ + BookKeeperConstants.COOKIE_NODE;
String zkPath = getZkPath(conf);
byte[] data = toString().getBytes();
if (znodeVersion != -1) {
@@ -237,7 +237,8 @@ class Cookie {
}
static Cookie readFromDirectory(File directory) throws IOException {
- File versionFile = new File(directory, VERSION_FILENAME);
+ File versionFile = new File(directory,
+ BookKeeperConstants.VERSION_FILENAME);
BufferedReader reader = new BufferedReader(new
FileReader(versionFile));
try {
return parse(reader);
@@ -252,7 +253,8 @@ class Cookie {
private static String getZkPath(ServerConfiguration conf)
throws UnknownHostException {
- String bookieCookiePath = conf.getZkLedgersRootPath() + "/" +
COOKIE_NODE;
+ String bookieCookiePath = conf.getZkLedgersRootPath() + "/"
+ + BookKeeperConstants.COOKIE_NODE;
return bookieCookiePath + "/" +
StringUtils.addrToString(Bookie.getBookieAddress(conf));
}
}
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
Sat Dec 8 10:18:30 2012
@@ -1,4 +1,4 @@
-/*
+/**
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +21,7 @@
package org.apache.bookkeeper.bookie;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.HardLink;
import org.apache.commons.io.FileUtils;
@@ -28,7 +29,6 @@ import org.apache.commons.cli.BasicParse
import org.apache.commons.cli.Options;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +55,6 @@ import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.KeeperException;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* Application for upgrading the bookkeeper filesystem
@@ -110,7 +109,8 @@ public class FileSystemUpgrade {
private static int detectPreviousVersion(File directory) throws
IOException {
String[] files = directory.list(BOOKIE_FILES_FILTER);
- File v2versionFile = new File(directory, Cookie.VERSION_FILENAME);
+ File v2versionFile = new File(directory,
+ BookKeeperConstants.VERSION_FILENAME);
if (files.length == 0 && !v2versionFile.exists()) { // no old data, so
we're ok
return Cookie.CURRENT_COOKIE_LAYOUT_VERSION;
}
@@ -198,7 +198,7 @@ public class FileSystemUpgrade {
continue;
}
try {
- File curDir = new File(d, Bookie.CURRENT_DIR);
+ File curDir = new File(d, BookKeeperConstants.CURRENT_DIR);
File tmpDir = new File(d, "upgradeTmp." +
System.nanoTime());
deferredMoves.put(curDir, tmpDir);
if (!tmpDir.mkdirs()) {
@@ -260,7 +260,8 @@ public class FileSystemUpgrade {
int version = detectPreviousVersion(d);
if (version < 3) {
if (version == 2) {
- File v2versionFile = new File(d,
Cookie.VERSION_FILENAME);
+ File v2versionFile = new File(d,
+ BookKeeperConstants.VERSION_FILENAME);
if (!v2versionFile.delete()) {
LOG.warn("Could not delete old version file {}",
v2versionFile);
}
@@ -297,7 +298,8 @@ public class FileSystemUpgrade {
int version = detectPreviousVersion(d);
if (version <= Cookie.CURRENT_COOKIE_LAYOUT_VERSION) {
- File curDir = new File(d, Bookie.CURRENT_DIR);
+ File curDir = new File(d,
+ BookKeeperConstants.CURRENT_DIR);
FileUtils.deleteDirectory(curDir);
} else {
throw new BookieException.UpgradeException(
@@ -334,7 +336,8 @@ public class FileSystemUpgrade {
root.addAppender(new org.apache.log4j.ConsoleAppender(
new org.apache.log4j.PatternLayout("%-5p
[%t]: %m%n")));
root.setLevel(org.apache.log4j.Level.ERROR);
-
root.getLogger(FileSystemUpgrade.class).setLevel(org.apache.log4j.Level.INFO);
+ org.apache.log4j.Logger.getLogger(FileSystemUpgrade.class).setLevel(
+ org.apache.log4j.Level.INFO);
final Options opts = new Options();
opts.addOption("c", "conf", true, "Configuration for Bookie");
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
Sat Dec 8 10:18:30 2012
@@ -23,7 +23,6 @@ package org.apache.bookkeeper.client;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
import org.apache.bookkeeper.client.AsyncCallback.CreateCallback;
import org.apache.bookkeeper.client.AsyncCallback.DeleteCallback;
@@ -37,8 +36,6 @@ import org.apache.bookkeeper.util.Ordere
import org.apache.bookkeeper.util.ZkUtils;
import org.apache.bookkeeper.zookeeper.ZooKeeperWatcherBase;
import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooKeeper;
import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
Sat Dec 8 10:18:30 2012
@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Random;
import java.util.UUID;
-import org.apache.bookkeeper.bookie.Bookie;
import org.apache.bookkeeper.client.AsyncCallback.OpenCallback;
import org.apache.bookkeeper.client.AsyncCallback.RecoverCallback;
import org.apache.bookkeeper.client.BookKeeper.SyncOpenCallback;
@@ -38,6 +37,7 @@ import org.apache.bookkeeper.client.Ledg
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.MultiCallback;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.Processor;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.IOUtils;
import org.apache.bookkeeper.util.ZkUtils;
import org.apache.bookkeeper.zookeeper.ZooKeeperWatcherBase;
@@ -56,9 +56,6 @@ import org.slf4j.LoggerFactory;
*/
public class BookKeeperAdmin {
private static Logger LOG = LoggerFactory.getLogger(BookKeeperAdmin.class);
-
- static final String COLON = ":";
-
// ZK client instance
private ZooKeeper zk;
// ZK ledgers related String constants
@@ -373,11 +370,12 @@ public class BookKeeperAdmin {
return;
}
for (String bookieNode : children) {
- if (Bookie.READONLY.equals(bookieNode)) {
+ if (BookKeeperConstants.READONLY
+ .equals(bookieNode)) {
// exclude the readonly node from available
bookies.
continue;
}
- String parts[] = bookieNode.split(COLON);
+ String parts[] =
bookieNode.split(BookKeeperConstants.COLON);
if (parts.length < 2) {
LOG.error("Bookie Node retrieved from ZK has
invalid name format: " + bookieNode);
cb.recoverComplete(BKException.Code.ZKException,
context);
@@ -754,16 +752,17 @@ public class BookKeeperAdmin {
// Clear the INSTANCEID
try {
- zkc.delete(conf.getZkLedgersRootPath() + "/" +
Bookie.INSTANCEID, -1);
+ zkc.delete(conf.getZkLedgersRootPath() + "/"
+ + BookKeeperConstants.INSTANCEID, -1);
} catch (KeeperException.NoNodeException e) {
LOG.debug("INSTANCEID not exists in zookeeper to delete");
}
// create INSTANCEID
String instanceId = UUID.randomUUID().toString();
- zkc.create(conf.getZkLedgersRootPath() + "/" + Bookie.INSTANCEID,
- instanceId.getBytes(), Ids.OPEN_ACL_UNSAFE,
- CreateMode.PERSISTENT);
+ zkc.create(conf.getZkLedgersRootPath() + "/"
+ + BookKeeperConstants.INSTANCEID, instanceId.getBytes(),
+ Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
LOG.info("Successfully formatted BookKeeper metadata");
} finally {
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java
Sat Dec 8 10:18:30 2012
@@ -30,9 +30,9 @@ import java.util.concurrent.LinkedBlocki
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.bookkeeper.bookie.Bookie;
import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException;
import org.apache.bookkeeper.conf.ClientConfiguration;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.SafeRunnable;
import org.apache.bookkeeper.util.StringUtils;
import org.slf4j.Logger;
@@ -111,7 +111,7 @@ class BookieWatcher implements Watcher,
// Just exclude the 'readonly' znode to exclude r-o bookies from
// available nodes list.
- children.remove(Bookie.READONLY);
+ children.remove(BookKeeperConstants.READONLY);
HashSet<InetSocketAddress> newBookieAddrs =
convertToBookieAddresses(children);
@@ -248,7 +248,8 @@ class BookieWatcher implements Watcher,
public ReadOnlyBookieWatcher(ClientConfiguration conf, BookKeeper bk)
throws KeeperException,
InterruptedException {
this.bk = bk;
- readOnlyBookieRegPath = conf.getZkAvailableBookiesPath() + "/" +
Bookie.READONLY;
+ readOnlyBookieRegPath = conf.getZkAvailableBookiesPath() + "/"
+ + BookKeeperConstants.READONLY;
if (null == bk.getZkHandle().exists(readOnlyBookieRegPath, false))
{
try {
bk.getZkHandle().create(readOnlyBookieRegPath, new
byte[0], Ids.OPEN_ACL_UNSAFE,
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java
Sat Dec 8 10:18:30 2012
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Set;
import java.util.Map;
-import org.apache.bookkeeper.bookie.Bookie;
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.apache.bookkeeper.client.LedgerMetadata;
import org.apache.bookkeeper.client.BKException;
@@ -31,6 +30,7 @@ import org.apache.bookkeeper.meta.Ledger
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.MultiCallback;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.Processor;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.versioning.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,11 +51,6 @@ abstract class AbstractZkLedgerManager i
static Logger LOG = LoggerFactory.getLogger(AbstractZkLedgerManager.class);
- // Ledger Node Prefix
- static public final String LEDGER_NODE_PREFIX = "L";
- static final String AVAILABLE_NODE = "available";
- static final String COOKIES_NODE = "cookies";
-
protected final AbstractConfiguration conf;
protected final ZooKeeper zk;
protected final String ledgerRootPath;
@@ -348,12 +343,11 @@ abstract class AbstractZkLedgerManager i
* @return true if the znode is a special znode otherwise false
*/
protected boolean isSpecialZnode(String znode) {
- if (AVAILABLE_NODE.equals(znode)
- || COOKIES_NODE.equals(znode)
- || LedgerLayout.LAYOUT_ZNODE.equals(znode)
- || Bookie.INSTANCEID.equals(znode)
- || ZkLedgerUnderreplicationManager.UNDER_REPLICATION_NODE
- .equals(znode)) {
+ if (BookKeeperConstants.AVAILABLE_NODE.equals(znode)
+ || BookKeeperConstants.COOKIE_NODE.equals(znode)
+ || BookKeeperConstants.LAYOUT_ZNODE.equals(znode)
+ || BookKeeperConstants.INSTANCEID.equals(znode)
+ || BookKeeperConstants.UNDER_REPLICATION_NODE.equals(znode)) {
return true;
}
return false;
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
Sat Dec 8 10:18:30 2012
@@ -27,6 +27,7 @@ import org.apache.bookkeeper.client.Ledg
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.Processor;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.StringUtils;
import org.apache.bookkeeper.util.ZkUtils;
import org.apache.zookeeper.AsyncCallback;
@@ -79,7 +80,8 @@ class FlatLedgerManager extends Abstract
public FlatLedgerManager(AbstractConfiguration conf, ZooKeeper zk) {
super(conf, zk);
- ledgerPrefix = ledgerRootPath + "/" + LEDGER_NODE_PREFIX;
+ ledgerPrefix = ledgerRootPath + "/"
+ + BookKeeperConstants.LEDGER_NODE_PREFIX;
}
@Override
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
Sat Dec 8 10:18:30 2012
@@ -31,6 +31,7 @@ import org.apache.bookkeeper.client.Ledg
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.Processor;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.StringUtils;
import org.apache.bookkeeper.util.ZkUtils;
import org.apache.zookeeper.AsyncCallback;
@@ -198,10 +199,11 @@ class HierarchicalLedgerManager extends
String ledgerIdStr = StringUtils.getZKStringId(ledgerId);
// do 2-4-4 split
StringBuilder sb = new StringBuilder();
- sb.append(ledgerRootPath).append("/")
- .append(ledgerIdStr.substring(0, 2)).append("/")
- .append(ledgerIdStr.substring(2, 6)).append("/")
- .append(LEDGER_NODE_PREFIX).append(ledgerIdStr.substring(6, 10));
+ sb.append(ledgerRootPath).append("/").append(
+ ledgerIdStr.substring(0, 2)).append("/").append(
+ ledgerIdStr.substring(2, 6)).append("/").append(
+ BookKeeperConstants.LEDGER_NODE_PREFIX).append(
+ ledgerIdStr.substring(6, 10));
return sb.toString();
}
@@ -215,8 +217,8 @@ class HierarchicalLedgerManager extends
if (hierarchicalParts.length != 3) {
throw new IOException("it is not a valid hierarchical path name :
" + pathName);
}
- hierarchicalParts[2] =
- hierarchicalParts[2].substring(LEDGER_NODE_PREFIX.length());
+ hierarchicalParts[2] = hierarchicalParts[2]
+ .substring(BookKeeperConstants.LEDGER_NODE_PREFIX.length());
return getLedgerId(hierarchicalParts);
}
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerLayout.java
Sat Dec 8 10:18:30 2012
@@ -20,6 +20,7 @@ package org.apache.bookkeeper.meta;
import java.io.IOException;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs.Ids;
@@ -36,8 +37,7 @@ import org.slf4j.LoggerFactory;
class LedgerLayout {
static final Logger LOG = LoggerFactory.getLogger(LedgerLayout.class);
- // Znode name to store layout information
- public static final String LAYOUT_ZNODE = "LAYOUT";
+
// version of compability layout version
public static final int LAYOUT_MIN_COMPAT_VERSION = 1;
// version of ledger layout metadata
@@ -52,7 +52,7 @@ class LedgerLayout {
*/
public static LedgerLayout readLayout(final ZooKeeper zk, final String
ledgersRoot)
throws IOException, KeeperException {
- String ledgersLayout = ledgersRoot + "/" + LAYOUT_ZNODE;
+ String ledgersLayout = ledgersRoot + "/" +
BookKeeperConstants.LAYOUT_ZNODE;
try {
LedgerLayout layout;
@@ -141,9 +141,10 @@ class LedgerLayout {
*/
public void store(final ZooKeeper zk, String ledgersRoot)
throws IOException, KeeperException, InterruptedException {
- String ledgersLayout = ledgersRoot + "/" + LAYOUT_ZNODE;
- zk.create(ledgersLayout, serialize(),
- Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+ String ledgersLayout = ledgersRoot + "/"
+ + BookKeeperConstants.LAYOUT_ZNODE;
+ zk.create(ledgersLayout, serialize(), Ids.OPEN_ACL_UNSAFE,
+ CreateMode.PERSISTENT);
}
/**
@@ -151,7 +152,8 @@ class LedgerLayout {
*/
public void delete(final ZooKeeper zk, String ledgersRoot)
throws KeeperException, InterruptedException {
- String ledgersLayout = ledgersRoot + "/" + LAYOUT_ZNODE;
+ String ledgersLayout = ledgersRoot + "/"
+ + BookKeeperConstants.LAYOUT_ZNODE;
zk.delete(ledgersLayout, -1);
}
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
Sat Dec 8 10:18:30 2012
@@ -21,6 +21,7 @@ package org.apache.bookkeeper.meta;
import org.apache.bookkeeper.replication.ReplicationEnableCb;
import org.apache.bookkeeper.replication.ReplicationException;
import
org.apache.bookkeeper.replication.ReplicationException.UnavailableException;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.ZkUtils;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
import org.apache.bookkeeper.proto.DataFormats.LedgerRereplicationLayoutFormat;
@@ -73,8 +74,6 @@ import org.slf4j.LoggerFactory;
public class ZkLedgerUnderreplicationManager implements
LedgerUnderreplicationManager {
static final Logger LOG =
LoggerFactory.getLogger(ZkLedgerUnderreplicationManager.class);
static final Charset UTF8 = Charset.forName("UTF-8");
- public static final String UNDER_REPLICATION_NODE = "underreplication";
- static final String DISABLE_NODE = "disable";
static final String LAYOUT="BASIC";
static final int LAYOUT_VERSION=1;
@@ -104,9 +103,10 @@ public class ZkLedgerUnderreplicationMan
public ZkLedgerUnderreplicationManager(AbstractConfiguration conf,
ZooKeeper zkc)
throws KeeperException, InterruptedException,
ReplicationException.CompatibilityException {
basePath = conf.getZkLedgersRootPath() + '/'
- + ZkLedgerUnderreplicationManager.UNDER_REPLICATION_NODE;
- layoutZNode = basePath + '/' + LedgerLayout.LAYOUT_ZNODE;
- urLedgerPath = basePath + "/ledgers";
+ + BookKeeperConstants.UNDER_REPLICATION_NODE;
+ layoutZNode = basePath + '/' + BookKeeperConstants.LAYOUT_ZNODE;
+ urLedgerPath = basePath
+ + BookKeeperConstants.ZK_LEDGERS_ROOT_PATH_DEFAULT;
urLockPath = basePath + "/locks";
idExtractionPattern = Pattern.compile("urL(\\d+)$");
@@ -448,8 +448,8 @@ public class ZkLedgerUnderreplicationMan
LOG.debug("disableLedegerReplication()");
try {
ZkUtils.createFullPathOptimistic(zkc, basePath + '/'
- + ZkLedgerUnderreplicationManager.DISABLE_NODE, ""
- .getBytes(), Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+ + BookKeeperConstants.DISABLE_NODE, "".getBytes(),
+ Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
LOG.info("Auto ledger re-replication is disabled!");
} catch (KeeperException ke) {
LOG.error("Exception while stopping replication", ke);
@@ -467,8 +467,7 @@ public class ZkLedgerUnderreplicationMan
throws ReplicationException.UnavailableException {
LOG.debug("enableLedegerReplication()");
try {
- zkc.delete(basePath + '/'
- + ZkLedgerUnderreplicationManager.DISABLE_NODE, -1);
+ zkc.delete(basePath + '/' + BookKeeperConstants.DISABLE_NODE, -1);
LOG.info("Resuming automatic ledger re-replication");
} catch (KeeperException ke) {
LOG.error("Exception while resuming ledger replication", ke);
@@ -486,7 +485,8 @@ public class ZkLedgerUnderreplicationMan
throws ReplicationException.UnavailableException {
LOG.debug("isLedgerReplicationEnabled()");
try {
- if (null != zkc.exists(basePath + '/' + DISABLE_NODE, false)) {
+ if (null != zkc.exists(basePath + '/'
+ + BookKeeperConstants.DISABLE_NODE, false)) {
return false;
}
return true;
@@ -514,7 +514,8 @@ public class ZkLedgerUnderreplicationMan
}
};
try {
- if (null == zkc.exists(basePath + '/' + DISABLE_NODE, w)) {
+ if (null == zkc.exists(basePath + '/'
+ + BookKeeperConstants.DISABLE_NODE, w)) {
cb.operationComplete(0, null);
return;
}
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
Sat Dec 8 10:18:30 2012
@@ -22,7 +22,6 @@ package org.apache.bookkeeper.proto;
import java.io.File;
import java.io.IOException;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AuditorElector.java
Sat Dec 8 10:18:30 2012
@@ -27,6 +27,7 @@ import java.io.Serializable;
import org.apache.bookkeeper.conf.AbstractConfiguration;
import
org.apache.bookkeeper.replication.ReplicationException.UnavailableException;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.commons.lang.StringUtils;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
@@ -86,7 +87,8 @@ public class AuditorElector {
this.bookieId = bookieId;
this.conf = conf;
this.zkc = zkc;
- basePath = conf.getZkLedgersRootPath() + "/underreplication";
+ basePath = conf.getZkLedgersRootPath() + '/'
+ + BookKeeperConstants.UNDER_REPLICATION_NODE;
electionPath = basePath + "/auditorelection";
createElectorPath();
}
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/AutoRecoveryMain.java
Sat Dec 8 10:18:30 2012
@@ -22,8 +22,6 @@ package org.apache.bookkeeper.replicatio
import java.io.File;
import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import org.apache.bookkeeper.bookie.Bookie;
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/BookieLedgerIndexer.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/BookieLedgerIndexer.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/BookieLedgerIndexer.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/BookieLedgerIndexer.java
Sat Dec 8 10:18:30 2012
@@ -75,7 +75,6 @@ public class BookieLedgerIndexer {
public void operationComplete(final int rc,
LedgerMetadata ledgerMetadata) {
if (rc == BKException.Code.OK) {
- StringBuilder bookieAddr;
for (Map.Entry<Long, ArrayList<InetSocketAddress>>
ensemble : ledgerMetadata
.getEnsembles().entrySet()) {
for (InetSocketAddress bookie : ensemble
Added:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java?rev=1418637&view=auto
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java
(added)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/BookKeeperConstants.java
Sat Dec 8 10:18:30 2012
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.bookkeeper.util;
+
+/**
+ * This class contains constants used in BookKeeper
+ */
+public class BookKeeperConstants {
+
+ // //////////////////////////
+ // /////Basic constants//////
+ // //////////////////////////
+ public static final String LEDGER_NODE_PREFIX = "L";
+ public static final String COLON = ":";
+ public static final String VERSION_FILENAME = "VERSION";
+ public final static String PASSWD = "passwd";
+ public static final String CURRENT_DIR = "current";
+ public static final String READONLY = "readonly";
+
+ // //////////////////////////
+ // ///// Znodes//////////////
+ // //////////////////////////
+ public static final String AVAILABLE_NODE = "available";
+ public static final String COOKIE_NODE = "cookies";
+ public static final String UNDER_REPLICATION_NODE = "underreplication";
+ public static final String DISABLE_NODE = "disable";
+ public static final String ZK_LEDGERS_ROOT_PATH_DEFAULT = "/ledgers";
+ public static final String LAYOUT_ZNODE = "LAYOUT";
+ public static final String INSTANCEID = "INSTANCEID";
+}
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
Sat Dec 8 10:18:30 2012
@@ -29,6 +29,7 @@ import org.apache.bookkeeper.bookie.Book
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.meta.ActiveLedgerManager;
import org.apache.bookkeeper.meta.LedgerManagerFactory;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Assert;
@@ -64,7 +65,7 @@ public class LedgerCacheTest extends Tes
ledgerDir.delete();
ledgerDir.mkdir();
// create current dir
- new File(ledgerDir, Bookie.CURRENT_DIR).mkdir();
+ new File(ledgerDir, BookKeeperConstants.CURRENT_DIR).mkdir();
conf = new ServerConfiguration();
conf.setZkServers(null);
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java
Sat Dec 8 10:18:30 2012
@@ -1,4 +1,4 @@
-/*
+/**
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,19 +22,14 @@
package org.apache.bookkeeper.meta;
import java.io.IOException;
-import java.util.Random;
import java.lang.reflect.Field;
-import org.apache.bookkeeper.client.BookKeeper.DigestType;
import org.apache.bookkeeper.conf.ClientConfiguration;
-import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.junit.Test;
-import org.junit.Assert.*;
public class LedgerLayoutTest extends BookKeeperClusterTestCase {
@@ -99,7 +94,8 @@ public class LedgerLayoutTest extends Bo
@Test
public void testAbsentLedgerManagerLayout() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
- String ledgersLayout = conf.getZkLedgersRootPath() + "/" +
LedgerLayout.LAYOUT_ZNODE;
+ String ledgersLayout = conf.getZkLedgersRootPath() + "/"
+ + BookKeeperConstants.LAYOUT_ZNODE;
// write bad format ledger layout
StringBuilder sb = new StringBuilder();
sb.append(LedgerLayout.LAYOUT_FORMAT_VERSION).append("\n");
@@ -118,7 +114,8 @@ public class LedgerLayoutTest extends Bo
public void testBaseLedgerManagerLayout() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
String rootPath = conf.getZkLedgersRootPath();
- String ledgersLayout = rootPath + "/" + LedgerLayout.LAYOUT_ZNODE;
+ String ledgersLayout = rootPath + "/"
+ + BookKeeperConstants.LAYOUT_ZNODE;
// write bad format ledger layout
StringBuilder sb = new StringBuilder();
sb.append(LedgerLayout.LAYOUT_FORMAT_VERSION).append("\n")
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
Sat Dec 8 10:18:30 2012
@@ -22,8 +22,8 @@
package org.apache.bookkeeper.replication;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.nio.charset.Charset;
@@ -46,11 +46,11 @@ import java.util.concurrent.atomic.Atomi
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.meta.LedgerManagerFactory;
import org.apache.bookkeeper.meta.LedgerUnderreplicationManager;
-import org.apache.bookkeeper.meta.ZkLedgerUnderreplicationManager;
import org.apache.bookkeeper.proto.DataFormats.UnderreplicatedLedgerFormat;
import
org.apache.bookkeeper.replication.ReplicationException.CompatibilityException;
import
org.apache.bookkeeper.replication.ReplicationException.UnavailableException;
import org.apache.bookkeeper.test.ZooKeeperUtil;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.ZkUtils;
import org.apache.bookkeeper.zookeeper.ZooKeeperWatcherBase;
import org.apache.commons.lang.StringUtils;
@@ -104,8 +104,9 @@ public class TestLedgerUnderreplicationM
lmf1 = LedgerManagerFactory.newLedgerManagerFactory(conf, zkc1);
lmf2 = LedgerManagerFactory.newLedgerManagerFactory(conf, zkc2);
basePath = conf.getZkLedgersRootPath() + '/'
- + ZkLedgerUnderreplicationManager.UNDER_REPLICATION_NODE;
- urLedgerPath = basePath + "/ledgers";
+ + BookKeeperConstants.UNDER_REPLICATION_NODE;
+ urLedgerPath = basePath
+ + BookKeeperConstants.ZK_LEDGERS_ROOT_PATH_DEFAULT;
}
@After
Modified:
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java?rev=1418637&r1=1418636&r2=1418637&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
(original)
+++
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestReplicationWorker.java
Sat Dec 8 10:18:30 2012
@@ -36,8 +36,8 @@ import org.apache.bookkeeper.client.Ledg
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.meta.LedgerManagerFactory;
import org.apache.bookkeeper.meta.LedgerUnderreplicationManager;
-import org.apache.bookkeeper.meta.ZkLedgerUnderreplicationManager;
import org.apache.bookkeeper.test.MultiLedgerManagerTestCase;
+import org.apache.bookkeeper.util.BookKeeperConstants;
import org.apache.bookkeeper.util.ZkUtils;
import org.apache.bookkeeper.zookeeper.ZooKeeperWatcherBase;
import org.apache.zookeeper.KeeperException;
@@ -68,8 +68,8 @@ public class TestReplicationWorker exten
baseConf.setLedgerManagerFactoryClassName(ledgerManagerFactory);
baseClientConf.setLedgerManagerFactoryClassName(ledgerManagerFactory);
basePath = baseClientConf.getZkLedgersRootPath() + '/'
- + ZkLedgerUnderreplicationManager.UNDER_REPLICATION_NODE
- + "/ledgers";
+ + BookKeeperConstants.UNDER_REPLICATION_NODE
+ + BookKeeperConstants.ZK_LEDGERS_ROOT_PATH_DEFAULT;
baseConf.setRereplicationEntryBatchSize(3);
}
