natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2024-02-29 11:39:44 +01:00
parent 612c9638dc a124cfce85
commit e120088d44
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -4,6 +4,7 @@ Merged from 4.0:
* Remove redundant code in StorageProxy#sendToHintedReplicas (CASSANDRA-19412)
* Remove bashisms for mx4j tool in cassandra-env.sh (CASSANDRA-19416)
Merged from 3.11:
* Move ClientWarn.State#warnings to a thread-safe list (CASSANDRA-19427)
Merged from 3.0:
* Fix SCM URL link (CASSANDRA-19422)

6
src/java/org/apache/cassandra/service/ClientWarn.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.cassandra.service;
import java.util.ArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.List;
import org.apache.cassandra.concurrent.ExecutorLocals;
@ -71,7 +71,9 @@ public class ClientWarn extends ExecutorLocals.Impl
public static class State
{
private final List<String> warnings = new ArrayList<>();
// This must be a thread-safe list. Even though it's wrapped in a ThreadLocal, it's propagated to each thread
// from shared state, so multiple threads can reference the same State.
private final List<String> warnings = new CopyOnWriteArrayList<>();
private void add(String warning)
{