This is an automated email from the ASF dual-hosted git repository.
janh pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 553985e HBASE-23627 Resolved remaining Checkstyle violations in
hbase-thrift
553985e is described below
commit 553985e1a4db2dcb12e7a50e1f6af7dc78e8d94d
Author: Jan Hentschel <[email protected]>
AuthorDate: Wed Jan 1 22:41:13 2020 +0100
HBASE-23627 Resolved remaining Checkstyle violations in hbase-thrift
Signed-off-by: Viraj Jasani <[email protected]>
Signed-off-by: stack <[email protected]>
---
.../hadoop/hbase/thrift/IncrementCoalescer.java | 120 +++++++++++----------
.../thrift/TestThriftSpnegoHttpFallbackServer.java | 44 ++++----
.../hbase/thrift/TestThriftSpnegoHttpServer.java | 44 ++++----
3 files changed, 102 insertions(+), 106 deletions(-)
diff --git
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java
index 122675c..d8c2f03 100644
---
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java
+++
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.hadoop.hbase.thrift;
import java.io.IOException;
@@ -35,7 +34,6 @@ import org.apache.hadoop.hbase.thrift.generated.TIncrement;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.metrics2.util.MBeans;
-import org.apache.thrift.TException;
import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +49,6 @@ import org.slf4j.LoggerFactory;
*/
@InterfaceAudience.Private
public class IncrementCoalescer implements IncrementCoalescerMBean {
-
/**
* Used to identify a cell that will be incremented.
*
@@ -82,10 +79,6 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
return rowKey;
}
- public void setRowKey(byte[] rowKey) {
- this.rowKey = rowKey;
- }
-
public byte[] getFamily() {
return family;
}
@@ -115,17 +108,30 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
@Override
public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+
FullyQualifiedRow other = (FullyQualifiedRow) obj;
- if (!Arrays.equals(family, other.family)) return false;
- if (!Arrays.equals(qualifier, other.qualifier)) return false;
- if (!Arrays.equals(rowKey, other.rowKey)) return false;
- if (!Arrays.equals(table, other.table)) return false;
- return true;
- }
+ if (!Arrays.equals(family, other.family)) {
+ return false;
+ }
+ if (!Arrays.equals(qualifier, other.qualifier)) {
+ return false;
+ }
+ if (!Arrays.equals(rowKey, other.rowKey)) {
+ return false;
+ }
+
+ return Arrays.equals(table, other.table);
+ }
}
private final LongAdder failedIncrements = new LongAdder();
@@ -139,9 +145,8 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
private int maxQueueSize = 500000;
private static final int CORE_POOL_SIZE = 1;
- private static final Logger LOG =
LoggerFactory.getLogger(FullyQualifiedRow.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(IncrementCoalescer.class);
- @SuppressWarnings("deprecation")
public IncrementCoalescer(ThriftHBaseServiceHandler hand) {
this.handler = hand;
LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
@@ -151,7 +156,7 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
MBeans.register("thrift", "Thrift", this);
}
- public boolean queueIncrement(TIncrement inc) throws TException {
+ public boolean queueIncrement(TIncrement inc) {
if (!canQueue()) {
failedIncrements.increment();
return false;
@@ -159,7 +164,7 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
return internalQueueTincrement(inc);
}
- public boolean queueIncrements(List<TIncrement> incs) throws TException {
+ public boolean queueIncrements(List<TIncrement> incs) {
if (!canQueue()) {
failedIncrements.increment();
return false;
@@ -169,12 +174,14 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
internalQueueTincrement(tinc);
}
return true;
-
}
- private boolean internalQueueTincrement(TIncrement inc) throws TException {
+ private boolean internalQueueTincrement(TIncrement inc) {
byte[][] famAndQf = CellUtil.parseColumn(inc.getColumn());
- if (famAndQf.length != 2) return false;
+
+ if (famAndQf.length != 2) {
+ return false;
+ }
return internalQueueIncrement(inc.getTable(), inc.getRow(), famAndQf[0],
famAndQf[1],
inc.getAmmount());
@@ -182,10 +189,9 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
@SuppressWarnings("FutureReturnValueIgnored")
private boolean internalQueueIncrement(byte[] tableName, byte[] rowKey,
byte[] fam,
- byte[] qual, long ammount) throws TException {
+ byte[] qual, long ammount) {
int countersMapSize = countersMap.size();
-
//Make sure that the number of threads is scaled.
dynamicallySetCoreSize(countersMapSize);
@@ -199,7 +205,7 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
Long value = countersMap.remove(key);
if (value == null) {
// There was nothing there, create a new value
- value = Long.valueOf(currentAmount);
+ value = currentAmount;
} else {
value += currentAmount;
successfulCoalescings.increment();
@@ -232,39 +238,36 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
}
private Callable<Integer> createIncCallable() {
- return new Callable<Integer>() {
- @Override
- public Integer call() throws Exception {
- int failures = 0;
- Set<FullyQualifiedRow> keys = countersMap.keySet();
- for (FullyQualifiedRow row : keys) {
- Long counter = countersMap.remove(row);
- if (counter == null) {
- continue;
+ return () -> {
+ int failures = 0;
+ Set<FullyQualifiedRow> keys = countersMap.keySet();
+ for (FullyQualifiedRow row : keys) {
+ Long counter = countersMap.remove(row);
+ if (counter == null) {
+ continue;
+ }
+ Table table = null;
+ try {
+ table = handler.getTable(row.getTable());
+ if (failures > 2) {
+ throw new IOException("Auto-Fail rest of ICVs");
}
- Table table = null;
- try {
- table = handler.getTable(row.getTable());
- if (failures > 2) {
- throw new IOException("Auto-Fail rest of ICVs");
- }
- table.incrementColumnValue(row.getRowKey(), row.getFamily(),
row.getQualifier(),
- counter);
- } catch (IOException e) {
- // log failure of increment
- failures++;
- LOG.error("FAILED_ICV: " + Bytes.toString(row.getTable()) + ", "
- + Bytes.toStringBinary(row.getRowKey()) + ", "
- + Bytes.toStringBinary(row.getFamily()) + ", "
- + Bytes.toStringBinary(row.getQualifier()) + ", " + counter,
e);
- } finally{
- if(table != null){
- table.close();
- }
+ table.incrementColumnValue(row.getRowKey(), row.getFamily(),
row.getQualifier(),
+ counter);
+ } catch (IOException e) {
+ // log failure of increment
+ failures++;
+ LOG.error("FAILED_ICV: " + Bytes.toString(row.getTable()) + ", "
+ + Bytes.toStringBinary(row.getRowKey()) + ", "
+ + Bytes.toStringBinary(row.getFamily()) + ", "
+ + Bytes.toStringBinary(row.getQualifier()) + ", " + counter, e);
+ } finally{
+ if(table != null){
+ table.close();
}
}
- return failures;
}
+ return failures;
};
}
@@ -280,9 +283,10 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
return;
}
double currentRatio = (double) countersMapSize / (double) maxQueueSize;
- int newValue = 1;
+ int newValue;
+
if (currentRatio < 0.1) {
- // it's 1
+ newValue = 1;
} else if (currentRatio < 0.3) {
newValue = 2;
} else if (currentRatio < 0.5) {
@@ -294,6 +298,7 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
} else {
newValue = 22;
}
+
if (pool.getCorePoolSize() != newValue) {
pool.setCorePoolSize(newValue);
}
@@ -369,5 +374,4 @@ public class IncrementCoalescer implements
IncrementCoalescerMBean {
public long getCountersMapSize() {
return countersMap.size();
}
-
}
diff --git
a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftSpnegoHttpFallbackServer.java
b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftSpnegoHttpFallbackServer.java
index 0d11215..a1334a4 100644
---
a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftSpnegoHttpFallbackServer.java
+++
b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftSpnegoHttpFallbackServer.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.security.HBaseKerberosUtils;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.thrift.generated.Hbase;
-import org.apache.hadoop.hbase.util.TableDescriptorChecker;
import org.apache.hadoop.security.authentication.util.KerberosName;
import org.apache.http.HttpHeaders;
import org.apache.http.auth.AuthSchemeProvider;
@@ -212,29 +211,26 @@ public class TestThriftSpnegoHttpFallbackServer extends
TestThriftHttpServer {
// The name of the principal
final String clientPrincipalName =
clientPrincipals.iterator().next().getName();
- return Subject.doAs(clientSubject, new
PrivilegedExceptionAction<CloseableHttpClient>() {
- @Override
- public CloseableHttpClient run() throws Exception {
- // Logs in with Kerberos via GSS
- GSSManager gssManager = GSSManager.getInstance();
- // jGSS Kerberos login constant
- Oid oid = new Oid("1.2.840.113554.1.2.2");
- GSSName gssClient = gssManager.createName(clientPrincipalName,
GSSName.NT_USER_NAME);
- GSSCredential credential = gssManager.createCredential(gssClient,
- GSSCredential.DEFAULT_LIFETIME, oid, GSSCredential.INITIATE_ONLY);
-
- Lookup<AuthSchemeProvider> authRegistry =
RegistryBuilder.<AuthSchemeProvider>create()
- .register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory(true, true))
- .build();
-
- BasicCredentialsProvider credentialsProvider = new
BasicCredentialsProvider();
- credentialsProvider.setCredentials(AuthScope.ANY, new
KerberosCredentials(credential));
-
- return HttpClients.custom()
- .setDefaultAuthSchemeRegistry(authRegistry)
- .setDefaultCredentialsProvider(credentialsProvider)
- .build();
- }
+ return Subject.doAs(clientSubject,
(PrivilegedExceptionAction<CloseableHttpClient>) () -> {
+ // Logs in with Kerberos via GSS
+ GSSManager gssManager = GSSManager.getInstance();
+ // jGSS Kerberos login constant
+ Oid oid = new Oid("1.2.840.113554.1.2.2");
+ GSSName gssClient = gssManager.createName(clientPrincipalName,
GSSName.NT_USER_NAME);
+ GSSCredential credential = gssManager.createCredential(gssClient,
+ GSSCredential.DEFAULT_LIFETIME, oid, GSSCredential.INITIATE_ONLY);
+
+ Lookup<AuthSchemeProvider> authRegistry =
RegistryBuilder.<AuthSchemeProvider>create()
+ .register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory(true, true))
+ .build();
+
+ BasicCredentialsProvider credentialsProvider = new
BasicCredentialsProvider();
+ credentialsProvider.setCredentials(AuthScope.ANY, new
KerberosCredentials(credential));
+
+ return HttpClients.custom()
+ .setDefaultAuthSchemeRegistry(authRegistry)
+ .setDefaultCredentialsProvider(credentialsProvider)
+ .build();
});
}
}
diff --git
a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftSpnegoHttpServer.java
b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftSpnegoHttpServer.java
index f126da1..3206b54 100644
---
a/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftSpnegoHttpServer.java
+++
b/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftSpnegoHttpServer.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.security.HBaseKerberosUtils;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.thrift.generated.Hbase;
-import org.apache.hadoop.hbase.util.TableDescriptorChecker;
import org.apache.hadoop.security.authentication.util.KerberosName;
import org.apache.http.HttpHeaders;
import org.apache.http.auth.AuthSchemeProvider;
@@ -211,29 +210,26 @@ public class TestThriftSpnegoHttpServer extends
TestThriftHttpServer {
// The name of the principal
final String clientPrincipalName =
clientPrincipals.iterator().next().getName();
- return Subject.doAs(clientSubject, new
PrivilegedExceptionAction<CloseableHttpClient>() {
- @Override
- public CloseableHttpClient run() throws Exception {
- // Logs in with Kerberos via GSS
- GSSManager gssManager = GSSManager.getInstance();
- // jGSS Kerberos login constant
- Oid oid = new Oid("1.2.840.113554.1.2.2");
- GSSName gssClient = gssManager.createName(clientPrincipalName,
GSSName.NT_USER_NAME);
- GSSCredential credential = gssManager.createCredential(gssClient,
- GSSCredential.DEFAULT_LIFETIME, oid, GSSCredential.INITIATE_ONLY);
-
- Lookup<AuthSchemeProvider> authRegistry =
RegistryBuilder.<AuthSchemeProvider>create()
- .register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory(true, true))
- .build();
-
- BasicCredentialsProvider credentialsProvider = new
BasicCredentialsProvider();
- credentialsProvider.setCredentials(AuthScope.ANY, new
KerberosCredentials(credential));
-
- return HttpClients.custom()
- .setDefaultAuthSchemeRegistry(authRegistry)
- .setDefaultCredentialsProvider(credentialsProvider)
- .build();
- }
+ return Subject.doAs(clientSubject,
(PrivilegedExceptionAction<CloseableHttpClient>) () -> {
+ // Logs in with Kerberos via GSS
+ GSSManager gssManager = GSSManager.getInstance();
+ // jGSS Kerberos login constant
+ Oid oid = new Oid("1.2.840.113554.1.2.2");
+ GSSName gssClient = gssManager.createName(clientPrincipalName,
GSSName.NT_USER_NAME);
+ GSSCredential credential = gssManager.createCredential(gssClient,
+ GSSCredential.DEFAULT_LIFETIME, oid, GSSCredential.INITIATE_ONLY);
+
+ Lookup<AuthSchemeProvider> authRegistry =
RegistryBuilder.<AuthSchemeProvider>create()
+ .register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory(true, true))
+ .build();
+
+ BasicCredentialsProvider credentialsProvider = new
BasicCredentialsProvider();
+ credentialsProvider.setCredentials(AuthScope.ANY, new
KerberosCredentials(credential));
+
+ return HttpClients.custom()
+ .setDefaultAuthSchemeRegistry(authRegistry)
+ .setDefaultCredentialsProvider(credentialsProvider)
+ .build();
});
}
}
