From 9de605215c193c98766856277551d7f8ac42ab23 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 +- tool/test/start-cloud-servers.sh | 3 ++- tool/test/start-core-server.sh | 2 +- 3 files changed, 4 insertions(+), 3 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/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