[2/2] phoenix git commit: PHOENIX-3045 Data regions in transition forever if RS holding them down during drop index
PHOENIX-3045 Data regions in transition forever if RS holding them down during drop index Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/dcbf5f83 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/dcbf5f83 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/dcbf5f83 Branch: refs/heads/4.x-HBase-1.0 Commit: dcbf5f83835327e1d9912d2e536918e9003a79ea Parents: 69034a3 Author: Ankit SinghalAuthored: Tue Jul 12 23:01:35 2016 +0530 Committer: Ankit Singhal Committed: Tue Jul 12 23:01:35 2016 +0530 -- .../org/apache/phoenix/hbase/index/Indexer.java | 23 +--- .../phoenix/hbase/index/write/IndexWriter.java | 14 +- .../hbase/index/write/RecoveryIndexWriter.java | 134 +++ .../phoenix/iterate/BaseResultIterators.java| 5 +- .../stats/StatisticsCollectorFactory.java | 21 +-- .../phoenix/schema/stats/StatisticsUtil.java| 27 6 files changed, 178 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/dcbf5f83/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java index 6e5edee..a964373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java @@ -24,11 +24,8 @@ import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +35,6 @@ import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Mutation; @@ -56,6 +52,9 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; +import org.apache.htrace.Span; +import org.apache.htrace.Trace; +import org.apache.htrace.TraceScope; import org.apache.phoenix.hbase.index.builder.IndexBuildManager; import org.apache.phoenix.hbase.index.builder.IndexBuilder; import org.apache.phoenix.hbase.index.table.HTableInterfaceReference; @@ -65,15 +64,11 @@ import org.apache.phoenix.hbase.index.util.VersionUtil; import org.apache.phoenix.hbase.index.wal.IndexedKeyValue; import org.apache.phoenix.hbase.index.write.IndexFailurePolicy; import org.apache.phoenix.hbase.index.write.IndexWriter; +import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter; import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache; import org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy; -import org.apache.phoenix.hbase.index.write.recovery.TrackingParallelWriterIndexCommitter; import org.apache.phoenix.trace.TracingUtils; import org.apache.phoenix.trace.util.NullSpan; -import org.apache.phoenix.util.IndexUtil; -import org.apache.htrace.Span; -import org.apache.htrace.Trace; -import org.apache.htrace.TraceScope; import com.google.common.collect.Multimap; @@ -157,11 +152,6 @@ public class Indexer extends BaseRegionObserver { // setup the actual index writer this.writer = new IndexWriter(env, serverName + "-index-writer"); - -// setup the recovery writer that does retries on the failed edits -TrackingParallelWriterIndexCommitter recoveryCommmiter = -new TrackingParallelWriterIndexCommitter(); - try { // get the specified failure policy. We only ever override it in tests, but we need to do it // here @@ -170,10 +160,9 @@ public class Indexer extends BaseRegionObserver { StoreFailuresInCachePolicy.class, IndexFailurePolicy.class); IndexFailurePolicy policy = policyClass.getConstructor(PerRegionIndexWriteCache.class).newInstance(failedIndexEdits); - LOG.debug("Setting up recovery writter with committer: " + recoveryCommmiter.getClass() - + " and failure policy: " + policy.getClass()); + LOG.debug("Setting up recovery writter with failure policy: " +
[2/2] phoenix git commit: PHOENIX-3045 Data regions in transition forever if RS holding them down during drop index
PHOENIX-3045 Data regions in transition forever if RS holding them down during drop index Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e2b4e57d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e2b4e57d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e2b4e57d Branch: refs/heads/4.x-HBase-1.1 Commit: e2b4e57d78e10f2f725ecc668c712016ac4b8b91 Parents: f034b08 Author: Ankit SinghalAuthored: Tue Jul 12 22:58:16 2016 +0530 Committer: Ankit Singhal Committed: Tue Jul 12 22:58:16 2016 +0530 -- .../org/apache/phoenix/hbase/index/Indexer.java | 23 +--- .../phoenix/hbase/index/write/IndexWriter.java | 14 +- .../hbase/index/write/RecoveryIndexWriter.java | 134 +++ .../phoenix/iterate/BaseResultIterators.java| 5 +- .../stats/StatisticsCollectorFactory.java | 21 +-- .../phoenix/schema/stats/StatisticsUtil.java| 27 6 files changed, 178 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e2b4e57d/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java index 6e5edee..a964373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java @@ -24,11 +24,8 @@ import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +35,6 @@ import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Mutation; @@ -56,6 +52,9 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; +import org.apache.htrace.Span; +import org.apache.htrace.Trace; +import org.apache.htrace.TraceScope; import org.apache.phoenix.hbase.index.builder.IndexBuildManager; import org.apache.phoenix.hbase.index.builder.IndexBuilder; import org.apache.phoenix.hbase.index.table.HTableInterfaceReference; @@ -65,15 +64,11 @@ import org.apache.phoenix.hbase.index.util.VersionUtil; import org.apache.phoenix.hbase.index.wal.IndexedKeyValue; import org.apache.phoenix.hbase.index.write.IndexFailurePolicy; import org.apache.phoenix.hbase.index.write.IndexWriter; +import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter; import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache; import org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy; -import org.apache.phoenix.hbase.index.write.recovery.TrackingParallelWriterIndexCommitter; import org.apache.phoenix.trace.TracingUtils; import org.apache.phoenix.trace.util.NullSpan; -import org.apache.phoenix.util.IndexUtil; -import org.apache.htrace.Span; -import org.apache.htrace.Trace; -import org.apache.htrace.TraceScope; import com.google.common.collect.Multimap; @@ -157,11 +152,6 @@ public class Indexer extends BaseRegionObserver { // setup the actual index writer this.writer = new IndexWriter(env, serverName + "-index-writer"); - -// setup the recovery writer that does retries on the failed edits -TrackingParallelWriterIndexCommitter recoveryCommmiter = -new TrackingParallelWriterIndexCommitter(); - try { // get the specified failure policy. We only ever override it in tests, but we need to do it // here @@ -170,10 +160,9 @@ public class Indexer extends BaseRegionObserver { StoreFailuresInCachePolicy.class, IndexFailurePolicy.class); IndexFailurePolicy policy = policyClass.getConstructor(PerRegionIndexWriteCache.class).newInstance(failedIndexEdits); - LOG.debug("Setting up recovery writter with committer: " + recoveryCommmiter.getClass() - + " and failure policy: " + policy.getClass()); + LOG.debug("Setting up recovery writter with failure policy: " +
[2/2] phoenix git commit: PHOENIX-3045 Data regions in transition forever if RS holding them down during drop index
PHOENIX-3045 Data regions in transition forever if RS holding them down during drop index Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e060a131 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e060a131 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e060a131 Branch: refs/heads/master Commit: e060a131bd7cc94e860b70e0698c7d2d9802ddc9 Parents: 52d639f Author: Ankit SinghalAuthored: Tue Jul 12 22:55:23 2016 +0530 Committer: Ankit Singhal Committed: Tue Jul 12 22:55:23 2016 +0530 -- .../org/apache/phoenix/hbase/index/Indexer.java | 23 +--- .../phoenix/hbase/index/write/IndexWriter.java | 14 +- .../hbase/index/write/RecoveryIndexWriter.java | 134 +++ .../phoenix/iterate/BaseResultIterators.java| 5 +- .../stats/StatisticsCollectorFactory.java | 21 +-- .../phoenix/schema/stats/StatisticsUtil.java| 27 6 files changed, 178 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e060a131/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java index 6e5edee..a964373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java @@ -24,11 +24,8 @@ import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +35,6 @@ import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Mutation; @@ -56,6 +52,9 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; +import org.apache.htrace.Span; +import org.apache.htrace.Trace; +import org.apache.htrace.TraceScope; import org.apache.phoenix.hbase.index.builder.IndexBuildManager; import org.apache.phoenix.hbase.index.builder.IndexBuilder; import org.apache.phoenix.hbase.index.table.HTableInterfaceReference; @@ -65,15 +64,11 @@ import org.apache.phoenix.hbase.index.util.VersionUtil; import org.apache.phoenix.hbase.index.wal.IndexedKeyValue; import org.apache.phoenix.hbase.index.write.IndexFailurePolicy; import org.apache.phoenix.hbase.index.write.IndexWriter; +import org.apache.phoenix.hbase.index.write.RecoveryIndexWriter; import org.apache.phoenix.hbase.index.write.recovery.PerRegionIndexWriteCache; import org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy; -import org.apache.phoenix.hbase.index.write.recovery.TrackingParallelWriterIndexCommitter; import org.apache.phoenix.trace.TracingUtils; import org.apache.phoenix.trace.util.NullSpan; -import org.apache.phoenix.util.IndexUtil; -import org.apache.htrace.Span; -import org.apache.htrace.Trace; -import org.apache.htrace.TraceScope; import com.google.common.collect.Multimap; @@ -157,11 +152,6 @@ public class Indexer extends BaseRegionObserver { // setup the actual index writer this.writer = new IndexWriter(env, serverName + "-index-writer"); - -// setup the recovery writer that does retries on the failed edits -TrackingParallelWriterIndexCommitter recoveryCommmiter = -new TrackingParallelWriterIndexCommitter(); - try { // get the specified failure policy. We only ever override it in tests, but we need to do it // here @@ -170,10 +160,9 @@ public class Indexer extends BaseRegionObserver { StoreFailuresInCachePolicy.class, IndexFailurePolicy.class); IndexFailurePolicy policy = policyClass.getConstructor(PerRegionIndexWriteCache.class).newInstance(failedIndexEdits); - LOG.debug("Setting up recovery writter with committer: " + recoveryCommmiter.getClass() - + " and failure policy: " + policy.getClass()); + LOG.debug("Setting up recovery writter with failure policy: " + policy.getClass());