diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index 2331eeb1a642..0a98e8cf53b8 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -397,27 +397,27 @@
org.slf4j
slf4j-api
- 1.7.36
+ 2.0.17
org.slf4j
log4j-over-slf4j
- 1.7.36
+ 2.0.17
org.slf4j
jcl-over-slf4j
- 1.7.36
+ 2.0.17
ch.qos.logback
logback-core
- 1.2.12
+ 1.5.18
ch.qos.logback
logback-classic
- 1.2.12
+ 1.5.18
com.fasterxml.jackson.core
diff --git a/CHANGES.txt b/CHANGES.txt
index e760a39537e6..9b3b42ae4f49 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.0.6
+ * Upgrade logback version to 1.5.18 and slf4j dependencies to 2.0.17 (CASSANDRA-20429)
* Fix range queries on early-open BTI files (CASSANDRA-20976)
* Avoid re-initializing underlying iterator in LazilyInitializedUnfilteredRowIterator after closing (CASSANDRA-20972)
* Flush SAI segment builder when current SSTable writer is switched (CASSANDRA-20752)
diff --git a/conf/logback.xml b/conf/logback.xml
index 102cf06352a4..e1baba591713 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -23,8 +23,6 @@ appender reference in the root level section below.
-->
-
-
@@ -43,7 +41,7 @@ appender reference in the root level section below.
5GB
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
@@ -60,7 +58,7 @@ appender reference in the root level section below.
5GB
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
@@ -80,7 +78,7 @@ appender reference in the root level section below.
INFO
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
@@ -98,7 +96,7 @@ appender reference in the root level section below.
5GB
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
-->
diff --git a/doc/modules/cassandra/pages/managing/configuration/cass_logback_xml_file.adoc b/doc/modules/cassandra/pages/managing/configuration/cass_logback_xml_file.adoc
index a62dfe91a7be..41c22f82e7c9 100644
--- a/doc/modules/cassandra/pages/managing/configuration/cass_logback_xml_file.adoc
+++ b/doc/modules/cassandra/pages/managing/configuration/cass_logback_xml_file.adoc
@@ -76,8 +76,8 @@ the rolling policy.
Specify the format of the message. Part of the rolling policy.
-*Example:* 7 *Example:*
-%-5level [%thread] %date\{ISO8601} %F:%L - %msg%n
+*Example:*
+%-5level [%thread] %date\{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
=== Logging to Cassandra virtual table
@@ -106,7 +106,6 @@ The appender to virtual table is commented out by default so logging to virtual
[source,XML]
----
-
@@ -126,7 +125,7 @@ The appender to virtual table is commented out by default so logging to virtual
5GB
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
@@ -143,7 +142,7 @@ The appender to virtual table is commented out by default so logging to virtual
5GB
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
@@ -163,7 +162,7 @@ The appender to virtual table is commented out by default so logging to virtual
INFO
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
diff --git a/doc/modules/cassandra/pages/managing/operating/audit_logging.adoc b/doc/modules/cassandra/pages/managing/operating/audit_logging.adoc
index ffc4683cdfd6..a40fcc5b2e43 100644
--- a/doc/modules/cassandra/pages/managing/operating/audit_logging.adoc
+++ b/doc/modules/cassandra/pages/managing/operating/audit_logging.adoc
@@ -213,7 +213,7 @@ the audit log events to flow through separate log file instead of system.log.
5GB
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 1aec3d5280d3..b30929d180e2 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -556,7 +556,6 @@ default int upgradeSSTables(String keyspaceName, boolean excludeCurrentVersion,
* If classQualifer is not empty but level is empty/null, it will set the level to null for the defined classQualifer
* If level cannot be parsed, then the level will be defaulted to DEBUG
*
- * The logback configuration should have {@code < jmxConfigurator />} set
*
* @param classQualifier The logger's classQualifer
* @param level The log level
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 0f53ccd4df66..b72098523a2a 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -2247,7 +2247,7 @@ public void setLoggingLevel(String classQualifier, String level)
}
catch (Exception e)
{
- throw new RuntimeException("Error setting log for " + classQualifier + " on level " + level + ". Please check logback configuration and ensure to have set", e);
+ throw new RuntimeException("Error setting log for " + classQualifier + " on level " + level + ". Please check logback configuration.", e);
}
}
diff --git a/src/java/org/apache/cassandra/utils/logging/LogbackLoggingSupport.java b/src/java/org/apache/cassandra/utils/logging/LogbackLoggingSupport.java
index e710d44dd1dc..b42cc51756cd 100644
--- a/src/java/org/apache/cassandra/utils/logging/LogbackLoggingSupport.java
+++ b/src/java/org/apache/cassandra/utils/logging/LogbackLoggingSupport.java
@@ -18,7 +18,6 @@
package org.apache.cassandra.utils.logging;
-import java.lang.management.ManagementFactory;
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.Iterator;
@@ -26,25 +25,21 @@
import java.util.Map;
import java.util.Optional;
-import javax.management.JMX;
-import javax.management.ObjectName;
-
-import org.apache.cassandra.security.ThreadAwareSecurityManager;
+import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Maps;
-
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.jmx.JMXConfiguratorMBean;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.classic.spi.TurboFilterList;
import ch.qos.logback.classic.turbo.ReconfigureOnChangeFilter;
import ch.qos.logback.classic.turbo.TurboFilter;
+import ch.qos.logback.classic.util.ContextInitializer;
import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.hook.DelayingShutdownHook;
+import ch.qos.logback.core.hook.DefaultShutdownHook;
+import org.apache.cassandra.security.ThreadAwareSecurityManager;
/**
* Encapsulates all logback-specific implementations in a central place.
@@ -92,7 +87,7 @@ public void onStartup()
@Override
public void onShutdown()
{
- DelayingShutdownHook logbackHook = new DelayingShutdownHook();
+ DefaultShutdownHook logbackHook = new DefaultShutdownHook();
logbackHook.setContext((LoggerContext) LoggerFactory.getILoggerFactory());
logbackHook.run();
}
@@ -105,10 +100,9 @@ public void setLoggingLevel(String classQualifier, String rawLevel) throws Excep
// if both classQualifier and rawLevel are empty, reload from configuration
if (StringUtils.isBlank(classQualifier) && StringUtils.isBlank(rawLevel))
{
- JMXConfiguratorMBean jmxConfiguratorMBean = JMX.newMBeanProxy(ManagementFactory.getPlatformMBeanServer(),
- new ObjectName("ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator"),
- JMXConfiguratorMBean.class);
- jmxConfiguratorMBean.reloadDefaultConfiguration();
+ LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+ lc.reset();
+ new ContextInitializer(lc).autoConfig();
return;
}
// classQualifier is set, but blank level given
diff --git a/test/conf/logback-burntest.xml b/test/conf/logback-burntest.xml
index e1e48a9d3fae..4c0b062b3bc3 100644
--- a/test/conf/logback-burntest.xml
+++ b/test/conf/logback-burntest.xml
@@ -20,7 +20,7 @@
-
+
@@ -36,7 +36,7 @@
- %-5level [%thread] ${instance_id} %date{ISO8601} %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %msg%n
false
@@ -51,7 +51,7 @@
- %-5level [%thread] ${instance_id} %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
diff --git a/test/conf/logback-dtest.xml b/test/conf/logback-dtest.xml
index 52eaf335ded3..1a632c0344cc 100644
--- a/test/conf/logback-dtest.xml
+++ b/test/conf/logback-dtest.xml
@@ -22,19 +22,19 @@
-
+
./build/test/logs/${cassandra.testtag}/${suitename}/${cluster_id}/${instance_id}/system.log
- %-5level [%thread] ${instance_id} %date{ISO8601} %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
true
- %-5level %date{HH:mm:ss,SSS} %msg%n
+ %-5level %date{"HH:mm:ss,SSS"} %msg%n
WARN
@@ -43,7 +43,7 @@
- %-5level [%thread] ${instance_id} %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
DEBUG
diff --git a/test/conf/logback-dtest_with_vtable_appender.xml b/test/conf/logback-dtest_with_vtable_appender.xml
index c9fd108c77d8..726c46d524d8 100644
--- a/test/conf/logback-dtest_with_vtable_appender.xml
+++ b/test/conf/logback-dtest_with_vtable_appender.xml
@@ -21,19 +21,19 @@
-
+
./build/test/logs/${cassandra.testtag}/${suitename}/${cluster_id}/${instance_id}/system.log
- %-5level [%thread] ${instance_id} %date{ISO8601} %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %msg%n
true
- %-5level %date{HH:mm:ss,SSS} %msg%n
+ %-5level %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %msg%n
WARN
@@ -42,7 +42,7 @@
- %-5level [%thread] ${instance_id} %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
DEBUG
diff --git a/test/conf/logback-dtest_with_vtable_appender_invalid.xml b/test/conf/logback-dtest_with_vtable_appender_invalid.xml
index 1b30c141c2a7..257f85753498 100644
--- a/test/conf/logback-dtest_with_vtable_appender_invalid.xml
+++ b/test/conf/logback-dtest_with_vtable_appender_invalid.xml
@@ -21,19 +21,19 @@
-
+
./build/test/logs/${cassandra.testtag}/${suitename}/${cluster_id}/${instance_id}/system.log
- %-5level [%thread] ${instance_id} %date{ISO8601} %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %msg%n
true
- %-5level %date{HH:mm:ss,SSS} %msg%n
+ %-5level %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %msg%n
WARN
@@ -42,7 +42,7 @@
- %-5level [%thread] ${instance_id} %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
DEBUG
diff --git a/test/conf/logback-jmh.xml b/test/conf/logback-jmh.xml
index 4138f19c72bc..1f9bb3fd1b86 100644
--- a/test/conf/logback-jmh.xml
+++ b/test/conf/logback-jmh.xml
@@ -23,7 +23,6 @@ appender reference in the root level section below.
-->
-
@@ -42,7 +41,7 @@ appender reference in the root level section below.
5GB
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
@@ -59,7 +58,7 @@ appender reference in the root level section below.
5GB
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
@@ -79,7 +78,7 @@ appender reference in the root level section below.
INFO
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
diff --git a/test/conf/logback-simulator.xml b/test/conf/logback-simulator.xml
index 25c9de8a6aac..ae3d4c82fdbf 100644
--- a/test/conf/logback-simulator.xml
+++ b/test/conf/logback-simulator.xml
@@ -21,19 +21,19 @@
-
+
./build/test/logs/${cassandra.testtag}/${suitename}/${cluster_id}/${instance_id}/system.log
- %-5level [%thread] ${instance_id} %date{ISO8601} %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %msg%n
true
- %-5level [%thread] ${instance_id} %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] ${instance_id} %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
WARN
diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml
index 3e3349fd82f0..757806e35f2b 100644
--- a/test/conf/logback-test.xml
+++ b/test/conf/logback-test.xml
@@ -19,7 +19,7 @@
-
+
@@ -38,14 +38,14 @@
- %-5level [%thread] %date{ISO8601} %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %msg%n
false
- %-5level [%thread] %date{ISO8601} %F:%L - %msg%n
+ %-5level [%thread] %date{"yyyy-MM-dd'T'HH:mm:ss,SSS", UTC} %F:%L - %msg%n
DEBUG
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
index 24afbb7e802c..72bbc53b76b8 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
@@ -31,18 +31,8 @@
import java.util.concurrent.ThreadLocalRandom;
import org.apache.commons.lang3.time.DateUtils;
-
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.ReconfigureOnChangeTask;
-import ch.qos.logback.classic.spi.TurboFilterList;
-import ch.qos.logback.classic.turbo.ReconfigureOnChangeFilter;
-import ch.qos.logback.classic.turbo.TurboFilter;
-import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.cql3.QueryProcessor;
import org.apache.cassandra.cql3.UntypedResultSet;
@@ -51,13 +41,13 @@
import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.exceptions.FunctionExecutionException;
import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.service.ClientState;
import org.apache.cassandra.transport.Event.SchemaChange.Change;
import org.apache.cassandra.transport.Event.SchemaChange.Target;
import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.transport.messages.ResultMessage;
-import static ch.qos.logback.core.CoreConstants.RECONFIGURE_ON_CHANGE_TASK;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -1893,91 +1883,48 @@ public void testLogbackReload() throws Throwable
{
// see https://issues.apache.org/jira/browse/CASSANDRA-11033
- // make logback's scan interval 1ms - boilerplate, but necessary for this test
- configureLogbackScanPeriod(1L);
- try
- {
-
- createTable("CREATE TABLE %s (" +
- " year int PRIMARY KEY," +
- " country text," +
- " title text)");
-
- String[] countries = Locale.getISOCountries();
- ThreadLocalRandom rand = ThreadLocalRandom.current();
- for (int i = 0; i < 10000; i++)
- {
- execute("INSERT INTO %s (year, country, title) VALUES (1980,?,?)",
- countries[rand.nextInt(countries.length)],
- "title-" + i);
- }
-
- String albumCountByCountry = createFunction(KEYSPACE,
- "map,text,text",
- "CREATE FUNCTION IF NOT EXISTS %s(state map,country text, album_title text)\n" +
- " RETURNS NULL ON NULL INPUT\n" +
- " RETURNS map\n" +
- " LANGUAGE java\n" +
- " AS $$\n" +
- " if(state.containsKey(country)) {\n" +
- " Long newCount = (Long)state.get(country) + 1;\n" +
- " state.put(country, newCount);\n" +
- " } else {\n" +
- " state.put(country, 1L);\n" +
- " }\n" +
- " return state;\n" +
- " $$;");
-
- String releasesByCountry = createAggregate(KEYSPACE,
- "text, text",
- " CREATE AGGREGATE IF NOT EXISTS %s(text, text)\n" +
- " SFUNC " + shortFunctionName(albumCountByCountry) + '\n' +
- " STYPE map\n" +
- " INITCOND { };");
-
- long tEnd = System.currentTimeMillis() + 150;
- while (System.currentTimeMillis() < tEnd)
- {
- execute("SELECT " + releasesByCountry + "(country,title) FROM %s WHERE year=1980");
- }
- }
- finally
- {
- configureLogbackScanPeriod(60000L);
- }
- }
+ createTable("CREATE TABLE %s (" +
+ " year int PRIMARY KEY," +
+ " country text," +
+ " title text)");
- private static void configureLogbackScanPeriod(long millis)
- {
- Logger l = LoggerFactory.getLogger(AggregationTest.class);
- ch.qos.logback.classic.Logger logbackLogger = (ch.qos.logback.classic.Logger) l;
- LoggerContext ctx = logbackLogger.getLoggerContext();
- TurboFilterList turboFilterList = ctx.getTurboFilterList();
- boolean done = false;
- for (TurboFilter turboFilter : turboFilterList)
+ String[] countries = Locale.getISOCountries();
+ ThreadLocalRandom rand = ThreadLocalRandom.current();
+ for (int i = 0; i < 10000; i++)
{
- if (turboFilter instanceof ReconfigureOnChangeFilter)
- {
- ReconfigureOnChangeFilter reconfigureFilter = (ReconfigureOnChangeFilter) turboFilter;
- reconfigureFilter.setContext(ctx);
- reconfigureFilter.setRefreshPeriod(millis);
- reconfigureFilter.stop();
- reconfigureFilter.start(); // start() sets the next check timestammp
- done = true;
- break;
- }
+ execute("INSERT INTO %s (year, country, title) VALUES (1980,?,?)",
+ countries[rand.nextInt(countries.length)],
+ "title-" + i);
}
- ReconfigureOnChangeTask roct = (ReconfigureOnChangeTask) ctx.getObject(RECONFIGURE_ON_CHANGE_TASK);
- if (roct != null)
+ String albumCountByCountry = createFunction(KEYSPACE,
+ "map,text,text",
+ "CREATE FUNCTION IF NOT EXISTS %s(state map,country text, album_title text)\n" +
+ " RETURNS NULL ON NULL INPUT\n" +
+ " RETURNS map\n" +
+ " LANGUAGE java\n" +
+ " AS $$\n" +
+ " if(state.containsKey(country)) {\n" +
+ " Long newCount = (Long)state.get(country) + 1;\n" +
+ " state.put(country, newCount);\n" +
+ " } else {\n" +
+ " state.put(country, 1L);\n" +
+ " }\n" +
+ " return state;\n" +
+ " $$;");
+
+ String releasesByCountry = createAggregate(KEYSPACE,
+ "text, text",
+ " CREATE AGGREGATE IF NOT EXISTS %s(text, text)\n" +
+ " SFUNC " + shortFunctionName(albumCountByCountry) + '\n' +
+ " STYPE map\n" +
+ " INITCOND { };");
+
+ long tEnd = System.currentTimeMillis() + 150;
+ while (System.currentTimeMillis() < tEnd)
{
- // New functionality in logback - they replaced ReconfigureOnChangeFilter (which runs in the logging code)
- // with an async ReconfigureOnChangeTask - i.e. in a thread that does not become sandboxed.
- // Let the test run anyway, just we cannot reconfigure it (and it is pointless to reconfigure).
- return;
+ execute("SELECT " + releasesByCountry + "(country,title) FROM %s WHERE year=1980");
}
-
- assertTrue("ReconfigureOnChangeFilter not in logback's turbo-filter list - do that by adding scan=\"true\" to logback-test.xml's configuration element", done);
}
@Test