You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2019/10/06 07:54:39 UTC
[incubator-pinot] branch master updated: Remove validation for
config controller.host (#4681)
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/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new aa04c57 Remove validation for config controller.host (#4681)
aa04c57 is described below
commit aa04c571c06436dc3d4163068694e5b693bd0b5b
Author: Xiang Fu <fx...@gmail.com>
AuthorDate: Sun Oct 6 00:54:34 2019 -0700
Remove validation for config controller.host (#4681)
---
kubernetes/examples/gke/skaffold/pinot-broker.yml | 2 +-
kubernetes/examples/gke/skaffold/pinot-controller.yml | 3 +--
kubernetes/examples/gke/skaffold/pinot-server.yml | 2 +-
.../org/apache/pinot/tools/admin/command/StartControllerCommand.java | 5 -----
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/kubernetes/examples/gke/skaffold/pinot-broker.yml b/kubernetes/examples/gke/skaffold/pinot-broker.yml
index 0872cef..99d865e 100644
--- a/kubernetes/examples/gke/skaffold/pinot-broker.yml
+++ b/kubernetes/examples/gke/skaffold/pinot-broker.yml
@@ -52,7 +52,7 @@ items:
spec:
terminationGracePeriodSeconds: 30
containers:
- - image: winedepot/pinot:kafka2
+ - image: winedepot/pinot:0.1.13-SNAPSHOT
imagePullPolicy: Always
name: pinot-broker
args: [
diff --git a/kubernetes/examples/gke/skaffold/pinot-controller.yml b/kubernetes/examples/gke/skaffold/pinot-controller.yml
index 6443bac..4cd4f25 100644
--- a/kubernetes/examples/gke/skaffold/pinot-controller.yml
+++ b/kubernetes/examples/gke/skaffold/pinot-controller.yml
@@ -28,7 +28,6 @@ items:
data:
pinot-controller.conf: |-
controller.helix.cluster.name=pinot-quickstart
- controller.host=pinot-controller-0.pinot-controller
controller.port=9000
controller.vip.host=pinot-controller
controller.vip.port=9000
@@ -56,7 +55,7 @@ items:
spec:
terminationGracePeriodSeconds: 30
containers:
- - image: winedepot/pinot:kafka2
+ - image: winedepot/pinot:0.1.13-SNAPSHOT
imagePullPolicy: Always
name: pinot-controller
args: [
diff --git a/kubernetes/examples/gke/skaffold/pinot-server.yml b/kubernetes/examples/gke/skaffold/pinot-server.yml
index 441cde7..c285603 100644
--- a/kubernetes/examples/gke/skaffold/pinot-server.yml
+++ b/kubernetes/examples/gke/skaffold/pinot-server.yml
@@ -53,7 +53,7 @@ items:
spec:
terminationGracePeriodSeconds: 30
containers:
- - image: winedepot/pinot:kafka2
+ - image: winedepot/pinot:0.1.13-SNAPSHOT
imagePullPolicy: Always
name: pinot-server
args: [
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
index 45d36a2..3cdd136 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
@@ -197,11 +197,6 @@ public class StartControllerCommand extends AbstractBaseAdminCommand implements
return false;
}
- if (conf.getControllerHost() == null) {
- LOGGER.error("Error: missing hostname, please specify 'controller.host' property in config file.");
- return false;
- }
-
if (conf.getControllerPort() == null) {
LOGGER.error("Error: missing controller port, please specify 'controller.port' property in config file.");
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org