Merge branch 'm' into hlc Incorporates the revert of HBASE-14498. Lets see if it respoonsible for timing issues seen on this branch.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4e7c55d9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4e7c55d9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4e7c55d9 Branch: refs/heads/HBASE-14070.HLC Commit: 4e7c55d996643538a3ac85bea3d898b049672f5f Parents: b2a1848 05f07f6 Author: Michael Stack <[email protected]> Authored: Tue Aug 22 08:41:02 2017 -0700 Committer: Michael Stack <[email protected]> Committed: Tue Aug 22 08:41:02 2017 -0700 ---------------------------------------------------------------------- .../src/main/assembly/hadoop-two-compat.xml | 2 + .../hadoop/hbase/filter/FuzzyRowFilter.java | 22 ++- .../java/org/apache/hadoop/hbase/CellUtil.java | 53 +++++ .../MetricsRegionServerSourceImpl.java | 2 - .../hadoop/hbase/IntegrationTestBase.java | 21 ++ .../hadoop/hbase/RESTApiClusterManager.java | 32 ++-- .../hadoop/hbase/TestIntegrationTestBase.java | 48 +++++ .../hbase/chaos/factories/MonkeyConstants.java | 11 ++ .../hbase/chaos/util/ChaosMonkeyRunner.java | 26 ++- .../hadoop/hbase/rest/ResourceConfig.java | 31 --- .../hadoop/hbase/rest/model/VersionModel.java | 4 +- .../hadoop/hbase/rest/TestVersionResource.java | 6 +- .../master/assignment/AssignmentManager.java | 7 +- .../hbase/regionserver/RSRpcServices.java | 23 +-- .../hadoop/hbase/regionserver/StoreScanner.java | 5 +- .../querymatcher/ScanQueryMatcher.java | 13 ++ .../regionserver/WALEntryStream.java | 8 +- .../DefaultVisibilityLabelServiceImpl.java | 12 +- .../visibility/VisibilityController.java | 4 + .../visibility/VisibilityScanDeleteTracker.java | 19 +- .../hbase/client/TestClientClusterStatus.java | 10 +- .../hbase/client/TestFromClientSide3.java | 101 ++++++++++ .../filter/TestFuzzyRowFilterEndToEnd.java | 27 ++- .../master/assignment/MockMasterServices.java | 9 +- .../assignment/TestRogueRSAssignment.java | 192 +++++++++++++++++++ .../TestRegionServerReadRequestMetrics.java | 2 + .../ExpAsStringVisibilityLabelServiceImpl.java | 4 + .../TestVisibilityLabelsWithDeletes.java | 191 ++++++++++++++++++ src/main/asciidoc/_chapters/datamodel.adoc | 4 +- src/main/asciidoc/_chapters/developer.adoc | 54 ++++++ 30 files changed, 837 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4e7c55d9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4e7c55d9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java ---------------------------------------------------------------------- diff --cc hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index 951f47c,a220f54..8b02998 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@@ -42,9 -48,11 +42,10 @@@ import org.apache.hadoop.hbase.regionse import org.apache.hadoop.hbase.regionserver.querymatcher.LegacyScanQueryMatcher; import org.apache.hadoop.hbase.regionserver.querymatcher.ScanQueryMatcher; import org.apache.hadoop.hbase.regionserver.querymatcher.UserScanQueryMatcher; - import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.hbase.util.CollectionUtils; -import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; + import org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting; + /** * Scanner scans both the memstore and the Store. Coalesce KeyValue stream into List<KeyValue> * for a single row. http://git-wip-us.apache.org/repos/asf/hbase/blob/4e7c55d9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.java ----------------------------------------------------------------------
