Skip to content

chore: correcting pinot-server health check #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 22, 2020
Merged

chore: correcting pinot-server health check #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f34ac6
chore: correcting pinot-server health check
kotharironak Dec 22, 2020
955f85d
Adding alias for pinot in test docker-compose file
kotharironak Dec 22, 2020
e662b5b
Merge branch 'main' into fix-pinot-server-health-check
kotharironak Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/hypertrace-service/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ services:
default:
aliases:
- pinot-controller
- pinot-server
- pinot-broker
cpu_shares: 2048
depends_on:
kafka-zookeeper:
Expand Down
13 changes: 12 additions & 1 deletion hypertrace-service/src/main/java/org/hypertrace/service/HypertraceUIServerTimerTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public class HypertraceUIServerTimerTask extends TimerTask {
private static final String DEFAULT_PINOT_CONTROLLER_HOST = "pinot-controller";
private static final String PINOT_CONTROLLER_PORT = "pinot.controller_port";
private static final int DEFAULT_PINOT_CONTROLLER_PORT = 9000;
private static final String PINOT_SERVER_HOST = "pinot.server_host";
private static final String DEFAULT_PINOT_SERVER_HOST = "pinot-server";
private static final String PINOT_SERVER_PORT = "pinot.server_port";
private static final int DEFAULT_PINOT_SERVER_PORT = 8097;

private final HypertraceUIServer uiServer;
private final GatewayServiceBlockingStub client;
Expand All @@ -51,6 +55,8 @@ public class HypertraceUIServerTimerTask extends TimerTask {
private String defaultTenant;
private String pinotControllerHost;
private int pinotControllerPort;
private String pinotSeverHost;
private int pinotServerPort;
private boolean isPinotUp;


Expand All @@ -69,6 +75,11 @@ public HypertraceUIServerTimerTask(Config appConfig, HypertraceUIServer uiServer
pinotControllerPort = appConfig.hasPath(PINOT_CONTROLLER_PORT) ?
appConfig.getInt(PINOT_CONTROLLER_PORT) : DEFAULT_PINOT_CONTROLLER_PORT;

pinotSeverHost = appConfig.hasPath(PINOT_SERVER_HOST) ?
appConfig.getString(PINOT_SERVER_HOST) : DEFAULT_PINOT_SERVER_HOST;
pinotServerPort = appConfig.hasPath(PINOT_SERVER_PORT) ?
appConfig.getInt(PINOT_SERVER_PORT) : DEFAULT_PINOT_SERVER_PORT;

this.uiServer = uiServer;
this.numRetries = 0;
this.defaultTenant = defaultTenant;
Expand Down Expand Up @@ -163,7 +174,7 @@ private SpansRequest buildSpanRequest() {
private boolean executePinotHealthCheck() throws Exception {
HttpURLConnection con = null;
try {
URL url = new URL(String.format("http://%s:%s/health", pinotControllerHost, pinotControllerPort));
URL url = new URL(String.format("http://%s:%s/health", pinotSeverHost, pinotServerPort));
con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET");
con.setConnectTimeout(timeout * 1000);
Expand Down
4 changes: 4 additions & 0 deletions hypertrace-service/src/main/resources/configs/hypertrace-service/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ hypertraceUI {
}
}
pinot {
server_host = "pinot-server"
server_host = ${?PINOT_SERVER_HOST}
server_port = 8097
server_port = ${?PINOT_SERVER_PORT}
controller_host = "pinot-controller"
controller_host = ${?PINOT_CONTROLLER_HOST}
controller_port = 9000
Expand Down