PHOENIX-4979 Fix IndexToolForPartialBuildWithNamespaceEnabledIT for branches <= HBase 1.2
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8559765e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8559765e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8559765e Branch: refs/heads/4.14-cdh5.13 Commit: 8559765e2d14927461fe4202e6c4f78da1f2832c Parents: 94168ef Author: Vincent Poon <vincentp...@apache.org> Authored: Wed Oct 17 01:41:26 2018 +0100 Committer: Pedro Boado <pbo...@apache.org> Committed: Wed Oct 17 20:39:22 2018 +0100 ---------------------------------------------------------------------- .../apache/phoenix/end2end/IndexToolForPartialBuildIT.java | 4 +++- .../IndexToolForPartialBuildWithNamespaceEnabledIT.java | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8559765e/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java index 85209b2..51ccabd 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildIT.java @@ -107,7 +107,9 @@ public class IndexToolForPartialBuildIT extends BaseOwnClusterIT { @BeforeClass public static void doSetup() throws Exception { Map<String, String> serverProps = getServerProperties(); - setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), ReadOnlyProps.EMPTY_PROPS); + Map<String, String> clientProps = Maps.newHashMapWithExpectedSize(2); + clientProps.put(HConstants.HBASE_CLIENT_RETRIES_NUMBER, "2"); + setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), new ReadOnlyProps(clientProps.entrySet().iterator())); } @Parameters(name="localIndex = {0}") http://git-wip-us.apache.org/repos/asf/phoenix/blob/8559765e/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java index a8c1f1e..aae51ca 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForPartialBuildWithNamespaceEnabledIT.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Map; +import org.apache.hadoop.hbase.HConstants; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; @@ -46,13 +47,15 @@ public class IndexToolForPartialBuildWithNamespaceEnabledIT extends IndexToolFor serverProps.put(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, "true"); Map<String, String> clientProps = Maps.newHashMapWithExpectedSize(1); clientProps.put(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, "true"); + clientProps.put(HConstants.HBASE_CLIENT_RETRIES_NUMBER, "2"); setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), new ReadOnlyProps(clientProps.entrySet().iterator())); } @Parameters(name="localIndex = {0} , isNamespaceEnabled = {1}") public static Collection<Boolean[]> data() { - return Arrays.asList(new Boolean[][] { - { false, true},{ true, false } + return Arrays.asList(new Boolean[][] { + { false, true}, + { true, true } }); }
