This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 37830770d1e54703c4b30a67c259b50317e3d4e3 Merge: 7d0cb20 530bc91 Author: Andrés de la Peña <[email protected]> AuthorDate: Tue Oct 26 18:24:00 2021 +0100 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/net/InboundSink.java | 8 ++++++-- .../apache/cassandra/service/AbstractWriteResponseHandler.java | 10 ++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --cc src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java index b3b6728,7128277..b249ca6 --- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java @@@ -39,21 -41,12 +39,24 @@@ import org.apache.cassandra.exceptions. import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.net.RequestCallback; import org.apache.cassandra.net.Message; -import org.apache.cassandra.schema.Schema; -import org.apache.cassandra.utils.concurrent.SimpleCondition; +import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException; +import static java.lang.Long.MAX_VALUE; +import static java.lang.Math.min; import static java.util.concurrent.TimeUnit.NANOSECONDS; ++ +import static org.apache.cassandra.utils.Clock.Global.nanoTime; +import static java.util.stream.Collectors.toList; +import static org.apache.cassandra.config.DatabaseDescriptor.getCounterWriteRpcTimeout; +import static org.apache.cassandra.config.DatabaseDescriptor.getWriteRpcTimeout; +import static org.apache.cassandra.db.WriteType.COUNTER; +import static org.apache.cassandra.locator.ReplicaPlan.ForTokenWrite; +import static org.apache.cassandra.schema.Schema.instance; +import static org.apache.cassandra.service.StorageProxy.WritePerformer; +import static org.apache.cassandra.utils.concurrent.Condition.newOneTimeCondition; + import static org.apache.cassandra.locator.Replicas.countInOurDc; + + public abstract class AbstractWriteResponseHandler<T> implements RequestCallback<T> { protected static final Logger logger = LoggerFactory.getLogger(AbstractWriteResponseHandler.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
