Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 1b2c95094 -> e3257489c
PHOENIX-4723 Fix UpsertSelectOverlappingBatchesIT#testSplitDuringUpsertSelect test Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e3257489 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e3257489 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e3257489 Branch: refs/heads/5.x-HBase-2.0 Commit: e3257489c986bc2b17cb9a2595916b006c37ff88 Parents: 1b2c950 Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Thu May 24 10:46:14 2018 -0700 Committer: Ankit Singhal <ankitsingha...@gmail.com> Committed: Thu May 24 10:46:14 2018 -0700 ---------------------------------------------------------------------- .../phoenix/execute/UpsertSelectOverlappingBatchesIT.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3257489/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java index e0c8484..0759caa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/UpsertSelectOverlappingBatchesIT.java @@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.DoNotRetryRegionException; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.coprocessor.ObserverContext; @@ -227,10 +228,10 @@ public class UpsertSelectOverlappingBatchesIT extends BaseUniqueNamesOwnClusterI logger.info("Attempting to split region"); admin.splitRegionAsync(hRegion.getRegionName(), Bytes.toBytes(2)); return false; - } catch (NotServingRegionException nsre) { + } catch (NotServingRegionException | DoNotRetryRegionException re) { // during split return false; - } + } } }); } finally {
