You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2022/01/20 15:51:08 UTC
[cassandra] branch cassandra-3.0 updated: Upgrade logback to 1.2.9
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
new 28004d9 Upgrade logback to 1.2.9
28004d9 is described below
commit 28004d9c602bff1d6e3d8551c8cd53538578a8bb
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Dec 14 13:24:20 2021 -0600
Upgrade logback to 1.2.9
Patch by brandonwilliams; reviewed by bereng for CASSANDRA-17204
includes backported test changes from CASSANDRA-14183
---
CHANGES.txt | 1 +
build.xml | 4 ++--
.../cql3/validation/operations/AggregationTest.java | 12 ++++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index e23f5e7..65fe841 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.26:
+ * Upgrade logback to 1.2.9 (CASSANDRA-17204)
* Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673)
* Fix abort when window resizing during cqlsh COPY (CASSANDRA-15230)
* Fix slow keycache load which blocks startup for tables with many sstables (CASSANDRA-14898)
diff --git a/build.xml b/build.xml
index 41f530d..6dd09fe 100644
--- a/build.xml
+++ b/build.xml
@@ -326,8 +326,8 @@
<dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.7"/>
<dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.7"/>
<dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.7" />
- <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.3"/>
- <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.3"/>
+ <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.2.9"/>
+ <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.2.9"/>
<dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.2"/>
<dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl" version="1.9.2"/>
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
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 a073aca..6de7052 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
@@ -38,6 +38,7 @@ 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;
@@ -59,6 +60,7 @@ import org.apache.cassandra.transport.Event.SchemaChange.Change;
import org.apache.cassandra.transport.Event.SchemaChange.Target;
import org.apache.cassandra.transport.messages.ResultMessage;
+import static ch.qos.logback.core.CoreConstants.RECONFIGURE_ON_CHANGE_TASK;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -1871,6 +1873,16 @@ public class AggregationTest extends CQLTester
break;
}
}
+
+ ReconfigureOnChangeTask roct = (ReconfigureOnChangeTask) ctx.getObject(RECONFIGURE_ON_CHANGE_TASK);
+ if (roct != null)
+ {
+ // 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;
+ }
+
assertTrue("ReconfigureOnChangeFilter not in logback's turbo-filter list - do that by adding scan=\"true\" to logback-test.xml's configuration element", done);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org