You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2019/06/03 18:33:52 UTC
[hbase] branch branch-1 updated: HBASE-22510 Address
findbugs/spotbugs complaints (branch-1) (#278)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push:
new eae7126 HBASE-22510 Address findbugs/spotbugs complaints (branch-1) (#278)
eae7126 is described below
commit eae71261b3442b94016d4f7cf95e875d1572fd62
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Mon Jun 3 11:33:47 2019 -0700
HBASE-22510 Address findbugs/spotbugs complaints (branch-1) (#278)
Signed-off-by: Sean Busbey <bu...@apache.org>
---
.../apache/hadoop/hbase/io/encoding/EncodedDataBlock.java | 11 ++++++-----
.../main/java/org/apache/hadoop/hbase/master/HMaster.java | 2 +-
.../org/apache/hadoop/hbase/quotas/MasterQuotaManager.java | 7 ++++---
.../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 13 ++++++++++---
.../java/org/apache/hadoop/hbase/regionserver/HStore.java | 6 +++++-
.../apache/hadoop/hbase/util/compaction/MajorCompactor.java | 2 +-
6 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java
index 6959edd..c4638cc 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java
@@ -255,7 +255,7 @@ public class EncodedDataBlock {
}
BufferGrabbingByteArrayOutputStream stream = new BufferGrabbingByteArrayOutputStream();
baos.writeTo(stream);
- this.dataBlockEncoder.endBlockEncoding(encodingCtx, out, stream.getOurBytes());
+ this.dataBlockEncoder.endBlockEncoding(encodingCtx, out, stream.toByteArray());
} catch (IOException e) {
throw new RuntimeException(String.format(
"Bug in encoding part of algorithm %s. " +
@@ -268,14 +268,15 @@ public class EncodedDataBlock {
private static class BufferGrabbingByteArrayOutputStream extends ByteArrayOutputStream {
private byte[] ourBytes;
- private synchronized byte[] getOurBytes() {
- return ourBytes;
- }
-
@Override
public synchronized void write(byte[] b, int off, int len) {
this.ourBytes = b;
}
+
+ @Override
+ public synchronized byte[] toByteArray() {
+ return ourBytes;
+ }
}
@Override
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index f9d92ab..503cc6b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -3078,7 +3078,7 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
}
}
if (cpHost != null) {
- bypass = cpHost.postListNamespaces(namespaces);
+ cpHost.postListNamespaces(namespaces);
}
return namespaces;
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java
index f48533d..9c9b4d0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/MasterQuotaManager.java
@@ -440,9 +440,10 @@ public class MasterQuotaManager implements RegionStateListener {
case READ_SIZE:
if (req.hasTimedQuota()) {
throttle.setReadSize(req.getTimedQuota());
- } else {
- throttle.clearReadSize();
- }
+ } else {
+ throttle.clearReadSize();
+ }
+ break;
case REQUEST_CAPACITY_UNIT:
if (req.hasTimedQuota()) {
throttle.setReqCapacityUnit(req.getTimedQuota());
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index aa0375b..b4b7c5f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -7959,7 +7959,9 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
for (Map.Entry<Store, List<Cell>> entry: removedCellsForMemStore.entrySet()) {
entry.getKey().add(entry.getValue());
}
- if (we != null) mvcc.complete(we);
+ if (we != null) {
+ mvcc.complete(we);
+ }
} else if (we != null) {
mvcc.completeAndWait(we);
}
@@ -8180,6 +8182,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
rowLock.release();
}
// if the wal sync was unsuccessful, remove keys from memstore
+ WriteEntry we = walKey != null ? walKey.getWriteEntry() : null;
if (doRollBackMemstore) {
for (Map.Entry<Store, List<Cell>> entry: forMemStore.entrySet()) {
rollbackMemstore(entry.getKey(), entry.getValue());
@@ -8187,9 +8190,13 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
for (Map.Entry<Store, List<Cell>> entry: removedCellsForMemStore.entrySet()) {
entry.getKey().add(entry.getValue());
}
- if (walKey != null) mvcc.complete(walKey.getWriteEntry());
+ if (we != null) {
+ mvcc.complete(we);
+ }
} else {
- if (walKey != null) mvcc.completeAndWait(walKey.getWriteEntry());
+ if (we != null) {
+ mvcc.completeAndWait(we);
+ }
}
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index fb4ff9a..41e8918 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -2796,10 +2796,14 @@ public class HStore implements Store {
// Just close and return
filesToRemove.add(file);
} else {
- LOG.info("Can't archive compacted file " + file.getPath()
+ if (r != null) {
+ LOG.info("Can't archive compacted file " + file.getPath()
+ " because of either isCompactedAway=" + r.isCompactedAway()
+ " or file has reference, isReferencedInReads=" + r.isReferencedInReads()
+ ", refCount=" + r.getRefCount() + ", skipping for now.");
+ } else {
+ LOG.info("Can't archive compacted file " + file.getPath() + ", skipping for now.");
+ }
}
} catch (Exception e) {
LOG.error(
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java
index 96faee8..b2918e8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java
@@ -69,7 +69,7 @@ import org.slf4j.LoggerFactory;
public class MajorCompactor extends Configured implements Tool {
private static final Logger LOG = LoggerFactory.getLogger(MajorCompactor.class);
- protected static final Set<MajorCompactionRequest> ERRORS = Sets.newHashSet();
+ static final Set<MajorCompactionRequest> ERRORS = Sets.newHashSet();
protected ClusterCompactionQueues clusterCompactionQueues;
private long timestamp;