From bc3bdd02073dc422b5b6b6f4451d0c4ae8949b19 Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Wed, 27 Apr 2016 09:59:52 -0700 Subject: [PATCH] BOOKKEEPER-925: Fix FindBugs discovered issues in master --- .../java/org/apache/bookkeeper/bookie/BookieShell.java | 3 ++- .../bookkeeper/bookie/ScanAndCompareGarbageCollector.java | 8 ++++---- .../java/org/apache/bookkeeper/client/BookieWatcher.java | 3 +-- .../bookkeeper/meta/ZkLedgerUnderreplicationManager.java | 2 +- .../java/org/apache/bookkeeper/proto/AuthHandler.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java index 7d49a6a12a5..df31bf218e1 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java @@ -458,7 +458,8 @@ int runCmd(CommandLine cmdLine) throws Exception { while (entries.hasNext()) { LedgerEntry entry = entries.next(); HexDump.dump(entry.getEntry(), 0, out, 0); - System.out.println("Entry Id: " + entry.getEntryId() + ", Data: " + new String(out.toByteArray())); + System.out.println( + "Entry Id: " + entry.getEntryId() + ", Data: " + new String(out.toByteArray(), UTF_8)); out.reset(); } } catch (Exception e) { diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java index 05cd958f93a..c422a89506e 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java @@ -212,13 +212,13 @@ private void release() { try { ZkLedgerUnderreplicationManager.releaseUnderreplicatedLedgerLock(zk, zkLedgersRootPath, ledgerId); - } catch (Exception e) { - LOG.error("Error removing underreplicated lock for ledger {}", ledgerId, e); + } catch (Throwable t) { + LOG.error("Exception when removing underreplicated lock for ledger {}", ledgerId, t); } } }); - } catch (Exception e) { - LOG.error("Exception when iterating through the ledgers to check for over-replication", e); + } catch (Throwable t) { + LOG.error("Exception when iterating through the ledgers to check for over-replication", t); latch.countDown(); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java index 01428271919..1e49cf8dd05 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java @@ -62,7 +62,6 @@ class BookieWatcher implements Watcher, ChildrenCallback { public static int ZK_CONNECT_BACKOFF_SEC = 1; private static final Set EMPTY_SET = new HashSet(); - private static final Boolean BOOLEAN = new Boolean(true); // Bookie registration path in ZK private final String bookieRegistrationPath; @@ -302,7 +301,7 @@ public BookieSocketAddress replaceBookie(List existingBooki */ public void quarantineBookie(BookieSocketAddress bookie) { if (quarantinedBookies.getIfPresent(bookie) == null) { - quarantinedBookies.put(bookie, BOOLEAN); + quarantinedBookies.put(bookie, Boolean.TRUE); logger.warn("Bookie {} has been quarantined because of read/write errors.", bookie); } } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java index c49c5a20a75..363b51732d8 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java @@ -78,7 +78,7 @@ public class ZkLedgerUnderreplicationManager implements LedgerUnderreplicationMa static final String LAYOUT="BASIC"; static final int LAYOUT_VERSION=1; - public static final byte[] LOCK_DATA = getLockData(); + private static final byte[] LOCK_DATA = getLockData(); private static class Lock { private final String lockZNode; diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java index ab49da70f33..dd51a6839c3 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java @@ -274,7 +274,7 @@ public void messageReceived(ChannelHandlerContext ctx, public void writeRequested(ChannelHandlerContext ctx, MessageEvent e) throws Exception { - synchronized (waitingForAuth) { + synchronized (this) { if (authenticated) { super.writeRequested(ctx, e); } else if (e.getMessage() instanceof BookkeeperProtocol.Request) { @@ -339,7 +339,7 @@ class AuthHandshakeCompleteCallback implements GenericCallback { @Override public void operationComplete(int rc, Void v) { if (rc == BKException.Code.OK) { - synchronized (waitingForAuth) { + synchronized (this) { authenticated = true; MessageEvent e = waitingForAuth.poll(); while (e != null) {