You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by jl...@apache.org on 2021/09/29 17:00:35 UTC
[pinot] branch master updated: create controller resource packages
config key (#7488)
This is an automated email from the ASF dual-hosted git repository.
jlli 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 bd5bff1 create controller resource packages config key (#7488)
bd5bff1 is described below
commit bd5bff1bbace1d33dd9e1f4f1d7ff5e7a26d9da6
Author: Rong Rong <wa...@gmail.com>
AuthorDate: Wed Sep 29 10:00:13 2021 -0700
create controller resource packages config key (#7488)
* create controller resource packages config key
* rename config key literals
Co-authored-by: Rong Rong <ro...@startree.ai>
Co-authored-by: Jialiang Li <jl...@linkedin.com>
---
.../main/java/org/apache/pinot/controller/ControllerConf.java | 10 +++++++++-
.../pinot/controller/api/ControllerAdminApiApplication.java | 7 ++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
index 77bf264..20dfd69 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java
@@ -66,10 +66,14 @@ public class ControllerConf extends PinotConfiguration {
public static final String CONTROLLER_MODE = "controller.mode";
public static final String LEAD_CONTROLLER_RESOURCE_REBALANCE_STRATEGY = "controller.resource.rebalance.strategy";
- // Comma separated list of list of packages that contain TableConfigTuners to be added to the registry
+ // Comma separated list of packages that contain TableConfigTuners to be added to the registry
public static final String TABLE_CONFIG_TUNER_PACKAGES = "controller.table.config.tuner.packages";
public static final String DEFAULT_TABLE_CONFIG_TUNER_PACKAGES = "org.apache.pinot";
+ // Comma separated list of packages that contains javax service resources.
+ private static final String CONTROLLER_RESOURCE_PACKAGES = "controller.restlet.api.resource.packages";
+ private static final String DEFAULT_CONTROLLER_RESOURCE_PACKAGES = "org.apache.pinot.controller.api.resources";
+
public enum ControllerMode {
DUAL, PINOT_ONLY, HELIX_ONLY
}
@@ -833,6 +837,10 @@ public class ControllerConf extends PinotConfiguration {
.asList(getProperty(TABLE_CONFIG_TUNER_PACKAGES, DEFAULT_TABLE_CONFIG_TUNER_PACKAGES).split("\\s*,\\s*"));
}
+ public String getControllerResourcePackages() {
+ return getProperty(CONTROLLER_RESOURCE_PACKAGES, DEFAULT_CONTROLLER_RESOURCE_PACKAGES);
+ }
+
private long convertPeriodToUnit(String period, TimeUnit timeUnitToConvertTo) {
return timeUnitToConvertTo.convert(TimeUtils.convertPeriodToMillis(period), TimeUnit.MILLISECONDS);
}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
index dff3408..276f14e 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/ControllerAdminApiApplication.java
@@ -46,14 +46,15 @@ public class ControllerAdminApiApplication extends ResourceConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(ControllerAdminApiApplication.class);
public static final String PINOT_CONFIGURATION = "pinotConfiguration";
+ private final String _controllerResourcePackages;
private HttpServer _httpServer;
- private static final String RESOURCE_PACKAGE = "org.apache.pinot.controller.api.resources";
public ControllerAdminApiApplication(ControllerConf conf) {
super();
property(PINOT_CONFIGURATION, conf);
- packages(RESOURCE_PACKAGE);
+ _controllerResourcePackages = conf.getControllerResourcePackages();
+ packages(_controllerResourcePackages);
// TODO See ControllerResponseFilter
// register(new LoggingFeature());
register(JacksonFeature.class);
@@ -103,7 +104,7 @@ public class ControllerAdminApiApplication extends ResourceConfig {
beanConfig.setVersion("1.0");
beanConfig.setSchemes(new String[]{CommonConstants.HTTP_PROTOCOL, CommonConstants.HTTPS_PROTOCOL});
beanConfig.setBasePath("/");
- beanConfig.setResourcePackage(RESOURCE_PACKAGE);
+ beanConfig.setResourcePackage(_controllerResourcePackages);
beanConfig.setScan(true);
ClassLoader loader = this.getClass().getClassLoader();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org