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 2023-11-29 12:12:38 +01:00
parent 78dd963481 8dc32c5dd7
commit c8d6182148
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -24,6 +24,7 @@ Merged from 3.11:
* Revert CASSANDRA-18543 (CASSANDRA-18854)
* Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739)
Merged from 3.0:
* Do not set RPC_READY to false on transports shutdown in order to not fail counter updates for deployments with coordinator and storage nodes with transports turned off (CASSANDRA-18935)
* Suppress CVE-2023-44487 (CASSANDRA-18943)
* Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935)
* Implement the logic in bin/stop-server (CASSANDRA-18838)

1
src/java/org/apache/cassandra/service/CassandraDaemon.java
View File

@ -845,7 +845,6 @@ public class CassandraDaemon
{
if (nativeTransportService != null)
{
StorageService.instance.setRpcReady(false);
nativeTransportService.stop();
}
}

5
test/distributed/org/apache/cassandra/distributed/test/NativeProtocolTest.java
View File

@ -139,9 +139,10 @@ public class NativeProtocolTest extends TestBaseImpl
i.runOnInstance((IIsolatedExecutor.SerializableRunnable) () -> StorageService.instance.startNativeTransport());
assertTrue(i.callOnInstance((IIsolatedExecutor.SerializableCallable<Boolean>) () -> StorageService.instance.isRpcReady(FBUtilities.getBroadcastAddressAndPort())));
// by calling e.g. nodetool disablebinary, rpc will be set to false again
// by calling e.g. nodetool disablebinary, rpc will NOT be set to false again
// please read CASSANDRA-18935 for in-depth explanation why it is so
i.runOnInstance((IIsolatedExecutor.SerializableRunnable) () -> StorageService.instance.stopNativeTransport());
assertFalse(i.callOnInstance((IIsolatedExecutor.SerializableCallable<Boolean>) () -> StorageService.instance.isRpcReady(FBUtilities.getBroadcastAddressAndPort())));
assertTrue(i.callOnInstance((IIsolatedExecutor.SerializableCallable<Boolean>) () -> StorageService.instance.isRpcReady(FBUtilities.getBroadcastAddressAndPort())));
}
}
}