Merge branch 'cassandra-5.0' into trunk

CHANGES.txt

@@ -268,6 +268,7 @@ Merged from 5.0:
  * Prioritize built indexes in IndexStatusManager (CASSANDRA-19400)
  * Add java.base/java.lang.reflect among opens for jvm11-client.options (CASSANDRA-19780)
 Merged from 4.1:
+ * IntrusiveStack.accumulate is not accumulating correctly (CASSANDRA-20670)
  * Add nodetool get/setguardrailsconfig commands (CASSANDRA-19552)
  * Fix mixed mode paxos ttl commit hang (CASSANDRA-20514)
  * Fix paxos mixed mode infinite loop (CASSANDRA-20493)

src/java/org/apache/cassandra/utils/concurrent/IntrusiveStack.java

@@ -175,7 +175,7 @@ public class IntrusiveStack<T extends IntrusiveStack<T>> implements Iterable<T>
         long value = initialValue;
         while (list != null)
         {
-            value = accumulator.apply(list, initialValue);
+            value = accumulator.apply(list, value);
             list = list.next;
         }
         return value;

test/unit/org/apache/cassandra/service/FailureRecordingCallbackTest.java

@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.service;
+
+import java.net.UnknownHostException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.cassandra.exceptions.RequestFailureReason;
+import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.net.Message;
+
+public class FailureRecordingCallbackTest
+{
+    @Test
+    public void testFailuresCount() throws UnknownHostException
+    {
+        FailureRecordingCallback cb = new FailureRecordingCallback()
+        {
+
+            @Override
+            public void onResponse(Message msg) {}
+            @Override
+            public boolean invokeOnFailure() { return super.invokeOnFailure();}
+            @Override
+            public boolean trackLatencyForSnitch() { return super.trackLatencyForSnitch();}
+        };
+        cb.onFailureWithMutex(InetAddressAndPort.getByName("127.0.0.1"), RequestFailureReason.UNKNOWN);
+        cb.onFailureWithMutex(InetAddressAndPort.getByName("127.0.0.2"), RequestFailureReason.UNKNOWN);
+        cb.onFailureWithMutex(InetAddressAndPort.getByName("127.0.0.3"), RequestFailureReason.TIMEOUT);
+        Assert.assertEquals(2, cb.failureReasonsAsMap().failureCount());
+    }
+}