From 5932aad79e759d2c84d3726b36e030787325bbdb Mon Sep 17 00:00:00 2001 From: joshua Date: Sat, 23 Mar 2024 17:29:53 +0000 Subject: [PATCH] Disable monitoring for booted Cloud instances --- java/test/behaviour/connection/ConnectionStepsBase.java | 2 +- nodejs/test/integration/test-cloud-failover.js | 2 ++ python/tests/integration/cloud_test_rule.bzl | 4 +++- python/tests/integration/test_cloud_failover.py | 4 +++- tool/test/start-cloud-servers.sh | 3 ++- tool/test/start-core-server.sh | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/java/test/behaviour/connection/ConnectionStepsBase.java b/java/test/behaviour/connection/ConnectionStepsBase.java index 57d0c91ac5..596c6ac0d2 100644 --- a/java/test/behaviour/connection/ConnectionStepsBase.java +++ b/java/test/behaviour/connection/ConnectionStepsBase.java @@ -65,7 +65,7 @@ public abstract class ConnectionStepsBase { public static final Map serverOptions = map( pair("--diagnostics.reporting.errors", "false"), pair("--diagnostics.reporting.statistics", "false"), - pair("--diagnostics.monitoring.monitoring", "false") + pair("--diagnostics.monitoring.enable", "false") ); public static TypeDBTransaction tx() { diff --git a/nodejs/test/integration/test-cloud-failover.js b/nodejs/test/integration/test-cloud-failover.js index b0c7c88a3b..c1fbaa8da5 100644 --- a/nodejs/test/integration/test-cloud-failover.js +++ b/nodejs/test/integration/test-cloud-failover.js @@ -72,6 +72,8 @@ function serverStart(idx) { "--server.encryption.file.internal-grpc.root-ca", encryptionResourceDir + "int-grpc-root-ca.pem", "--server.encryption.file.internal-zmq.private-key", encryptionResourceDir + "int-zmq-private-key", "--server.encryption.file.internal-zmq.public-key", encryptionResourceDir + "int-zmq-public-key", + "--diagnostics.reporting.errors", "false", + "--diagnostics.monitoring.enable", "false" ]); node.stdout.on('data', (data) => { console.log(`stdout: ${data}`); diff --git a/python/tests/integration/cloud_test_rule.bzl b/python/tests/integration/cloud_test_rule.bzl index a94b905b95..6ec96944ef 100644 --- a/python/tests/integration/cloud_test_rule.bzl +++ b/python/tests/integration/cloud_test_rule.bzl @@ -47,7 +47,9 @@ def _rule_implementation(ctx): --server.peers.peer-3.address=localhost:31729 \ --server.peers.peer-3.internal-address.zeromq=localhost:31730 \ --server.peers.peer-3.internal-address.grpc=localhost:31731 \ - --server.encryption.enable=true + --server.encryption.enable=true \ + --diagnostics.reporting.errors=false \ + --diagnostics.monitoring.enable=false } if test -d typedb_distribution; then echo Existing distribution detected. Cleaning. diff --git a/python/tests/integration/test_cloud_failover.py b/python/tests/integration/test_cloud_failover.py index fe7b14b733..1b89817bc2 100644 --- a/python/tests/integration/test_cloud_failover.py +++ b/python/tests/integration/test_cloud_failover.py @@ -59,7 +59,9 @@ def server_start(index): "--server.peers.peer-3.address", "localhost:31729", "--server.peers.peer-3.internal-address.zeromq", "localhost:31730", "--server.peers.peer-3.internal-address.grpc", "localhost:31731", - "--server.encryption.enable", "true" + "--server.encryption.enable", "true", + "--diagnostics.reporting.errors", "false", + "--diagnostics.monitoring.enable", "false" ]) def get_primary_replica(self, database_manager: DatabaseManager): diff --git a/tool/test/start-cloud-servers.sh b/tool/test/start-cloud-servers.sh index 177afabc12..950c15a861 100755 --- a/tool/test/start-cloud-servers.sh +++ b/tool/test/start-cloud-servers.sh @@ -49,7 +49,8 @@ function server_start() { --server.encryption.file.internal-grpc.root-ca=`realpath tool/test/resources/encryption/int-grpc-root-ca.pem` \ --server.encryption.file.internal-zmq.private-key=`realpath tool/test/resources/encryption/int-zmq-private-key` \ --server.encryption.file.internal-zmq.public-key=`realpath tool/test/resources/encryption/int-zmq-public-key` \ - --diagnostics.reporting.errors=false + --diagnostics.reporting.errors=false \ + --diagnostics.monitoring.enable=false } rm -rf $(seq 1 $NODE_COUNT) typedb-cloud-all diff --git a/tool/test/start-core-server.sh b/tool/test/start-core-server.sh index 1b864359cc..6dce4b6709 100755 --- a/tool/test/start-core-server.sh +++ b/tool/test/start-core-server.sh @@ -26,7 +26,7 @@ rm -rf typedb-all bazel run //tool/test:typedb-extractor -- typedb-all BAZEL_JAVA_HOME=$(bazel run //tool/test:echo-java-home) -JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.errors=false & +JAVA_HOME=$BAZEL_JAVA_HOME ./typedb-all/typedb server --diagnostics.reporting.errors=false --diagnostics.monitoring.enable=false & set +e POLL_INTERVAL_SECS=0.5