[
https://issues.apache.org/jira/browse/AMQ-8593?focusedWorklogId=765350&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-765350
]
ASF GitHub Bot logged work on AMQ-8593:
---------------------------------------
Author: ASF GitHub Bot
Created on: 03/May/22 10:05
Start Date: 03/May/22 10:05
Worklog Time Spent: 10m
Work Description: gemmellr commented on code in PR #835:
URL: https://github.com/apache/activemq/pull/835#discussion_r863632302
##########
activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgentFactory.java:
##########
@@ -27,6 +27,7 @@
import java.net.URI;
import java.util.Map;
+@Deprecated
Review Comment:
Ditto
##########
activemq-client/src/main/java/org/apache/activemq/transport/discovery/masterslave/MasterSlaveDiscoveryAgent.java:
##########
@@ -24,7 +24,10 @@
/**
* A static DiscoveryAgent that supports connecting to a Master / Slave tuple
* of brokers.
+ *
+ * @deprecated This class is superseded by HADiscoveryAgent and will be
removed in 5.18.0.
*/
+@Deprecated
Review Comment:
Can it use the 'for removal' flag? If so it seems like it should. Though i
realise most things arent going to touch the code itself so it would really
only be for descriptive purposes.
(I've yet to use it myself so not clear when it came in)
##########
activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkConnectionsTest.java:
##########
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
Review Comment:
Seems like this should be unwound...but if a change actually needs made, I'd
make the licence header a comment rather than Javadoc.
Issue Time Tracking
-------------------
Worklog Id: (was: 765350)
Time Spent: 1h (was: 50m)
> Deprecate masterslave discovery agent and add a new leaderfollower discovery
> agent
> ----------------------------------------------------------------------------------
>
> Key: AMQ-8593
> URL: https://issues.apache.org/jira/browse/AMQ-8593
> Project: ActiveMQ
> Issue Type: Task
> Components: Network of Brokers
> Affects Versions: 5.17.2
> Reporter: Lucas Tétreault
> Priority: Major
> Time Spent: 1h
> Remaining Estimate: 0h
>
> This [tweet|https://twitter.com/owenblacker/status/1517156221207212032]
> raised the issue of non-inclusive terminology in the [AWS
> docs|https://docs.aws.amazon.com/amazon-mq/latest/developer-guide/amazon-mq-creating-configuring-network-of-brokers.html#creating-configuring-network-of-brokers-configure-network-connectors]
> and suggested that we should replace masterslave with an more inclusive name
> for the network connector transport. The AWS docs refer to a feature of
> ActiveMQ that is a convenience discovery agent:
> [https://activemq.apache.org/networks-of-brokers#masterslave-discovery]
> Replacing master/slave nomenclature in ActiveMQ was raised in July 2020
> AMQ-7514 and there have been some attempts at making some changes
> ([#679|https://github.com/apache/activemq/pull/679],
> [#714|https://github.com/apache/activemq/pull/714],
> [#788|https://github.com/apache/activemq/pull/788]) however we have not been
> able to come to an agreement on nomenclature so these efforts seem to have
> stalled out.
> If we are able to come to an agreement on nomenclature in this PR, we can
> move forward with removing more non-inclusive terminology on the website (I
> will follow up with some PRs to the website), in discussions with the
> community and of course in this codebase. This will remove adoption barriers
> and make ActiveMQ a more approachable and inclusive project for everyone!
> Other Apache projects such as Solr and Kafka have moved from master/slave to
> leader/follower. Leader/follower is also recommended by the
> [IETF|https://tools.ietf.org/id/draft-knodel-terminology-02.html] and
> [inclusivenaming.org|https://inclusivenaming.org/word-lists/tier-1/] which is
> supported by companies such as Cisco, Intel, and RedHat.
> If we can't come to an agreement on Leader/Follower or some other
> nomenclature I will, at the very least, create a follow up PR to remove the
> masterslave transport since it is just a convenience method to use
> static+failover with ?randomize=false&maxReconnectAttempts=0.
> This change leaves the masterslave: transport in place but provides a new
> alias leaderfollower: for now but we can easily remove it in 5.18.0.
> PR: https://github.com/apache/activemq/pull/835
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
