You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2020/01/26 18:46:26 UTC
[hbase] branch branch-2.1 updated (00555d2 -> 8a7139c)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a change to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 00555d2 HBASE-23686 Revert binary incompatible change in ByteRangeUtils and removed reflections in CommonFSUtils
new 7fba1a6 HBASE-23737 [Flakey Tests] TestFavoredNodeTableImport fails 30% of the time
new 8a7139c HBASE-23737 [Flakey Tests] TestFavoredNodeTableImport fails 30% of the time; AMENDMENT This is actual fix; previous added debug to test.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hadoop/hbase/favored/FavoredNodesManager.java | 57 +++++++++-------------
.../hadoop/hbase/favored/FavoredNodesPlan.java | 42 +++++++++-------
.../hbase/master/RegionPlacementMaintainer.java | 2 +-
.../balancer/TestFavoredNodeTableImport.java | 27 +++++++---
4 files changed, 69 insertions(+), 59 deletions(-)
[hbase] 02/02: HBASE-23737 [Flakey Tests]
TestFavoredNodeTableImport fails 30% of the time;
AMENDMENT This is actual fix; previous added debug to test.
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8a7139c630fc9cf67314ec9303c250e2e4d14c5a
Author: stack <st...@apache.org>
AuthorDate: Sat Jan 25 17:01:10 2020 -0800
HBASE-23737 [Flakey Tests] TestFavoredNodeTableImport fails 30% of the time; AMENDMENT
This is actual fix; previous added debug to test.
---
.../hadoop/hbase/favored/FavoredNodesManager.java | 57 +++++++++-------------
.../hadoop/hbase/favored/FavoredNodesPlan.java | 42 +++++++++-------
.../hbase/master/RegionPlacementMaintainer.java | 2 +-
3 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java
index 67d4071..77334db 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesManager.java
@@ -1,5 +1,4 @@
-/**
- *
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -23,7 +22,6 @@ import static org.apache.hadoop.hbase.favored.FavoredNodeAssignmentHelper.FAVORE
import static org.apache.hadoop.hbase.favored.FavoredNodesPlan.Position.PRIMARY;
import static org.apache.hadoop.hbase.favored.FavoredNodesPlan.Position.SECONDARY;
import static org.apache.hadoop.hbase.favored.FavoredNodesPlan.Position.TERTIARY;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,9 +29,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
+import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseIOException;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.master.MasterServices;
@@ -56,22 +53,21 @@ import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
* should be done through this class. There should only be one instance of
* {@link FavoredNodesManager} in Master. {@link FavoredNodesPlan} and favored node information
* from {@link SnapshotOfRegionAssignmentFromMeta} should not be used outside this class (except
- * for may be tools that only read or test cases). All other classes including Favored balancers
+ * for tools that only read or fortest cases). All other classes including Favored balancers
* and {@link FavoredNodeAssignmentHelper} should use {@link FavoredNodesManager} for any
* read/write/deletes to favored nodes.
*/
@InterfaceAudience.Private
public class FavoredNodesManager {
-
private static final Logger LOG = LoggerFactory.getLogger(FavoredNodesManager.class);
- private FavoredNodesPlan globalFavoredNodesAssignmentPlan;
- private Map<ServerName, List<RegionInfo>> primaryRSToRegionMap;
- private Map<ServerName, List<RegionInfo>> secondaryRSToRegionMap;
- private Map<ServerName, List<RegionInfo>> teritiaryRSToRegionMap;
+ private final FavoredNodesPlan globalFavoredNodesAssignmentPlan;
+ private final Map<ServerName, List<RegionInfo>> primaryRSToRegionMap;
+ private final Map<ServerName, List<RegionInfo>> secondaryRSToRegionMap;
+ private final Map<ServerName, List<RegionInfo>> teritiaryRSToRegionMap;
- private MasterServices masterServices;
- private RackManager rackManager;
+ private final MasterServices masterServices;
+ private final RackManager rackManager;
/**
* Datanode port to be used for Favored Nodes.
@@ -87,15 +83,19 @@ public class FavoredNodesManager {
this.rackManager = new RackManager(masterServices.getConfiguration());
}
- public void initialize(SnapshotOfRegionAssignmentFromMeta snapshotOfRegionAssignment)
- throws HBaseIOException {
- globalFavoredNodesAssignmentPlan = snapshotOfRegionAssignment.getExistingAssignmentPlan();
- primaryRSToRegionMap = snapshotOfRegionAssignment.getPrimaryToRegionInfoMap();
- secondaryRSToRegionMap = snapshotOfRegionAssignment.getSecondaryToRegionInfoMap();
- teritiaryRSToRegionMap = snapshotOfRegionAssignment.getTertiaryToRegionInfoMap();
- datanodeDataTransferPort = getDataNodePort();
+ public synchronized void initialize(SnapshotOfRegionAssignmentFromMeta snapshot) {
+ // Add snapshot to structures made on creation. Current structures may have picked
+ // up data between construction and the scan of meta needed before this method
+ // is called. See HBASE-23737 "[Flakey Tests] TestFavoredNodeTableImport fails 30% of the time"
+ this.globalFavoredNodesAssignmentPlan.
+ updateFavoredNodesMap(snapshot.getExistingAssignmentPlan());
+ primaryRSToRegionMap.putAll(snapshot.getPrimaryToRegionInfoMap());
+ secondaryRSToRegionMap.putAll(snapshot.getSecondaryToRegionInfoMap());
+ teritiaryRSToRegionMap.putAll(snapshot.getTertiaryToRegionInfoMap());
+ datanodeDataTransferPort= getDataNodePort();
}
+ @VisibleForTesting
public int getDataNodePort() {
HdfsConfiguration.init();
@@ -122,18 +122,10 @@ public class FavoredNodesManager {
/**
* Filter and return regions for which favored nodes is not applicable.
- *
- * @param regions - collection of regions
* @return set of regions for which favored nodes is not applicable
*/
public static Set<RegionInfo> filterNonFNApplicableRegions(Collection<RegionInfo> regions) {
- Set<RegionInfo> fnRegions = Sets.newHashSet();
- for (RegionInfo regionInfo : regions) {
- if (!isFavoredNodeApplicable(regionInfo)) {
- fnRegions.add(regionInfo);
- }
- }
- return fnRegions;
+ return regions.stream().filter(r -> !isFavoredNodeApplicable(r)).collect(Collectors.toSet());
}
/*
@@ -194,8 +186,7 @@ public class FavoredNodesManager {
}
// Lets do a bulk update to meta since that reduces the RPC's
- FavoredNodeAssignmentHelper.updateMetaWithFavoredNodesInfo(
- regionToFavoredNodes,
+ FavoredNodeAssignmentHelper.updateMetaWithFavoredNodesInfo(regionToFavoredNodes,
masterServices.getConnection());
deleteFavoredNodesForRegions(regionToFavoredNodes.keySet());
@@ -208,8 +199,8 @@ public class FavoredNodesManager {
}
private synchronized void addToReplicaLoad(RegionInfo hri, List<ServerName> servers) {
- ServerName serverToUse = ServerName.valueOf(servers.get(PRIMARY.ordinal()).getHostAndPort(),
- NON_STARTCODE);
+ ServerName serverToUse =
+ ServerName.valueOf(servers.get(PRIMARY.ordinal()).getAddress().toString(), NON_STARTCODE);
List<RegionInfo> regionList = primaryRSToRegionMap.get(serverToUse);
if (regionList == null) {
regionList = new ArrayList<>();
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 ac8281e..a7667c3 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
@@ -1,4 +1,4 @@
-/**
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,10 +18,11 @@
*/
package org.apache.hadoop.hbase.favored;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
+import java.util.stream.Collectors;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.yetus.audience.InterfaceAudience;
@@ -35,9 +36,8 @@ import org.apache.yetus.audience.InterfaceAudience;
*/
@InterfaceAudience.Private
public class FavoredNodesPlan {
-
- /** the map between each region name and its favored region server list */
- private Map<String, List<ServerName>> favoredNodesMap;
+ /** The map between each region name and its favored region server list */
+ private final Map<String, List<ServerName>> favoredNodesMap;
public static enum Position {
PRIMARY,
@@ -46,13 +46,18 @@ public class FavoredNodesPlan {
}
public FavoredNodesPlan() {
- favoredNodesMap = new ConcurrentHashMap<>();
+ this.favoredNodesMap = new ConcurrentHashMap<>();
+ }
+
+ /**
+ * Add to existing Map of FavoredNodes.
+ */
+ void updateFavoredNodesMap(FavoredNodesPlan fnp) {
+ this.favoredNodesMap.putAll(fnp.favoredNodesMap);
}
/**
* Update an assignment to the plan
- * @param region
- * @param servers
*/
public void updateFavoredNodesMap(RegionInfo region, List<ServerName> servers) {
if (region == null || servers == null || servers.isEmpty()) {
@@ -63,15 +68,13 @@ public class FavoredNodesPlan {
/**
* Remove a favored node assignment
- * @param region region
* @return the list of favored region server for this region based on the plan
*/
- public List<ServerName> removeFavoredNodes(RegionInfo region) {
+ List<ServerName> removeFavoredNodes(RegionInfo region) {
return favoredNodesMap.remove(region.getRegionNameAsString());
}
/**
- * @param region
* @return the list of favored region server for this region based on the plan
*/
public List<ServerName> getFavoredNodes(RegionInfo region) {
@@ -81,8 +84,6 @@ public class FavoredNodesPlan {
/**
* Return the position of the server in the favoredNodes list. Assumes the
* favoredNodes list is of size 3.
- * @param favoredNodes
- * @param server
* @return position
*/
public static Position getFavoredServerPosition(
@@ -103,7 +104,13 @@ public class FavoredNodesPlan {
* @return the mapping between each region to its favored region server list
*/
public Map<String, List<ServerName>> getAssignmentMap() {
- return favoredNodesMap;
+ // Make a deep copy so changes don't harm our copy of favoredNodesMap.
+ return this.favoredNodesMap.entrySet().stream().
+ collect(Collectors.toMap(k -> k.getKey(), v -> new ArrayList<ServerName>(v.getValue())));
+ }
+
+ public int size() {
+ return this.favoredNodesMap.size();
}
@Override
@@ -117,12 +124,13 @@ public class FavoredNodesPlan {
if (getClass() != o.getClass()) {
return false;
}
- // To compare the map from objec o is identical to current assignment map.
- Map<String, List<ServerName>> comparedMap = ((FavoredNodesPlan)o).getAssignmentMap();
+ // To compare the map from object o is identical to current assignment map.
+ Map<String, List<ServerName>> comparedMap = ((FavoredNodesPlan)o).favoredNodesMap;
// compare the size
- if (comparedMap.size() != this.favoredNodesMap.size())
+ if (comparedMap.size() != this.favoredNodesMap.size()) {
return false;
+ }
// compare each element in the assignment map
for (Map.Entry<String, List<ServerName>> entry :
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java
index faf5e4a..2e2658d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlacementMaintainer.java
@@ -700,7 +700,7 @@ public class RegionPlacementMaintainer {
LOG.info("Region server " +
ProtobufUtil.getServerInfo(null, currentRegionServer).getServerName() +
" has updated " + updateFavoredNodesResponse.getResponse() + " / " +
- singleServerPlan.getAssignmentMap().size() +
+ singleServerPlan.size() +
" regions with the assignment plan");
succeededNum ++;
}
[hbase] 01/02: HBASE-23737 [Flakey Tests]
TestFavoredNodeTableImport fails 30% of the time
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 7fba1a6d2f054e38730ed4f3afd081149d095779
Author: stack <st...@apache.org>
AuthorDate: Fri Jan 24 17:56:42 2020 -0800
HBASE-23737 [Flakey Tests] TestFavoredNodeTableImport fails 30% of the time
---
.../balancer/TestFavoredNodeTableImport.java | 27 +++++++++++++++-------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredNodeTableImport.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredNodeTableImport.java
index 6958ed2..29f0708 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredNodeTableImport.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredNodeTableImport.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.master.balancer;
import static org.apache.hadoop.hbase.favored.FavoredNodeAssignmentHelper.FAVORED_NODES_NUM;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.util.List;
import java.util.Set;
@@ -34,11 +35,13 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.favored.FavoredNodesManager;
+import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
import org.junit.After;
import org.junit.ClassRule;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
@@ -66,7 +69,6 @@ public class TestFavoredNodeTableImport {
@After
public void stopCluster() throws Exception {
- UTIL.cleanupTestDir();
UTIL.shutdownMiniCluster();
}
@@ -81,13 +83,14 @@ public class TestFavoredNodeTableImport {
Threads.sleep(1);
}
Admin admin = UTIL.getAdmin();
- admin.setBalancerRunning(false, true);
+ admin.balancerSwitch(false, true);
String tableName = "testFNImport";
HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(tableName));
desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
admin.createTable(desc, Bytes.toBytes("a"), Bytes.toBytes("z"), REGION_NUM);
UTIL.waitTableAvailable(desc.getTableName());
+ admin.balancerSwitch(true, true);
LOG.info("Shutting down cluster");
UTIL.shutdownMiniHBaseCluster();
@@ -97,18 +100,26 @@ public class TestFavoredNodeTableImport {
UTIL.getConfiguration().set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS,
FavoredStochasticBalancer.class.getName());
UTIL.restartHBaseCluster(SLAVES);
- while (!UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
+ HMaster master = UTIL.getMiniHBaseCluster().getMaster();
+ while (!master.isInitialized()) {
Threads.sleep(1);
}
- admin = UTIL.getAdmin();
-
UTIL.waitTableAvailable(desc.getTableName());
+ UTIL.waitUntilNoRegionsInTransition(10000);
+ assertTrue(master.isBalancerOn());
- FavoredNodesManager fnm = UTIL.getHBaseCluster().getMaster().getFavoredNodesManager();
+ FavoredNodesManager fnm = master.getFavoredNodesManager();
+ assertNotNull(fnm);
+ admin = UTIL.getAdmin();
List<HRegionInfo> regionsOfTable = admin.getTableRegions(TableName.valueOf(tableName));
for (HRegionInfo rInfo : regionsOfTable) {
- Set<ServerName> favNodes = Sets.newHashSet(fnm.getFavoredNodes(rInfo));
+ assertNotNull(rInfo);
+ assertNotNull(fnm);
+ List<ServerName> fns = fnm.getFavoredNodes(rInfo);
+ LOG.info("FNS {} {}", rInfo, fns);
+ assertNotNull(rInfo.toString(), fns);
+ Set<ServerName> favNodes = Sets.newHashSet(fns);
assertNotNull(favNodes);
assertEquals("Required no of favored nodes not found.", FAVORED_NODES_NUM, favNodes.size());
for (ServerName fn : favNodes) {