Repository: hbase Updated Branches: refs/heads/master d3aefe783 -> d272ac908
HBASE-20069 fix existing findbugs errors in hbase-server; ADDENDUM Address review Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d272ac90 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d272ac90 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d272ac90 Branch: refs/heads/master Commit: d272ac908ceb4696e05431066ae02d953fa6fc9d Parents: d3aefe7 Author: Michael Stack <st...@apache.org> Authored: Mon Feb 26 16:26:36 2018 -0800 Committer: Michael Stack <st...@apache.org> Committed: Mon Feb 26 23:16:21 2018 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/master/ClusterStatusPublisher.java | 6 +++++- .../hadoop/hbase/regionserver/MemStoreFlusher.java | 14 +++----------- .../hbase/regionserver/RegionCoprocessorHost.java | 4 +++- 3 files changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d272ac90/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java index 5e97204..21fa263 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java @@ -134,7 +134,7 @@ public class ClusterStatusPublisher extends ScheduledChore { @Override protected void chore() { - if (!connected) { + if (!isConnected()) { return; } @@ -170,6 +170,10 @@ public class ClusterStatusPublisher extends ScheduledChore { publisher.close(); } + private synchronized boolean isConnected() { + return this.connected; + } + /** * Create the dead server to send. A dead server is sent NB_SEND times. We send at max * MAX_SERVER_PER_MESSAGE at a time. if there are too many dead servers, we send the newly http://git-wip-us.apache.org/repos/asf/hbase/blob/d272ac90/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java index a0e65ec..23321e8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java @@ -90,17 +90,9 @@ class MemStoreFlusher implements FlushRequester { private FlushType flushType; /** - * Singleton instance of this class inserted into flush queue. + * Singleton instance inserted into flush queue used for signaling. */ - private static final WakeupFlushThread WAKEUPFLUSH_INSTANCE = new WakeupFlushThread(); - - /** - * Marker class used as a token inserted into flush queue that ensures the flusher does not sleep. - * Create a single instance only. - */ - private static final class WakeupFlushThread implements FlushQueueEntry { - private WakeupFlushThread() {} - + private static final FlushQueueEntry WAKEUPFLUSH_INSTANCE = new FlushQueueEntry() { @Override public long getDelay(TimeUnit unit) { return 0; @@ -120,7 +112,7 @@ class MemStoreFlusher implements FlushRequester { public int hashCode() { return 42; } - } + }; /** http://git-wip-us.apache.org/repos/asf/hbase/blob/d272ac90/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java index f3c93dc..47b389a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java @@ -1119,6 +1119,8 @@ public class RegionCoprocessorHost * @return true or false to return to client if default processing should be bypassed, or null * otherwise */ + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NP_BOOLEAN_RETURN_NULL", + justification="Null is legit") public Boolean preCheckAndPutAfterRowLock( final byte[] row, final byte[] family, final byte[] qualifier, final CompareOperator op, final ByteArrayComparable comparator, final Put put) throws IOException { @@ -1207,7 +1209,7 @@ public class RegionCoprocessorHost * or null otherwise */ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NP_BOOLEAN_RETURN_NULL", - justification="TODO: Fix") + justification="Null is legit") public Boolean preCheckAndDeleteAfterRowLock(final byte[] row, final byte[] family, final byte[] qualifier, final CompareOperator op, final ByteArrayComparable comparator, final Delete delete) throws IOException {
