You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2022/11/02 17:18:42 UTC
[cassandra] branch trunk updated: Log JVM Arguments at in-JVM Test Class Initialization
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9a0dd603b1 Log JVM Arguments at in-JVM Test Class Initialization
9a0dd603b1 is described below
commit 9a0dd603b18ab5034df27443a4bbc10111edcd8b
Author: Natnael Adere <na...@apple.com>
AuthorDate: Tue Nov 1 10:45:02 2022 -0700
Log JVM Arguments at in-JVM Test Class Initialization
patch by Natnael Adere; reviewed by Caleb Rackliffe, David Capwell for CASSANDRA-16664
---
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++--
.../org/apache/cassandra/distributed/impl/Instance.java | 1 +
.../org/apache/cassandra/distributed/test/JVMDTestTest.java | 10 ++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 3ca42513a6..770eed0a75 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -250,7 +250,7 @@ public class CassandraDaemon
ThreadAwareSecurityManager.install();
- logSystemInfo();
+ logSystemInfo(logger);
NativeLibrary.tryMlockall();
@@ -626,7 +626,7 @@ public class CassandraDaemon
return setupCompleted;
}
- private void logSystemInfo()
+ public static void logSystemInfo(Logger logger)
{
if (logger.isInfoEnabled())
{
diff --git a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index e31c37cdbf..7d8bccdfb2 100644
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@ -596,6 +596,7 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance
FileUtils.setFSErrorHandler(new DefaultFSErrorHandler());
DatabaseDescriptor.createAllDirectories();
CassandraDaemon.getInstanceForTesting().migrateSystemDataIfNeeded();
+ CassandraDaemon.logSystemInfo(inInstancelogger);
CommitLog.instance.start();
CassandraDaemon.getInstanceForTesting().runStartupChecks();
diff --git a/test/distributed/org/apache/cassandra/distributed/test/JVMDTestTest.java b/test/distributed/org/apache/cassandra/distributed/test/JVMDTestTest.java
index 089d17bcfa..f11ad16bb7 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/JVMDTestTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/JVMDTestTest.java
@@ -94,6 +94,16 @@ public class JVMDTestTest extends TestBaseImpl
}
}
+ @Test
+ public void jvmArgumentLoggingTest() throws IOException
+ {
+ try (Cluster cluster = Cluster.build(1).start())
+ {
+ LogAction logs = cluster.get(1).logs();
+ Assertions.assertThat(logs.grep("JVM Arguments").getResult()).isNotEmpty();
+ }
+ }
+
@Test
public void nonSharedConfigClassTest() throws IOException
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org