You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2013/10/14 16:43:26 UTC
svn commit: r1531920 - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/
bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ bo...
Author: ivank
Date: Mon Oct 14 14:43:24 2013
New Revision: 1531920
URL: http://svn.apache.org/r1531920
Log:
BOOKKEEPER-605: Use static Logger objects everywhere for bookkeeper (sijie via ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchBookie.java
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchReadThroughputLatency.java
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java
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/FileInfo.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/bookie/InterleavedLedgerStorage.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.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/LedgerChecker.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/MacDigestManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.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/MSLedgerManagerFactory.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestHandler.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/ReplicationWorker.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/BookKeeperTools.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NativeIO.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexCorruptionTest.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/bookie/TestLedgerDirsManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestSyncThread.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCloseTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ListLedgersTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestDeathwatcher.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestPerChannelBookieClient.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Oct 14 14:43:24 2013
@@ -48,6 +48,8 @@ Trunk (unreleased changes)
BOOKKEEPER-686: Bookie startup will fail if one of the configured ledgerDir is full and the same is used for replaying the journal (Rakesh via sijie)
+ BOOKKEEPER-605: Use static Logger objects everywhere for bookkeeper (sijie via ivank)
+
bookkeeper-server:
BOOKKEEPER-567: ReadOnlyBookieTest hangs on shutdown (sijie via ivank)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchBookie.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchBookie.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchBookie.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchBookie.java Mon Oct 14 14:43:24 2013
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BenchBookie {
- static Logger LOG = LoggerFactory.getLogger(BenchBookie.class);
+ static final Logger LOG = LoggerFactory.getLogger(BenchBookie.class);
static class LatencyCallback implements WriteCallback {
boolean complete;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchReadThroughputLatency.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchReadThroughputLatency.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchReadThroughputLatency.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchReadThroughputLatency.java Mon Oct 14 14:43:24 2013
@@ -56,7 +56,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BenchReadThroughputLatency {
- static Logger LOG = LoggerFactory.getLogger(BenchReadThroughputLatency.class);
+ static final Logger LOG = LoggerFactory.getLogger(BenchReadThroughputLatency.class);
private static final Pattern LEDGER_PATTERN = Pattern.compile("L([0-9]+)$");
Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java Mon Oct 14 14:43:24 2013
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Charsets.UTF_8;
public class BenchThroughputLatency implements AddCallback, Runnable {
- static Logger LOG = LoggerFactory.getLogger(BenchThroughputLatency.class);
+ static final Logger LOG = LoggerFactory.getLogger(BenchThroughputLatency.class);
BookKeeper bk;
LedgerHandle lh[];
Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java Mon Oct 14 14:43:24 2013
@@ -35,7 +35,7 @@ import static com.google.common.base.Cha
import org.apache.zookeeper.KeeperException;
public class MySqlClient {
- static Logger LOG = LoggerFactory.getLogger(MySqlClient.class);
+ static final Logger LOG = LoggerFactory.getLogger(MySqlClient.class);
BookKeeper x;
LedgerHandle lh;
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=1531920&r1=1531919&r2=1531920&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 Mon Oct 14 14:43:24 2013
@@ -80,7 +80,7 @@ import com.google.common.annotations.Vis
public class Bookie extends BookieThread {
- static Logger LOG = LoggerFactory.getLogger(Bookie.class);
+ private final static Logger LOG = LoggerFactory.getLogger(Bookie.class);
final File journalDirectory;
final ServerConfiguration conf;
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=1531920&r1=1531919&r2=1531920&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 Mon Oct 14 14:43:24 2013
@@ -64,7 +64,7 @@ import com.google.protobuf.TextFormat;
* with the cluster. It's better to fail early and obviously.
*/
class Cookie {
- static Logger LOG = LoggerFactory.getLogger(Cookie.class);
+ private final static Logger LOG = LoggerFactory.getLogger(Cookie.class);
static final int CURRENT_COOKIE_LAYOUT_VERSION = 4;
private int layoutVersion = 0;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java Mon Oct 14 14:43:24 2013
@@ -54,7 +54,7 @@ import com.google.common.annotations.Vis
* </p>
*/
class FileInfo {
- static Logger LOG = LoggerFactory.getLogger(FileInfo.class);
+ private final static Logger LOG = LoggerFactory.getLogger(FileInfo.class);
static final int NO_MASTER_KEY = -1;
static final int STATE_FENCED_BIT = 0x1;
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=1531920&r1=1531919&r2=1531920&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 Mon Oct 14 14:43:24 2013
@@ -63,7 +63,7 @@ import static com.google.common.base.Cha
* between versions
*/
public class FileSystemUpgrade {
- static Logger LOG = LoggerFactory.getLogger(FileSystemUpgrade.class);
+ private final static Logger LOG = LoggerFactory.getLogger(FileSystemUpgrade.class);
static FilenameFilter BOOKIE_FILES_FILTER = new FilenameFilter() {
private boolean containsIndexFiles(File dir, String name) {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java Mon Oct 14 14:43:24 2013
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* file and maintains an index file for each ledger.
*/
class InterleavedLedgerStorage implements LedgerStorage, EntryLogListener {
- final static Logger LOG = LoggerFactory.getLogger(InterleavedLedgerStorage.class);
+ private final static Logger LOG = LoggerFactory.getLogger(InterleavedLedgerStorage.class);
// Hold the last checkpoint
static class CheckpointHolder {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Journal.java Mon Oct 14 14:43:24 2013
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
*/
class Journal extends BookieThread implements CheckpointSource {
- static Logger LOG = LoggerFactory.getLogger(Journal.class);
+ private final static Logger LOG = LoggerFactory.getLogger(Journal.class);
/**
* Filter to pickup journals
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/JournalChannel.java Mon Oct 14 14:43:24 2013
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* information to the file.
*/
class JournalChannel implements Closeable {
- static Logger LOG = LoggerFactory.getLogger(JournalChannel.class);
+ private final static Logger LOG = LoggerFactory.getLogger(JournalChannel.class);
final RandomAccessFile randomAccessFile;
final FileChannel fc;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptorImpl.java Mon Oct 14 14:43:24 2013
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class LedgerDescriptorImpl extends LedgerDescriptor {
- final static Logger LOG = LoggerFactory.getLogger(LedgerDescriptor.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerDescriptor.class);
final LedgerStorage ledgerStorage;
private long ledgerId;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsManager.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsManager.java Mon Oct 14 14:43:24 2013
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* This class manages ledger directories used by the bookie.
*/
public class LedgerDirsManager {
- private static Logger LOG = LoggerFactory
+ private final static Logger LOG = LoggerFactory
.getLogger(LedgerDirsManager.class);
private volatile List<File> filledDirs;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SyncThread.java Mon Oct 14 14:43:24 2013
@@ -55,7 +55,7 @@ import com.google.common.util.concurrent
* </p>
*/
class SyncThread {
- static Logger LOG = LoggerFactory.getLogger(SyncThread.class);
+ private final static Logger LOG = LoggerFactory.getLogger(SyncThread.class);
final ScheduledExecutorService executor;
final int flushInterval;
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=1531920&r1=1531919&r2=1531920&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 Mon Oct 14 14:43:24 2013
@@ -63,7 +63,7 @@ import static com.google.common.base.Cha
* Admin client for BookKeeper clusters
*/
public class BookKeeperAdmin {
- private static Logger LOG = LoggerFactory.getLogger(BookKeeperAdmin.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookKeeperAdmin.class);
// ZK client instance
private ZooKeeper zk;
// ZK ledgers related String constants
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerChecker.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerChecker.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerChecker.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerChecker.java Mon Oct 14 14:43:24 2013
@@ -41,7 +41,7 @@ import java.util.concurrent.atomic.Atomi
*Checks the complete ledger and finds the UnderReplicated fragments if any
*/
public class LedgerChecker {
- private static Logger LOG = LoggerFactory.getLogger(LedgerChecker.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerChecker.class);
public final BookieClient bookieClient;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java Mon Oct 14 14:43:24 2013
@@ -35,7 +35,7 @@ import org.jboss.netty.buffer.ChannelBuf
*/
public class LedgerEntry {
- Logger LOG = LoggerFactory.getLogger(LedgerEntry.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerEntry.class);
long ledgerId;
long entryId;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java Mon Oct 14 14:43:24 2013
@@ -54,7 +54,7 @@ public class LedgerFragmentReplicator {
this.bkc = bkc;
}
- private static Logger LOG = LoggerFactory
+ private final static Logger LOG = LoggerFactory
.getLogger(LedgerFragmentReplicator.class);
private void replicateFragmentInternal(final LedgerHandle lh,
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/MacDigestManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/MacDigestManager.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/MacDigestManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/MacDigestManager.java Mon Oct 14 14:43:24 2013
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Charsets.UTF_8;
class MacDigestManager extends DigestManager {
- final static Logger LOG = LoggerFactory.getLogger(MacDigestManager.class);
+ private final static Logger LOG = LoggerFactory.getLogger(MacDigestManager.class);
public static String DIGEST_ALGORITHM = "SHA-1";
public static String KEY_ALGORITHM = "HmacSHA1";
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java Mon Oct 14 14:43:24 2013
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
*
*/
class PendingAddOp implements WriteCallback {
- final static Logger LOG = LoggerFactory.getLogger(PendingAddOp.class);
+ private final static Logger LOG = LoggerFactory.getLogger(PendingAddOp.class);
ChannelBuffer toSend;
AddCallback cb;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java Mon Oct 14 14:43:24 2013
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
*
*/
class PendingReadOp implements Enumeration<LedgerEntry>, ReadEntryCallback {
- Logger LOG = LoggerFactory.getLogger(PendingReadOp.class);
+ private final static Logger LOG = LoggerFactory.getLogger(PendingReadOp.class);
final int speculativeReadTimeout;
final private ScheduledExecutorService scheduler;
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=1531920&r1=1531919&r2=1531920&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 Mon Oct 14 14:43:24 2013
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
*/
abstract class AbstractZkLedgerManager implements LedgerManager {
- static Logger LOG = LoggerFactory.getLogger(AbstractZkLedgerManager.class);
+ private final static Logger LOG = LoggerFactory.getLogger(AbstractZkLedgerManager.class);
protected final AbstractConfiguration conf;
protected final ZooKeeper zk;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java Mon Oct 14 14:43:24 2013
@@ -65,7 +65,7 @@ import com.google.common.util.concurrent
*/
public class MSLedgerManagerFactory extends LedgerManagerFactory {
- static Logger LOG = LoggerFactory.getLogger(MSLedgerManagerFactory.class);
+ private final static Logger LOG = LoggerFactory.getLogger(MSLedgerManagerFactory.class);
public static final int CUR_VERSION = 1;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java Mon Oct 14 14:43:24 2013
@@ -54,7 +54,7 @@ import com.google.common.util.concurrent
* Netty server for serving bookie requests
*/
class BookieNettyServer {
- static Logger LOG = LoggerFactory.getLogger(BookieNettyServer.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookieNettyServer.class);
final static int maxMessageSize = 0xfffff;
final ServerConfiguration conf;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtoEncoding.java Mon Oct 14 14:43:24 2013
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BookieProtoEncoding {
- static Logger LOG = LoggerFactory.getLogger(BookieProtoEncoding.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookieProtoEncoding.class);
public static class RequestEncoder extends OneToOneEncoder {
@Override
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestHandler.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestHandler.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestHandler.java Mon Oct 14 14:43:24 2013
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
class BookieRequestHandler extends SimpleChannelHandler
implements BookkeeperInternalCallbacks.WriteCallback {
- static Logger LOG = LoggerFactory.getLogger(BookieRequestHandler.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookieRequestHandler.class);
private final Bookie bookie;
private final ChannelGroup allChannels;
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=1531920&r1=1531919&r2=1531920&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 Mon Oct 14 14:43:24 2013
@@ -59,7 +59,7 @@ public class BookieServer {
private volatile boolean running = false;
Bookie bookie;
DeathWatcher deathWatcher;
- static Logger LOG = LoggerFactory.getLogger(BookieServer.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookieServer.class);
int exitCode = ExitCode.OK;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/ReplicationWorker.java Mon Oct 14 14:43:24 2013
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
* ZKLedgerUnderreplicationManager and replicates to it.
*/
public class ReplicationWorker implements Runnable {
- private static Logger LOG = LoggerFactory
+ private final static Logger LOG = LoggerFactory
.getLogger(ReplicationWorker.class);
final private LedgerUnderreplicationManager underreplicationManager;
private ServerConfiguration conf;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java Mon Oct 14 14:43:24 2013
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class LedgerInputStream extends InputStream {
- Logger LOG = LoggerFactory.getLogger(LedgerInputStream.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerInputStream.class);
private LedgerHandle lh;
private ByteBuffer bytebuff;
byte[] bbytes;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java Mon Oct 14 14:43:24 2013
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
* out the entry to the ledger.
*/
public class LedgerOutputStream extends OutputStream {
- Logger LOG = LoggerFactory.getLogger(LedgerOutputStream.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerOutputStream.class);
private LedgerHandle lh;
private ByteBuffer bytebuff;
byte[] bbytes;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/BookKeeperTools.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/BookKeeperTools.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/BookKeeperTools.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/BookKeeperTools.java Mon Oct 14 14:43:24 2013
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class BookKeeperTools {
- private static Logger LOG = LoggerFactory.getLogger(BookKeeperTools.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookKeeperTools.class);
/**
* Main method so we can invoke the bookie recovery via command line.
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java Mon Oct 14 14:43:24 2013
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
*/
public abstract class EntryFormatter {
- static Logger LOG = LoggerFactory.getLogger(EntryFormatter.class);
+ private final static Logger LOG = LoggerFactory.getLogger(EntryFormatter.class);
protected Configuration conf;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NativeIO.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NativeIO.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NativeIO.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/NativeIO.java Mon Oct 14 14:43:24 2013
@@ -26,7 +26,7 @@ import com.sun.jna.LastErrorException;
import com.sun.jna.Native;
public final class NativeIO {
- private static Logger LOG = LoggerFactory.getLogger(NativeIO.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NativeIO.class);
private static final int POSIX_FADV_DONTNEED = 4; /* fadvise.h */
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java Mon Oct 14 14:43:24 2013
@@ -42,7 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BookieJournalTest {
- static Logger LOG = LoggerFactory.getLogger(BookieJournalTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookieJournalTest.class);
final Random r = new Random(System.currentTimeMillis());
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java Mon Oct 14 14:43:24 2013
@@ -40,7 +40,7 @@ import org.junit.Test;
* This class tests the entry log compaction functionality.
*/
public class CompactionTest extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(CompactionTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(CompactionTest.class);
DigestType digestType;
static int ENTRY_SIZE = 1024;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java Mon Oct 14 14:43:24 2013
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class EntryLogTest extends TestCase {
- static Logger LOG = LoggerFactory.getLogger(EntryLogTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(EntryLogTest.class);
@Before
public void setUp() throws Exception {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexCorruptionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexCorruptionTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexCorruptionTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/IndexCorruptionTest.java Mon Oct 14 14:43:24 2013
@@ -40,7 +40,7 @@ import org.junit.Test;
* This class tests that index corruption cases
*/
public class IndexCorruptionTest extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(IndexCorruptionTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(IndexCorruptionTest.class);
DigestType digestType;
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=1531920&r1=1531919&r2=1531920&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 Mon Oct 14 14:43:24 2013
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* LedgerCache related test cases
*/
public class LedgerCacheTest extends TestCase {
- static Logger LOG = LoggerFactory.getLogger(LedgerCacheTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerCacheTest.class);
SnapshotMap<Long, Boolean> activeLedgers;
LedgerManagerFactory ledgerManagerFactory;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java Mon Oct 14 14:43:24 2013
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TestLedgerDirsManager extends TestCase {
- static Logger LOG = LoggerFactory.getLogger(TestLedgerDirsManager.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestLedgerDirsManager.class);
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
File curDir;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestSyncThread.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestSyncThread.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestSyncThread.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestSyncThread.java Mon Oct 14 14:43:24 2013
@@ -50,7 +50,7 @@ import org.junit.After;
import static org.junit.Assert.*;
public class TestSyncThread {
- static Logger LOG = LoggerFactory.getLogger(TestSyncThread.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestSyncThread.class);
ExecutorService executor = null;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java Mon Oct 14 14:43:24 2013
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class UpgradeTest {
- static Logger LOG = LoggerFactory.getLogger(FileInfo.class);
+ private final static Logger LOG = LoggerFactory.getLogger(FileInfo.class);
ZooKeeperUtil zkutil;
ZooKeeper zkc = null;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java Mon Oct 14 14:43:24 2013
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
* Tests of the main BookKeeper client
*/
public class BookKeeperTest extends BaseTestCase {
- static Logger LOG = LoggerFactory.getLogger(BookKeeperTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookKeeperTest.class);
DigestType digestType;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java Mon Oct 14 14:43:24 2013
@@ -55,7 +55,7 @@ import org.junit.Test;
* This class tests the bookie recovery admin functionality.
*/
public class BookieRecoveryTest extends MultiLedgerManagerMultiDigestTestCase {
- static Logger LOG = LoggerFactory.getLogger(BookieRecoveryTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookieRecoveryTest.class);
// Object used for synchronizing async method calls
class SyncObject {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java Mon Oct 14 14:43:24 2013
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
public class BookieWriteLedgerTest extends
MultiLedgerManagerMultiDigestTestCase implements AddCallback {
- private static Logger LOG = LoggerFactory
+ private final static Logger LOG = LoggerFactory
.getLogger(BookieWriteLedgerTest.class);
byte[] ledgerPassword = "aaa".getBytes();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCloseTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCloseTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCloseTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerCloseTest.java Mon Oct 14 14:43:24 2013
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
*/
public class LedgerCloseTest extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(LedgerCloseTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerCloseTest.class);
static final int READ_TIMEOUT = 1;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java Mon Oct 14 14:43:24 2013
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*/
public class LedgerRecoveryTest extends BaseTestCase {
- static Logger LOG = LoggerFactory.getLogger(LedgerRecoveryTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerRecoveryTest.class);
DigestType digestType;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ListLedgersTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ListLedgersTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ListLedgersTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ListLedgersTest.java Mon Oct 14 14:43:24 2013
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ListLedgersTest extends BaseTestCase {
- static Logger LOG = LoggerFactory.getLogger(ListLedgersTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ListLedgersTest.class);
DigestType digestType;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java Mon Oct 14 14:43:24 2013
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RoundRobinDistributionScheduleTest {
- static Logger LOG = LoggerFactory.getLogger(RoundRobinDistributionScheduleTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(RoundRobinDistributionScheduleTest.class);
@Test(timeout=60000)
public void testDistributionSchedule() throws Exception {
@@ -61,4 +61,4 @@ public class RoundRobinDistributionSched
assertFalse("Shouldn't cover yet", covSet.addBookieAndCheckCovered(0));
assertTrue("Should cover now", covSet.addBookieAndCheckCovered(2));
}
-}
\ No newline at end of file
+}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java Mon Oct 14 14:43:24 2013
@@ -40,7 +40,7 @@ import org.apache.bookkeeper.test.BookKe
import org.apache.bookkeeper.conf.ClientConfiguration;
public class SlowBookieTest extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(SlowBookieTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(SlowBookieTest.class);
public SlowBookieTest() {
super(4);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java Mon Oct 14 14:43:24 2013
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class TestFencing extends BaseTestCase {
- static Logger LOG = LoggerFactory.getLogger(TestFencing.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestFencing.class);
DigestType digestType;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java Mon Oct 14 14:43:24 2013
@@ -39,7 +39,7 @@ public class TestLedgerChecker extends B
private static final byte[] TEST_LEDGER_ENTRY_DATA = "TestCheckerData"
.getBytes();
private static final byte[] TEST_LEDGER_PASSWORD = "testpasswd".getBytes();
- static Logger LOG = LoggerFactory.getLogger(TestLedgerChecker.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestLedgerChecker.class);
public TestLedgerChecker() {
super(3);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java Mon Oct 14 14:43:24 2013
@@ -43,7 +43,7 @@ public class TestLedgerFragmentReplicati
private static final byte[] TEST_PSSWD = "testpasswd".getBytes();
private static final DigestType TEST_DIGEST_TYPE = BookKeeper.DigestType.CRC32;
- private static Logger LOG = LoggerFactory
+ private final static Logger LOG = LoggerFactory
.getLogger(TestLedgerFragmentReplication.class);
public TestLedgerFragmentReplication() {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java Mon Oct 14 14:43:24 2013
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class TestReadTimeout extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(TestReadTimeout.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestReadTimeout.class);
DigestType digestType;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java Mon Oct 14 14:43:24 2013
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
*
*/
public class TestSpeculativeRead extends BaseTestCase {
- static Logger LOG = LoggerFactory.getLogger(TestSpeculativeRead.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestSpeculativeRead.class);
DigestType digestType;
byte[] passwd = "specPW".getBytes();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java Mon Oct 14 14:43:24 2013
@@ -43,7 +43,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TestLedgerManager extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(TestLedgerManager.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestLedgerManager.class);
public TestLedgerManager() {
super(0);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java Mon Oct 14 14:43:24 2013
@@ -49,7 +49,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
public class TestMetaStore extends TestCase {
- final static Logger logger = LoggerFactory.getLogger(TestMetaStore.class);
+ private final static Logger logger = LoggerFactory.getLogger(TestMetaStore.class);
protected final static String TABLE = "myTable";
protected final static String RECORDID = "test";
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestDeathwatcher.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestDeathwatcher.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestDeathwatcher.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestDeathwatcher.java Mon Oct 14 14:43:24 2013
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* Tests for the BookieServer death watcher
*/
public class TestDeathwatcher extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(TestDeathwatcher.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestDeathwatcher.class);
public TestDeathwatcher() {
super(1);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestPerChannelBookieClient.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestPerChannelBookieClient.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestPerChannelBookieClient.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestPerChannelBookieClient.java Mon Oct 14 14:43:24 2013
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
* had a few race conditions, so this is what these tests focus on.
*/
public class TestPerChannelBookieClient extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(TestPerChannelBookieClient.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestPerChannelBookieClient.class);
public TestPerChannelBookieClient() {
super(1);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java Mon Oct 14 14:43:24 2013
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
public class AuditorBookieTest extends BookKeeperClusterTestCase {
// Depending on the taste, select the amount of logging
// by decommenting one of the two lines below
- // static Logger LOG = Logger.getRootLogger();
+ // private final static Logger LOG = Logger.getRootLogger();
private final static Logger LOG = LoggerFactory
.getLogger(AuditorBookieTest.class);
private String electionPath;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java Mon Oct 14 14:43:24 2013
@@ -62,7 +62,7 @@ public class AuditorLedgerCheckerTest ex
// Depending on the taste, select the amount of logging
// by decommenting one of the two lines below
- // static Logger LOG = Logger.getRootLogger();
+ // private final static Logger LOG = Logger.getRootLogger();
private final static Logger LOG = LoggerFactory
.getLogger(AuditorLedgerCheckerTest.class);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java Mon Oct 14 14:43:24 2013
@@ -50,7 +50,7 @@ public class BookieLedgerIndexTest exten
// Depending on the taste, select the amount of logging
// by decommenting one of the two lines below
- // static Logger LOG = Logger.getRootLogger();
+ // private final static Logger LOG = Logger.getRootLogger();
private static final Logger LOG = LoggerFactory
.getLogger(BookieLedgerIndexTest.class);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java Mon Oct 14 14:43:24 2013
@@ -51,7 +51,7 @@ import org.junit.Test;
public class AsyncLedgerOpsTest extends MultiLedgerManagerMultiDigestTestCase
implements AddCallback, ReadCallback, CreateCallback,
CloseCallback, OpenCallback {
- static Logger LOG = LoggerFactory.getLogger(AsyncLedgerOpsTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(AsyncLedgerOpsTest.class);
DigestType digestType;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java Mon Oct 14 14:43:24 2013
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BookieClientTest extends TestCase {
- static Logger LOG = LoggerFactory.getLogger(BookieClientTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookieClientTest.class);
BookieServer bs;
File tmpDir;
public int port = 13645;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java Mon Oct 14 14:43:24 2013
@@ -54,8 +54,8 @@ public class BookieFailureTest extends M
// Depending on the taste, select the amount of logging
// by decommenting one of the two lines below
- // static Logger LOG = Logger.getRootLogger();
- static Logger LOG = LoggerFactory.getLogger(BookieFailureTest.class);
+ // private final static Logger LOG = Logger.getRootLogger();
+ private final static Logger LOG = LoggerFactory.getLogger(BookieFailureTest.class);
byte[] ledgerPassword = "aaa".getBytes();
LedgerHandle lh, lh2;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java Mon Oct 14 14:43:24 2013
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
* This class tests that bookie rolling journals
*/
public class BookieJournalRollingTest extends BookKeeperClusterTestCase {
- static Logger LOG = LoggerFactory.getLogger(BookieJournalRollingTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BookieJournalRollingTest.class);
DigestType digestType;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java Mon Oct 14 14:43:24 2013
@@ -67,8 +67,8 @@ public class BookieReadWriteTest extends
// Depending on the taste, select the amount of logging
// by decommenting one of the two lines below
- // static Logger LOG = Logger.getRootLogger();
- static Logger LOG = LoggerFactory.getLogger(BookieReadWriteTest.class);
+ // private final static Logger LOG = Logger.getRootLogger();
+ private final static Logger LOG = LoggerFactory.getLogger(BookieReadWriteTest.class);
byte[] ledgerPassword = "aaa".getBytes();
LedgerHandle lh, lh2;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java Mon Oct 14 14:43:24 2013
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
*/
public class CloseTest extends BaseTestCase {
- static Logger LOG = LoggerFactory.getLogger(CloseTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(CloseTest.class);
DigestType digestType;
public CloseTest(DigestType digestType) {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java Mon Oct 14 14:43:24 2013
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
* Tests writing to concurrent ledgers
*/
public class ConcurrentLedgerTest extends TestCase {
- static Logger LOG = LoggerFactory.getLogger(ConcurrentLedgerTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ConcurrentLedgerTest.class);
Bookie bookie;
File txnDir, ledgerDir;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java Mon Oct 14 14:43:24 2013
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
* Tests conditional set of the ledger metadata znode.
*/
public class ConditionalSetTest extends BaseTestCase {
- static Logger LOG = LoggerFactory.getLogger(ConditionalSetTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ConditionalSetTest.class);
byte[] entry;
DigestType digestType;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java Mon Oct 14 14:43:24 2013
@@ -39,7 +39,7 @@ import org.junit.Test;
* client and the server side.
*/
public class LedgerDeleteTest extends MultiLedgerManagerTestCase {
- static Logger LOG = LoggerFactory.getLogger(LedgerDeleteTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LedgerDeleteTest.class);
DigestType digestType;
public LedgerDeleteTest(String ledgerManagerFactory) {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java Mon Oct 14 14:43:24 2013
@@ -46,7 +46,7 @@ import org.jboss.netty.channel.socket.ni
*/
class LoopbackClient implements WriteCallback {
- Logger LOG = LoggerFactory.getLogger(LoopbackClient.class);
+ private final static Logger LOG = LoggerFactory.getLogger(LoopbackClient.class);
BookieClient client;
static int recvTimeout = 2000;
long begin = 0;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java?rev=1531920&r1=1531919&r2=1531920&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java Mon Oct 14 14:43:24 2013
@@ -42,7 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TestBackwardCompat {
- static Logger LOG = LoggerFactory.getLogger(TestBackwardCompat.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TestBackwardCompat.class);
private static ZooKeeperUtil zkUtil = new ZooKeeperUtil();;
private static byte[] ENTRY_DATA = "ThisIsAnEntry".getBytes();
@@ -615,4 +615,4 @@ public class TestBackwardCompat {
scur.stop();
}
-}
\ No newline at end of file
+}