You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by si...@apache.org on 2012/09/14 15:42:13 UTC
svn commit: r1384782 [1/2] - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-server/
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/
bookkeeper-server/src/main/java/org/apache/bookkeeper/client/
bookkeeper-server/src/main/java/org/apache/bo...
Author: sijie
Date: Fri Sep 14 13:42:11 2012
New Revision: 1384782
URL: http://svn.apache.org/viewvc?rev=1384782&view=rev
Log:
BOOKKEEPER-32: Clean up LOG.debug statements (Stu Hood via sijie)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
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/GarbageCollectorThread.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/LedgerCacheImpl.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/LedgerHandle.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerRecoveryOp.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/client/ReadLastConfirmedOp.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/proto/BookieServer.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkHubServerManager.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Fri Sep 14 13:42:11 2012
@@ -30,6 +30,8 @@ Trunk (unreleased changes)
BOOKKEEPER-338: Create Version.NEW and Version.ANY static instances of Version so that were not passing around nulls (sijie via ivank)
+ BOOKKEEPER-32: Clean up LOG.debug statements (Stu Hood via sijie)
+
bookkeeper-server:
BOOKKEEPER-183: Provide tools to read/check data files in bookie server (sijie via ivank)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml Fri Sep 14 13:42:11 2012
@@ -83,6 +83,11 @@
<version>1.2</version>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.1</version>
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -137,8 +137,10 @@ public class Bookie extends Thread {
@Override
public void writeComplete(int rc, long ledgerId, long entryId,
InetSocketAddress addr, Object ctx) {
- LOG.debug("Finished writing entry {} @ ledger {} for {} : {}",
- new Object[] { entryId, ledgerId, addr, rc });
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Finished writing entry {} @ ledger {} for {} : {}",
+ new Object[] { entryId, ledgerId, addr, rc });
+ }
}
}
@@ -173,9 +175,7 @@ public class Bookie extends Thread {
public SyncThread(ServerConfiguration conf) {
super("SyncThread");
flushInterval = conf.getFlushInterval();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Flush Interval : " + flushInterval);
- }
+ LOG.debug("Flush Interval : {}", flushInterval);
}
@Override
public void run() {
@@ -429,7 +429,7 @@ public class Bookie extends Thread {
synchronized public void start() {
setDaemon(true);
- LOG.debug("I'm starting a bookie with journal directory " + journalDirectory.getName());
+ LOG.debug("I'm starting a bookie with journal directory {}", journalDirectory.getName());
// replay journals
try {
readJournal();
@@ -732,9 +732,7 @@ public class Bookie extends Thread {
long entryId = handle.addEntry(entry);
entry.rewind();
- if (LOG.isTraceEnabled()) {
- LOG.trace("Adding " + entryId + "@" + ledgerId);
- }
+ LOG.trace("Adding {}@{}", entryId, ledgerId);
journal.logAddEntry(entry, cb, ctx);
}
@@ -785,9 +783,7 @@ public class Bookie extends Thread {
public ByteBuffer readEntry(long ledgerId, long entryId)
throws IOException, NoLedgerException {
LedgerDescriptor handle = handles.getReadOnlyHandle(ledgerId);
- if (LOG.isTraceEnabled()) {
- LOG.trace("Reading " + entryId + "@" + ledgerId);
- }
+ LOG.trace("Reading {}@{}", entryId, ledgerId);
return handle.readEntry(entryId);
}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java Fri Sep 14 13:42:11 2012
@@ -291,10 +291,7 @@ public class GarbageCollectorThread exte
if (meta.getUsage() >= threshold) {
break;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Compacting entry log " + meta.entryLogId + " below threshold "
- + threshold + ".");
- }
+ LOG.debug("Compacting entry log {} below threshold {}.", meta.entryLogId, threshold);
compactEntryLog(meta.entryLogId);
if (!running) { // if gc thread is not running, stop compaction
return;
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -119,9 +119,7 @@ class Journal extends Thread {
// persisted to disk (both index & entry logger)
bb.putLong(lastMark.getTxnLogId());
bb.putLong(lastMark.getTxnLogPosition());
- if (LOG.isDebugEnabled()) {
- LOG.debug("RollLog to persist last marked log : " + lastMark);
- }
+ LOG.debug("RollLog to persist last marked log : {}", lastMark);
for(File dir: ledgerDirectories) {
File file = new File(dir, "lastMark");
try {
@@ -265,9 +263,7 @@ class Journal extends Thread {
// read last log mark
lastLogMark.readLog();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Last Log Mark : " + lastLogMark);
- }
+ LOG.debug("Last Log Mark : {}", lastLogMark);
}
LastLogMark getLastLogMark() {
@@ -418,9 +414,7 @@ class Journal extends Thread {
throw new IOException("Recovery log " + markedLogId + " is missing");
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Try to relay journal logs : " + logs);
- }
+ LOG.debug("Try to relay journal logs : {}", logs);
// TODO: When reading in the journal logs that need to be synced, we
// should use BufferedChannels instead to minimize the amount of
// system calls done.
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCacheImpl.java Fri Sep 14 13:42:11 2012
@@ -257,9 +257,7 @@ public class LedgerCacheImpl implements
lf = new File(dir, ledgerName);
// A new ledger index file has been created for this Bookie.
// Add this new ledger to the set of active ledgers.
- if (LOG.isDebugEnabled()) {
- LOG.debug("New ledger index file created for ledgerId: " + ledger);
- }
+ LOG.debug("New ledger index file created for ledgerId: {}", ledger);
activeLedgerManager.addActiveLedger(ledger, true);
}
evictFileInfoIfNecessary();
@@ -300,7 +298,7 @@ public class LedgerCacheImpl implements
synchronized(this) {
for(Long l: pages.keySet()) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Adding " + Long.toHexString(l) + " to dirty pages");
+ LOG.trace("Adding {} to dirty pages", Long.toHexString(l));
}
dirtyLedgers.add(l);
}
@@ -347,9 +345,7 @@ public class LedgerCacheImpl implements
for(Map.Entry<Long, LedgerEntryPage> entry: pageMap.entrySet()) {
LedgerEntryPage lep = entry.getValue();
if (lep.isClean()) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Page is clean " + lep);
- }
+ LOG.trace("Page is clean {}", lep);
continue;
}
firstEntryList.add(lep.getFirstEntry());
@@ -419,7 +415,7 @@ public class LedgerCacheImpl implements
List<LedgerEntryPage> entries, FileInfo fi,
int start, int count) throws IOException {
if (LOG.isTraceEnabled()) {
- LOG.trace("Writing " + count + " buffers of " + Long.toHexString(ledger));
+ LOG.trace("Writing {} buffers of {}", count, Long.toHexString(ledger));
}
if (count == 0) {
return;
@@ -613,8 +609,7 @@ public class LedgerCacheImpl implements
*/
@Override
public void deleteLedger(long ledgerId) throws IOException {
- if (LOG.isDebugEnabled())
- LOG.debug("Deleting ledgerId: " + ledgerId);
+ LOG.debug("Deleting ledgerId: {}", ledgerId);
// remove pages first to avoid page flushed when deleting file info
synchronized(this) {
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -622,7 +622,7 @@ public class BookKeeper {
SyncCounter counter = (SyncCounter) ctx;
counter.setLh(lh);
- LOG.debug("Open complete: " + rc);
+ LOG.debug("Open complete: {}", rc);
counter.setrc(rc);
counter.dec();
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -474,9 +474,7 @@ public class BookKeeperAdmin {
*/
private void recoverLedger(final InetSocketAddress bookieSrc, final long lId,
final AsyncCallback.VoidCallback ledgerIterCb, final List<InetSocketAddress> availableBookies) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Recovering ledger : " + lId);
- }
+ LOG.debug("Recovering ledger : {}", lId);
asyncOpenLedgerNoRecovery(lId, new OpenCallback() {
@Override
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java Fri Sep 14 13:42:11 2012
@@ -206,9 +206,7 @@ public class LedgerHandle {
}
void writeLedgerConfig(GenericCallback<Void> writeCb) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Writing metadata to ledger manager: " + this.ledgerId + ", " + metadata.getVersion());
- }
+ LOG.debug("Writing metadata to ledger manager: {}, {}", this.ledgerId, metadata.getVersion());
bk.getLedgerManager().writeLedgerMetadata(ledgerId, metadata, writeCb);
}
@@ -665,10 +663,7 @@ public class LedgerHandle {
void handleBookieFailure(final InetSocketAddress addr, final int bookieIndex) {
InetSocketAddress newBookie;
- if (LOG.isDebugEnabled()) {
- LOG.debug("Handling failure of bookie: " + addr + " index: "
- + bookieIndex);
- }
+ LOG.debug("Handling failure of bookie: {} index: {}", addr, bookieIndex);
final ArrayList<InetSocketAddress> newEnsemble = new ArrayList<InetSocketAddress>();
blockAddCompletions.incrementAndGet();
final long newEnsembleStartEntry = lastAddConfirmed + 1;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java Fri Sep 14 13:42:11 2012
@@ -243,9 +243,7 @@ public class LedgerMetadata {
StringBuilder s = new StringBuilder();
s.append(VERSION_KEY).append(tSplitter).append(CURRENT_METADATA_FORMAT_VERSION).append(lSplitter);
s.append(TextFormat.printToString(builder.build()));
- if (LOG.isDebugEnabled()) {
- LOG.debug("Serialized config: " + s.toString());
- }
+ LOG.debug("Serialized config: {}", s);
return s.toString().getBytes();
}
@@ -268,9 +266,7 @@ public class LedgerMetadata {
s.append(lSplitter).append(getLastEntryId()).append(tSplitter).append(closed);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Serialized config: " + s.toString());
- }
+ LOG.debug("Serialized config: {}", s);
return s.toString().getBytes();
}
@@ -292,9 +288,7 @@ public class LedgerMetadata {
String config = new String(bytes);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Parsing Config: " + config);
- }
+ LOG.debug("Parsing Config: {}", config);
BufferedReader reader = new BufferedReader(new StringReader(config));
String versionLine = reader.readLine();
if (versionLine == null) {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerRecoveryOp.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerRecoveryOp.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerRecoveryOp.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerRecoveryOp.java Fri Sep 14 13:42:11 2012
@@ -121,7 +121,7 @@ class LedgerRecoveryOp implements ReadCa
cb.operationComplete(BKException.Code.ZKException, null);
} else {
cb.operationComplete(BKException.Code.OK, null);
- LOG.debug("After closing length is: " + lh.getLength());
+ LOG.debug("After closing length is: {}", lh.getLength());
}
}
}, null, BKException.Code.LedgerClosedException);
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -74,10 +74,7 @@ class PendingReadOp implements Enumerati
ArrayList<InetSocketAddress> ensemble = null;
do {
-
- if(LOG.isDebugEnabled()) {
- LOG.debug("Acquiring lock: " + i);
- }
+ LOG.debug("Acquiring lock: {}", i);
lh.opCounterSem.acquire();
@@ -162,9 +159,7 @@ class PendingReadOp implements Enumerati
submitCallback(BKException.Code.OK);
}
- if(LOG.isDebugEnabled()) {
- LOG.debug("Releasing lock: " + entryId);
- }
+ LOG.debug("Releasing lock: {}", entryId);
lh.opCounterSem.release();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java Fri Sep 14 13:42:11 2012
@@ -89,7 +89,8 @@ class ReadLastConfirmedOp implements Rea
} catch (BKDigestMatchException e) {
// Too bad, this bookie didn't give us a valid answer, we
// still might be able to recover though so continue
- LOG.error("Mac mismatch while reading last entry from bookie: "
+ LOG.error("Mac mismatch for ledger: " + ledgerId + ", entry: " + entryId
+ + " while reading last entry from bookie: "
+ lh.metadata.currentEnsemble.get(bookieIndex));
}
}
@@ -108,9 +109,8 @@ class ReadLastConfirmedOp implements Rea
&& coverageSet.addBookieAndCheckCovered(bookieIndex)
&& !completed) {
completed = true;
- if (LOG.isDebugEnabled()) {
- LOG.debug("Read Complete with enough validResponses");
- }
+ LOG.debug("Read Complete with enough validResponses for ledger: {}, entry: {}",
+ ledgerId, entryId);
cb.readLastConfirmedDataComplete(BKException.Code.OK, maxRecoveredData);
return;
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -191,9 +191,7 @@ abstract class AbstractZkLedgerManager i
zk.sync(nodePath, new AsyncCallback.VoidCallback() {
@Override
public void processResult(int rc, String path, Object ctx) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Sync node path " + path + " return : " + rc);
- }
+ LOG.debug("Sync node path {} return : {}", path, rc);
if (rc != Code.OK.intValue()) {
LOG.error("ZK error syncing the ledgers node when getting children: ", KeeperException
.create(KeeperException.Code.get(rc), path));
@@ -218,9 +216,7 @@ abstract class AbstractZkLedgerManager i
getLedgersCallback.operationComplete(rc, null);
return;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Retrieved current set of ledger nodes: " + ledgerNodes);
- }
+ LOG.debug("Retrieved current set of ledger nodes: {}", ledgerNodes);
// Convert the ZK retrieved ledger nodes to a HashSet for easier comparisons.
HashSet<Long> allActiveLedgers = new HashSet<Long>(ledgerNodes.size(), 1.0f);
for (String ledgerNode : ledgerNodes) {
@@ -262,9 +258,7 @@ abstract class AbstractZkLedgerManager i
protected HashSet<Long> getLedgersInSingleNode(final String nodePath)
throws IOException, InterruptedException {
final GetLedgersCtx ctx = new GetLedgersCtx();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Try to get ledgers of node : " + nodePath);
- }
+ LOG.debug("Try to get ledgers of node : {}", nodePath);
asyncGetLedgersInSingleNode(nodePath, new GenericCallback<HashSet<Long>>() {
@Override
public void operationComplete(int rc, HashSet<Long> zkActiveLedgers) {
@@ -328,9 +322,7 @@ abstract class AbstractZkLedgerManager i
return;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Processing ledgers : " + zkActiveLedgers);
- }
+ LOG.debug("Processing ledgers: {}", zkActiveLedgers);
// no ledgers found, return directly
if (zkActiveLedgers.size() == 0) {
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -147,8 +147,8 @@ class FlatLedgerManager extends Abstract
Map<Long, Boolean> bkActiveLedgers = activeLedgers.snapshot();
Set<Long> zkActiveLedgers = getLedgersInSingleNode(ledgerRootPath);
if (LOG.isDebugEnabled()) {
- LOG.debug("All active ledgers from ZK: " + zkActiveLedgers);
- LOG.debug("Current active ledgers from Bookie: " + bkActiveLedgers.keySet());
+ LOG.debug("All active ledgers from ZK: {}. Current active ledgers from Bookie: {}.",
+ zkActiveLedgers, bkActiveLedgers.keySet());
}
doGc(gc, bkActiveLedgers, zkActiveLedgers);
} catch (IOException ie) {
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -105,9 +105,7 @@ class HierarchicalLedgerManager extends
this.idGenPath = ledgerRootPath + IDGENERATION_PREFIX;
this.scheduler = Executors.newSingleThreadScheduledExecutor();
- if (LOG.isDebugEnabled()) {
- LOG.debug("Using HierarchicalLedgerManager with root path : " + ledgerRootPath);
- }
+ LOG.debug("Using HierarchicalLedgerManager with root path : {}", ledgerRootPath);
}
@Override
@@ -173,9 +171,7 @@ class HierarchicalLedgerManager extends
LOG.warn("Exception during deleting znode for id generation : ",
KeeperException.create(KeeperException.Code.get(rc), path));
} else {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Deleting znode for id generation : " + idPathName);
- }
+ LOG.debug("Deleting znode for id generation : {}", idPathName);
}
}
}, null);
@@ -393,10 +389,8 @@ class HierarchicalLedgerManager extends
long endLedgerId = getEndLedgerIdByLevel(level1, level2);
Map<Long, Boolean> bkActiveLedgers = snapshot.subMap(startLedgerId, true, endLedgerId, true);
if (LOG.isDebugEnabled()) {
- LOG.debug("All active ledgers from ZK for hash node "
- + level1 + "/" + level2 + " : " + zkActiveLedgers);
- LOG.debug("Current active ledgers from Bookie for hash node "
- + level1 + "/" + level2 + " : " + bkActiveLedgers);
+ LOG.debug("For hash node: " + level1 + "/" + level2 + ": All active ledgers from ZK: "
+ + zkActiveLedgers + ". Current active ledgers from Bookie: "+ bkActiveLedgers);
}
doGc(gc, bkActiveLedgers, zkActiveLedgers);
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -161,15 +161,12 @@ class LedgerLayout {
* @return byte[]
*/
private byte[] serialize() throws IOException {
- StringBuilder sb = new StringBuilder();
- sb.append(layoutFormatVersion).append(lSplitter)
- .append(managerFactoryCls).append(splitter).append(managerVersion);
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("Serialized layout info: " + sb.toString());
- }
+ String s =
+ new StringBuilder().append(layoutFormatVersion).append(lSplitter)
+ .append(managerFactoryCls).append(splitter).append(managerVersion).toString();
- return sb.toString().getBytes("UTF-8");
+ LOG.debug("Serialized layout info: {}", s);
+ return s.getBytes("UTF-8");
}
/**
@@ -186,9 +183,7 @@ class LedgerLayout {
private static LedgerLayout parseLayout(byte[] bytes) throws IOException {
String layout = new String(bytes, "UTF-8");
- if (LOG.isDebugEnabled()) {
- LOG.debug("Parsing Layout: " + layout);
- }
+ LOG.debug("Parsing Layout: {}", layout);
String lines[] = layout.split(lSplitter);
@@ -214,7 +209,7 @@ class LedgerLayout {
int managerVersion = new Integer(parts[1]);
return new LedgerLayout(managerFactoryCls, managerVersion, layoutFormatVersion);
} catch (NumberFormatException e) {
- throw new IOException(e);
+ throw new IOException("Could not parse layout '" + layout + "'", e);
}
}
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=1384782&r1=1384781&r2=1384782&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 Fri Sep 14 13:42:11 2012
@@ -45,6 +45,7 @@ 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.apache.commons.codec.binary.Hex;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -362,7 +363,6 @@ public class BookieServer implements NIO
statType = BKStats.STATS_ADD;
try {
TimedCnxn tsrc = new TimedCnxn(src, startTime);
- // LOG.debug("Master key: " + new String(masterKey));
if ((flags & BookieProtocol.FLAG_RECOVERY_ADD) == BookieProtocol.FLAG_RECOVERY_ADD) {
bookie.recoveryAddEntry(packet.slice(), this, tsrc, masterKey);
} else {
@@ -383,7 +383,7 @@ public class BookieServer implements NIO
case BookieProtocol.READENTRY:
statType = BKStats.STATS_READ;
ByteBuffer[] rsp = new ByteBuffer[2];
- LOG.debug("Received new read request: " + ledgerId + ", " + entryId);
+ LOG.debug("Received new read request: {}, {}", ledgerId, entryId);
int errorCode = BookieProtocol.EIO;
try {
if ((flags & BookieProtocol.FLAG_DO_FENCING) == BookieProtocol.FLAG_DO_FENCING) {
@@ -399,7 +399,7 @@ public class BookieServer implements NIO
}
}
rsp[1] = bookie.readEntry(ledgerId, entryId);
- LOG.debug("##### Read entry ##### " + rsp[1].remaining());
+ LOG.debug("##### Read entry ##### {}", rsp[1].remaining());
errorCode = BookieProtocol.EOK;
success = true;
} catch (Bookie.NoLedgerException e) {
@@ -434,7 +434,13 @@ public class BookieServer implements NIO
rsp[1].putLong(entryId);
rsp[1].flip();
}
- LOG.debug("Sending response for: " + entryId + ", " + new String(rsp[1].array()));
+ if (LOG.isTraceEnabled()) {
+ byte[] content = new byte[rsp[1].remaining()];
+ rsp[1].duplicate().get(content);
+ LOG.trace("Sending response for: {}, content: {}", entryId, Hex.encodeHexString(content));
+ } else {
+ LOG.debug("Sending response for: {}, length: {}", entryId, rsp[1].remaining());
+ }
src.sendResponse(rsp);
break;
default:
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java Fri Sep 14 13:42:11 2012
@@ -390,7 +390,7 @@ public class NIOServerFactory extends Th
synchronized (cnxns) {
cnxns.remove(this);
}
- LOG.debug("close NIOServerCnxn: " + sock);
+ LOG.debug("close NIOServerCnxn: {}", sock);
try {
/*
* The following sequence of code is stupid! You would think
@@ -451,9 +451,7 @@ public class NIOServerFactory extends Th
total += bb[i].remaining();
}
}
- if (LOG.isTraceEnabled()) {
- LOG.debug("Sending response of size " + total + " to " + peerName);
- }
+ LOG.debug("Sending response of size {} to {}", total, peerName);
len.putInt(total);
len.flip();
outgoingBuffers.add(len);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java Fri Sep 14 13:42:11 2012
@@ -115,8 +115,7 @@ public class PerChannelBookieClient exte
}
private void connect() {
- if (LOG.isDebugEnabled())
- LOG.debug("Connecting to bookie: " + addr);
+ LOG.debug("Connecting to bookie: {}", addr);
// Set up the ClientBootStrap so we can create a new Channel connection
// to the bookie.
@@ -575,7 +574,7 @@ public class PerChannelBookieClient exte
void handleReadResponse(long ledgerId, long entryId, int rc, ChannelBuffer buffer) {
if (LOG.isDebugEnabled()) {
LOG.debug("Got response for read request from bookie: " + addr + " for ledger: " + ledgerId + " entry: "
- + entryId + " rc: " + rc + "entry length: " + buffer.readableBytes());
+ + entryId + " rc: " + rc + " entry length: " + buffer.readableBytes());
}
// convert to BKException code because thats what the uppper
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java Fri Sep 14 13:42:11 2012
@@ -98,7 +98,7 @@ public class LocalBookKeeper {
}
boolean b = waitForServerUp(HOSTPORT, CONNECTION_TIMEOUT);
- LOG.debug("ZooKeeper server up: " + b);
+ LOG.debug("ZooKeeper server up: {}", b);
}
private void initializeZookeper() throws IOException {
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java Fri Sep 14 13:42:11 2012
@@ -79,9 +79,8 @@ public class BenchmarkSubscriber extends
@Override
public void deliver(ByteString thisTopic, ByteString subscriberId, Message msg,
Callback<Void> callback, Object context) {
- if (logger.isDebugEnabled())
- logger.debug("Got message from src-region: " + msg.getSrcRegion() + " with seq-id: "
- + msg.getMsgId());
+ logger.debug("Got message from src-region: {} with seq-id: {}",
+ msg.getSrcRegion(), msg.getMsgId());
String mapKey = topic + msg.getSrcRegion().toStringUtf8();
Long lastSeqIdSeen = lastSeqIdSeenMap.get(mapKey);
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java Fri Sep 14 13:42:11 2012
@@ -67,10 +67,8 @@ public class MessageConsumeCallback impl
try {
handler = HedwigClientImpl.getResponseHandlerFromChannel(topicSubscriberChannel);
} catch (NoResponseHandlerException e) {
- if (logger.isDebugEnabled()) {
- logger.debug("No response handler found while invoking asyncMessageConsumed in the Message" +
- " consume retry task ." , e);
- }
+ logger.debug("No response handler found while invoking asyncMessageConsumed in the Message"
+ + " consume retry task.", e);
// Explicitly close the channel
if (null != topicSubscriberChannel) {
topicSubscriberChannel.close();
@@ -91,9 +89,7 @@ public class MessageConsumeCallback impl
try {
handler = HedwigClientImpl.getResponseHandlerFromChannel(topicSubscriberChannel);
} catch (NoResponseHandlerException e) {
- if (logger.isDebugEnabled()) {
- logger.debug("No response handler found while invoking messageConsumed." , e);
- }
+ logger.debug("No response handler found while invoking messageConsumed.", e);
// Explicitly close the channel
if (null != topicSubscriberChannel) {
topicSubscriberChannel.close();
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java Fri Sep 14 13:42:11 2012
@@ -52,8 +52,7 @@ public class PubSubCallback implements C
}
public void operationFinished(Object ctx, PubSubProtocol.ResponseBody resultOfOperation) {
- if (logger.isDebugEnabled())
- logger.debug("PubSub call succeeded for pubSubData: " + pubSubData);
+ logger.debug("PubSub call succeeded for pubSubData: {}", pubSubData);
// Wake up the main sync PubSub thread that is waiting for us to
// complete.
synchronized (pubSubData) {
@@ -65,8 +64,7 @@ public class PubSubCallback implements C
}
public void operationFailed(Object ctx, PubSubException exception) {
- if (logger.isDebugEnabled())
- logger.debug("PubSub call failed with exception: " + exception + ", pubSubData: " + pubSubData);
+ logger.debug("PubSub call failed with exception: {}, pubSubData: {}", exception, pubSubData);
// Wake up the main sync PubSub thread that is waiting for us to
// complete.
synchronized (pubSubData) {
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java Fri Sep 14 13:42:11 2012
@@ -63,8 +63,7 @@ public class SubscribeReconnectCallback
class SubscribeReconnectRetryTask extends TimerTask {
@Override
public void run() {
- if (logger.isDebugEnabled())
- logger.debug("Retrying subscribe reconnect request for origSubData: " + origSubData);
+ logger.debug("Retrying subscribe reconnect request for origSubData: {}", origSubData);
// Clear out all of the servers we've contacted or attempted to from
// this request.
origSubData.clearServersList();
@@ -73,8 +72,7 @@ public class SubscribeReconnectCallback
}
public void operationFinished(Object ctx, PubSubProtocol.ResponseBody resultOfOperation) {
- if (logger.isDebugEnabled())
- logger.debug("Subscribe reconnect succeeded for origSubData: " + origSubData);
+ logger.debug("Subscribe reconnect succeeded for origSubData: {}", origSubData);
// Now we want to restart delivery for the subscription channel only
// if delivery was started at the time the original subscribe channel
// was disconnected.
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java Fri Sep 14 13:42:11 2012
@@ -218,10 +218,8 @@ public class SubscribeResponseHandler {
// so these messages are not consumed and just buffered up here.
if (subscribeMsgQueue == null)
subscribeMsgQueue = new LinkedList<Message>();
- if (logger.isDebugEnabled())
- logger
- .debug("Message has arrived but Subscribe channel does not have a registered MessageHandler yet so queueing up the message: "
- + message);
+ logger.debug("Message has arrived but Subscribe channel does not have a registered "
+ + "MessageHandler yet so queueing up the message: {}", message);
subscribeMsgQueue.add(message);
}
}
@@ -301,10 +299,8 @@ public class SubscribeResponseHandler {
// Send the consume request and reset the consumed messages buffer
// variables. We will use the same Channel created from the
// subscribe request for the TopicSubscriber.
- if (logger.isDebugEnabled())
- logger
- .debug("Consumed message buffer limit reached so send the Consume Request to the server with lastMessageSeqId: "
- + lastMessageSeqId);
+ logger.debug("Consumed message buffer limit reached so send the Consume Request to the "
+ + "server with lastMessageSeqId: {}", lastMessageSeqId);
responseHandler.getSubscriber().doConsume(origSubData, subscribeChannel, lastMessageSeqId);
numConsumedMessagesInBuffer = 0;
lastMessageSeqId = null;
@@ -316,11 +312,9 @@ public class SubscribeResponseHandler {
// consume. We could make this a configurable parameter if needed.
if (!subscribeChannel.isReadable() && outstandingMsgSet.isEmpty()) {
if (logger.isDebugEnabled())
- logger
- .debug("Message consumption has caught up so okay to turn off throttling of messages on the subscribe channel for topic: "
- + origSubData.topic.toStringUtf8()
- + ", subscriberId: "
- + origSubData.subscriberId.toStringUtf8());
+ logger.debug("Message consumption has caught up so okay to turn off throttling of " +
+ "messages on the subscribe channel for topic: " + origSubData.topic.toStringUtf8()
+ + ", subscriberId: " + origSubData.subscriberId.toStringUtf8());
subscribeChannel.setReadable(true);
}
}
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java Fri Sep 14 13:42:11 2012
@@ -78,8 +78,7 @@ public class ConnectCallback implements
pubSubData.getCallback().operationFailed(pubSubData.context, new CouldNotConnectException(
"Could not connect to host: " + host));
} else {
- if (logger.isDebugEnabled())
- logger.debug("Try to connect to server: " + host + " again for pubSubData: " + pubSubData);
+ logger.debug("Try to connect to server: {} again for pubSubData: {}", host, pubSubData);
// Keep track of this current server that we failed to connect
// to but retry the request on the default server host/VIP.
// The topic2Host mapping might need to be updated.
@@ -95,8 +94,7 @@ public class ConnectCallback implements
// Now that we have connected successfully to the server, see what type
// of PubSub request this was.
- if (logger.isDebugEnabled())
- logger.debug("Connection to host: " + host + " was successful for pubSubData: " + pubSubData);
+ logger.debug("Connection to host: {} was successful for pubSubData: {}", host, pubSubData);
if (pubSubData.operationType.equals(OperationType.PUBLISH)) {
// Publish Request so store this Channel connection in the
// HedwigPublisher Map (if it doesn't exist yet) and then
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java Fri Sep 14 13:42:11 2012
@@ -167,8 +167,7 @@ public class HedwigClientImpl implements
*/
@Override
public void run() {
- if (logger.isDebugEnabled())
- logger.debug("Running the PubSubRequest Timeout Task");
+ logger.debug("Running the PubSubRequest Timeout Task");
// Loop through all outstanding PubSubData requests and check if
// the requestWriteTime has timed out compared to the current time.
long curTime = MathUtils.now();
@@ -262,8 +261,7 @@ public class HedwigClientImpl implements
* Input server host to connect to of type InetSocketAddress
*/
public void doConnect(PubSubData pubSubData, InetSocketAddress serverHost) {
- if (logger.isDebugEnabled())
- logger.debug("Connecting to host: " + serverHost + " with pubSubData: " + pubSubData);
+ logger.debug("Connecting to host: {} with pubSubData: {}", serverHost, pubSubData);
// Set up the ClientBootStrap so we can create a new Channel connection
// to the server.
ClientBootstrap bootstrap = new ClientBootstrap(socketFactory);
@@ -360,8 +358,7 @@ public class HedwigClientImpl implements
// need to remove all of the topic mappings that the host was
// responsible for.
public void clearAllTopicsForHost(InetSocketAddress host) {
- if (logger.isDebugEnabled())
- logger.debug("Clearing all topics for host: " + host);
+ logger.debug("Clearing all topics for host: {}", host);
// For each of the topics that the host was responsible for,
// remove it from the topic2Host mapping.
ConcurrentLinkedQueue<ByteString> topicsForHost = host2Topics.get(host);
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java Fri Sep 14 13:42:11 2012
@@ -247,8 +247,7 @@ public class HedwigPublisher implements
// set of server hosts, we could be redirected to a server that
// we already have a channel connection to from a prior existing
// topic. Close these redundant channels as they won't be used.
- if (logger.isDebugEnabled())
- logger.debug("Channel mapping to host: " + host + " already exists so no need to store it.");
+ logger.debug("Channel mapping to host: {} already exists so no need to store it.", host);
try {
HedwigClientImpl.getResponseHandlerFromChannel(channel).handleChannelClosedExplicitly();
} catch (NoResponseHandlerException e) {
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java Fri Sep 14 13:42:11 2012
@@ -190,8 +190,7 @@ public class ResponseHandler extends Sim
// We've already exceeded the maximum number of server redirects
// so consider this as an error condition for the client.
// Invoke the operationFailed callback and just return.
- if (logger.isDebugEnabled())
- logger.debug("Exceeded the number of server redirects (" + curNumServerRedirects + ") so error out.");
+ logger.debug("Exceeded the maximum number of redirects ({}): erroring out.", curNumServerRedirects);
pubSubData.getCallback().operationFailed(pubSubData.context, new ServiceDownException(
new TooManyServerRedirectsException("Already reached max number of redirects: "
+ curNumServerRedirects)));
@@ -292,9 +291,8 @@ public class ResponseHandler extends Sim
// and unsubscribe requests.
Channel channel = pub.host2Channel.get(host);
if (channel != null && channel.equals(ctx.getChannel())) {
- if (logger.isDebugEnabled())
- logger.debug("Disconnected channel for host: " + host
- + " was for Publish/Unsubscribe requests so remove all references to it.");
+ logger.debug("Disconnected channel for host: {} was for Publish/Unsubscribe requests" +
+ " so remove all references to it.", host);
if (pub.host2Channel.remove(host, channel)) {
client.clearAllTopicsForHost(host);
}
@@ -317,8 +315,7 @@ public class ResponseHandler extends Sim
// case before the channel disconnect).
origSubData.setCallback(new SubscribeReconnectCallback(origSubData, client));
origSubData.context = null;
- if (logger.isDebugEnabled())
- logger.debug("Disconnected subscribe channel so reconnect with origSubData: " + origSubData);
+ logger.debug("Disconnected subscribe channel so reconnect with origSubData: {}", origSubData);
client.doConnect(origSubData, cfg.getDefaultServerHost());
}
@@ -329,9 +326,8 @@ public class ResponseHandler extends Sim
// we're not sure of the state of the request since the ack response was
// never received.
for (PubSubData pubSubData : txn2PubSubData.values()) {
- if (logger.isDebugEnabled())
- logger.debug("Channel disconnected so invoking the operationFailed callback for pubSubData: "
- + pubSubData);
+ logger.debug("Channel disconnected so invoking the operationFailed callback for pubSubData: {}",
+ pubSubData);
pubSubData.getCallback().operationFailed(pubSubData.context, new UncertainStateException(
"Server ack response never received before server connection disconnected!"));
}
@@ -347,9 +343,7 @@ public class ResponseHandler extends Sim
// No need to initiate the SSL handshake if we are closing this channel
// explicitly or the client has been stopped.
if (cfg.isSSLEnabled() && !channelClosedExplicitly && !client.hasStopped()) {
- if (logger.isDebugEnabled()) {
- logger.debug("Initiating the SSL handshake");
- }
+ logger.debug("Initiating the SSL handshake");
ctx.getPipeline().get(SslHandler.class).handshake(e.getChannel());
}
}
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java Fri Sep 14 13:42:11 2012
@@ -86,9 +86,8 @@ public class WriteCallback implements Ch
pubSubData.getCallback().operationFailed(pubSubData.context, new ServiceDownException(
"Error while writing message to server: " + hostString));
} else {
- if (logger.isDebugEnabled())
- logger.debug("Try to send the PubSubRequest again to the default server host/VIP for pubSubData: "
- + pubSubData);
+ logger.debug("Try to send the PubSubRequest again to the default server host/VIP for pubSubData: {}",
+ pubSubData);
// Keep track of this current server that we failed to write to
// but retry the request on the default server host/VIP.
if (pubSubData.writeFailedServers == null)
@@ -101,8 +100,7 @@ public class WriteCallback implements Ch
// to respond. The ResponseHandler will take care of the ack
// response from the server before we can determine if the async
// PubSub call has really completed successfully or not.
- if (logger.isDebugEnabled())
- logger.debug("Successfully wrote to host: " + host + " for pubSubData: " + pubSubData);
+ logger.debug("Successfully wrote to host: {} for pubSubData: {}", host, pubSubData);
}
}
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java Fri Sep 14 13:42:11 2012
@@ -162,10 +162,8 @@ public class HedwigAdmin {
// connect to zookeeper
zk = new ZooKeeper(hubConf.getZkHost(), hubConf.getZkTimeout(), new MyWatcher());
- if (LOG.isDebugEnabled()) {
- LOG.debug("Connecting to zookeeper " + hubConf.getZkHost() + ", timeout = "
- + hubConf.getZkTimeout());
- }
+ LOG.debug("Connecting to zookeeper {}, timeout = {}",
+ hubConf.getZkHost(), hubConf.getZkTimeout());
// wait until connection is ready
if (!zkReadyLatch.await(hubConf.getZkTimeout() * 2, TimeUnit.MILLISECONDS)) {
throw new Exception("Count not establish connection with ZooKeeper after " + hubConf.getZkTimeout() * 2 + " ms.");
@@ -179,9 +177,7 @@ public class HedwigAdmin {
// connect to bookkeeper
bk = new BookKeeper(bkClientConf, zk);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Connecting to bookkeeper");
- }
+ LOG.debug("Connecting to bookkeeper");
}
/**
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/admin/console/HedwigConsole.java Fri Sep 14 13:42:11 2012
@@ -909,9 +909,7 @@ public class HedwigConsole {
return false;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Processing " + cmd);
- }
+ LOG.debug("Processing {}", cmd);
MyCommand myCommand = myCommands.get(cmd);
if (myCommand == null) {
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java Fri Sep 14 13:42:11 2012
@@ -76,9 +76,7 @@ public class UmbrellaHandler extends Sim
if (throwable instanceof IOException || throwable instanceof TooLongFrameException
|| throwable instanceof CorruptedFrameException) {
e.getChannel().close();
- if (logger.isDebugEnabled()) {
- logger.debug("Uncaught exception", throwable);
- }
+ logger.debug("Uncaught exception", throwable);
} else {
// call our uncaught exception handler, which might decide to
// shutdown the system
@@ -104,9 +102,7 @@ public class UmbrellaHandler extends Sim
ctx.getPipeline().get(SslHandler.class).handshake(e.getChannel()).addListener(new ChannelFutureListener() {
public void operationComplete(ChannelFuture future) throws Exception {
if (future.isSuccess()) {
- if (logger.isDebugEnabled()) {
- logger.debug("SSL handshake has completed successfully!");
- }
+ logger.debug("SSL handshake has completed successfully!");
allChannels.add(future.getChannel());
} else {
future.getChannel().close();
@@ -125,9 +121,7 @@ public class UmbrellaHandler extends Sim
}
public static void sendErrorResponseToMalformedRequest(Channel channel, long txnId, String msg) {
- if (logger.isDebugEnabled()) {
- logger.debug("Malformed request from " + channel.getRemoteAddress() + " msg, = " + msg);
- }
+ logger.debug("Malformed request from {}, msg = {}", channel.getRemoteAddress(), msg);
MalformedRequestException mre = new MalformedRequestException(msg);
PubSubResponse response = PubSubResponseUtils.getResponseForException(mre, txnId);
channel.write(response);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java Fri Sep 14 13:42:11 2012
@@ -278,10 +278,8 @@ public class BookkeeperPersistenceManage
return;
}
- if (logger.isDebugEnabled()) {
- logger.debug("Read response from ledger: " + lh.getId() + " entry-id: "
- + entry.getEntryId());
- }
+ logger.debug("Read response from ledger: {} entry-id: {}",
+ lh.getId(), entry.getEntryId());
assert expectedEntryId == entry.getEntryId() : "expectedEntryId (" + expectedEntryId
+ ") != entry.getEntryId() (" + entry.getEntryId() + ")";
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java Fri Sep 14 13:42:11 2012
@@ -62,9 +62,7 @@ public class CacheValue {
this.message = message;
this.timeOfAddition = currTime;
ScanCallbackWithContext callbackWithCtx;
- if (logger.isDebugEnabled()) {
- logger.debug("Invoking " + callbacks.size() + " callbacks for " + " message added to cache");
- }
+ logger.debug("Invoking {} callbacks for {} message added to cache", callbacks.size(), message);
while ((callbackWithCtx = callbacks.poll()) != null) {
callbackWithCtx.getScanCallback().messageScanned(callbackWithCtx.getCtx(), message);
}
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java Fri Sep 14 13:42:11 2012
@@ -427,7 +427,10 @@ public class LocalDBPersistenceManager i
+ " <= ?");
stmt.setLong(1, seqId);
int rowCount = stmt.executeUpdate();
- logger.debug("Deleted " + rowCount + " records for topic: " + topic.toStringUtf8() + ", seqId: " + seqId);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Deleted " + rowCount + " records for topic: " + topic.toStringUtf8()
+ + ", seqId: " + seqId);
+ }
} catch (SQLException sqle) {
String theError = (sqle).getSQLState();
if (theError.equals("42X05")) {
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java Fri Sep 14 13:42:11 2012
@@ -360,9 +360,7 @@ public class ReadAheadCache implements P
CacheValue cacheValue = new CacheValue();
cache.put(cacheKey, cacheValue);
- if (logger.isDebugEnabled()) {
- logger.debug("Adding stub for seq-id: " + seqId + " topic: " + topic.toStringUtf8());
- }
+ logger.debug("Adding cache stub for: {}", cacheKey);
installedStubs.add(cacheKey);
seqId = realPersistenceManager.getSeqIdAfterSkipping(topic, seqId, 1);
@@ -485,10 +483,7 @@ public class ReadAheadCache implements P
* @param message
*/
protected void addMessageToCache(CacheKey cacheKey, Message message, long currTime) {
- if (logger.isDebugEnabled()) {
- logger.debug("Adding msg (topic: " + cacheKey.getTopic().toStringUtf8() + ", seq-id: "
- + message.getMsgId().getLocalComponent() + ") to readahead cache");
- }
+ logger.debug("Adding msg {} to readahead cache", cacheKey);
CacheValue cacheValue;
@@ -558,10 +553,7 @@ public class ReadAheadCache implements P
for (Iterator<CacheKey> iter = oldCacheEntries.iterator(); iter.hasNext();) {
CacheKey cacheKey = iter.next();
- if (logger.isDebugEnabled()) {
- logger.debug("Removing topic: " + cacheKey.getTopic() + "seq-id: " + cacheKey.getSeqId()
- + " from cache because its the oldest");
- }
+ logger.debug("Removing {} from cache because it's the oldest.", cacheKey);
removeMessageFromCache(cacheKey, readAheadExceptionInstance, //
// maintainTimeIndex=
false,
@@ -659,11 +651,8 @@ public class ReadAheadCache implements P
Long seqId = iter.next();
CacheKey cacheKey = new CacheKey(topic, seqId);
- if (logger.isDebugEnabled()) {
- logger.debug("Removing seq-id: " + cacheKey.getSeqId() + " topic: "
- + cacheKey.getTopic().toStringUtf8()
- + " from cache because every subscriber has moved past");
- }
+ logger.debug("Removing {} from cache because every subscriber has moved past",
+ cacheKey);
removeMessageFromCache(cacheKey, readAheadExceptionInstance, //
// maintainTimeIndex=
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java Fri Sep 14 13:42:11 2012
@@ -59,7 +59,7 @@ public class RegionManager implements Su
private final PersistenceManager pm;
private final ArrayList<HedwigHubClient> clients = new ArrayList<HedwigHubClient>();
private final TopicOpQueuer queue;
- private final ByteString myRegion;
+ private final String myRegion;
// Timer for running a retry thread task to retry remote-subscription in asynchronous mode.
private final Timer timer = new Timer(true);
private final HashMap<HedwigHubClient, Set<ByteString>> retryMap =
@@ -81,7 +81,7 @@ public class RegionManager implements Su
}
if (hubClients.isEmpty()) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] There is no hub client needs to retry subscriptions.");
+ LOGGER.debug("[" + myRegion + "] There is no hub client needs to retry subscriptions.");
}
return;
}
@@ -137,7 +137,7 @@ public class RegionManager implements Su
for (final String hub : cfg.getRegions()) {
clients.add(hubClientFactory.create(new HedwigSocketAddress(hub)));
}
- myRegion = cfg.getMyRegionByteString();
+ myRegion = cfg.getMyRegionByteString().toStringUtf8();
if (cfg.getRetryRemoteSubscribeThreadRunInterval() > 0) {
timer.schedule(new RetrySubscribeTask(), 0, cfg.getRetryRemoteSubscribeThreadRunInterval());
}
@@ -145,7 +145,7 @@ public class RegionManager implements Su
private void putTopicInRetryMap(HedwigHubClient client, ByteString topic) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] Put topic in retry map : " + topic.toStringUtf8());
+ LOGGER.debug("[" + myRegion + "] Put topic in retry map : " + topic.toStringUtf8());
}
synchronized (retryMap) {
Set<ByteString> topics = retryMap.get(client);
@@ -177,14 +177,14 @@ public class RegionManager implements Su
try {
if (sub.hasSubscription(topic, mySubId)) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] cross-region subscription for topic "
+ LOGGER.debug("[" + myRegion + "] cross-region subscription for topic "
+ topic.toStringUtf8() + " has existed before.");
}
mcb.operationFinished(null, null);
return;
}
} catch (PubSubException e) {
- LOGGER.error("[" + myRegion.toStringUtf8() + "] checking cross-region subscription for topic "
+ LOGGER.error("[" + myRegion + "] checking cross-region subscription for topic "
+ topic.toStringUtf8() + " failed (this is should not happen): ", e);
mcb.operationFailed(context, e);
return;
@@ -193,7 +193,7 @@ public class RegionManager implements Su
@Override
public void operationFinished(Object ctx, Void resultOfOperation) {
if (LOGGER.isDebugEnabled())
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] cross-region subscription done for topic " + topic.toStringUtf8());
+ LOGGER.debug("[" + myRegion + "] cross-region subscription done for topic " + topic.toStringUtf8());
try {
sub.startDelivery(topic, mySubId, new MessageHandler() {
@Override
@@ -213,7 +213,7 @@ public class RegionManager implements Su
@Override
public void operationFinished(Object ctx, MessageSeqId resultOfOperation) {
if (LOGGER.isDebugEnabled())
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] cross-region recv-fwd succeeded for topic "
+ LOGGER.debug("[" + myRegion + "] cross-region recv-fwd succeeded for topic "
+ topic.toStringUtf8());
callback.operationFinished(context, null);
}
@@ -221,7 +221,7 @@ public class RegionManager implements Su
@Override
public void operationFailed(Object ctx, PubSubException exception) {
if (LOGGER.isDebugEnabled())
- LOGGER.error("[" + myRegion.toStringUtf8() + "] cross-region recv-fwd failed for topic "
+ LOGGER.error("[" + myRegion + "] cross-region recv-fwd failed for topic "
+ topic.toStringUtf8(), exception);
callback.operationFailed(context, exception);
}
@@ -229,16 +229,16 @@ public class RegionManager implements Su
}
});
if (LOGGER.isDebugEnabled())
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] cross-region start-delivery succeeded for topic "
+ LOGGER.debug("[" + myRegion + "] cross-region start-delivery succeeded for topic "
+ topic.toStringUtf8());
mcb.operationFinished(ctx, null);
} catch (PubSubException ex) {
if (LOGGER.isDebugEnabled())
LOGGER.error(
- "[" + myRegion.toStringUtf8() + "] cross-region start-delivery failed for topic " + topic.toStringUtf8(), ex);
+ "[" + myRegion + "] cross-region start-delivery failed for topic " + topic.toStringUtf8(), ex);
mcb.operationFailed(ctx, ex);
} catch (AlreadyStartDeliveryException ex) {
- LOGGER.error("[" + myRegion.toStringUtf8() + "] cross-region start-delivery failed for topic "
+ LOGGER.error("[" + myRegion + "] cross-region start-delivery failed for topic "
+ topic.toStringUtf8(), ex);
mcb.operationFailed(ctx, new PubSubException.UnexpectedConditionException("cross-region start-delivery failed : " + ex.getMessage()));
}
@@ -247,7 +247,7 @@ public class RegionManager implements Su
@Override
public void operationFailed(Object ctx, PubSubException exception) {
if (LOGGER.isDebugEnabled())
- LOGGER.error("[" + myRegion.toStringUtf8() + "] cross-region subscribe failed for topic " + topic.toStringUtf8(),
+ LOGGER.error("[" + myRegion + "] cross-region subscribe failed for topic " + topic.toStringUtf8(),
exception);
if (!synchronous) {
putTopicInRetryMap(client, topic);
@@ -259,7 +259,7 @@ public class RegionManager implements Su
private void retrySubscribe(final HedwigHubClient client, final ByteString topic, final Callback<Void> cb) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] Retry remote subscribe topic : " + topic.toStringUtf8());
+ LOGGER.debug("[" + myRegion + "] Retry remote subscribe topic : " + topic.toStringUtf8());
}
queue.pushAndMaybeRun(topic, queue.new AsynchronousOp<Void>(topic, cb, null) {
@Override
@@ -285,8 +285,8 @@ public class RegionManager implements Su
@Override
public void run() {
Callback<Void> postCb = synchronous ? cb : CallbackUtils.logger(LOGGER,
- "[" + myRegion.toStringUtf8() + "] all cross-region subscriptions succeeded",
- "[" + myRegion.toStringUtf8() + "] at least one cross-region subscription failed");
+ "[" + myRegion + "] all cross-region subscriptions succeeded",
+ "[" + myRegion + "] at least one cross-region subscription failed");
final Callback<Void> mcb = CallbackUtils.multiCallback(clients.size(), postCb, ctx);
for (final HedwigHubClient client : clients) {
doRemoteSubscribe(client, topic, synchronous, mcb, ctx);
@@ -308,13 +308,13 @@ public class RegionManager implements Su
@Override
public void operationFinished(Object ctx, Void result) {
if (LOGGER.isDebugEnabled())
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] cross-region unsubscribes succeeded for topic " + topic.toStringUtf8());
+ LOGGER.debug("[" + myRegion + "] cross-region unsubscribes succeeded for topic " + topic.toStringUtf8());
}
@Override
public void operationFailed(Object ctx, PubSubException exception) {
if (LOGGER.isDebugEnabled())
- LOGGER.error("[" + myRegion.toStringUtf8() + "] cross-region unsubscribes failed for topic " + topic.toStringUtf8(), exception);
+ LOGGER.error("[" + myRegion + "] cross-region unsubscribes failed for topic " + topic.toStringUtf8(), exception);
}
}, null) {
@@ -326,14 +326,14 @@ public class RegionManager implements Su
try {
if (!sub.hasSubscription(topic, mySubId)) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("[" + myRegion.toStringUtf8() + "] cross-region subscription for topic "
+ LOGGER.debug("[" + myRegion + "] cross-region subscription for topic "
+ topic.toStringUtf8() + " has existed before.");
}
mcb.operationFinished(null, null);
continue;
}
} catch (PubSubException e) {
- LOGGER.error("[" + myRegion.toStringUtf8() + "] checking cross-region subscription for topic "
+ LOGGER.error("[" + myRegion + "] checking cross-region subscription for topic "
+ topic.toStringUtf8() + " failed (this is should not happen): ", e);
mcb.operationFailed(ctx, e);
continue;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java?rev=1384782&r1=1384781&r2=1384782&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java Fri Sep 14 13:42:11 2012
@@ -125,7 +125,10 @@ public abstract class AbstractTopicManag
@Override
public void operationFinished(Object ctx, Void resultOfOperation) {
- logger.debug("successful periodic release of topic " + topic);
+ if (logger.isDebugEnabled()) {
+ logger.debug("successful periodic release of topic "
+ + topic.toStringUtf8());
+ }
}
}, null);