Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-20069 fix existing findbugs errors in hbase-server; ADDENDUM Address review 

Revert of the revert, i.e. reapply. Thought this had broken the build
but it was a bad nightly. Putting it back.

Revert "Revert "HBASE-20069 fix existing findbugs errors in hbase-server; ADDENDUM Address review""

This reverts commit 07eae00ec1.
This commit is contained in:
Michael Stack 2018-02-27 21:07:38 -08:00
parent 2ceafe108f
commit 5317ca92bc
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/ClusterStatusPublisher.java
View File

@ -134,7 +134,7 @@ public class ClusterStatusPublisher extends ScheduledChore {
@Override @Override
protected void chore() { protected void chore() {
if (!connected) { if (!isConnected()) {
return; return;
} }
@ -170,6 +170,10 @@ public class ClusterStatusPublisher extends ScheduledChore {
publisher.close(); 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 * 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 * MAX_SERVER_PER_MESSAGE at a time. if there are too many dead servers, we send the newly

14
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
View File

@ -90,17 +90,9 @@ class MemStoreFlusher implements FlushRequester {
private FlushType flushType; 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(); private static final FlushQueueEntry WAKEUPFLUSH_INSTANCE = new FlushQueueEntry() {
/**
* 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() {}
@Override @Override
public long getDelay(TimeUnit unit) { public long getDelay(TimeUnit unit) {
return 0; return 0;
@ -120,7 +112,7 @@ class MemStoreFlusher implements FlushRequester {
public int hashCode() { public int hashCode() {
return 42; return 42;
} }
} };
/** /**

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java
View File

@ -1119,6 +1119,8 @@ public class RegionCoprocessorHost
* @return true or false to return to client if default processing should be bypassed, or null * @return true or false to return to client if default processing should be bypassed, or null
* otherwise * otherwise
*/ */
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NP_BOOLEAN_RETURN_NULL",
justification="Null is legit")
public Boolean preCheckAndPutAfterRowLock( public Boolean preCheckAndPutAfterRowLock(
final byte[] row, final byte[] family, final byte[] qualifier, final CompareOperator op, final byte[] row, final byte[] family, final byte[] qualifier, final CompareOperator op,
final ByteArrayComparable comparator, final Put put) throws IOException { final ByteArrayComparable comparator, final Put put) throws IOException {
@ -1207,7 +1209,7 @@ public class RegionCoprocessorHost
* or null otherwise * or null otherwise
*/ */
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NP_BOOLEAN_RETURN_NULL", @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, public Boolean preCheckAndDeleteAfterRowLock(final byte[] row, final byte[] family,
final byte[] qualifier, final CompareOperator op, final ByteArrayComparable comparator, final byte[] qualifier, final CompareOperator op, final ByteArrayComparable comparator,
final Delete delete) throws IOException { final Delete delete) throws IOException {