You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by mc...@apache.org on 2019/06/29 21:12:25 UTC
[incubator-pinot] branch increase-wait-time updated (fa3875f ->
b08d69e)
This is an automated email from the ASF dual-hosted git repository.
mcvsubbu pushed a change to branch increase-wait-time
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
from fa3875f initial
new 276e065 Revert "initial"
new b08d69e Updating zk version dependency to be same as helix dependency
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pinot-broker/pom.xml | 5 +++++
pinot-controller/pom.xml | 5 +++++
pinot-core/pom.xml | 5 +++++
pinot-integration-tests/pom.xml | 4 ++++
.../tests/ControllerPeriodicTasksIntegrationTests.java | 2 +-
.../HadoopSegmentBuildPushOfflineClusterIntegrationTest.java | 2 +-
.../pinot/integration/tests/HybridClusterIntegrationTest.java | 2 +-
.../tests/HybridClusterIntegrationTestCommandLineRunner.java | 2 +-
...etadataAndDictionaryAggregationPlanClusterIntegrationTest.java | 4 ++--
.../pinot/integration/tests/OfflineClusterIntegrationTest.java | 2 +-
.../pinot/integration/tests/RealtimeClusterIntegrationTest.java | 2 +-
.../pinot/integration/tests/StarTreeClusterIntegrationTest.java | 4 ++--
pom.xml | 8 +++++++-
13 files changed, 36 insertions(+), 11 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[incubator-pinot] 01/02: Revert "initial"
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mcvsubbu pushed a commit to branch increase-wait-time
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 276e0650555c1ef8ff832f3748f1cf2eea29ffce
Author: Subbu Subramaniam <ss...@linkedin.com>
AuthorDate: Sat Jun 29 14:09:06 2019 -0700
Revert "initial"
This reverts commit fa3875f7de89fd78e5986ef63fdbcb36ec6a391d.
---
.../integration/tests/ControllerPeriodicTasksIntegrationTests.java | 2 +-
.../tests/HadoopSegmentBuildPushOfflineClusterIntegrationTest.java | 2 +-
.../apache/pinot/integration/tests/HybridClusterIntegrationTest.java | 2 +-
.../tests/HybridClusterIntegrationTestCommandLineRunner.java | 2 +-
.../MetadataAndDictionaryAggregationPlanClusterIntegrationTest.java | 4 ++--
.../apache/pinot/integration/tests/OfflineClusterIntegrationTest.java | 2 +-
.../pinot/integration/tests/RealtimeClusterIntegrationTest.java | 2 +-
.../pinot/integration/tests/StarTreeClusterIntegrationTest.java | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerPeriodicTasksIntegrationTests.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerPeriodicTasksIntegrationTests.java
index ed6a79a..8c9ffe5 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerPeriodicTasksIntegrationTests.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ControllerPeriodicTasksIntegrationTests.java
@@ -193,7 +193,7 @@ public class ControllerPeriodicTasksIntegrationTests extends BaseClusterIntegrat
executor.shutdown();
executor.awaitTermination(10, TimeUnit.MINUTES);
uploadSegments(_tarDir);
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
}
/**
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HadoopSegmentBuildPushOfflineClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HadoopSegmentBuildPushOfflineClusterIntegrationTest.java
index c452565..36e083c 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HadoopSegmentBuildPushOfflineClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HadoopSegmentBuildPushOfflineClusterIntegrationTest.java
@@ -99,7 +99,7 @@ public class HadoopSegmentBuildPushOfflineClusterIntegrationTest extends BaseClu
generateAndPushSegmentsFromHadoop();
// Wait for all documents loaded
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
}
@AfterClass
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java
index b8b7c1a..f9ca74a 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTest.java
@@ -100,7 +100,7 @@ public class HybridClusterIntegrationTest extends BaseClusterIntegrationTestSet
uploadSegments(_tarDir);
// Wait for all documents loaded
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
}
protected void startHybridCluster()
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTestCommandLineRunner.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTestCommandLineRunner.java
index 5b75a91..6e5474f 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTestCommandLineRunner.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/HybridClusterIntegrationTestCommandLineRunner.java
@@ -324,7 +324,7 @@ public class HybridClusterIntegrationTestCommandLineRunner {
responseFileReader.mark(4096);
_countStarResult = JsonUtils.stringToJsonNode(responseFileReader.readLine()).get("totalDocs").asLong();
responseFileReader.reset();
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
// Run queries in multiple threads
ExecutorService executorService =
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MetadataAndDictionaryAggregationPlanClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MetadataAndDictionaryAggregationPlanClusterIntegrationTest.java
index 4e64bee..61dc1b7 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MetadataAndDictionaryAggregationPlanClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/MetadataAndDictionaryAggregationPlanClusterIntegrationTest.java
@@ -113,9 +113,9 @@ public class MetadataAndDictionaryAggregationPlanClusterIntegrationTest extends
loadDataIntoH2(avroFiles);
// Wait for all documents loaded
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
_currentTable = STAR_TREE_TABLE_NAME;
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
}
private void loadDataIntoH2(List<File> avroFiles)
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
index 05720da..8d9d144 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
@@ -133,7 +133,7 @@ public class OfflineClusterIntegrationTest extends BaseClusterIntegrationTestSet
registerCallbackHandlers();
// Wait for all documents loaded
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
}
private void registerCallbackHandlers() {
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeClusterIntegrationTest.java
index 07c4800..d5196bf 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/RealtimeClusterIntegrationTest.java
@@ -74,7 +74,7 @@ public class RealtimeClusterIntegrationTest extends BaseClusterIntegrationTestSe
setUpTable(avroFiles.get(0));
// Wait for all documents loaded
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
}
protected void setUpTable(File avroFile)
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/StarTreeClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/StarTreeClusterIntegrationTest.java
index 861c9b6..06ea600 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/StarTreeClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/StarTreeClusterIntegrationTest.java
@@ -101,9 +101,9 @@ public class StarTreeClusterIntegrationTest extends BaseClusterIntegrationTest {
// Wait for all documents loaded
_currentTable = DEFAULT_TABLE_NAME;
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
_currentTable = STAR_TREE_TABLE_NAME;
- waitForAllDocsLoaded(1200_000L);
+ waitForAllDocsLoaded(600_000L);
}
protected void setUpSegmentsAndQueryGenerator()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[incubator-pinot] 02/02: Updating zk version dependency to be same
as helix dependency
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mcvsubbu pushed a commit to branch increase-wait-time
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit b08d69ecda4ac2e9ffe65fd7bc91e8c941ca5aa1
Author: Subbu Subramaniam <ss...@linkedin.com>
AuthorDate: Sat Jun 29 14:09:26 2019 -0700
Updating zk version dependency to be same as helix dependency
Helix uses zookeeper-3.4.13, updating pinot dependency to use the same version
---
pinot-broker/pom.xml | 5 +++++
pinot-controller/pom.xml | 5 +++++
pinot-core/pom.xml | 5 +++++
pinot-integration-tests/pom.xml | 4 ++++
pom.xml | 8 +++++++-
5 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/pinot-broker/pom.xml b/pinot-broker/pom.xml
index 4f19949..468169b 100644
--- a/pinot-broker/pom.xml
+++ b/pinot-broker/pom.xml
@@ -101,6 +101,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-server</artifactId>
<scope>test</scope>
diff --git a/pinot-controller/pom.xml b/pinot-controller/pom.xml
index 7092a50..b9c6490 100644
--- a/pinot-controller/pom.xml
+++ b/pinot-controller/pom.xml
@@ -176,6 +176,11 @@
<groupId>com.jcabi</groupId>
<artifactId>jcabi-log</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- test -->
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/pinot-core/pom.xml b/pinot-core/pom.xml
index 51c9231..cb03fce 100644
--- a/pinot-core/pom.xml
+++ b/pinot-core/pom.xml
@@ -192,5 +192,10 @@
<artifactId>equalsverifier</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
index 5467174..56b47fb 100644
--- a/pinot-integration-tests/pom.xml
+++ b/pinot-integration-tests/pom.xml
@@ -260,6 +260,10 @@
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index 95bd02c..28a7885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,6 +279,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
@@ -489,7 +495,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.11</version>
+ <version>3.4.13</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org