This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e7ea235 Adding a config file to override quickstart configs (#8059)
e7ea235 is described below
commit e7ea235a1e0e94da02b5a8b171bba0b00d0d6076
Author: Xiang Fu <xiangfu.1...@gmail.com>
AuthorDate: Mon Jan 24 09:44:25 2022 -0800
Adding a config file to override quickstart configs (#8059)
---
.../org/apache/pinot/tools/EmptyQuickstart.java | 5 ----
.../org/apache/pinot/tools/GenericQuickstart.java | 18 ++++++++++---
.../apache/pinot/tools/GitHubEventsQuickstart.java | 30 +++++++++++++++++++---
.../org/apache/pinot/tools/HybridQuickstart.java | 2 +-
.../org/apache/pinot/tools/JoinQuickStart.java | 3 ++-
.../apache/pinot/tools/JsonIndexQuickStart.java | 3 ++-
.../OfflineComplexTypeHandlingQuickStart.java | 3 ++-
.../pinot/tools/PartialUpsertQuickStart.java | 12 +++++++--
.../org/apache/pinot/tools/QuickStartBase.java | 20 +++++++++++++++
.../java/org/apache/pinot/tools/Quickstart.java | 5 ----
.../RealtimeComplexTypeHandlingQuickStart.java | 3 ++-
.../pinot/tools/RealtimeJsonIndexQuickStart.java | 3 ++-
.../org/apache/pinot/tools/RealtimeQuickStart.java | 3 ++-
.../pinot/tools/RealtimeQuickStartWithMinion.java | 5 ++--
.../apache/pinot/tools/UpsertJsonQuickStart.java | 3 ++-
.../org/apache/pinot/tools/UpsertQuickStart.java | 3 ++-
.../command/GitHubEventsQuickStartCommand.java | 2 +-
.../tools/admin/command/QuickStartCommand.java | 8 ++++++
.../tools/admin/command/QuickstartRunner.java | 5 ++--
19 files changed, 102 insertions(+), 34 deletions(-)
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/EmptyQuickstart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/EmptyQuickstart.java
index 150ae58..08586ed 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/EmptyQuickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/EmptyQuickstart.java
@@ -22,7 +22,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import org.apache.pinot.tools.admin.PinotAdministrator;
import org.apache.pinot.tools.admin.command.QuickstartRunner;
@@ -37,10 +36,6 @@ public class EmptyQuickstart extends QuickStartBase {
return null;
}
- public Map<String, Object> getConfigOverrides() {
- return null;
- }
-
public void execute()
throws Exception {
File quickstartTmpDir = new File(_dataDir.getAbsolutePath());
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/GenericQuickstart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/GenericQuickstart.java
index 536dad4..400e58a 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/GenericQuickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/GenericQuickstart.java
@@ -22,6 +22,8 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.io.File;
import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.spi.stream.StreamDataProvider;
@@ -33,7 +35,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.pinot.tools.Quickstart.prettyPrintResponse;
-import static org.apache.pinot.tools.Quickstart.printStatus;
/**
@@ -48,7 +49,7 @@ import static org.apache.pinot.tools.Quickstart.printStatus;
* ingestion_job_spec.json
* </code>
*/
-public class GenericQuickstart {
+public class GenericQuickstart extends QuickStartBase {
private static final Logger LOGGER =
LoggerFactory.getLogger(GenericQuickstart.class);
private final File _schemaFile;
private final File _tableConfigFile;
@@ -57,6 +58,11 @@ public class GenericQuickstart {
private StreamDataServerStartable _kafkaStarter;
private ZkStarter.ZookeeperInstance _zookeeperInstance;
+ public GenericQuickstart() {
+
this(GenericQuickstart.class.getClassLoader().getResource("examples/batch/starbucksStores").getPath(),
+ "starbucksStores");
+ }
+
public GenericQuickstart(String tableDirectoryPath, String tableName) {
_tableDirectory = new File(tableDirectoryPath);
_tableName = tableName;
@@ -80,13 +86,19 @@ public class GenericQuickstart {
_kafkaStarter.createTopic("pullRequestMergedEvents",
KafkaStarterUtils.getTopicCreationProps(2));
}
+ @Override
+ public List<String> types() {
+ return Arrays.asList("GENERIC");
+ }
+
public void execute()
throws Exception {
File tempDir = new File(FileUtils.getTempDirectory(),
String.valueOf(System.currentTimeMillis()));
Preconditions.checkState(tempDir.mkdirs());
QuickstartTableRequest request = new
QuickstartTableRequest(_tableDirectory.getAbsolutePath());
- final QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, tempDir);
+ final QuickstartRunner runner =
+ new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, tempDir,
getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Kafka *****");
startKafka();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/GitHubEventsQuickstart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/GitHubEventsQuickstart.java
index a2e5615..e8495b1 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/GitHubEventsQuickstart.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/GitHubEventsQuickstart.java
@@ -22,6 +22,8 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.io.File;
import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.spi.stream.StreamDataProvider;
@@ -34,7 +36,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.pinot.tools.Quickstart.prettyPrintResponse;
-import static org.apache.pinot.tools.Quickstart.printStatus;
/**
@@ -43,10 +44,14 @@ import static org.apache.pinot.tools.Quickstart.printStatus;
* Creates a realtime table pullRequestMergedEvents
* Starts the {@link PullRequestMergedEventsStream} to publish
pullRequestMergedEvents into the topic
*/
-public class GitHubEventsQuickstart {
+public class GitHubEventsQuickstart extends QuickStartBase {
private static final Logger LOGGER =
LoggerFactory.getLogger(GitHubEventsQuickstart.class);
private StreamDataServerStartable _kafkaStarter;
private ZkStarter.ZookeeperInstance _zookeeperInstance;
+ private String _personalAccessToken;
+
+ public GitHubEventsQuickstart() {
+ }
private void startKafka() {
_zookeeperInstance = ZkStarter.startLocalZkServer();
@@ -60,7 +65,7 @@ public class GitHubEventsQuickstart {
_kafkaStarter.createTopic("pullRequestMergedEvents",
KafkaStarterUtils.getTopicCreationProps(2));
}
- public void execute(String personalAccessToken)
+ private void execute(String personalAccessToken)
throws Exception {
final File quickStartDataDir =
new File(new File("githubEvents-" + System.currentTimeMillis()),
"pullRequestMergedEvents");
@@ -84,7 +89,8 @@ public class GitHubEventsQuickstart {
File tempDir = new File(FileUtils.getTempDirectory(),
String.valueOf(System.currentTimeMillis()));
Preconditions.checkState(tempDir.mkdirs());
QuickstartTableRequest request = new
QuickstartTableRequest(quickStartDataDir.getAbsolutePath());
- final QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, tempDir);
+ final QuickstartRunner runner =
+ new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, tempDir,
getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Kafka *****");
startKafka();
@@ -149,4 +155,20 @@ public class GitHubEventsQuickstart {
printStatus(Color.GREEN, "You can always go to http://localhost:9000 to
play around in the query console");
}
+
+ @Override
+ public List<String> types() {
+ return Arrays.asList("GITHUB-EVENTS", "GITHUB_EVENTS");
+ }
+
+ @Override
+ public void execute()
+ throws Exception {
+ execute(_personalAccessToken);
+ }
+
+ public GitHubEventsQuickstart setPersonalAccessToken(String
personalAccessToken) {
+ _personalAccessToken = personalAccessToken;
+ return this;
+ }
}
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
index 45893af..7c738a4 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
@@ -115,7 +115,7 @@ public class HybridQuickstart extends QuickStartBase {
Preconditions.checkState(dataDir.mkdirs());
QuickstartTableRequest bootstrapTableRequest =
prepareTableRequest(baseDir);
final QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(bootstrapTableRequest),
- 1, 1, 1, 0, dataDir);
+ 1, 1, 1, 0, dataDir, getConfigOverrides());
printStatus(Color.YELLOW, "***** Starting Kafka *****");
startKafka();
printStatus(Color.YELLOW, "***** Starting airline data stream and
publishing to Kafka *****");
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/JoinQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/JoinQuickStart.java
index f4d9ea7..3270b66 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/JoinQuickStart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/JoinQuickStart.java
@@ -80,7 +80,8 @@ public class JoinQuickStart extends QuickStartBase {
File tempDir = new File(quickstartTmpDir, "tmp");
FileUtils.forceMkdir(tempDir);
- QuickstartRunner runner = new QuickstartRunner(Lists.newArrayList(request,
dimTableRequest), 1, 1, 3, 0, tempDir);
+ QuickstartRunner runner =
+ new QuickstartRunner(Lists.newArrayList(request, dimTableRequest), 1,
1, 3, 0, tempDir, getConfigOverrides());
printStatus(Quickstart.Color.CYAN, "***** Starting Zookeeper, controller,
broker and server *****");
runner.startAll();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/JsonIndexQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/JsonIndexQuickStart.java
index 36ba63d..80ec6d4 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/JsonIndexQuickStart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/JsonIndexQuickStart.java
@@ -63,7 +63,8 @@ public class JsonIndexQuickStart extends QuickStartBase {
FileUtils.copyURLToFile(resource, ingestionJobSpecFile);
QuickstartTableRequest request = new
QuickstartTableRequest(baseDir.getAbsolutePath());
- final QuickstartRunner runner = new
QuickstartRunner(Collections.singletonList(request), 1, 1, 1, 0, dataDir);
+ final QuickstartRunner runner =
+ new QuickstartRunner(Collections.singletonList(request), 1, 1, 1, 0,
dataDir, getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Zookeeper, controller, broker and
server *****");
runner.startAll();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/OfflineComplexTypeHandlingQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/OfflineComplexTypeHandlingQuickStart.java
index ed3eb61..69f07b6 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/OfflineComplexTypeHandlingQuickStart.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/OfflineComplexTypeHandlingQuickStart.java
@@ -65,7 +65,8 @@ public class OfflineComplexTypeHandlingQuickStart extends
QuickStartBase {
FileUtils.copyURLToFile(resource, ingestionJobSpecFile);
QuickstartTableRequest request = new
QuickstartTableRequest(baseDir.getAbsolutePath());
- final QuickstartRunner runner = new
QuickstartRunner(Collections.singletonList(request), 1, 1, 1, 0, dataDir);
+ final QuickstartRunner runner =
+ new QuickstartRunner(Collections.singletonList(request), 1, 1, 1, 0,
dataDir, getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Zookeeper, controller, broker and
server *****");
runner.startAll();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/PartialUpsertQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/PartialUpsertQuickStart.java
index 1615901..c23f4c8 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/PartialUpsertQuickStart.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/PartialUpsertQuickStart.java
@@ -22,6 +22,8 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.io.File;
import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.spi.plugin.PluginManager;
@@ -36,7 +38,7 @@ import static
org.apache.pinot.tools.Quickstart.prettyPrintResponse;
import static org.apache.pinot.tools.Quickstart.printStatus;
-public class PartialUpsertQuickStart {
+public class PartialUpsertQuickStart extends QuickStartBase {
private StreamDataServerStartable _kafkaStarter;
public static void main(String[] args)
@@ -45,6 +47,11 @@ public class PartialUpsertQuickStart {
new PartialUpsertQuickStart().execute();
}
+ @Override
+ public List<String> types() {
+ return Arrays.asList("PARTIAL-UPSERT", "PARTIAL_UPSERT");
+ }
+
// Todo: add a quick start demo
public void execute()
throws Exception {
@@ -66,7 +73,8 @@ public class PartialUpsertQuickStart {
FileUtils.copyURLToFile(resource, tableConfigFile);
QuickstartTableRequest request = new
QuickstartTableRequest(bootstrapTableDir.getAbsolutePath());
- final QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir);
+ final QuickstartRunner runner =
+ new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir,
getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Kafka *****");
final ZkStarter.ZookeeperInstance zookeeperInstance =
ZkStarter.startLocalZkServer();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/QuickStartBase.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/QuickStartBase.java
index 6b2686a..0fdb528 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/QuickStartBase.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/QuickStartBase.java
@@ -18,15 +18,21 @@
*/
package org.apache.pinot.tools;
+import com.google.common.collect.ImmutableMap;
import java.io.File;
import java.util.List;
+import java.util.Map;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pinot.tools.admin.command.QuickstartRunner;
+import org.apache.pinot.tools.utils.PinotConfigUtils;
public abstract class QuickStartBase {
protected File _dataDir = FileUtils.getTempDirectory();
protected String _zkExternalAddress;
+ protected String _configFilePath;
public QuickStartBase setDataDir(String dataDir) {
_dataDir = new File(dataDir);
@@ -38,6 +44,11 @@ public abstract class QuickStartBase {
return this;
}
+ public QuickStartBase setConfigFilePath(String configFilePath) {
+ _configFilePath = configFilePath;
+ return this;
+ }
+
public abstract List<String> types();
protected void waitForBootstrapToComplete(QuickstartRunner runner)
@@ -53,4 +64,13 @@ public abstract class QuickStartBase {
public abstract void execute()
throws Exception;
+
+ protected Map<String, Object> getConfigOverrides() {
+ try {
+ return StringUtils.isEmpty(_configFilePath) ? ImmutableMap.of()
+ : PinotConfigUtils.readConfigFromFile(_configFilePath);
+ } catch (ConfigurationException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
index 886085a..a8efabc 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
@@ -26,7 +26,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.apache.pinot.tools.admin.PinotAdministrator;
import org.apache.pinot.tools.admin.command.QuickstartRunner;
@@ -67,10 +66,6 @@ public class Quickstart extends QuickStartBase {
return null;
}
- public Map<String, Object> getConfigOverrides() {
- return null;
- }
-
public static String prettyPrintResponse(JsonNode response) {
StringBuilder responseBuilder = new StringBuilder();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeComplexTypeHandlingQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeComplexTypeHandlingQuickStart.java
index 3e45e9d..c070046 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeComplexTypeHandlingQuickStart.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeComplexTypeHandlingQuickStart.java
@@ -74,7 +74,8 @@ public class RealtimeComplexTypeHandlingQuickStart extends
QuickStartBase {
FileUtils.copyURLToFile(resource, tableConfigFile);
QuickstartTableRequest request = new
QuickstartTableRequest(baseDir.getAbsolutePath());
- QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir);
+ QuickstartRunner runner =
+ new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir,
getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Kafka *****");
ZkStarter.ZookeeperInstance zookeeperInstance =
ZkStarter.startLocalZkServer();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeJsonIndexQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeJsonIndexQuickStart.java
index 758222d..3875543 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeJsonIndexQuickStart.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeJsonIndexQuickStart.java
@@ -73,7 +73,8 @@ public class RealtimeJsonIndexQuickStart extends
QuickStartBase {
FileUtils.copyURLToFile(resource, tableConfigFile);
QuickstartTableRequest request = new
QuickstartTableRequest(baseDir.getAbsolutePath());
- QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir);
+ QuickstartRunner runner =
+ new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir,
getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Kafka *****");
ZkStarter.ZookeeperInstance zookeeperInstance =
ZkStarter.startLocalZkServer();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeQuickStart.java
index bcceaf8..975eeb3 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeQuickStart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeQuickStart.java
@@ -73,7 +73,8 @@ public class RealtimeQuickStart extends QuickStartBase {
FileUtils.copyURLToFile(resource, tableConfigFile);
QuickstartTableRequest request = new
QuickstartTableRequest(baseDir.getAbsolutePath());
- final QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir);
+ final QuickstartRunner runner =
+ new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir,
getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Kafka *****");
final ZkStarter.ZookeeperInstance zookeeperInstance =
ZkStarter.startLocalZkServer();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeQuickStartWithMinion.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeQuickStartWithMinion.java
index c124033..6809e65 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeQuickStartWithMinion.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/RealtimeQuickStartWithMinion.java
@@ -25,7 +25,6 @@ import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -64,8 +63,8 @@ public class RealtimeQuickStartWithMinion extends
QuickStartBase {
}
public Map<String, Object> getConfigOverrides() {
- Map<String, Object> properties = new HashMap<>();
- properties.put("controller.task.scheduler.enabled", true);
+ Map<String, Object> properties = super.getConfigOverrides();
+ properties.putIfAbsent("controller.task.scheduler.enabled", true);
return properties;
}
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/UpsertJsonQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/UpsertJsonQuickStart.java
index 1cfe368..7a86ee8 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/UpsertJsonQuickStart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/UpsertJsonQuickStart.java
@@ -73,7 +73,8 @@ public class UpsertJsonQuickStart extends QuickStartBase {
FileUtils.copyURLToFile(resource, tableConfigFile);
QuickstartTableRequest request = new
QuickstartTableRequest(baseDir.getAbsolutePath());
- QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir);
+ QuickstartRunner runner =
+ new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir,
getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Kafka *****");
ZkStarter.ZookeeperInstance zookeeperInstance =
ZkStarter.startLocalZkServer();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/UpsertQuickStart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/UpsertQuickStart.java
index a80ea92..e17de70 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/UpsertQuickStart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/UpsertQuickStart.java
@@ -74,7 +74,8 @@ public class UpsertQuickStart extends QuickStartBase {
FileUtils.copyURLToFile(resource, tableConfigFile);
QuickstartTableRequest request = new
QuickstartTableRequest(bootstrapTableDir.getAbsolutePath());
- final QuickstartRunner runner = new
QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0, dataDir);
+ final QuickstartRunner runner
+ = new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 0,
dataDir, getConfigOverrides());
printStatus(Color.CYAN, "***** Starting Kafka *****");
final ZkStarter.ZookeeperInstance zookeeperInstance =
ZkStarter.startLocalZkServer();
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/GitHubEventsQuickStartCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/GitHubEventsQuickStartCommand.java
index fb4f51d..578f94d 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/GitHubEventsQuickStartCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/GitHubEventsQuickStartCommand.java
@@ -68,7 +68,7 @@ public class GitHubEventsQuickStartCommand extends
AbstractBaseAdminCommand impl
public boolean execute()
throws Exception {
PluginManager.get().init();
- new GitHubEventsQuickstart().execute(_personalAccessToken);
+ new
GitHubEventsQuickstart().setPersonalAccessToken(_personalAccessToken).execute();
return true;
}
}
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickStartCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickStartCommand.java
index 43927a4..6a79d4d 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickStartCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickStartCommand.java
@@ -47,6 +47,10 @@ public class QuickStartCommand extends
AbstractBaseAdminCommand implements Comma
description = "URL for an external Zookeeper instance instead of using
the default embedded instance")
private String _zkExternalAddress;
+ @CommandLine.Option(names = {"-configFile", "-configFilePath"}, required =
false,
+ description = "Config file path to override default pinot configs")
+ private String _configFilePath;
+
@CommandLine.Option(names = {"-help", "-h", "--h", "--help"}, required =
false,
description = "Print this message.")
private boolean _help = false;
@@ -130,6 +134,10 @@ public class QuickStartCommand extends
AbstractBaseAdminCommand implements Comma
quickstart.setZkExternalAddress(_zkExternalAddress);
}
+ if (_configFilePath != null) {
+ quickstart.setConfigFilePath(_configFilePath);
+ }
+
quickstart.execute();
return true;
}
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
index 7387e42..ebcd095 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
@@ -85,9 +85,10 @@ public class QuickstartRunner {
private boolean _isStopped = false;
public QuickstartRunner(List<QuickstartTableRequest> tableRequests, int
numControllers, int numBrokers,
- int numServers, int numMinions, File tempDir)
+ int numServers, int numMinions, File tempDir, Map<String, Object>
configOverrides)
throws Exception {
- this(tableRequests, numControllers, numBrokers, numServers, numMinions,
tempDir, true, null, null, null, true);
+ this(tableRequests, numControllers, numBrokers, numServers, numMinions,
tempDir, true, null, configOverrides, null,
+ true);
}
public QuickstartRunner(List<QuickstartTableRequest> tableRequests, int
numControllers, int numBrokers,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
