This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 23462f88f2b HBASE-27202 Clean up error-prone findings in
hbase-balancer (#4623)
23462f88f2b is described below
commit 23462f88f2b90f503e0db78a67c9f6c76a89f84d
Author: Andrew Purtell <[email protected]>
AuthorDate: Mon Jul 18 15:35:43 2022 -0700
HBASE-27202 Clean up error-prone findings in hbase-balancer (#4623)
On branch-2.5, the affected code is in hbase-server.
Signed-off-by: Duo Zhang <[email protected]>
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java
---
.../hadoop/hbase/favored/FavoredNodeAssignmentHelper.java | 12 +++++-------
.../org/apache/hadoop/hbase/favored/FavoredNodesPlan.java | 4 ++--
.../hadoop/hbase/master/AssignmentVerificationReport.java | 6 +++---
.../main/java/org/apache/hadoop/hbase/master/RegionPlan.java | 5 +----
.../hadoop/hbase/master/balancer/BalancerClusterState.java | 2 +-
.../hadoop/hbase/master/balancer/RegionLocationFinder.java | 2 +-
6 files changed, 13 insertions(+), 18 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeAssignmentHelper.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeAssignmentHelper.java
index 85b815ded5e..f98c1da3782 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeAssignmentHelper.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeAssignmentHelper.java
@@ -109,7 +109,7 @@ public class FavoredNodeAssignmentHelper {
break;
}
}
- serverList.add((sn));
+ serverList.add(sn);
this.regionServerToRackMap.put(sn.getHostname(), rackName);
}
}
@@ -233,7 +233,7 @@ public class FavoredNodeAssignmentHelper {
if (numIterations % rackList.size() == 0) {
if (++serverIndex >= maxRackSize) serverIndex = 0;
}
- if ((++rackIndex) >= rackList.size()) {
+ if (++rackIndex >= rackList.size()) {
rackIndex = 0; // reset the rack index to 0
}
} else break;
@@ -257,7 +257,7 @@ public class FavoredNodeAssignmentHelper {
if (numIterations % rackList.size() == 0) {
++serverIndex;
}
- if ((++rackIndex) >= rackList.size()) {
+ if (++rackIndex >= rackList.size()) {
rackIndex = 0; // reset the rack index to 0
}
}
@@ -296,7 +296,7 @@ public class FavoredNodeAssignmentHelper {
if (getTotalNumberOfRacks() == 1) {
favoredNodes = singleRackCase(regionInfo, primaryRS, primaryRack);
} else {
- favoredNodes = multiRackCase(regionInfo, primaryRS, primaryRack);
+ favoredNodes = multiRackCase(primaryRS, primaryRack);
}
return favoredNodes;
}
@@ -481,14 +481,12 @@ public class FavoredNodeAssignmentHelper {
* has only one region server, then we place primary and tertiary on one
rack and secondary on
* another. The aim is two distribute the three favored nodes on >= 2 racks.
TODO: see how we can
* use generateMissingFavoredNodeMultiRack API here
- * @param regionInfo Region for which we are trying to generate FN
* @param primaryRS The primary favored node.
* @param primaryRack The rack of the primary favored node.
* @return Array containing secondary and tertiary favored nodes.
* @throws IOException Signals that an I/O exception has occurred.
*/
- private ServerName[] multiRackCase(RegionInfo regionInfo, ServerName
primaryRS,
- String primaryRack) throws IOException {
+ private ServerName[] multiRackCase(ServerName primaryRS, String primaryRack)
throws IOException {
List<ServerName> favoredNodes = Lists.newArrayList(primaryRS);
// Create the secondary and tertiary pair
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPlan.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPlan.java
index da58fc9d358..9fbcf288e92 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPlan.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPlan.java
@@ -99,7 +99,7 @@ public class FavoredNodesPlan {
}
/**
- * @return the mapping between each region to its favored region server list
+ * Return the mapping between each region to its favored region server list.
*/
public Map<String, List<ServerName>> getAssignmentMap() {
// Make a deep copy so changes don't harm our copy of favoredNodesMap.
@@ -119,7 +119,7 @@ public class FavoredNodesPlan {
if (o == null) {
return false;
}
- if (getClass() != o.getClass()) {
+ if (!(o instanceof FavoredNodesPlan)) {
return false;
}
// To compare the map from object o is identical to current assignment map.
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java
index ff4903026f6..8d32107cf87 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentVerificationReport.java
@@ -410,8 +410,8 @@ public class AssignmentVerificationReport {
}
/**
- * @return list which contains just 3 elements: average dispersion score,
max dispersion score and
- * min dispersion score as first, second and third element
respectively.
+ * Return a list which contains 3 elements: average dispersion score, max
dispersion score and min
+ * dispersion score as first, second and third elements, respectively.
*/
public List<Float> getDispersionInformation() {
List<Float> dispersion = new ArrayList<>();
@@ -579,7 +579,7 @@ public class AssignmentVerificationReport {
}
int i = 0;
for (ServerName addr : serverSet) {
- if ((i++) % 3 == 0) {
+ if (i++ % 3 == 0) {
System.out.print("\n\t\t\t");
}
System.out.print(addr.getAddress() + " ; ");
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
index d6909dc2802..5632fcc02ff 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java
@@ -148,10 +148,7 @@ public class RegionPlan implements Comparable<RegionPlan> {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (!(obj instanceof RegionPlan)) {
return false;
}
RegionPlan other = (RegionPlan) obj;
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BalancerClusterState.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BalancerClusterState.java
index ab55b1bcfd2..4a9bdfee708 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BalancerClusterState.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BalancerClusterState.java
@@ -216,7 +216,7 @@ class BalancerClusterState {
colocatedReplicaCountsPerHost = new Int2IntCounterMap[numHosts];
colocatedReplicaCountsPerRack = new Int2IntCounterMap[numRacks];
- int tableIndex = 0, regionIndex = 0, regionPerServerIndex = 0;
+ int regionIndex = 0, regionPerServerIndex = 0;
for (Map.Entry<ServerName, List<RegionInfo>> entry :
clusterState.entrySet()) {
if (entry.getKey() == null) {
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java
index 53d18eefc94..56b6de154ee 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java
@@ -282,7 +282,7 @@ class RegionLocationFinder {
* @param hosts the list of hosts
* @return ServerName list
*/
- protected List<ServerName> mapHostNameToServerName(List<String> hosts) {
+ List<ServerName> mapHostNameToServerName(List<String> hosts) {
if (hosts == null || status == null) {
if (hosts == null) {
LOG.warn("RegionLocationFinder top hosts is null");
