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 {