Skip to content
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

Disable Prometheus HTTP endpoint when the port is specified to zero in Scalar DB server #260

Merged
merged 1 commit into from
Aug 2, 2021
Merged

Disable Prometheus HTTP endpoint when the port is specified to zero in Scalar DB server #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion ...ava/com/scalar/db/server/ConsensusCommitWithDistributedStorageServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.scalar.db.api.TableMetadata;
import com.scalar.db.config.DatabaseConfig;
import com.scalar.db.io.DataType;
import com.scalar.db.server.config.ServerConfig;
import com.scalar.db.storage.jdbc.test.TestEnv;
import com.scalar.db.storage.rpc.GrpcConfig;
import com.scalar.db.storage.rpc.GrpcStorage;
Expand Down Expand Up @@ -106,7 +107,9 @@ public static void setUpBeforeClass() throws Exception {
testEnv.createTables();
testEnv.insertMetadata();

server = new ScalarDbServer(testEnv.getJdbcConfig().getProperties());
Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
server = new ScalarDbServer(serverProperties);
server.start();

Properties properties = new Properties();
Expand Down
5 changes: 4 additions & 1 deletion ...gration-test/java/com/scalar/db/server/DistributedStorageAdminServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.scalar.db.api.TableMetadata;
import com.scalar.db.config.DatabaseConfig;
import com.scalar.db.io.DataType;
import com.scalar.db.server.config.ServerConfig;
import com.scalar.db.storage.AdminIntegrationTestBase;
import com.scalar.db.storage.jdbc.test.TestEnv;
import com.scalar.db.storage.rpc.GrpcAdmin;
Expand Down Expand Up @@ -58,7 +59,9 @@ public static void setUpBeforeClass() throws Exception {
testEnv.createMetadataTable();
testEnv.insertMetadata();

server = new ScalarDbServer(testEnv.getJdbcConfig().getProperties());
Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
server = new ScalarDbServer(serverProperties);
server.start();

Properties properties = new Properties();
Expand Down
5 changes: 4 additions & 1 deletion .../integration-test/java/com/scalar/db/server/DistributedStorageServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.scalar.db.config.DatabaseConfig;
import com.scalar.db.io.DataType;
import com.scalar.db.io.Key;
import com.scalar.db.server.config.ServerConfig;
import com.scalar.db.storage.IntegrationTestBase;
import com.scalar.db.storage.jdbc.test.TestEnv;
import com.scalar.db.storage.rpc.GrpcConfig;
Expand Down Expand Up @@ -116,7 +117,9 @@ public static void setUpBeforeClass() throws Exception {
testEnv.createTables();
testEnv.insertMetadata();

server = new ScalarDbServer(testEnv.getJdbcConfig().getProperties());
Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
server = new ScalarDbServer(serverProperties);
server.start();

Properties properties = new Properties();
Expand Down
2 changes: 2 additions & 0 deletions ...com/scalar/db/server/DistributedTransactionServiceWithConsensusCommitIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.scalar.db.io.DataType;
import com.scalar.db.io.IntValue;
import com.scalar.db.io.Key;
import com.scalar.db.server.config.ServerConfig;
import com.scalar.db.storage.jdbc.test.TestEnv;
import com.scalar.db.storage.rpc.GrpcConfig;
import com.scalar.db.transaction.consensuscommit.Coordinator;
Expand Down Expand Up @@ -1135,6 +1136,7 @@ public static void setUpBeforeClass() throws Exception {
testEnv.insertMetadata();

Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
server = new ScalarDbServer(serverProperties);
server.start();

Expand Down
2 changes: 2 additions & 0 deletions .../server/DistributedTransactionServiceWithConsensusCommitWithExtraReadIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.scalar.db.exception.transaction.TransactionException;
import com.scalar.db.io.DataType;
import com.scalar.db.io.IntValue;
import com.scalar.db.server.config.ServerConfig;
import com.scalar.db.storage.jdbc.test.TestEnv;
import com.scalar.db.storage.rpc.GrpcConfig;
import com.scalar.db.transaction.consensuscommit.Coordinator;
Expand Down Expand Up @@ -295,6 +296,7 @@ public static void setUpBeforeClass() throws Exception {
Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
serverProperties.setProperty(DatabaseConfig.ISOLATION_LEVEL, "SERIALIZABLE");
serverProperties.setProperty(DatabaseConfig.SERIALIZABLE_STRATEGY, "EXTRA_READ");
serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
server = new ScalarDbServer(serverProperties);
server.start();

Expand Down
2 changes: 2 additions & 0 deletions ...server/DistributedTransactionServiceWithConsensusCommitWithExtraWriteIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.scalar.db.exception.transaction.TransactionException;
import com.scalar.db.io.DataType;
import com.scalar.db.io.IntValue;
import com.scalar.db.server.config.ServerConfig;
import com.scalar.db.storage.jdbc.test.TestEnv;
import com.scalar.db.storage.rpc.GrpcConfig;
import com.scalar.db.transaction.consensuscommit.Coordinator;
Expand Down Expand Up @@ -255,6 +256,7 @@ public static void setUpBeforeClass() throws Exception {
Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
serverProperties.setProperty(DatabaseConfig.ISOLATION_LEVEL, "SERIALIZABLE");
serverProperties.setProperty(DatabaseConfig.SERIALIZABLE_STRATEGY, "EXTRA_WRITE");
serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
server = new ScalarDbServer(serverProperties);
server.start();

Expand Down
2 changes: 2 additions & 0 deletions ...com/scalar/db/server/DistributedTransactionServiceWithJdbcTransactionIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.scalar.db.io.DataType;
import com.scalar.db.io.IntValue;
import com.scalar.db.io.Key;
import com.scalar.db.server.config.ServerConfig;
import com.scalar.db.storage.jdbc.test.TestEnv;
import com.scalar.db.storage.rpc.GrpcConfig;
import com.scalar.db.transaction.rpc.GrpcTransaction;
Expand Down Expand Up @@ -327,6 +328,7 @@ public static void setUpBeforeClass() throws Exception {

Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
serverProperties.setProperty(DatabaseConfig.TRANSACTION_MANAGER, "jdbc");
serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
server = new ScalarDbServer(serverProperties);
server.start();

Expand Down
8 changes: 7 additions & 1 deletion server/src/main/java/com/scalar/db/server/service/ServerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,22 @@ private void startJmxReporter(MetricRegistry metricRegistry) {
}

private void startPrometheusHttpEndpoint(MetricRegistry metricRegistry) {
int prometheusHttpEndpointPort = config.getPrometheusHttpEndpointPort();
if (prometheusHttpEndpointPort == 0) {
return;
}

CollectorRegistry.defaultRegistry.register(new DropwizardExports(metricRegistry));

Server server = new Server(config.getPrometheusHttpEndpointPort());
Server server = new Server(prometheusHttpEndpointPort);
ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
server.setHandler(context);
context.addServlet(new ServletHolder(new MetricsServlet()), "/metrics");
server.setStopAtShutdown(true);
try {
server.start();
LOGGER.info("Prometheus HTTP endpoint started, listening on {}", prometheusHttpEndpointPort);
} catch (Exception e) {
LOGGER.error("failed to start Jetty server", e);
}
Expand Down