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:
Ekaterina Dimitrova 2022-06-20 21:02:10 -04:00
parent e50e2e93fb c8481836e6
commit b283f0602e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/unit/org/apache/cassandra/net/ProxyHandlerConnectionsTest.java
View File

@ -50,6 +50,7 @@ import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.cassandra.net.ConnectionTest.SETTINGS;
import static org.apache.cassandra.net.OutboundConnectionSettings.Framing.CRC;
@ -276,7 +277,7 @@ public class ProxyHandlerConnectionsTest
{
CompletableFuture.runAsync(() -> {
while (!cond.get()) {}
}).get(30, SECONDS);
}).get(1, MINUTES);
}
private static void waitForCondition(Supplier<Boolean> cond, Supplier<String> s) throws Throwable