hbase git commit: HBASE-20153 Add error prone to precommit
Repository: hbase Updated Branches: refs/heads/branch-1.4 10076c2fa -> d8007bb97 HBASE-20153 Add error prone to precommit Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d8007bb9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d8007bb9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d8007bb9 Branch: refs/heads/branch-1.4 Commit: d8007bb97334f0f05dcdcd18c6f62c0d09d8fc5f Parents: 10076c2 Author: Mike DrobAuthored: Fri Mar 9 15:48:44 2018 -0600 Committer: Andrew Purtell Committed: Mon Mar 12 17:53:51 2018 -0700 -- dev-support/hbase-personality.sh | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d8007bb9/dev-support/hbase-personality.sh -- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index ddf9dee..eaa48fd 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -155,6 +155,10 @@ function personality_modules return fi + if [[ ${testtype} == compile ]]; then +extra="${extra} -PerrorProne" + fi + # If EXCLUDE_TESTS_URL/INCLUDE_TESTS_URL is set, fetches the url # and sets -Dtest.exclude.pattern/-Dtest to exclude/include the # tests respectively.
[hbase] Git Push Summary
Repository: hbase Updated Tags: refs/tags/1.3.2RC1 [created] 1ceb91b84
[hbase] Git Push Summary
Repository: hbase Updated Tags: refs/tags/1.3.2RC1 [deleted] 874cf2d26
[hbase] Git Push Summary
Repository: hbase Updated Tags: refs/tags/1.3.2RC1 [created] 874cf2d26
hbase git commit: HBASE-20174 Fix TestZKLessMergeOnCluster flakiness
Repository: hbase Updated Branches: refs/heads/branch-1.3 0d81bd171 -> 96a029c0f HBASE-20174 Fix TestZKLessMergeOnCluster flakiness Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/96a029c0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/96a029c0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/96a029c0 Branch: refs/heads/branch-1.3 Commit: 96a029c0f6da60a2a78787fd9daa06d9cc287b71 Parents: 0d81bd1 Author: Francis LiuAuthored: Mon Mar 12 16:57:44 2018 -0700 Committer: Francis Liu Committed: Mon Mar 12 17:03:06 2018 -0700 -- .../regionserver/TestRegionMergeTransactionOnCluster.java | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/96a029c0/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java index a15508d..0501de3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java @@ -60,6 +60,8 @@ import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -109,6 +111,9 @@ public class TestRegionMergeTransactionOnCluster { static void setupOnce() throws Exception { // Start a cluster +//Make sure discharger does not interfere with tests that control discharger + TEST_UTIL.getConfiguration().setInt(CompactionConfiguration.HBASE_HFILE_COMPACTION_DISCHARGER_INTERVAL, +Integer.MAX_VALUE); TEST_UTIL.startMiniCluster(NB_SERVERS); cluster = TEST_UTIL.getHBaseCluster(); master = cluster.getMaster(); @@ -235,7 +240,9 @@ public class TestRegionMergeTransactionOnCluster { for(HColumnDescriptor colFamily : columnFamilies) { newcount += hrfs.getStoreFiles(colFamily.getName()).size(); } -if(newcount > count) { +if(newcount > count && +//compacted file added to directory, let's make sure compaction is actually done with the commit +admin.getCompactionState(tableName) == AdminProtos.GetRegionInfoResponse.CompactionState.NONE) { break; } Thread.sleep(50);
hbase git commit: HBASE-20174 Fix TestZKLessMergeOnCluster flakiness
Repository: hbase Updated Branches: refs/heads/branch-1.4 15d75e4fc -> 10076c2fa HBASE-20174 Fix TestZKLessMergeOnCluster flakiness Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/10076c2f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/10076c2f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/10076c2f Branch: refs/heads/branch-1.4 Commit: 10076c2fa92d542ae3f193abf11e0e2c36fcc499 Parents: 15d75e4 Author: Francis LiuAuthored: Mon Mar 12 16:57:44 2018 -0700 Committer: Francis Liu Committed: Mon Mar 12 16:58:44 2018 -0700 -- .../regionserver/TestRegionMergeTransactionOnCluster.java | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/10076c2f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java index a15508d..0501de3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java @@ -60,6 +60,8 @@ import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -109,6 +111,9 @@ public class TestRegionMergeTransactionOnCluster { static void setupOnce() throws Exception { // Start a cluster +//Make sure discharger does not interfere with tests that control discharger + TEST_UTIL.getConfiguration().setInt(CompactionConfiguration.HBASE_HFILE_COMPACTION_DISCHARGER_INTERVAL, +Integer.MAX_VALUE); TEST_UTIL.startMiniCluster(NB_SERVERS); cluster = TEST_UTIL.getHBaseCluster(); master = cluster.getMaster(); @@ -235,7 +240,9 @@ public class TestRegionMergeTransactionOnCluster { for(HColumnDescriptor colFamily : columnFamilies) { newcount += hrfs.getStoreFiles(colFamily.getName()).size(); } -if(newcount > count) { +if(newcount > count && +//compacted file added to directory, let's make sure compaction is actually done with the commit +admin.getCompactionState(tableName) == AdminProtos.GetRegionInfoResponse.CompactionState.NONE) { break; } Thread.sleep(50);
hbase git commit: HBASE-20174 Fix TestZKLessMergeOnCluster flakiness
Repository: hbase Updated Branches: refs/heads/branch-1 b54a439e5 -> 38471229f HBASE-20174 Fix TestZKLessMergeOnCluster flakiness Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/38471229 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/38471229 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/38471229 Branch: refs/heads/branch-1 Commit: 38471229f9bc2a5bf433d50c4ac35c609a96c392 Parents: b54a439 Author: Francis LiuAuthored: Mon Mar 12 16:57:44 2018 -0700 Committer: Francis Liu Committed: Mon Mar 12 16:57:59 2018 -0700 -- .../regionserver/TestRegionMergeTransactionOnCluster.java | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/38471229/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java index a15508d..0501de3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java @@ -60,6 +60,8 @@ import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; +import org.apache.hadoop.hbase.regionserver.compactions.CompactionConfiguration; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -109,6 +111,9 @@ public class TestRegionMergeTransactionOnCluster { static void setupOnce() throws Exception { // Start a cluster +//Make sure discharger does not interfere with tests that control discharger + TEST_UTIL.getConfiguration().setInt(CompactionConfiguration.HBASE_HFILE_COMPACTION_DISCHARGER_INTERVAL, +Integer.MAX_VALUE); TEST_UTIL.startMiniCluster(NB_SERVERS); cluster = TEST_UTIL.getHBaseCluster(); master = cluster.getMaster(); @@ -235,7 +240,9 @@ public class TestRegionMergeTransactionOnCluster { for(HColumnDescriptor colFamily : columnFamilies) { newcount += hrfs.getStoreFiles(colFamily.getName()).size(); } -if(newcount > count) { +if(newcount > count && +//compacted file added to directory, let's make sure compaction is actually done with the commit +admin.getCompactionState(tableName) == AdminProtos.GetRegionInfoResponse.CompactionState.NONE) { break; } Thread.sleep(50);
hbase git commit: HBASE-20153 Add error prone to precommit
Repository: hbase Updated Branches: refs/heads/branch-1 55b3c0c21 -> b54a439e5 HBASE-20153 Add error prone to precommit Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b54a439e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b54a439e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b54a439e Branch: refs/heads/branch-1 Commit: b54a439e5096f842cc7acf89fd12f2d917a44550 Parents: 55b3c0c Author: Mike DrobAuthored: Fri Mar 9 15:48:44 2018 -0600 Committer: Mike Drob Committed: Mon Mar 12 17:37:11 2018 -0500 -- dev-support/hbase-personality.sh | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/b54a439e/dev-support/hbase-personality.sh -- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index ddf9dee..eaa48fd 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -155,6 +155,10 @@ function personality_modules return fi + if [[ ${testtype} == compile ]]; then +extra="${extra} -PerrorProne" + fi + # If EXCLUDE_TESTS_URL/INCLUDE_TESTS_URL is set, fetches the url # and sets -Dtest.exclude.pattern/-Dtest to exclude/include the # tests respectively.
[2/4] hbase git commit: HBASE-20153 Add error prone to precommit
HBASE-20153 Add error prone to precommit Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9342e009 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9342e009 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9342e009 Branch: refs/heads/master Commit: 9342e0091d665585c4afba00cc58a3cdf07e7ad2 Parents: 7749748 Author: Mike DrobAuthored: Fri Mar 9 15:48:44 2018 -0600 Committer: Mike Drob Committed: Mon Mar 12 16:06:57 2018 -0500 -- dev-support/hbase-personality.sh | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/9342e009/dev-support/hbase-personality.sh -- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index b2fc76e..b6a 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -155,6 +155,10 @@ function personality_modules return fi + if [[ ${testtype} == compile ]]; then +extra="${extra} -PerrorProne" + fi + # If EXCLUDE_TESTS_URL/INCLUDE_TESTS_URL is set, fetches the url # and sets -Dtest.exclude.pattern/-Dtest to exclude/include the # tests respectively.
[1/4] hbase git commit: HBASE-20153 Add error prone to precommit
Repository: hbase Updated Branches: refs/heads/branch-2 4033405b3 -> d42886f4f refs/heads/branch-2.0 546929c54 -> f7323881b refs/heads/master 774974889 -> 9342e0091 HBASE-20153 Add error prone to precommit Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d42886f4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d42886f4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d42886f4 Branch: refs/heads/branch-2 Commit: d42886f4fe72f917a6f8499674727081765a53af Parents: 4033405 Author: Mike DrobAuthored: Fri Mar 9 15:48:44 2018 -0600 Committer: Mike Drob Committed: Mon Mar 12 16:06:08 2018 -0500 -- dev-support/hbase-personality.sh | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d42886f4/dev-support/hbase-personality.sh -- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index b2fc76e..b6a 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -155,6 +155,10 @@ function personality_modules return fi + if [[ ${testtype} == compile ]]; then +extra="${extra} -PerrorProne" + fi + # If EXCLUDE_TESTS_URL/INCLUDE_TESTS_URL is set, fetches the url # and sets -Dtest.exclude.pattern/-Dtest to exclude/include the # tests respectively.
[4/4] hbase git commit: HBASE-19987 error-prone 2.2.0
HBASE-19987 error-prone 2.2.0 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/261acca2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/261acca2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/261acca2 Branch: refs/heads/branch-2.0 Commit: 261acca2dbe1b7858f683092667d60050849a340 Parents: 546929c Author: Mike DrobAuthored: Mon Feb 12 17:13:32 2018 -0600 Committer: Mike Drob Committed: Mon Mar 12 16:34:33 2018 -0500 -- hbase-build-support/hbase-error-prone/pom.xml | 6 ++ .../java/org/apache/hadoop/hbase/errorprone/AlwaysPasses.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ServerLoad.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/client/Mutation.java | 2 +- .../org/apache/hadoop/hbase/filter/BigDecimalComparator.java | 1 + .../java/org/apache/hadoop/hbase/filter/BinaryComparator.java | 1 + .../org/apache/hadoop/hbase/filter/BinaryPrefixComparator.java | 1 + .../java/org/apache/hadoop/hbase/filter/BitComparator.java | 1 + .../java/org/apache/hadoop/hbase/filter/LongComparator.java| 1 + .../java/org/apache/hadoop/hbase/filter/NullComparator.java| 1 + .../org/apache/hadoop/hbase/filter/RegexStringComparator.java | 1 + .../org/apache/hadoop/hbase/filter/SubstringComparator.java| 1 + .../org/apache/hadoop/hbase/filter/ByteArrayComparable.java| 1 + pom.xml| 2 +- 14 files changed, 19 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/261acca2/hbase-build-support/hbase-error-prone/pom.xml -- diff --git a/hbase-build-support/hbase-error-prone/pom.xml b/hbase-build-support/hbase-error-prone/pom.xml index 6037780..7675323 100644 --- a/hbase-build-support/hbase-error-prone/pom.xml +++ b/hbase-build-support/hbase-error-prone/pom.xml @@ -37,6 +37,12 @@ error_prone_annotation ${error-prone.version} provided + + + com.google.guava + guava + +
[3/4] hbase git commit: HBASE-20153 Add error prone to precommit
HBASE-20153 Add error prone to precommit Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f7323881 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f7323881 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f7323881 Branch: refs/heads/branch-2.0 Commit: f7323881b2f392e004b87f589cece046599543c5 Parents: 261acca Author: Mike DrobAuthored: Fri Mar 9 15:48:44 2018 -0600 Committer: Mike Drob Committed: Mon Mar 12 16:34:33 2018 -0500 -- dev-support/hbase-personality.sh | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f7323881/dev-support/hbase-personality.sh -- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index b2fc76e..b6a 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -155,6 +155,10 @@ function personality_modules return fi + if [[ ${testtype} == compile ]]; then +extra="${extra} -PerrorProne" + fi + # If EXCLUDE_TESTS_URL/INCLUDE_TESTS_URL is set, fetches the url # and sets -Dtest.exclude.pattern/-Dtest to exclude/include the # tests respectively.
hbase git commit: HBASE-20177 Fix warning: Class org.apache.hadoop.minikdc.MiniKdc not found in hbase-spark
Repository: hbase Updated Branches: refs/heads/master c8fba7071 -> 774974889 HBASE-20177 Fix warning: Class org.apache.hadoop.minikdc.MiniKdc not found in hbase-spark Signed-off-by: tedyuProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/77497488 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/77497488 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/77497488 Branch: refs/heads/master Commit: 774974889dc98e2a4104cdc22730d684b3d6a51c Parents: c8fba70 Author: Artem Ervits Authored: Mon Mar 12 14:01:43 2018 -0400 Committer: tedyu Committed: Mon Mar 12 11:55:29 2018 -0700 -- hbase-spark/pom.xml | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/77497488/hbase-spark/pom.xml -- diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index 08ea0a6..3aeb470 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -615,6 +615,12 @@ test-jar test + + org.apache.hadoop + hadoop-minikdc + ${hadoop-two.version} + test +
hbase git commit: HBASE-20176 Fix warnings about Logging import in hbase-spark test code
Repository: hbase Updated Branches: refs/heads/master f30dfc69b -> c8fba7071 HBASE-20176 Fix warnings about Logging import in hbase-spark test code Signed-off-by: tedyuProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c8fba707 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c8fba707 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c8fba707 Branch: refs/heads/master Commit: c8fba7071e1ad4a0816977bcd8f4ae2d1ea12465 Parents: f30dfc6 Author: Artem Ervits Authored: Mon Mar 12 12:28:13 2018 -0400 Committer: tedyu Committed: Mon Mar 12 09:46:22 2018 -0700 -- .../test/scala/org/apache/hadoop/hbase/spark/BulkLoadSuite.scala| 1 - .../scala/org/apache/hadoop/hbase/spark/DefaultSourceSuite.scala| 1 - .../org/apache/hadoop/hbase/spark/DynamicLogicExpressionSuite.scala | 1 - .../scala/org/apache/hadoop/hbase/spark/HBaseCatalogSuite.scala | 1 - .../org/apache/hadoop/hbase/spark/HBaseConnectionCacheSuite.scala | 1 - .../scala/org/apache/hadoop/hbase/spark/HBaseContextSuite.scala | 1 - .../org/apache/hadoop/hbase/spark/HBaseDStreamFunctionsSuite.scala | 1 - .../org/apache/hadoop/hbase/spark/HBaseRDDFunctionsSuite.scala | 1 - .../scala/org/apache/hadoop/hbase/spark/PartitionFilterSuite.scala | 1 - 9 files changed, 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/c8fba707/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/BulkLoadSuite.scala -- diff --git a/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/BulkLoadSuite.scala b/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/BulkLoadSuite.scala index 71dbc2e..dc328f3 100644 --- a/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/BulkLoadSuite.scala +++ b/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/BulkLoadSuite.scala @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.spark import org.apache.hadoop.fs.{FileSystem, Path} import org.apache.hadoop.hbase.client.{Get, ConnectionFactory} import org.apache.hadoop.hbase.io.hfile.{CacheConfig, HFile} -import org.apache.hadoop.hbase.spark.Logging import org.apache.hadoop.hbase.tool.LoadIncrementalHFiles import org.apache.hadoop.hbase.{HConstants, CellUtil, HBaseTestingUtility, TableName} import org.apache.hadoop.hbase.util.Bytes http://git-wip-us.apache.org/repos/asf/hbase/blob/c8fba707/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DefaultSourceSuite.scala -- diff --git a/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DefaultSourceSuite.scala b/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DefaultSourceSuite.scala index 3669e3b..6298ed0 100644 --- a/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DefaultSourceSuite.scala +++ b/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DefaultSourceSuite.scala @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.spark import org.apache.avro.Schema import org.apache.avro.generic.GenericData import org.apache.hadoop.hbase.client.{ConnectionFactory, Put} -import org.apache.hadoop.hbase.spark.Logging import org.apache.hadoop.hbase.spark.datasources.HBaseSparkConf import org.apache.hadoop.hbase.util.Bytes import org.apache.hadoop.hbase.{HBaseTestingUtility, TableName} http://git-wip-us.apache.org/repos/asf/hbase/blob/c8fba707/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DynamicLogicExpressionSuite.scala -- diff --git a/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DynamicLogicExpressionSuite.scala b/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DynamicLogicExpressionSuite.scala index 709d76c..0424527 100644 --- a/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DynamicLogicExpressionSuite.scala +++ b/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DynamicLogicExpressionSuite.scala @@ -19,7 +19,6 @@ package org.apache.hadoop.hbase.spark import java.util -import org.apache.hadoop.hbase.spark.Logging import org.apache.hadoop.hbase.spark.datasources.{HBaseSparkConf, JavaBytesEncoder} import org.apache.hadoop.hbase.util.Bytes import org.apache.spark.sql.types._ http://git-wip-us.apache.org/repos/asf/hbase/blob/c8fba707/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/HBaseCatalogSuite.scala -- diff --git a/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/HBaseCatalogSuite.scala b/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/HBaseCatalogSuite.scala index f9e24c8..d8af4a8 100644 ---
hbase git commit: HBASE-19449 Minor logging change in HFileArchiver
Repository: hbase Updated Branches: refs/heads/branch-2 a58f65212 -> 4033405b3 HBASE-19449 Minor logging change in HFileArchiver Signed-off-by: Apekshit SharmaProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4033405b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4033405b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4033405b Branch: refs/heads/branch-2 Commit: 4033405b362e1b64cdd34f5eeb9157bb967a8eae Parents: a58f652 Author: BELUGA BEHR Authored: Mon Mar 12 22:00:38 2018 +0530 Committer: Apekshit Sharma Committed: Mon Mar 12 22:12:27 2018 +0530 -- .../main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/4033405b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java index 85e0c8a..dea6bf8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java @@ -255,7 +255,7 @@ public class HFileArchiver { } // otherwise we attempt to archive the store files -if (LOG.isDebugEnabled()) LOG.debug("Archiving compacted store files."); +LOG.debug("Archiving compacted store files."); // Wrap the storefile into a File StoreToFile getStorePath = new StoreToFile(fs);
hbase git commit: HBASE-19449 Minor logging change in HFileArchiver
Repository: hbase Updated Branches: refs/heads/master 1102e1e25 -> f30dfc69b HBASE-19449 Minor logging change in HFileArchiver Signed-off-by: Apekshit SharmaProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f30dfc69 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f30dfc69 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f30dfc69 Branch: refs/heads/master Commit: f30dfc69bb49729609f03c23f19b0091065d7103 Parents: 1102e1e Author: BELUGA BEHR Authored: Mon Mar 12 22:00:38 2018 +0530 Committer: Apekshit Sharma Committed: Mon Mar 12 22:01:56 2018 +0530 -- .../main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f30dfc69/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java index 85e0c8a..dea6bf8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java @@ -255,7 +255,7 @@ public class HFileArchiver { } // otherwise we attempt to archive the store files -if (LOG.isDebugEnabled()) LOG.debug("Archiving compacted store files."); +LOG.debug("Archiving compacted store files."); // Wrap the storefile into a File StoreToFile getStorePath = new StoreToFile(fs);
hbase git commit: HBASE-20171 Remove o.a.h.h.ProcedureState
Repository: hbase Updated Branches: refs/heads/master ec8aaeded -> 1102e1e25 HBASE-20171 Remove o.a.h.h.ProcedureState Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1102e1e2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1102e1e2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1102e1e2 Branch: refs/heads/master Commit: 1102e1e252bb0bcd04e703e54134c8682dd09a19 Parents: ec8aaed Author: Chia-Ping TsaiAuthored: Mon Mar 12 09:24:26 2018 -0700 Committer: Michael Stack Committed: Mon Mar 12 09:28:05 2018 -0700 -- .../org/apache/hadoop/hbase/ProcedureState.java | 28 1 file changed, 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/1102e1e2/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java -- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java deleted file mode 100644 index 18bdf73..000 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * 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 - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase; - -import org.apache.yetus.audience.InterfaceAudience; - -/** - * POJO representing Procedure State - */ -@InterfaceAudience.Public -public enum ProcedureState { - INITIALIZING, RUNNABLE, WAITING, WAITING_TIMEOUT, ROLLEDBACK, SUCCESS, FAILED -}
hbase git commit: HBASE-20171 Remove o.a.h.h.ProcedureState
Repository: hbase Updated Branches: refs/heads/branch-2.0 d016d4c22 -> 546929c54 HBASE-20171 Remove o.a.h.h.ProcedureState Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/546929c5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/546929c5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/546929c5 Branch: refs/heads/branch-2.0 Commit: 546929c5407fdbe6291c994817bc5d8e8427b71e Parents: d016d4c Author: Chia-Ping TsaiAuthored: Mon Mar 12 09:24:26 2018 -0700 Committer: Michael Stack Committed: Mon Mar 12 09:27:31 2018 -0700 -- .../org/apache/hadoop/hbase/ProcedureState.java | 28 1 file changed, 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/546929c5/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java -- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java deleted file mode 100644 index 18bdf73..000 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * 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 - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase; - -import org.apache.yetus.audience.InterfaceAudience; - -/** - * POJO representing Procedure State - */ -@InterfaceAudience.Public -public enum ProcedureState { - INITIALIZING, RUNNABLE, WAITING, WAITING_TIMEOUT, ROLLEDBACK, SUCCESS, FAILED -}
hbase git commit: HBASE-20171 Remove o.a.h.h.ProcedureState
Repository: hbase Updated Branches: refs/heads/branch-2 011809517 -> a58f65212 HBASE-20171 Remove o.a.h.h.ProcedureState Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a58f6521 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a58f6521 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a58f6521 Branch: refs/heads/branch-2 Commit: a58f65212c450b19a2ad1d70ec3d4c448628c725 Parents: 0118095 Author: Chia-Ping TsaiAuthored: Mon Mar 12 09:24:26 2018 -0700 Committer: Michael Stack Committed: Mon Mar 12 09:26:25 2018 -0700 -- .../org/apache/hadoop/hbase/ProcedureState.java | 28 1 file changed, 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/a58f6521/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java -- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java deleted file mode 100644 index 18bdf73..000 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureState.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * 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 - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase; - -import org.apache.yetus.audience.InterfaceAudience; - -/** - * POJO representing Procedure State - */ -@InterfaceAudience.Public -public enum ProcedureState { - INITIALIZING, RUNNABLE, WAITING, WAITING_TIMEOUT, ROLLEDBACK, SUCCESS, FAILED -}
hbase git commit: HBASE-20058 improper quoting in presplitting command docs
Repository: hbase Updated Branches: refs/heads/master e8ee5c060 -> ec8aaeded HBASE-20058 improper quoting in presplitting command docs Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ec8aaede Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ec8aaede Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ec8aaede Branch: refs/heads/master Commit: ec8aaeded846eaa37753e8eab43f665b92bd1e52 Parents: e8ee5c0 Author: maoling Authored: Sat Feb 24 11:59:05 2018 +0800 Committer: Chia-Ping Tsai Committed: Mon Mar 12 23:33:59 2018 +0800 -- src/main/asciidoc/_chapters/shell.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/ec8aaede/src/main/asciidoc/_chapters/shell.adoc -- diff --git a/src/main/asciidoc/_chapters/shell.adoc b/src/main/asciidoc/_chapters/shell.adoc index 1e51a20..522f482 100644 --- a/src/main/asciidoc/_chapters/shell.adoc +++ b/src/main/asciidoc/_chapters/shell.adoc @@ -377,7 +377,7 @@ This will continue for all split points up to the last. The last region will be [source] -hbase>create 't1','f',SPLITS => ['10','20',30'] +hbase>create 't1','f',SPLITS => ['10','20','30'] In the above example, the table 't1' will be created with column family 'f', pre-split to four regions. Note the first region will contain all keys from '\x00' up to '\x30' (as '\x31' is the ASCII code for '1').
hbase git commit: HBASE-20058 improper quoting in presplitting command docs
Repository: hbase Updated Branches: refs/heads/branch-2 fac3b8aad -> 011809517 HBASE-20058 improper quoting in presplitting command docs Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/01180951 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/01180951 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/01180951 Branch: refs/heads/branch-2 Commit: 011809517a554f0bcef2bad87c41a3f17b0147df Parents: fac3b8a Author: maoling Authored: Sat Feb 24 11:59:05 2018 +0800 Committer: Chia-Ping Tsai Committed: Mon Mar 12 23:46:37 2018 +0800 -- src/main/asciidoc/_chapters/shell.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/01180951/src/main/asciidoc/_chapters/shell.adoc -- diff --git a/src/main/asciidoc/_chapters/shell.adoc b/src/main/asciidoc/_chapters/shell.adoc index 1e51a20..522f482 100644 --- a/src/main/asciidoc/_chapters/shell.adoc +++ b/src/main/asciidoc/_chapters/shell.adoc @@ -377,7 +377,7 @@ This will continue for all split points up to the last. The last region will be [source] -hbase>create 't1','f',SPLITS => ['10','20',30'] +hbase>create 't1','f',SPLITS => ['10','20','30'] In the above example, the table 't1' will be created with column family 'f', pre-split to four regions. Note the first region will contain all keys from '\x00' up to '\x30' (as '\x31' is the ASCII code for '1').
hbase git commit: HBASE-20124 Make hbase-spark module work with hadoop3
Repository: hbase Updated Branches: refs/heads/master 62fc7fd3e -> e8ee5c060 HBASE-20124 Make hbase-spark module work with hadoop3 Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e8ee5c06 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e8ee5c06 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e8ee5c06 Branch: refs/heads/master Commit: e8ee5c060d401b710da405a1df056160db4ba606 Parents: 62fc7fd Author: tedyuAuthored: Mon Mar 12 08:25:13 2018 -0700 Committer: tedyu Committed: Mon Mar 12 08:25:13 2018 -0700 -- hbase-spark/pom.xml | 231 --- 1 file changed, 79 insertions(+), 152 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/e8ee5c06/hbase-spark/pom.xml -- diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml index a6a04ad..08ea0a6 100644 --- a/hbase-spark/pom.xml +++ b/hbase-spark/pom.xml @@ -151,158 +151,6 @@ - org.apache.hadoop - hadoop-client - ${hadoop-two.version} - - - log4j - log4j - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - org.jruby - jruby-complete - - - org.jboss.netty - netty - - - io.netty - netty - - - - - org.apache.hadoop - hadoop-common - ${hadoop-two.version} - - - org.apache.htrace - htrace-core - - - log4j - log4j - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - org.jruby - jruby-complete - - - org.jboss.netty - netty - - - io.netty - netty - - - com.google.code.findbugs - jsr305 - - - - - org.apache.hadoop - hadoop-common - ${hadoop-two.version} - test-jar - test - - - org.apache.htrace - htrace-core - - - log4j - log4j - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - org.jruby - jruby-complete - - - org.jboss.netty - netty - - - io.netty - netty - - - com.google.code.findbugs - jsr305 - - - - - org.apache.hadoop - hadoop-hdfs - ${hadoop-two.version} - test-jar - test - - - org.apache.htrace - htrace-core - - - log4j - log4j - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - org.jruby - jruby-complete - - - org.jboss.netty - netty - - - io.netty - netty - - - xerces - xercesImpl - - - - org.apache.hbase hbase-client @@ -732,5 +580,84 @@ true + + + hadoop-2.0 + + + + + !hadoop.profile + + + + + org.apache.hadoop + hadoop-client + ${hadoop-two.version} + + + org.apache.hadoop + hadoop-common + ${hadoop-two.version} + + + org.apache.hadoop + hadoop-common + ${hadoop-two.version} + test-jar + test + + + org.apache.hadoop + hadoop-hdfs + ${hadoop-two.version} + test-jar + test + + + + + + hadoop-3.0 + + + hadoop.profile + 3.0 + + + +3.0 + + + + org.apache.hadoop + hadoop-client + ${hadoop-three.version} + + + org.apache.hadoop + hadoop-common + ${hadoop-three.version} + + + org.apache.hadoop + hadoop-common + ${hadoop-three.version} + test-jar + test + + + org.apache.hadoop + hadoop-hdfs + ${hadoop-three.version} +
[03/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html index a298c05..1d94c77 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html @@ -91,7 +91,7 @@ 083 } 084 085 @Override -086 public void run() { +086 public final void run() { 087 setWorkerState(WorkerState.RUNNING); 088// Loop until we close down 089while (isActive()) { @@ -103,203 +103,206 @@ 095} 096continue; 097 } -098 -099 while (entryReader == null) { -100if (sleepForRetries("Replication WAL entry reader thread not initialized", -101 sleepMultiplier)) { -102 sleepMultiplier++; -103} -104 } -105 -106 try { -107WALEntryBatch entryBatch = entryReader.take(); -108shipEdits(entryBatch); -109 } catch (InterruptedException e) { -110LOG.trace("Interrupted while waiting for next replication entry batch", e); -111 Thread.currentThread().interrupt(); -112 } -113} -114// If the worker exits run loop without finishing its task, mark it as stopped. -115if (state != WorkerState.FINISHED) { -116 setWorkerState(WorkerState.STOPPED); -117} -118 } -119 -120 /** -121 * Do the shipping logic -122 */ -123 protected final void shipEdits(WALEntryBatch entryBatch) { -124ListEntry entries = entryBatch.getWalEntries(); -125long lastReadPosition = entryBatch.getLastWalPosition(); -126currentPath = entryBatch.getLastWalPath(); -127int sleepMultiplier = 0; -128if (entries.isEmpty()) { -129 if (lastLoggedPosition != lastReadPosition) { -130 updateLogPosition(lastReadPosition, entryBatch.getLastSeqIds()); -131// if there was nothing to ship and it's not an error -132// set "ageOfLastShippedOp" to now to indicate that we're current -133 source.getSourceMetrics().setAgeOfLastShippedOp(EnvironmentEdgeManager.currentTime(), -134 walGroupId); -135 } -136 return; -137} -138int currentSize = (int) entryBatch.getHeapSize(); -139while (isActive()) { -140 try { -141try { -142 source.tryThrottle(currentSize); -143} catch (InterruptedException e) { -144 LOG.debug("Interrupted while sleeping for throttling control"); -145 Thread.currentThread().interrupt(); -146 // current thread might be interrupted to terminate -147 // directly go back to while() for confirm this -148 continue; -149} -150 -151// create replicateContext here, so the entries can be GC'd upon return from this call -152// stack -153 ReplicationEndpoint.ReplicateContext replicateContext = -154new ReplicationEndpoint.ReplicateContext(); -155 replicateContext.setEntries(entries).setSize(currentSize); -156 replicateContext.setWalGroupId(walGroupId); -157 -158long startTimeNs = System.nanoTime(); -159// send the edits to the endpoint. Will block until the edits are shipped and acknowledged -160boolean replicated = source.getReplicationEndpoint().replicate(replicateContext); -161long endTimeNs = System.nanoTime(); -162 -163if (!replicated) { -164 continue; -165} else { -166 sleepMultiplier = Math.max(sleepMultiplier - 1, 0); -167} -168 -169if (this.lastLoggedPosition != lastReadPosition) { -170 // Clean up hfile references -171 int size = entries.size(); -172 for (int i = 0; i size; i++) { -173 cleanUpHFileRefs(entries.get(i).getEdit()); -174 } -175 // Log and clean up WAL logs -176 updateLogPosition(lastReadPosition, entryBatch.getLastSeqIds()); -177} -178 -179source.postShipEdits(entries, currentSize); -180// FIXME check relationship between wal group and overall -181 source.getSourceMetrics().shipBatch(entryBatch.getNbOperations(), currentSize, -182 entryBatch.getNbHFiles()); -183 source.getSourceMetrics().setAgeOfLastShippedOp( -184 entries.get(entries.size() - 1).getKey().getWriteTime(), walGroupId); -185if (LOG.isTraceEnabled()) { -186 LOG.trace("Replicated " + entries.size() + " entries or " + entryBatch.getNbOperations() -187 + " operations in " + ((endTimeNs -
[02/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html index 02aead0..be437fe 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.html @@ -40,383 +40,336 @@ 032import org.apache.hadoop.hbase.CellUtil; 033import org.apache.hadoop.hbase.HConstants; 034import org.apache.hadoop.hbase.replication.WALEntryFilter; -035import org.apache.hadoop.hbase.util.Bytes; -036import org.apache.hadoop.hbase.util.Pair; -037import org.apache.hadoop.hbase.util.Threads; -038import org.apache.hadoop.hbase.wal.WAL.Entry; -039import org.apache.hadoop.hbase.wal.WALEdit; -040import org.apache.yetus.audience.InterfaceAudience; -041import org.apache.yetus.audience.InterfaceStability; -042import org.slf4j.Logger; -043import org.slf4j.LoggerFactory; -044 -045import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.BulkLoadDescriptor; -046import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.StoreDescriptor; -047 -048/** -049 * Reads and filters WAL entries, groups the filtered entries into batches, and puts the batches -050 * onto a queue -051 */ -052@InterfaceAudience.Private -053@InterfaceStability.Evolving -054public class ReplicationSourceWALReader extends Thread { -055 private static final Logger LOG = LoggerFactory.getLogger(ReplicationSourceWALReader.class); -056 -057 private final PriorityBlockingQueuePath logQueue; -058 private final FileSystem fs; -059 private final Configuration conf; -060 private final WALEntryFilter filter; -061 private final ReplicationSource source; -062 -063 protected final BlockingQueueWALEntryBatch entryBatchQueue; -064 // max (heap) size of each batch - multiply by number of batches in queue to get total -065 private final long replicationBatchSizeCapacity; -066 // max count of each batch - multiply by number of batches in queue to get total -067 protected final int replicationBatchCountCapacity; -068 // position in the WAL to start reading at -069 private long currentPosition; -070 private final long sleepForRetries; -071 private final int maxRetriesMultiplier; -072 private final boolean eofAutoRecovery; -073 -074 // used to store the first cell in an entry before filtering. This is because that if serial -075 // replication is enabled, we may find out that an entry can not be pushed after filtering. And -076 // when we try the next time, the cells maybe null since the entry has already been filtered, -077 // especially for region event wal entries. And this can also used to determine whether we can -078 // skip filtering. -079 private Cell firstCellInEntryBeforeFiltering; -080 -081 //Indicates whether this particular worker is running -082 private boolean isReaderRunning = true; -083 -084 private AtomicLong totalBufferUsed; -085 private long totalBufferQuota; -086 -087 private final SerialReplicationChecker serialReplicationChecker; -088 -089 /** -090 * Creates a reader worker for a given WAL queue. Reads WAL entries off a given queue, batches the -091 * entries, and puts them on a batch queue. -092 * @param fs the files system to use -093 * @param conf configuration to use -094 * @param logQueue The WAL queue to read off of -095 * @param startPosition position in the first WAL to start reading from -096 * @param filter The filter to use while reading -097 * @param source replication source -098 */ -099 public ReplicationSourceWALReader(FileSystem fs, Configuration conf, -100 PriorityBlockingQueuePath logQueue, long startPosition, WALEntryFilter filter, -101 ReplicationSource source) { -102this.logQueue = logQueue; -103this.currentPosition = startPosition; -104this.fs = fs; -105this.conf = conf; -106this.filter = filter; -107this.source = source; -108this.replicationBatchSizeCapacity = -109 this.conf.getLong("replication.source.size.capacity", 1024 * 1024 * 64); -110this.replicationBatchCountCapacity = this.conf.getInt("replication.source.nb.capacity", 25000); -111// memory used will be batchSizeCapacity * (nb.batches + 1) -112// the +1 is for the current thread reading before placing onto the queue -113int batchCount = conf.getInt("replication.source.nb.batches", 1); -114this.totalBufferUsed = source.getSourceManager().getTotalBufferUsed(); -115this.totalBufferQuota = conf.getLong(HConstants.REPLICATION_SOURCE_TOTAL_BUFFER_KEY, -116
[01/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
Repository: hbase-site Updated Branches: refs/heads/asf-site d49e713e9 -> f1b07859b http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/license.html -- diff --git a/license.html b/license.html index 4a96507..a6dd525 100644 --- a/license.html +++ b/license.html @@ -7,7 +7,7 @@ - + Apache HBase Project Licenses @@ -484,7 +484,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/mail-lists.html -- diff --git a/mail-lists.html b/mail-lists.html index 7444989..9360b9a 100644 --- a/mail-lists.html +++ b/mail-lists.html @@ -7,7 +7,7 @@ - + Apache HBase Project Mailing Lists @@ -334,7 +334,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/metrics.html -- diff --git a/metrics.html b/metrics.html index 2da382e..cfd3100 100644 --- a/metrics.html +++ b/metrics.html @@ -7,7 +7,7 @@ - + Apache HBase Apache HBase (TM) Metrics @@ -452,7 +452,7 @@ export HBASE_REGIONSERVER_OPTS=$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/old_news.html -- diff --git a/old_news.html b/old_news.html index c157980..2a7bcf5 100644 --- a/old_news.html +++ b/old_news.html @@ -7,7 +7,7 @@ - + Apache HBase Old Apache HBase (TM) News @@ -407,7 +407,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/plugin-management.html -- diff --git a/plugin-management.html b/plugin-management.html index ecb3c65..6ecddfe 100644 --- a/plugin-management.html +++ b/plugin-management.html @@ -7,7 +7,7 @@ - + Apache HBase Project Plugin Management @@ -429,7 +429,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/plugins.html -- diff --git a/plugins.html b/plugins.html index 79856f1..d636009 100644 --- a/plugins.html +++ b/plugins.html @@ -7,7 +7,7 @@ - + Apache HBase Project Plugins @@ -368,7 +368,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/poweredbyhbase.html -- diff --git a/poweredbyhbase.html b/poweredbyhbase.html index 8e3dc61..1c8f4c4 100644 --- a/poweredbyhbase.html +++ b/poweredbyhbase.html @@ -7,7 +7,7 @@ - + Apache HBase Powered By Apache HBase™ @@ -762,7 +762,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/project-info.html
[13/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
Published site at 6060d3ba56706d87221f0934d0331a2a73e65167. Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/f1b07859 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/f1b07859 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/f1b07859 Branch: refs/heads/asf-site Commit: f1b07859b3cdd358076d7fec4ba42f418380ca4d Parents: d49e713 Author: jenkinsAuthored: Mon Mar 12 14:53:33 2018 + Committer: jenkins Committed: Mon Mar 12 14:53:33 2018 + -- acid-semantics.html | 4 +- apache_hbase_reference_guide.pdf| 4 +- book.html | 2 +- bulk-loads.html | 4 +- checkstyle-aggregate.html | 37338 - checkstyle.rss |30 +- coc.html| 4 +- cygwin.html | 4 +- dependencies.html | 4 +- dependency-convergence.html | 4 +- dependency-info.html| 4 +- dependency-management.html | 4 +- devapidocs/allclasses-frame.html| 2 +- devapidocs/allclasses-noframe.html | 2 +- devapidocs/constant-values.html | 6 +- devapidocs/index-all.html |58 +- .../hadoop/hbase/backup/package-tree.html | 4 +- .../org/apache/hadoop/hbase/class-use/Cell.html | 2 +- .../hadoop/hbase/client/package-tree.html |24 +- .../hadoop/hbase/executor/package-tree.html | 2 +- .../hadoop/hbase/filter/package-tree.html |10 +- .../hadoop/hbase/io/hfile/package-tree.html | 6 +- .../apache/hadoop/hbase/ipc/package-tree.html | 4 +- .../hadoop/hbase/mapreduce/package-tree.html| 4 +- .../hbase/master/balancer/package-tree.html | 2 +- .../hadoop/hbase/master/package-tree.html | 6 +- .../hbase/master/procedure/package-tree.html| 4 +- .../org/apache/hadoop/hbase/package-tree.html |18 +- .../hadoop/hbase/procedure2/package-tree.html | 4 +- .../hadoop/hbase/quotas/package-tree.html | 8 +- .../hadoop/hbase/regionserver/package-tree.html |18 +- .../regionserver/querymatcher/package-tree.html | 2 +- .../hbase/regionserver/wal/package-tree.html| 2 +- .../replication/class-use/ReplicationPeer.html | 2 +- .../replication/class-use/WALEntryFilter.html |16 +- .../RecoveredReplicationSource.html | 100 +- .../RecoveredReplicationSourceShipper.html |45 +- .../RecoveredReplicationSourceWALReader.html| 385 - .../regionserver/RefreshPeerCallable.html | 4 +- .../ReplicationSource.LogsComparator.html | 8 +- .../regionserver/ReplicationSource.html | 154 +- .../regionserver/ReplicationSourceShipper.html |74 +- .../ReplicationSourceWALReader.html | 182 +- .../regionserver/SerialReplicationChecker.html | 4 +- .../SerialReplicationSourceWALReader.html | 419 + .../SourceFSConfigurationProvider.html | 4 +- .../RecoveredReplicationSourceShipper.html |43 +- .../RecoveredReplicationSourceWALReader.html| 125 - .../class-use/ReplicationSource.html|18 +- .../class-use/ReplicationSourceShipper.html |14 + .../class-use/ReplicationSourceWALReader.html |24 +- .../class-use/SerialReplicationChecker.html | 2 +- .../SerialReplicationSourceWALReader.html | 125 + .../regionserver/class-use/WALEntryBatch.html |44 +- .../regionserver/class-use/WALEntryStream.html |12 +- .../replication/regionserver/package-frame.html | 2 +- .../regionserver/package-summary.html |56 +- .../replication/regionserver/package-tree.html | 4 +- .../replication/regionserver/package-use.html |43 +- .../hbase/security/access/package-tree.html | 2 +- .../hadoop/hbase/security/package-tree.html | 2 +- .../hadoop/hbase/thrift/package-tree.html | 2 +- .../apache/hadoop/hbase/util/package-tree.html |10 +- .../hadoop/hbase/wal/class-use/WAL.Entry.html |21 +- .../apache/hadoop/hbase/wal/package-tree.html | 2 +- devapidocs/overview-tree.html | 2 +- .../org/apache/hadoop/hbase/Version.html| 6 +- .../RecoveredReplicationSource.html | 289 +- .../RecoveredReplicationSourceShipper.html | 154 +- .../RecoveredReplicationSourceWALReader.html| 128 - .../ReplicationSource.LogsComparator.html | 642 +- .../regionserver/ReplicationSource.html | 642 +-
[09/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceWALReader.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceWALReader.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceWALReader.html deleted file mode 100644 index d295e22..000 --- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceWALReader.html +++ /dev/null @@ -1,385 +0,0 @@ -http://www.w3.org/TR/html4/loose.dtd;> - - - - - -RecoveredReplicationSourceWALReader (Apache HBase 3.0.0-SNAPSHOT API) - - - - - -var methods = {"i0":10}; -var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; -var altColor = "altColor"; -var rowColor = "rowColor"; -var tableTab = "tableTab"; -var activeTableTab = "activeTableTab"; - - -JavaScript is disabled on your browser. - - - - - -Skip navigation links - - - - -Overview -Package -Class -Use -Tree -Deprecated -Index -Help - - - - -PrevClass -NextClass - - -Frames -NoFrames - - -AllClasses - - - - - - - -Summary: -Nested| -Field| -Constr| -Method - - -Detail: -Field| -Constr| -Method - - - - - - - - -org.apache.hadoop.hbase.replication.regionserver -Class RecoveredReplicationSourceWALReader - - - -https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">java.lang.Object - - -https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true; title="class or interface in java.lang">java.lang.Thread - - -org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceWALReader - - -org.apache.hadoop.hbase.replication.regionserver.RecoveredReplicationSourceWALReader - - - - - - - - - - - -All Implemented Interfaces: -https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true; title="class or interface in java.lang">Runnable - - - -@InterfaceAudience.Private - @InterfaceStability.Evolving -public class RecoveredReplicationSourceWALReader -extends ReplicationSourceWALReader -Used by a RecoveredReplicationSourceShipper. - - - - - - - - - - - -Nested Class Summary - - - - -Nested classes/interfaces inherited from classjava.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true; title="class or interface in java.lang">Thread -https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.State.html?is-external=true; title="class or interface in java.lang">Thread.State, https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.UncaughtExceptionHandler.html?is-external=true; title="class or interface in java.lang">Thread.UncaughtExceptionHandler - - - - - - - - -Field Summary - -Fields - -Modifier and Type -Field and Description - - -private static org.slf4j.Logger -LOG - - - - - - -Fields inherited from classorg.apache.hadoop.hbase.replication.regionserver.ReplicationSourceWALReader -entryBatchQueue, replicationBatchCountCapacity - - - - - -Fields inherited from classjava.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true; title="class or interface in java.lang">Thread -https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true#MAX_PRIORITY; title="class or interface in java.lang">MAX_PRIORITY, https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true#MIN_PRIORITY; title="class or interface in java.lang">MIN_PRIORITY, https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true#NORM_PRIORITY; title="class or interface in java.lang">NORM_PRIORITY - - - - - - - - -Constructor Summary - -Constructors - -Constructor and Description - - -RecoveredReplicationSourceWALReader(org.apache.hadoop.fs.FileSystemfs, - org.apache.hadoop.conf.Configurationconf, - https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/PriorityBlockingQueue.html?is-external=true; title="class or interface in java.util.concurrent">PriorityBlockingQueueorg.apache.hadoop.fs.PathlogQueue, - longstartPosition, - WALEntryFilterfilter, - ReplicationSourcesource) - - - - - - - - - -Method Summary - -All MethodsInstance MethodsConcrete Methods - -Modifier and Type
[08/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html index 852bd23..46e0c1a 100644 --- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html +++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -290,39 +290,47 @@ extends https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html isFinished() +protected void +postFinish() + + +protected void +postShipEdits(WALEntryBatchentryBatch) + + void run() - + void setWALReader(ReplicationSourceWALReaderentryReader) - + void setWorkerState(ReplicationSourceShipper.WorkerStatestate) - + protected void shipEdits(WALEntryBatchentryBatch) Do the shipping logic - + boolean sleepForRetries(https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringmsg, intsleepMultiplier) Do the sleeping logic - + void startup(https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.UncaughtExceptionHandler.html?is-external=true; title="class or interface in java.lang">Thread.UncaughtExceptionHandlerhandler) - + void stopWorker() - + private void updateLogPosition(longlastReadPosition, https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttps://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true; title="class or interface in java.lang">LonglastSeqIds) @@ -489,7 +497,7 @@ extends https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html run -publicvoidrun() +public finalvoidrun() Specified by: https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true#run--; title="class or interface in java.lang">runin interfacehttps://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true; title="class or interface in java.lang">Runnable @@ -498,13 +506,31 @@ extends https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html + + + + + +postShipEdits +protectedvoidpostShipEdits(WALEntryBatchentryBatch) + + + + + + + +postFinish +protectedvoidpostFinish() + + shipEdits -protected finalvoidshipEdits(WALEntryBatchentryBatch) +protected finalvoidshipEdits(WALEntryBatchentryBatch) Do the shipping logic @@ -514,7 +540,7 @@ extends https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html cleanUpHFileRefs -privatevoidcleanUpHFileRefs(WALEditedit) +privatevoidcleanUpHFileRefs(WALEditedit) throws https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Throws: @@ -528,7 +554,7 @@ extends https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html updateLogPosition -privatevoidupdateLogPosition(longlastReadPosition, +privatevoidupdateLogPosition(longlastReadPosition, https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true; title="class or interface in java.util">Maphttps://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String,https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true; title="class or interface in java.lang">LonglastSeqIds) @@ -538,7 +564,7 @@ extends https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html startup -publicvoidstartup(https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.UncaughtExceptionHandler.html?is-external=true; title="class or interface in java.lang">Thread.UncaughtExceptionHandlerhandler) +publicvoidstartup(https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.UncaughtExceptionHandler.html?is-external=true; title="class or interface in java.lang">Thread.UncaughtExceptionHandlerhandler) @@ -547,7 +573,7 @@ extends
hbase-site git commit: INFRA-10751 Empty commit
Repository: hbase-site Updated Branches: refs/heads/asf-site f1b07859b -> 38f4bf625 INFRA-10751 Empty commit Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/38f4bf62 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/38f4bf62 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/38f4bf62 Branch: refs/heads/asf-site Commit: 38f4bf625a27fde3d060f13646285e4e908b21cc Parents: f1b0785 Author: jenkinsAuthored: Mon Mar 12 14:53:48 2018 + Committer: jenkins Committed: Mon Mar 12 14:53:48 2018 + -- --
[10/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html index 550d779..a7119b7 100644 --- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html @@ -208,9 +208,9 @@ java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) -org.apache.hadoop.hbase.master.procedure.ServerProcedureInterface.ServerOperationType -org.apache.hadoop.hbase.master.procedure.TableProcedureInterface.TableOperationType org.apache.hadoop.hbase.master.procedure.PeerProcedureInterface.PeerOperationType +org.apache.hadoop.hbase.master.procedure.TableProcedureInterface.TableOperationType +org.apache.hadoop.hbase.master.procedure.ServerProcedureInterface.ServerOperationType http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html index 1132642..fccff9f 100644 --- a/devapidocs/org/apache/hadoop/hbase/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html @@ -441,20 +441,20 @@ java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) +org.apache.hadoop.hbase.HealthChecker.HealthCheckerExitStatus org.apache.hadoop.hbase.HConstants.OperationStatusCode -org.apache.hadoop.hbase.KeepDeletedCells -org.apache.hadoop.hbase.CompatibilitySingletonFactory.SingletonStorage +org.apache.hadoop.hbase.MetaTableAccessor.QueryType +org.apache.hadoop.hbase.Cell.Type org.apache.hadoop.hbase.MemoryCompactionPolicy -org.apache.hadoop.hbase.CellBuilderType +org.apache.hadoop.hbase.Coprocessor.State org.apache.hadoop.hbase.ClusterMetrics.Option +org.apache.hadoop.hbase.CompatibilitySingletonFactory.SingletonStorage +org.apache.hadoop.hbase.CellBuilderType +org.apache.hadoop.hbase.CompareOperator +org.apache.hadoop.hbase.ProcedureState org.apache.hadoop.hbase.Size.Unit +org.apache.hadoop.hbase.KeepDeletedCells org.apache.hadoop.hbase.KeyValue.Type -org.apache.hadoop.hbase.MetaTableAccessor.QueryType -org.apache.hadoop.hbase.Coprocessor.State -org.apache.hadoop.hbase.ProcedureState -org.apache.hadoop.hbase.HealthChecker.HealthCheckerExitStatus -org.apache.hadoop.hbase.Cell.Type -org.apache.hadoop.hbase.CompareOperator http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html index c6d8d97..e0d4bd8 100644 --- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html @@ -213,10 +213,10 @@ java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) org.apache.hadoop.hbase.procedure2.LockedResourceType -org.apache.hadoop.hbase.procedure2.Procedure.LockState +org.apache.hadoop.hbase.procedure2.LockType org.apache.hadoop.hbase.procedure2.StateMachineProcedure.Flow +org.apache.hadoop.hbase.procedure2.Procedure.LockState org.apache.hadoop.hbase.procedure2.RootProcedureState.State -org.apache.hadoop.hbase.procedure2.LockType http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
[05/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html index e25088b..d0d2274 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html @@ -56,97 +56,69 @@ 048 } 049 050 @Override -051 public void run() { -052 setWorkerState(WorkerState.RUNNING); -053// Loop until we close down -054while (isActive()) { -055 int sleepMultiplier = 1; -056 // Sleep until replication is enabled again -057 if (!source.isPeerEnabled()) { -058if (source.sleepForRetries("Replication is disabled", sleepMultiplier)) { -059 sleepMultiplier++; -060} -061continue; -062 } -063 -064 while (entryReader == null) { -065if (source.sleepForRetries("Replication WAL entry reader thread not initialized", -066 sleepMultiplier)) { -067 sleepMultiplier++; -068} -069 } -070 -071 try { -072WALEntryBatch entryBatch = entryReader.take(); -073shipEdits(entryBatch); -074if (entryBatch.getWalEntries().isEmpty()) { -075 LOG.debug("Finished recovering queue for group " + walGroupId + " of peer " -076 + source.getQueueId()); -077 source.getSourceMetrics().incrCompletedRecoveryQueue(); -078 setWorkerState(WorkerState.FINISHED); -079 continue; -080} -081 } catch (InterruptedException e) { -082LOG.trace("Interrupted while waiting for next replication entry batch", e); -083 Thread.currentThread().interrupt(); -084 } -085} -086source.tryFinish(); -087// If the worker exits run loop without finishing its task, mark it as stopped. -088if (!isFinished()) { -089 setWorkerState(WorkerState.STOPPED); -090} -091 } -092 -093 @Override -094 public long getStartPosition() { -095long startPosition = getRecoveredQueueStartPos(); -096int numRetries = 0; -097while (numRetries = maxRetriesMultiplier) { -098 try { -099 source.locateRecoveredPaths(queue); -100break; -101 } catch (IOException e) { -102LOG.error("Error while locating recovered queue paths, attempt #" + numRetries); -103numRetries++; -104 } -105} -106return startPosition; -107 } -108 -109 // If this is a recovered queue, the queue is already full and the first log -110 // normally has a position (unless the RS failed between 2 logs) -111 private long getRecoveredQueueStartPos() { -112long startPosition = 0; -113String peerClusterZnode = source.getQueueId(); -114try { -115 startPosition = this.replicationQueues.getWALPosition(source.getServerWALsBelongTo(), -116peerClusterZnode, this.queue.peek().getName()); -117 if (LOG.isTraceEnabled()) { -118LOG.trace("Recovered queue started with log " + this.queue.peek() + " at position " + -119 startPosition); -120 } -121} catch (ReplicationException e) { -122 terminate("Couldn't get the position of this recovered queue " + peerClusterZnode, e); -123} -124return startPosition; -125 } -126 -127 private void terminate(String reason, Exception cause) { -128if (cause == null) { -129 LOG.info("Closing worker for wal group " + this.walGroupId + " because: " + reason); -130 -131} else { -132 LOG.error("Closing worker for wal group " + this.walGroupId -133 + " because an error occurred: " + reason, cause); -134} -135entryReader.interrupt(); -136Threads.shutdown(entryReader, sleepForRetries); -137this.interrupt(); -138Threads.shutdown(this, sleepForRetries); -139LOG.info("ReplicationSourceWorker " + this.getName() + " terminated"); -140 } -141} +051 protected void postShipEdits(WALEntryBatch entryBatch) { +052if (entryBatch.getWalEntries().isEmpty()) { +053 LOG.debug("Finished recovering queue for group " + walGroupId + " of peer " +054 + source.getQueueId()); +055 source.getSourceMetrics().incrCompletedRecoveryQueue(); +056 setWorkerState(WorkerState.FINISHED); +057} +058 } +059 +060 @Override +061 protected void postFinish() { +062source.tryFinish(); +063 } +064 +065 @Override +066 public long getStartPosition() { +067long startPosition = getRecoveredQueueStartPos(); +068int numRetries = 0; +069while (numRetries = maxRetriesMultiplier) { +070 try { +071
[12/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/checkstyle-aggregate.html -- diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html index df208e7..7512cef 100644 --- a/checkstyle-aggregate.html +++ b/checkstyle-aggregate.html @@ -7,7 +7,7 @@ - + Apache HBase Checkstyle Results @@ -277,7 +277,7 @@ 3578 0 0 -16170 +16169 Files @@ -8097,2166 +8097,2161 @@ 0 2 -org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceWALReader.java -0 -0 -1 - org/apache/hadoop/hbase/replication/regionserver/RegionReplicaReplicationEndpoint.java 0 0 3 - + org/apache/hadoop/hbase/replication/regionserver/Replication.java 0 0 2 - + org/apache/hadoop/hbase/replication/regionserver/ReplicationLoad.java 0 0 7 - + org/apache/hadoop/hbase/replication/regionserver/ReplicationObserver.java 0 0 4 - + org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java 0 0 15 - + org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceFactory.java 0 0 2 - + org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceInterface.java 0 0 1 - + org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java 0 0 4 - + org/apache/hadoop/hbase/replication/regionserver/ReplicationThrottler.java 0 0 2 - + org/apache/hadoop/hbase/replication/regionserver/TestMetricsReplicationSourceFactoryImpl.java 0 0 1 - + org/apache/hadoop/hbase/replication/regionserver/TestMetricsReplicationSourceImpl.java 0 0 2 - + org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java 0 0 1 - + org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java 0 0 11 - + org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java 0 0 7 - + org/apache/hadoop/hbase/replication/regionserver/TestWALEntrySinkFilter.java 0 0 16 - + org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.java 0 0 1 - + org/apache/hadoop/hbase/replication/regionserver/WALEntrySinkFilter.java 0 0 2 - + org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.java 0 0 3 - + org/apache/hadoop/hbase/rest/ExistsResource.java 0 0 3 - + org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java 0 0 14 - + org/apache/hadoop/hbase/rest/MetricsREST.java 0 0 3 - + org/apache/hadoop/hbase/rest/MetricsRESTSourceImpl.java 0 0 12 - + org/apache/hadoop/hbase/rest/MultiRowResource.java 0 0 3 - + org/apache/hadoop/hbase/rest/NamespacesInstanceResource.java 0 0 4 - + org/apache/hadoop/hbase/rest/NamespacesResource.java 0 0 2 - + org/apache/hadoop/hbase/rest/PerformanceEvaluation.java 0 0 20 - + org/apache/hadoop/hbase/rest/ProtobufMessageHandler.java 0 0 1 - + org/apache/hadoop/hbase/rest/RESTServer.java 0 0 16 - + org/apache/hadoop/hbase/rest/RESTServlet.java 0 0 5 - + org/apache/hadoop/hbase/rest/RESTServletContainer.java 0 0 2 - + org/apache/hadoop/hbase/rest/RegionsResource.java 0 0 3 - + org/apache/hadoop/hbase/rest/ResourceBase.java 0 0 1 - + org/apache/hadoop/hbase/rest/ResultGenerator.java 0 0 1 - + org/apache/hadoop/hbase/rest/RootResource.java 0 0 3 - + org/apache/hadoop/hbase/rest/RowResource.java 0 0 60 - + org/apache/hadoop/hbase/rest/RowResourceBase.java 0 0 15 - + org/apache/hadoop/hbase/rest/RowSpec.java 0 0 32 - + org/apache/hadoop/hbase/rest/ScannerInstanceResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/ScannerResource.java 0 0 4 - + org/apache/hadoop/hbase/rest/ScannerResultGenerator.java 0 0 1 - + org/apache/hadoop/hbase/rest/SchemaResource.java 0 0 10 - + org/apache/hadoop/hbase/rest/StorageClusterStatusResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/StorageClusterVersionResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/TableResource.java 0 0 4 - + org/apache/hadoop/hbase/rest/TableScanResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/TestGetAndPutResource.java 0 0 4 - + org/apache/hadoop/hbase/rest/TestMetricsRESTSourceImpl.java 0 0 3 - + org/apache/hadoop/hbase/rest/TestMultiRowResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/TestNamespacesResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/TestScannerResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/TestScannersWithFilters.java 0 0 144 - + org/apache/hadoop/hbase/rest/TestScannersWithLabels.java 0 0 2 - + org/apache/hadoop/hbase/rest/TestSchemaResource.java 0 0 1 - + org/apache/hadoop/hbase/rest/TestTableScan.java 0 0 18 - + org/apache/hadoop/hbase/rest/VersionResource.java 0 0 3 - + org/apache/hadoop/hbase/rest/client/Client.java 0 0 29 - + org/apache/hadoop/hbase/rest/client/RemoteAdmin.java 0 0 107 - +
[04/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html index 46ac7f1..b3369ce 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html @@ -92,7 +92,7 @@ 084 // per group queue size, keep no more than this number of logs in each wal group 085 protected int queueSizePerGroup; 086 protected ReplicationQueueStorage queueStorage; -087 private ReplicationPeer replicationPeer; +087 protected ReplicationPeer replicationPeer; 088 089 protected Configuration conf; 090 protected ReplicationQueueInfo replicationQueueInfo; @@ -292,332 +292,334 @@ 284this.walEntryFilter = new ChainWALEntryFilter(filters); 285 } 286 -287 protected void tryStartNewShipper(String walGroupId, PriorityBlockingQueuePath queue) { -288ReplicationSourceShipper worker = new ReplicationSourceShipper(conf, walGroupId, queue, this); +287 private void tryStartNewShipper(String walGroupId, PriorityBlockingQueuePath queue) { +288ReplicationSourceShipper worker = createNewShipper(walGroupId, queue); 289ReplicationSourceShipper extant = workerThreads.putIfAbsent(walGroupId, worker); 290if (extant != null) { -291 LOG.debug("Someone has beat us to start a worker thread for wal group " + walGroupId); +291 LOG.debug("Someone has beat us to start a worker thread for wal group {}", walGroupId); 292} else { -293 LOG.debug("Starting up worker for wal group " + walGroupId); -294 worker.startup(this::uncaughtException); -295 worker.setWALReader( -296 startNewWALReader(worker.getName(), walGroupId, queue, worker.getStartPosition())); -297} -298 } -299 -300 protected ReplicationSourceWALReader startNewWALReader(String threadName, String walGroupId, -301 PriorityBlockingQueuePath queue, long startPosition) { -302ReplicationSourceWALReader walReader = -303 new ReplicationSourceWALReader(fs, conf, queue, startPosition, walEntryFilter, this); -304return (ReplicationSourceWALReader) Threads.setDaemonThreadRunning(walReader, -305 threadName + ".replicationSource.wal-reader." + walGroupId + "," + queueId, -306 this::uncaughtException); -307 } -308 -309 protected final void uncaughtException(Thread t, Throwable e) { -310RSRpcServices.exitIfOOME(e); -311LOG.error("Unexpected exception in " + t.getName() + " currentPath=" + getCurrentPath(), e); -312server.abort("Unexpected exception in " + t.getName(), e); +293 LOG.debug("Starting up worker for wal group {}", walGroupId); +294 ReplicationSourceWALReader walReader = +295createNewWALReader(walGroupId, queue, worker.getStartPosition()); +296 Threads.setDaemonThreadRunning(walReader, Thread.currentThread().getName() + +297".replicationSource.wal-reader." + walGroupId + "," + queueId, this::uncaughtException); +298 worker.setWALReader(walReader); +299 worker.startup(this::uncaughtException); +300} +301 } +302 +303 protected ReplicationSourceShipper createNewShipper(String walGroupId, +304 PriorityBlockingQueuePath queue) { +305return new ReplicationSourceShipper(conf, walGroupId, queue, this); +306 } +307 +308 protected ReplicationSourceWALReader createNewWALReader(String walGroupId, +309 PriorityBlockingQueuePath queue, long startPosition) { +310return replicationPeer.getPeerConfig().isSerial() +311 ? new SerialReplicationSourceWALReader(fs, conf, queue, startPosition, walEntryFilter, this) +312 : new ReplicationSourceWALReader(fs, conf, queue, startPosition, walEntryFilter, this); 313 } 314 -315 @Override -316 public ReplicationEndpoint getReplicationEndpoint() { -317return this.replicationEndpoint; -318 } -319 -320 @Override -321 public ReplicationSourceManager getSourceManager() { -322return this.manager; -323 } -324 -325 @Override -326 public void tryThrottle(int batchSize) throws InterruptedException { -327 checkBandwidthChangeAndResetThrottler(); -328if (throttler.isEnabled()) { -329 long sleepTicks = throttler.getNextSleepInterval(batchSize); -330 if (sleepTicks 0) { -331if (LOG.isTraceEnabled()) { -332 LOG.trace("To sleep " + sleepTicks + "ms for throttling control"); -333} -334Thread.sleep(sleepTicks); -335// reset throttler's cycle start tick when sleep for throttling occurs -336throttler.resetStartTick(); -337 } -338} -339 } -340 -341 private void
[11/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/checkstyle.rss -- diff --git a/checkstyle.rss b/checkstyle.rss index faf89c1..693d844 100644 --- a/checkstyle.rss +++ b/checkstyle.rss @@ -26,7 +26,7 @@ under the License. 2007 - 2018 The Apache Software Foundation File: 3578, - Errors: 16170, + Errors: 16169, Warnings: 0, Infos: 0 @@ -858,20 +858,6 @@ under the License. - http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.replication.regionserver.RecoveredReplicationSourceWALReader.java;>org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceWALReader.java - - - 0 - - - 0 - - - 1 - - - - http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.thrift.THBaseThreadPoolExecutor.java;>org/apache/hadoop/hbase/thrift/THBaseThreadPoolExecutor.java @@ -18764,6 +18750,20 @@ under the License. + http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.replication.regionserver.SerialReplicationSourceWALReader.java;>org/apache/hadoop/hbase/replication/regionserver/SerialReplicationSourceWALReader.java + + + 0 + + + 0 + + + 0 + + + + http://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.filter.FilterAllFilter.java;>org/apache/hadoop/hbase/filter/FilterAllFilter.java http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/coc.html -- diff --git a/coc.html b/coc.html index dcb60e4..6f7be20 100644 --- a/coc.html +++ b/coc.html @@ -7,7 +7,7 @@ - + Apache HBase Code of Conduct Policy @@ -368,7 +368,7 @@ email to mailto:priv...@hbase.apache.org;>the priv https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/cygwin.html -- diff --git a/cygwin.html b/cygwin.html index f6a9cbb..9c073eaf 100644 --- a/cygwin.html +++ b/cygwin.html @@ -7,7 +7,7 @@ - + Apache HBase Installing Apache HBase (TM) on Windows using Cygwin @@ -667,7 +667,7 @@ Now your HBase server is running, start coding and build that next https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/dependencies.html -- diff --git a/dependencies.html b/dependencies.html index 3b7e00f..2b7c98a 100644 --- a/dependencies.html +++ b/dependencies.html @@ -7,7 +7,7 @@ - + Apache HBase Project Dependencies @@ -433,7 +433,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/dependency-convergence.html -- diff --git a/dependency-convergence.html b/dependency-convergence.html index 8dfe335..fd4c6bb 100644 --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -7,7 +7,7 @@ - + Apache HBase Reactor Dependency Convergence @@ -1063,7 +1063,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-03-11 + Last Published: 2018-03-12
[06/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-frame.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-frame.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-frame.html index f12f102..105aef5 100644 --- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-frame.html +++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-frame.html @@ -43,7 +43,6 @@ PeerProcedureHandlerImpl RecoveredReplicationSource RecoveredReplicationSourceShipper -RecoveredReplicationSourceWALReader RefreshPeerCallable RegionReplicaReplicationEndpoint RegionReplicaReplicationEndpoint.RegionReplicaOutputSink @@ -67,6 +66,7 @@ ReplicationSyncUp ReplicationThrottler SerialReplicationChecker +SerialReplicationSourceWALReader WALEntryBatch WALEntryStream http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-summary.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-summary.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-summary.html index b7405e9..8ea2f54 100644 --- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-summary.html +++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-summary.html @@ -239,18 +239,12 @@ -RecoveredReplicationSourceWALReader - -Used by a RecoveredReplicationSourceShipper. - - - RefreshPeerCallable The callable executed at RS side to refresh the peer config/state. - + RegionReplicaReplicationEndpoint A ReplicationEndpoint endpoint @@ -258,49 +252,49 @@ of regions. - + RegionReplicaReplicationEndpoint.RegionReplicaOutputSink - + RegionReplicaReplicationEndpoint.RegionReplicaReplayCallable Calls replay on the passed edits for the given set of entries belonging to the region. - + RegionReplicaReplicationEndpoint.RegionReplicaSinkWriter - + RegionReplicaReplicationEndpoint.RetryingRpcCallableV - + Replication Gateway to Replication. - + Replication.ReplicationStatisticsTask Statistics task. - + ReplicationLoad This class is used for exporting some of the info from replication metrics - + ReplicationObserver An Observer to add HFile References to replication queue. - + ReplicationSink @@ -308,71 +302,71 @@ from another cluster. - + ReplicationSinkManager Maintains a collection of peers to replicate to, and randomly selects a single peer to replicate to per set of data to replicate. - + ReplicationSinkManager.SinkPeer Wraps a replication region server sink to provide the ability to identify it. - + ReplicationSource Class that handles the source of a replication stream. - + ReplicationSource.LogsComparator Comparator used to compare logs together based on their start time - + ReplicationSourceFactory Constructs a ReplicationSourceInterface - + ReplicationSourceManager This class is responsible to manage all the replication sources. - + ReplicationSourceShipper This thread reads entries from a queue and ships them. - + ReplicationSourceWALActionListener Used to receive new wals. - + ReplicationSourceWALReader Reads and filters WAL entries, groups the filtered entries into batches, and puts the batches onto a queue - + ReplicationSyncUp In a scenario of Replication based Disaster/Recovery, when hbase Master-Cluster crashes, this tool is used to sync-up the delta from Master to Slave using the info from ZooKeeper. - + ReplicationThrottler Per-peer per-node throttling controller for replication: enabled if @@ -380,7 +374,7 @@ to peer within each cycle won't exceed 'bandwidth' bytes - + SerialReplicationChecker @@ -388,6 +382,12 @@ order. + +SerialReplicationSourceWALReader + +WAL reader for a serial replication peer. + + WALEntryBatch http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html index 0315949..732825f 100644 --- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html @@ -156,7 +156,7 @@ org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceWALReader -org.apache.hadoop.hbase.replication.regionserver.RecoveredReplicationSourceWALReader
[07/13] hbase-site git commit: Published site at 6060d3ba56706d87221f0934d0331a2a73e65167.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f1b07859/devapidocs/org/apache/hadoop/hbase/replication/regionserver/SerialReplicationSourceWALReader.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/SerialReplicationSourceWALReader.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/SerialReplicationSourceWALReader.html new file mode 100644 index 000..66b9039 --- /dev/null +++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/SerialReplicationSourceWALReader.html @@ -0,0 +1,419 @@ +http://www.w3.org/TR/html4/loose.dtd;> + + + + + +SerialReplicationSourceWALReader (Apache HBase 3.0.0-SNAPSHOT API) + + + + + +var methods = {"i0":10,"i1":10}; +var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; +var altColor = "altColor"; +var rowColor = "rowColor"; +var tableTab = "tableTab"; +var activeTableTab = "activeTableTab"; + + +JavaScript is disabled on your browser. + + + + + +Skip navigation links + + + + +Overview +Package +Class +Use +Tree +Deprecated +Index +Help + + + + +PrevClass +NextClass + + +Frames +NoFrames + + +AllClasses + + + + + + + +Summary: +Nested| +Field| +Constr| +Method + + +Detail: +Field| +Constr| +Method + + + + + + + + +org.apache.hadoop.hbase.replication.regionserver +Class SerialReplicationSourceWALReader + + + +https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true; title="class or interface in java.lang">java.lang.Object + + +https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true; title="class or interface in java.lang">java.lang.Thread + + +org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceWALReader + + +org.apache.hadoop.hbase.replication.regionserver.SerialReplicationSourceWALReader + + + + + + + + + + + +All Implemented Interfaces: +https://docs.oracle.com/javase/8/docs/api/java/lang/Runnable.html?is-external=true; title="class or interface in java.lang">Runnable + + + +@InterfaceAudience.Private +public class SerialReplicationSourceWALReader +extends ReplicationSourceWALReader +WAL reader for a serial replication peer. + + + + + + + + + + + +Nested Class Summary + + + + +Nested classes/interfaces inherited from classjava.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true; title="class or interface in java.lang">Thread +https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.State.html?is-external=true; title="class or interface in java.lang">Thread.State, https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.UncaughtExceptionHandler.html?is-external=true; title="class or interface in java.lang">Thread.UncaughtExceptionHandler + + + + + + + + +Field Summary + +Fields + +Modifier and Type +Field and Description + + +private SerialReplicationChecker +checker + + +private Cell +firstCellInEntryBeforeFiltering + + + + + + +Fields inherited from classorg.apache.hadoop.hbase.replication.regionserver.ReplicationSourceWALReader +entryBatchQueue + + + + + +Fields inherited from classjava.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true; title="class or interface in java.lang">Thread +https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true#MAX_PRIORITY; title="class or interface in java.lang">MAX_PRIORITY, https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true#MIN_PRIORITY; title="class or interface in java.lang">MIN_PRIORITY, https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true#NORM_PRIORITY; title="class or interface in java.lang">NORM_PRIORITY + + + + + + + + +Constructor Summary + +Constructors + +Constructor and Description + + +SerialReplicationSourceWALReader(org.apache.hadoop.fs.FileSystemfs, +org.apache.hadoop.conf.Configurationconf, +https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/PriorityBlockingQueue.html?is-external=true; title="class or interface in java.util.concurrent">PriorityBlockingQueueorg.apache.hadoop.fs.PathlogQueue, +longstartPosition, +WALEntryFilterfilter, +ReplicationSourcesource) + + + + + + + + + +Method Summary + +All MethodsInstance MethodsConcrete Methods + +Modifier and Type +Method and Description + + +protected
hbase git commit: HBASE-20047 AuthenticationTokenIdentifier should provide a toString
Repository: hbase Updated Branches: refs/heads/master 6060d3ba5 -> 62fc7fd3e HBASE-20047 AuthenticationTokenIdentifier should provide a toString Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/62fc7fd3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/62fc7fd3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/62fc7fd3 Branch: refs/heads/master Commit: 62fc7fd3ea080a16c4019e7c67c8629cc9088e19 Parents: 6060d3b Author: maoling Authored: Mon Mar 12 22:01:16 2018 +0800 Committer: Chia-Ping Tsai Committed: Mon Mar 12 22:06:08 2018 +0800 -- .../hbase/security/token/AuthenticationTokenIdentifier.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/62fc7fd3/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java index 13655d5..1e4a529 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java @@ -187,4 +187,11 @@ public class AuthenticationTokenIdentifier extends TokenIdentifier { public int hashCode() { return (int)sequenceNumber; } + + @Override + public String toString() { +return "(username=" + username + ", keyId=" ++ keyId + ", issueDate=" + issueDate ++ ", expirationDate=" + expirationDate + ", sequenceNumber=" + sequenceNumber + ")"; + } }
hbase git commit: HBASE-20047 AuthenticationTokenIdentifier should provide a toString
Repository: hbase Updated Branches: refs/heads/branch-2 842678c99 -> fac3b8aad HBASE-20047 AuthenticationTokenIdentifier should provide a toString Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fac3b8aa Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fac3b8aa Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fac3b8aa Branch: refs/heads/branch-2 Commit: fac3b8aad6cfbaeb16621318d8bf50b59ef961b9 Parents: 842678c Author: maoling Authored: Mon Mar 12 22:01:16 2018 +0800 Committer: Chia-Ping Tsai Committed: Mon Mar 12 22:16:22 2018 +0800 -- .../hbase/security/token/AuthenticationTokenIdentifier.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/fac3b8aa/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java index 13655d5..1e4a529 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenIdentifier.java @@ -187,4 +187,11 @@ public class AuthenticationTokenIdentifier extends TokenIdentifier { public int hashCode() { return (int)sequenceNumber; } + + @Override + public String toString() { +return "(username=" + username + ", keyId=" ++ keyId + ", issueDate=" + issueDate ++ ", expirationDate=" + expirationDate + ", sequenceNumber=" + sequenceNumber + ")"; + } }
hbase git commit: HBASE-20167 Optimize the implementation of ReplicationSourceWALReader
Repository: hbase Updated Branches: refs/heads/master d5aaeee88 -> 6060d3ba5 HBASE-20167 Optimize the implementation of ReplicationSourceWALReader Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6060d3ba Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6060d3ba Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6060d3ba Branch: refs/heads/master Commit: 6060d3ba56706d87221f0934d0331a2a73e65167 Parents: d5aaeee Author: zhangduoAuthored: Mon Mar 12 12:21:44 2018 +0800 Committer: zhangduo Committed: Mon Mar 12 15:14:16 2018 +0800 -- .../RecoveredReplicationSource.java | 67 +-- .../RecoveredReplicationSourceShipper.java | 48 ++-- .../RecoveredReplicationSourceWALReader.java| 56 -- .../regionserver/ReplicationSource.java | 36 +++--- .../regionserver/ReplicationSourceShipper.java | 27 +++-- .../ReplicationSourceWALReader.java | 101 + .../SerialReplicationSourceWALReader.java | 112 +++ 7 files changed, 218 insertions(+), 229 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/6060d3ba/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.java index d9506c0..169b469 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.java @@ -20,8 +20,8 @@ package org.apache.hadoop.hbase.replication.regionserver; import java.io.IOException; import java.util.List; import java.util.UUID; +import java.util.concurrent.BlockingQueue; import java.util.concurrent.PriorityBlockingQueue; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -59,31 +59,41 @@ public class RecoveredReplicationSource extends ReplicationSource { } @Override - protected void tryStartNewShipper(String walGroupId, PriorityBlockingQueue queue) { -final RecoveredReplicationSourceShipper worker = -new RecoveredReplicationSourceShipper(conf, walGroupId, queue, this, -this.queueStorage); -ReplicationSourceShipper extant = workerThreads.putIfAbsent(walGroupId, worker); -if (extant != null) { - LOG.debug("Someone has beat us to start a worker thread for wal group " + walGroupId); -} else { - LOG.debug("Starting up worker for wal group " + walGroupId); - worker.startup(this::uncaughtException); - worker.setWALReader( -startNewWALReader(worker.getName(), walGroupId, queue, worker.getStartPosition())); - workerThreads.put(walGroupId, worker); -} + protected RecoveredReplicationSourceShipper createNewShipper(String walGroupId, + PriorityBlockingQueue queue) { +return new RecoveredReplicationSourceShipper(conf, walGroupId, queue, this, queueStorage); + } + + private void handleEmptyWALEntryBatch0(ReplicationSourceWALReader reader, + BlockingQueue entryBatchQueue, Path currentPath) throws InterruptedException { +LOG.trace("Didn't read any new entries from WAL"); +// we're done with queue recovery, shut ourself down +reader.setReaderRunning(false); +// shuts down shipper thread immediately +entryBatchQueue.put(new WALEntryBatch(0, currentPath)); } @Override - protected ReplicationSourceWALReader startNewWALReader(String threadName, String walGroupId, + protected ReplicationSourceWALReader createNewWALReader(String walGroupId, PriorityBlockingQueue queue, long startPosition) { -ReplicationSourceWALReader walReader = - new RecoveredReplicationSourceWALReader(fs, conf, queue, startPosition, walEntryFilter, this); -Threads.setDaemonThreadRunning(walReader, - threadName + ".replicationSource.replicationWALReaderThread." + walGroupId + "," + queueId, - this::uncaughtException); -return walReader; +if (replicationPeer.getPeerConfig().isSerial()) { + return new SerialReplicationSourceWALReader(fs, conf, queue, startPosition, walEntryFilter, +this) { + +@Override +protected void handleEmptyWALEntryBatch(Path currentPath) throws InterruptedException { + handleEmptyWALEntryBatch0(this, entryBatchQueue, currentPath); +} + }; +} else { + return new