HBASE-26368 Fix checkstyle issues for HRegionServer (#3764)
Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
parent
e0813e5402
commit
0d8e5e5219
|
@ -380,8 +380,8 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
private Map<String, Service> coprocessorServiceHandlers = Maps.newHashMap();
|
||||
|
||||
/**
|
||||
* @deprecated since 2.4.0 and will be removed in 4.0.0.
|
||||
* Use {@link HRegionServer#UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY} instead.
|
||||
* @deprecated since 2.4.0 and will be removed in 4.0.0. Use
|
||||
* {@link HRegionServer#UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY} instead.
|
||||
* @see <a href="https://issues.apache.org/jira/browse/HBASE-24667">HBASE-24667</a>
|
||||
*/
|
||||
@Deprecated
|
||||
|
@ -521,9 +521,10 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
String hostname = conf.get(UNSAFE_RS_HOSTNAME_KEY);
|
||||
if (conf.getBoolean(UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY, false)) {
|
||||
if (!StringUtils.isBlank(hostname)) {
|
||||
String msg = UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY + " and " + UNSAFE_RS_HOSTNAME_KEY +
|
||||
" are mutually exclusive. Do not set " + UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY +
|
||||
" to true while " + UNSAFE_RS_HOSTNAME_KEY + " is used";
|
||||
String msg = UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY + " and " +
|
||||
UNSAFE_RS_HOSTNAME_KEY + " are mutually exclusive. Do not set " +
|
||||
UNSAFE_RS_HOSTNAME_DISABLE_MASTER_REVERSEDNS_KEY + " to true while " +
|
||||
UNSAFE_RS_HOSTNAME_KEY + " is used";
|
||||
throw new IOException(msg);
|
||||
} else {
|
||||
return rpcServices.getSocketAddress().getHostName();
|
||||
|
@ -617,7 +618,9 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
private static void checkCodecs(final Configuration c) throws IOException {
|
||||
// check to see if the codec list is available:
|
||||
String [] codecs = c.getStrings(REGIONSERVER_CODEC, (String[])null);
|
||||
if (codecs == null) return;
|
||||
if (codecs == null) {
|
||||
return;
|
||||
}
|
||||
for (String codec : codecs) {
|
||||
if (!CompressionTest.testCompression(codec)) {
|
||||
throw new IOException("Compression codec " + codec +
|
||||
|
@ -852,9 +855,15 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
|
||||
// Send interrupts to wake up threads if sleeping so they notice shutdown.
|
||||
// TODO: Should we check they are alive? If OOME could have exited already
|
||||
if (this.hMemManager != null) this.hMemManager.stop();
|
||||
if (this.cacheFlusher != null) this.cacheFlusher.interruptIfNecessary();
|
||||
if (this.compactSplitThread != null) this.compactSplitThread.interruptIfNecessary();
|
||||
if (this.hMemManager != null) {
|
||||
this.hMemManager.stop();
|
||||
}
|
||||
if (this.cacheFlusher != null) {
|
||||
this.cacheFlusher.interruptIfNecessary();
|
||||
}
|
||||
if (this.compactSplitThread != null) {
|
||||
this.compactSplitThread.interruptIfNecessary();
|
||||
}
|
||||
|
||||
// Stop the snapshot and other procedure handlers, forcefully killing all running tasks
|
||||
if (rspmHost != null) {
|
||||
|
@ -949,7 +958,9 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
}
|
||||
|
||||
private boolean areAllUserRegionsOffline() {
|
||||
if (getNumberOfOnlineRegions() > 2) return false;
|
||||
if (getNumberOfOnlineRegions() > 2) {
|
||||
return false;
|
||||
}
|
||||
boolean allUserRegionsOffline = true;
|
||||
for (Map.Entry<String, HRegion> e: this.onlineRegions.entrySet()) {
|
||||
if (!e.getValue().getRegionInfo().isMetaRegion()) {
|
||||
|
@ -1185,7 +1196,9 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
private String getOnlineRegionsAsPrintableString() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (Region r: this.onlineRegions.values()) {
|
||||
if (sb.length() > 0) sb.append(", ");
|
||||
if (sb.length() > 0) {
|
||||
sb.append(", ");
|
||||
}
|
||||
sb.append(r.getRegionInfo().getEncodedName());
|
||||
}
|
||||
return sb.toString();
|
||||
|
@ -1595,7 +1608,9 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
protected void chore() {
|
||||
final StringBuilder whyFlush = new StringBuilder();
|
||||
for (HRegion r : this.server.onlineRegions.values()) {
|
||||
if (r == null) continue;
|
||||
if (r == null) {
|
||||
continue;
|
||||
}
|
||||
if (r.shouldFlush(whyFlush)) {
|
||||
FlushRequester requester = server.getFlushRequester();
|
||||
if (requester != null) {
|
||||
|
@ -2134,7 +2149,9 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
" after " + pauseTime + "ms delay (Master is coming online...).":
|
||||
" immediately."),
|
||||
ioe);
|
||||
if (pause) Threads.sleep(pauseTime);
|
||||
if (pause) {
|
||||
Threads.sleep(pauseTime);
|
||||
}
|
||||
tries++;
|
||||
if (rssStub == rss) {
|
||||
rssStub = null;
|
||||
|
@ -2299,8 +2316,7 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
}
|
||||
|
||||
/**
|
||||
* @return Return the object that implements the replication
|
||||
* source executorService.
|
||||
* @return Return the object that implements the replication source executorService.
|
||||
*/
|
||||
@Override
|
||||
public ReplicationSourceService getReplicationSourceService() {
|
||||
|
@ -2397,8 +2413,8 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
}
|
||||
|
||||
/**
|
||||
* @return True if we should break loop because cluster is going down or
|
||||
* this server has been stopped or hdfs has gone bad.
|
||||
* @return True if we should break loop because cluster is going down or this server has been
|
||||
* stopped or hdfs has gone bad.
|
||||
*/
|
||||
private boolean keepLooping() {
|
||||
return !this.stopped && isClusterUp();
|
||||
|
@ -2412,10 +2428,14 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
* @throws IOException
|
||||
*/
|
||||
private RegionServerStartupResponse reportForDuty() throws IOException {
|
||||
if (this.masterless) return RegionServerStartupResponse.getDefaultInstance();
|
||||
if (this.masterless) {
|
||||
return RegionServerStartupResponse.getDefaultInstance();
|
||||
}
|
||||
ServerName masterServerName = createRegionServerStatusStub(true);
|
||||
RegionServerStatusService.BlockingInterface rss = rssStub;
|
||||
if (masterServerName == null || rss == null) return null;
|
||||
if (masterServerName == null || rss == null) {
|
||||
return null;
|
||||
}
|
||||
RegionServerStartupResponse result = null;
|
||||
try {
|
||||
rpcServices.requestCount.reset();
|
||||
|
@ -2493,12 +2513,16 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
if (hri.isMetaRegion()) {
|
||||
meta = e.getValue();
|
||||
}
|
||||
if (meta != null) break;
|
||||
if (meta != null) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
this.onlineRegionsLock.writeLock().unlock();
|
||||
}
|
||||
if (meta != null) closeRegionIgnoreErrors(meta.getRegionInfo(), abort);
|
||||
if (meta != null) {
|
||||
closeRegionIgnoreErrors(meta.getRegionInfo(), abort);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -2906,13 +2930,16 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
if (closeSeqNum == HConstants.NO_SEQNUM) {
|
||||
// No edits in WAL for this region; get the sequence number when the region was opened.
|
||||
closeSeqNum = r.getOpenSeqNum();
|
||||
if (closeSeqNum == HConstants.NO_SEQNUM) closeSeqNum = 0;
|
||||
if (closeSeqNum == HConstants.NO_SEQNUM) {
|
||||
closeSeqNum = 0;
|
||||
}
|
||||
}
|
||||
boolean selfMove = ServerName.isSameAddress(destination, this.getServerName());
|
||||
addToMovedRegions(r.getRegionInfo().getEncodedName(), destination, closeSeqNum, selfMove);
|
||||
if (selfMove) {
|
||||
this.regionServerAccounting.getRetainedRegionRWRequestsCnt().put(r.getRegionInfo().getEncodedName()
|
||||
, new Pair<>(r.getReadRequestsCount(), r.getWriteRequestsCount()));
|
||||
this.regionServerAccounting.getRetainedRegionRWRequestsCnt().put(
|
||||
r.getRegionInfo().getEncodedName(),
|
||||
new Pair<>(r.getReadRequestsCount(), r.getWriteRequestsCount()));
|
||||
}
|
||||
}
|
||||
this.regionFavoredNodesMap.remove(r.getRegionInfo().getEncodedName());
|
||||
|
@ -3028,7 +3055,7 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
* Return the favored nodes for a region given its encoded name. Look at the
|
||||
* comment around {@link #regionFavoredNodesMap} on why we convert to InetSocketAddress[]
|
||||
* here.
|
||||
* @param encodedRegionName
|
||||
* @param encodedRegionName the encoded region name.
|
||||
* @return array of favored locations
|
||||
*/
|
||||
@Override
|
||||
|
@ -3065,7 +3092,8 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
*/
|
||||
private static final int TIMEOUT_REGION_MOVED = (2 * 60 * 1000);
|
||||
|
||||
private void addToMovedRegions(String encodedName, ServerName destination, long closeSeqNum, boolean selfMove) {
|
||||
private void addToMovedRegions(String encodedName, ServerName destination,
|
||||
long closeSeqNum, boolean selfMove) {
|
||||
if (selfMove) {
|
||||
LOG.warn("Not adding moved region record: " + encodedName + " to self.");
|
||||
return;
|
||||
|
@ -3114,8 +3142,8 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
|
|||
String serviceName = call.getServiceName();
|
||||
Service service = coprocessorServiceHandlers.get(serviceName);
|
||||
if (service == null) {
|
||||
throw new UnknownProtocolException(null, "No registered coprocessor executorService found for " +
|
||||
serviceName);
|
||||
throw new UnknownProtocolException(null,
|
||||
"No registered coprocessor executorService found for " + serviceName);
|
||||
}
|
||||
ServiceDescriptor serviceDesc =
|
||||
service.getDescriptorForType();
|
||||
|
|
Loading…
Reference in New Issue