You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2018/07/23 23:29:36 UTC
hbase git commit: HBASE-20744 Address FindBugs warnings in branch-1
Repository: hbase
Updated Branches:
refs/heads/branch-1 dfc7ecd9c -> 3a97976ea
HBASE-20744 Address FindBugs warnings in branch-1
minor fix
Signed-off-by: tedyu <yu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3a97976e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3a97976e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3a97976e
Branch: refs/heads/branch-1
Commit: 3a97976eae02023f5f8feebf8132fad7b24fffd2
Parents: dfc7ecd
Author: Xu Cang <xc...@salesforce.com>
Authored: Sun Jul 22 23:40:17 2018 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Mon Jul 23 16:29:13 2018 -0700
----------------------------------------------------------------------
.../hadoop/hbase/io/encoding/EncodedDataBlock.java | 6 +++++-
.../hadoop/metrics2/lib/MetricsExecutorImpl.java | 2 +-
.../hbase/quotas/RegionServerQuotaManager.java | 17 +++--------------
3 files changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3a97976e/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/EncodedDataBlock.java
----------------------------------------------------------------------
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 192c84d..6959edd 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.ourBytes);
+ this.dataBlockEncoder.endBlockEncoding(encodingCtx, out, stream.getOurBytes());
} catch (IOException e) {
throw new RuntimeException(String.format(
"Bug in encoding part of algorithm %s. " +
@@ -268,6 +268,10 @@ 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;
http://git-wip-us.apache.org/repos/asf/hbase/blob/3a97976e/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java
----------------------------------------------------------------------
diff --git a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java
index c381609..57b199f 100644
--- a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java
+++ b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/metrics2/lib/MetricsExecutorImpl.java
@@ -48,7 +48,7 @@ public class MetricsExecutorImpl implements MetricsExecutor {
private enum ExecutorSingleton {
INSTANCE;
- private final ScheduledExecutorService scheduler = new ScheduledThreadPoolExecutor(1,
+ private final transient ScheduledExecutorService scheduler = new ScheduledThreadPoolExecutor(1,
new ThreadPoolExecutorThreadFactory("HBase-Metrics2-"));
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/3a97976e/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionServerQuotaManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionServerQuotaManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionServerQuotaManager.java
index 21f206a..89ae3f5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionServerQuotaManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/RegionServerQuotaManager.java
@@ -190,21 +190,10 @@ public class RegionServerQuotaManager {
+ e.getMessage());
// Depending on whether we are supposed to throw a retryable IO exeption or not, choose
// the correct exception type to (re)throw
- if (e instanceof ThrottlingException) {
- if (useRetryableThrottlingException) {
- throw new RpcThrottlingException(e.getMessage());
- } else {
- throw e;
- }
- } else if (e instanceof RpcThrottlingException) {
- if (useRetryableThrottlingException) {
- throw e;
- } else {
- throw new ThrottlingException(e.getMessage());
- }
- } else {
- LOG.warn("Unexpected exception from quota check", e);
+ if (useRetryableThrottlingException) {
throw e;
+ } else {
+ throw new ThrottlingException(e.getMessage());
}
}
return quota;