This is an automated email from the ASF dual-hosted git repository. samt pushed a commit to branch cep-21-tcm in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit eabc558d0fe6c4c239774f14a905aa316b977fe7 Author: Marcus Eriksson <[email protected]> AuthorDate: Mon Mar 13 13:49:54 2023 +0100 [CEP-21] Re-enable stdout/sterr redirection at startup patch by Marcus Eriksson; reviewed by Alex Petrov and Sam Tunnicliffe for CASSANDRA-18414 --- .../org/apache/cassandra/service/CassandraDaemon.java | 16 ++++++++-------- .../org/apache/cassandra/distributed/impl/Instance.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index c1adb3e36c..aa8921109e 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -95,6 +95,7 @@ import org.apache.cassandra.utils.logging.LoggingSupportFactory; import org.apache.cassandra.utils.logging.VirtualTableAppender; import static java.util.concurrent.TimeUnit.NANOSECONDS; +import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_FOREGROUND; import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_JMX_REMOTE_PORT; import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_PID_FILE; import static org.apache.cassandra.config.CassandraRelevantProperties.COM_SUN_MANAGEMENT_JMXREMOTE_PORT; @@ -764,7 +765,7 @@ public class CassandraDaemon /** * A convenience method to initialize and start the daemon in one shot. */ - public void activate() + public void activate(boolean closeStdOutErr) { // Do not put any references to DatabaseDescriptor above the forceStaticInitialization call. try @@ -782,12 +783,11 @@ public class CassandraDaemon new File(pidFile).deleteOnExit(); } - // TODO: this should definitely be done differently -// if (CASSANDRA_FOREGROUND.getString() == null) -// { -// System.out.close(); -// System.err.close(); -// } + if (closeStdOutErr) + { + System.out.close(); + System.err.close(); + } start(); @@ -903,7 +903,7 @@ public class CassandraDaemon public static void main(String[] args) { - instance.activate(); + instance.activate(CASSANDRA_FOREGROUND.getString() == null); } public void clearConnectionHistory() diff --git a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java index d6c51b317f..40451380ea 100644 --- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java @@ -587,7 +587,7 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance assert config.networkTopology().contains(config.broadcastAddress()) : String.format("Network topology %s doesn't contain the address %s", config.networkTopology(), config.broadcastAddress()); DistributedTestSnitch.assign(config.networkTopology()); - CassandraDaemon.getInstanceForTesting().activate(); + CassandraDaemon.getInstanceForTesting().activate(false); // TODO: filters won't work for the messages dispatched during startup registerInboundFilter(cluster); registerOutboundFilter(cluster); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
