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.1' into cassandra-5.0

This commit is contained in:
Stefan Miklosovic 2023-11-29 12:13:17 +01:00
parent 3259bea533 c8d6182148
commit 3396ce9f08
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -19,6 +19,8 @@
Merged from 4.0:
* Fix filtering system ks sstables for relocation on startup (CASSANDRA-18963)
* Remove completed coordinator sessions (CASSANDRA-18903)
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)
5.0-alpha2

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

@ -822,7 +822,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

@ -140,9 +140,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())));
}
}
}