[jgroups-git] [belaban/JGroups] dab1ea: - Fixed incorrect RELAY3 config in hf.xml and net[...
Brought to you by:
belaban
From: Bela B. <no...@gi...> - 2023-10-24 15:39:18
|
Branch: refs/heads/master Home: https://github.com/belaban/JGroups Commit: dab1ea138e8b9ce6674d237365b23ec13afa3373 https://github.com/belaban/JGroups/commit/dab1ea138e8b9ce6674d237365b23ec13afa3373 Author: Bela Ban <be...@ma...> Date: 2023-10-24 (Tue, 24 Oct 2023) Changed paths: M conf/jg-messages.properties M conf/jg-messages_de.properties M conf/relay/hf.xml M conf/relay/net1.xml M conf/relay/net2.xml M conf/relay/net3.xml R doc/design/SCOPE.txt M src/org/jgroups/Address.java M src/org/jgroups/BaseMessage.java M src/org/jgroups/Event.java M src/org/jgroups/FragmentedMessage.java M src/org/jgroups/Global.java M src/org/jgroups/Message.java M src/org/jgroups/Receiver.java M src/org/jgroups/blocks/GroupRequest.java M src/org/jgroups/blocks/Request.java M src/org/jgroups/blocks/RequestCorrelator.java M src/org/jgroups/blocks/UnicastRequest.java M src/org/jgroups/demos/RelayDemo.java M src/org/jgroups/fork/ForkProtocolStack.java M src/org/jgroups/protocols/DROP.java M src/org/jgroups/protocols/FD_SOCK2.java M src/org/jgroups/protocols/FORK.java M src/org/jgroups/protocols/FlowControl.java M src/org/jgroups/protocols/LOCAL_PING.java M src/org/jgroups/protocols/RSVP.java M src/org/jgroups/protocols/UNICAST3.java M src/org/jgroups/protocols/pbcast/GMS.java M src/org/jgroups/protocols/pbcast/STABLE.java A src/org/jgroups/protocols/relay/DefaultRouteStatusListener.java M src/org/jgroups/protocols/relay/RELAY.java M src/org/jgroups/protocols/relay/RELAY2.java M src/org/jgroups/protocols/relay/RELAY3.java A src/org/jgroups/protocols/relay/RandomSiteMasterPicker.java M src/org/jgroups/protocols/relay/RelayHeader.java M src/org/jgroups/protocols/relay/Relayer.java M src/org/jgroups/protocols/relay/Route.java M src/org/jgroups/protocols/relay/RouteStatusListener.java M src/org/jgroups/protocols/relay/SiteMaster.java M src/org/jgroups/protocols/relay/SiteUUID.java A src/org/jgroups/protocols/relay/StickySiteMasterPicker.java M src/org/jgroups/stack/IpAddress.java M src/org/jgroups/stack/Protocol.java M src/org/jgroups/stack/ProtocolStack.java A src/org/jgroups/util/Delayer.java M src/org/jgroups/util/ExpiryCache.java M src/org/jgroups/util/Headers.java M src/org/jgroups/util/MyReceiver.java M src/org/jgroups/util/Util.java A tests/junit-functional/org/jgroups/tests/DelayerTest.java M tests/junit-functional/org/jgroups/tests/ExpiryCacheTest.java M tests/junit-functional/org/jgroups/tests/RelayRpcDispatcherTest.java M tests/junit-functional/org/jgroups/tests/RelayTest.java M tests/junit-functional/org/jgroups/tests/RelayTestAsym.java M tests/junit-functional/org/jgroups/tests/RelayTests.java M tests/junit-functional/org/jgroups/tests/SizeTest.java Log Message: ----------- - Fixed incorrect RELAY3 config in hf.xml and net[1-3].xml - Added isSiteAddress()/isSiteMaster() to Address - Added methods to marshall/unmarshall/clear headers - RELAY3: marshall headers into RelayHeader and clear before routing - Added RelayHeader.headers for byte array of marshalled headers - UNICAST3: if msg.dest == SiteMaster(self) -> msg.dest=self - RELAY2 now also clears the headers and re-creates them from the buffer (same behavior as RELAY3). This should not pose any incompatibilities - GMS: view messages have the NO_RELAY flag, as they should be sent only to local members - Fixed failing RelayTest - Fixed incorrect FragmentedMessage.copyPayload - STABLE: send STABILITY message with NO_RELAY flag set - Added state transfer handling to MyReceiver - FlowControl: check if non-nul dest is multicast and skip if true - Added more tests to RelayTest - Added warning to RSVP when RELAYX is found - Removed SCOPE.TXT - Added more tests - UNICAST3: removes only local non-members on view change, not remote (different site addresses) - Added memberUnreachable() to RouteStatusListener - Added handling of MBR_UNREACHABLE plus unit test - Added MBR_UNREACHABLE event - Handling MBR_UNREACHABLE in FORK - RELAY3: discard own TOPO-RSP message - Added Delayer/DelayerTest - Added StickySiteMasterPicker (used by RELAY by default) - Added RandomSiteMasterPicker - GroupRequest: merged site/memberUnreachable() - RELAY3: added delaying of siteUnreachable() notification - Added more unit tests to test failover/multiple site masters in RELAY3 - UNICAST3: added real_dest for (1) retransmits, (2) acks, (3) send-first-seqno: if real_dest (e.g. SiteMaster("nyc")) is not the same as local_addr, then the src of the message must be real_dest, otherwise the recipient would not find the target in its send_table! - BaseMessage.setFlag(): overwrite flags, *don't* xor them - RelayHeader: added original_flags - RELAY3: store and restore original headers on routed messages Commit: 3d55b421721cf1f863097f984ec3808377a59702 https://github.com/belaban/JGroups/commit/3d55b421721cf1f863097f984ec3808377a59702 Author: Bela Ban <be...@ma...> Date: 2023-10-24 (Tue, 24 Oct 2023) Changed paths: M pom.xml Log Message: ----------- Merge branch 'master' of github.com:belaban/JGroups Compare: https://github.com/belaban/JGroups/compare/28b9e90e46cd...3d55b421721c |