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/07/14 21:49:27 UTC
[incubator-pinot] branch add-system-resource-to-instance-API
created (now 9b8be51)
This is an automated email from the ASF dual-hosted git repository.
jlli pushed a change to branch add-system-resource-to-instance-API
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
at 9b8be51 Add systemResourceInfo to getInstance API
This branch includes the following new commits:
new 9b8be51 Add systemResourceInfo to getInstance API
The 1 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[incubator-pinot] 01/01: Add systemResourceInfo to getInstance API
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlli pushed a commit to branch add-system-resource-to-instance-API
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 9b8be51bf61d0d2949e22e28ea4ff27b12d74bd6
Author: Jack Li(Analytics Engineering) <jl...@jlli-mn1.linkedin.biz>
AuthorDate: Wed Jul 14 14:48:53 2021 -0700
Add systemResourceInfo to getInstance API
---
.../controller/api/resources/PinotInstanceRestletResource.java | 6 ++++++
.../org/apache/pinot/server/starter/helix/BaseServerStarter.java | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
index 71ff652..d424ef6 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotInstanceRestletResource.java
@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import java.util.List;
+import java.util.Map;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -106,6 +107,7 @@ public class PinotInstanceRestletResource {
if ("true".equalsIgnoreCase(queriesDisabled)) {
response.put(CommonConstants.Helix.QUERIES_DISABLED, "true");
}
+ response.put("systemResourceInfo", JsonUtils.objectToJsonNode(getSystemResourceInfo(instanceConfig)));
return response.toString();
}
@@ -133,6 +135,10 @@ public class PinotInstanceRestletResource {
return Instance.NOT_SET_ADMIN_PORT_VALUE;
}
+ private Map<String, String> getSystemResourceInfo(InstanceConfig instanceConfig) {
+ return instanceConfig.getRecord().getMapField(CommonConstants.Helix.Instance.SYSTEM_RESOURCE_INFO_KEY);
+ }
+
@POST
@Path("/instances")
@Authenticate(AccessType.CREATE)
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java
index 111e43c..c809313 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/BaseServerStarter.java
@@ -700,7 +700,7 @@ public abstract class BaseServerStarter implements ServiceStartable {
* @param instanceId Id of instance for which to set the system resource info
* @param systemResourceMap Map containing system resource info
*/
- private void setInstanceResourceInfo(HelixAdmin helixAdmin, String helixClusterName, String instanceId,
+ protected void setInstanceResourceInfo(HelixAdmin helixAdmin, String helixClusterName, String instanceId,
Map<String, String> systemResourceMap) {
InstanceConfig instanceConfig = helixAdmin.getInstanceConfig(helixClusterName, instanceId);
instanceConfig.getRecord().setMapField(Helix.Instance.SYSTEM_RESOURCE_INFO_KEY, systemResourceMap);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org