[cassandra] branch trunk updated: Fix IMH#acquireCapacity() to return correct Outcome when endpoint reserve runs out

[aleksey]

This is an automated email from the ASF dual-hosted git repository.

aleksey pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new aef3bec  Fix IMH#acquireCapacity() to return correct Outcome when 
endpoint reserve runs out
aef3bec is described below

commit aef3bec08743cde30ab1bf6029336997800e51a4
Author: Aleksey Yeshchenko <alek...@apache.org>
AuthorDate: Mon Apr 6 17:23:13 2020 +0100

    Fix IMH#acquireCapacity() to return correct Outcome when endpoint reserve 
runs out
    
    patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for CASSANDRA-15607
---
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/net/InboundMessageHandler.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2b7f7c5..b7932ee 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0-alpha4
+ * Fix IMH#acquireCapacity() to return correct Outcome when endpoint reserve 
runs out (CASSANDRA-15607)
  * Fix nodetool describering output (CASSANDRA-15682)
  * Only track ideal CL failure when request CL met (CASSANDRA-15696)
  * Fix flaky CoordinatorMessagingTest and docstring in OutboundSink and 
ConsistentSession (CASSANDRA-15672)
diff --git a/src/java/org/apache/cassandra/net/InboundMessageHandler.java 
b/src/java/org/apache/cassandra/net/InboundMessageHandler.java
index 8807e8d..1fc182b 100644
--- a/src/java/org/apache/cassandra/net/InboundMessageHandler.java
+++ b/src/java/org/apache/cassandra/net/InboundMessageHandler.java
@@ -578,7 +578,7 @@ public class InboundMessageHandler extends 
ChannelInboundHandlerAdapter implemen
         {
             globalReserve.release(allocatedExcess);
             globalWaitQueue.signal();
-            return ResourceLimits.Outcome.INSUFFICIENT_GLOBAL;
+            return ResourceLimits.Outcome.INSUFFICIENT_ENDPOINT;
         }
 
         long newQueueSize = queueSizeUpdater.addAndGet(this, bytes);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org