This is an automated email from the ASF dual-hosted git repository.
mcvsubbu pushed a commit to branch try-helix-0.9.1
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit c97345d5947d22bd403a0e33d50e3da15caa4c9b
Author: Jackie (Xiaotian) Jiang <xaji...@linkedin.com>
AuthorDate: Tue Aug 13 22:23:07 2019 -0700
Upgrade Helix to version 0.9.1
---
.../java/org/apache/pinot/controller/helix/ControllerTest.java | 7 -------
pinot-integration-tests/pom.xml | 2 --
pom.xml | 4 +---
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git
a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
index 069c7bd..6068451 100644
---
a/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
+++
b/pinot-controller/src/test/java/org/apache/pinot/controller/helix/ControllerTest.java
@@ -162,13 +162,6 @@ public abstract class ControllerTest {
case PINOT_ONLY:
_helixAdmin = _helixResourceManager.getHelixAdmin();
_propertyStore = _helixResourceManager.getPropertyStore();
-
- // TODO: Enable periodic rebalance per 10 seconds as a temporary
work-around for the Helix issue:
- // https://github.com/apache/helix/issues/331. Remove this after
Helix fixing the issue.
- _helixAdmin.setConfig(
- new
HelixConfigScopeBuilder(HelixConfigScope.ConfigScopeProperty.CLUSTER).forCluster(getHelixClusterName())
- .build(),
-
Collections.singletonMap(ClusterConfig.ClusterConfigProperty.REBALANCE_TIMER_PERIOD.name(),
"10000"));
break;
case HELIX_ONLY:
_helixAdmin = _helixManager.getClusterManagmentTool();
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
index 1155bb7..0049838 100644
--- a/pinot-integration-tests/pom.xml
+++ b/pinot-integration-tests/pom.xml
@@ -90,8 +90,6 @@
<exclude>**/RealtimeClusterIntegrationTest.java</exclude>
<!-- Covered by ConvertToRawIndexMinionClusterIntegrationTest
-->
<exclude>**/HybridClusterIntegrationTest.java</exclude>
- <!-- TODO: re-enable the Minion tests when upgrading to Helix
0.9.1 -->
- <exclude>**/*MinionClusterIntegrationTest.java</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index d770f29..c16212a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<!-- Configuration for unit/integration tests section 1 of 3 (properties)
ENDS HERE.-->
<avro.version>1.7.6</avro.version>
<parquet.version>1.8.0</parquet.version>
- <helix.version>0.8.4</helix.version>
+ <helix.version>0.9.1</helix.version>
<zkclient.version>0.7</zkclient.version>
<jackson.version>2.9.8</jackson.version>
<async-http-client.version>1.9.21</async-http-client.version>
@@ -1169,8 +1169,6 @@
<!-- Excludes integration tests when unit tests are run. -->
<excludes>
<exclude>**/*IT.java</exclude>
- <!-- TODO: re-enable the Minion tests when upgrading to Helix
0.9.1 -->
- <exclude>**/*MinionClusterIntegrationTest.java</exclude>
</excludes>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
