[
https://issues.apache.org/jira/browse/AMQ-7514?focusedWorklogId=621609&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-621609
]
ASF GitHub Bot logged work on AMQ-7514:
---------------------------------------
Author: ASF GitHub Bot
Created on: 12/Jul/21 19:57
Start Date: 12/Jul/21 19:57
Worklog Time Spent: 10m
Work Description: mattrpav commented on a change in pull request #679:
URL: https://github.com/apache/activemq/pull/679#discussion_r667972064
##########
File path:
activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
##########
@@ -485,15 +490,15 @@ public JmsConnector removeJmsConnector(JmsConnector
connector) {
}
public void masterFailed() {
- if (shutdownOnMasterFailure) {
- LOG.error("The Master has failed ... shutting down");
+ if (shutdownOnActiveFailure) {
+ LOG.error("The Active has failed ... shutting down");
try {
stop();
} catch (Exception e) {
- LOG.error("Failed to stop for master failure", e);
+ LOG.error("Failed to stop for active failure", e);
Review comment:
2 messages could yield 2 alerts. I think we break this up into some
sub-tasks and add a broker config param to flip b/w the log messages using
deprecated terms.
##########
File path:
activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
##########
@@ -485,15 +490,15 @@ public JmsConnector removeJmsConnector(JmsConnector
connector) {
}
public void masterFailed() {
- if (shutdownOnMasterFailure) {
- LOG.error("The Master has failed ... shutting down");
+ if (shutdownOnActiveFailure) {
+ LOG.error("The Active has failed ... shutting down");
try {
stop();
} catch (Exception e) {
- LOG.error("Failed to stop for master failure", e);
+ LOG.error("Failed to stop for active failure", e);
Review comment:
2 messages could yield 2 alerts. I think we break this up into some
sub-tasks and add a broker config param to flip b/w the log messages using
deprecated terms. I'll update the JIRA with some sub-tasks.
##########
File path:
activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
##########
@@ -2896,51 +2922,142 @@ public void setSslContext(SslContext sslContext) {
this.sslContext = sslContext;
}
+ /**
+ * @deprecated AMQ-7514 in the move to inclusive nomenclature
+ */
+ @Deprecated
public boolean isShutdownOnSlaveFailure() {
return shutdownOnSlaveFailure;
}
/**
+ * Configuration `shutdownOnSlaveFailure` is deprecated and will be
removed in a future release. Use `shutdownOnStandbyFailure` instead.
+ * @deprecated AMQ-7514 in the move to inclusive nomenclature
+ * @param shutdownOnSlaveFailure
* @org.apache.xbean.Property
propertyEditor="org.apache.activemq.util.BooleanEditor"
*/
+ @Deprecated
public void setShutdownOnSlaveFailure(boolean shutdownOnSlaveFailure) {
this.shutdownOnSlaveFailure = shutdownOnSlaveFailure;
+ this.shutdownOnStandbyFailure = shutdownOnSlaveFailure;
+ LOG.warn("Configuration `shutdownOnSlaveFailure` is deprecated and
will be removed in a future release. Use `shutdownOnStandbyFailure` instead.");
}
+ public boolean isShutdownOnStandbyFailure() {
+ return shutdownOnStandbyFailure;
+ }
+
+ /**
+ * @org.apache.xbean.Property
propertyEditor="org.apache.activemq.util.BooleanEditor"
+ */
+ public void setShutdownOnStandbyFailure(boolean shutdownOnStandbyFailure) {
+ this.shutdownOnSlaveFailure = shutdownOnStandbyFailure;
+ this.shutdownOnStandbyFailure = shutdownOnStandbyFailure;
+ }
+
+ /**
+ * @deprecated AMQ-7514 in the move to inclusive nomenclature
+ */
+ @Deprecated
public boolean isWaitForSlave() {
return waitForSlave;
}
/**
+ * Configuration `waitForSlave` is deprecated and will be removed in a
future release. Use `waitForStandby` instead.
+ * @deprecated AMQ-7514 in the move to inclusive nomenclature
+ * @param waitForSlave
* @org.apache.xbean.Property
propertyEditor="org.apache.activemq.util.BooleanEditor"
*/
+ @Deprecated
public void setWaitForSlave(boolean waitForSlave) {
this.waitForSlave = waitForSlave;
+ this.waitForStandby = waitForSlave;
+ LOG.warn("Configuration `waitForSlave` is deprecated and will be
removed in a future release. Use `waitForStandby` instead.");
}
+ /**
+ * @deprecated AMQ-7514 in the move to inclusive nomenclature
+ */
+ @Deprecated
public long getWaitForSlaveTimeout() {
return this.waitForSlaveTimeout;
}
+ /**
+ * Configuration `waitForSlaveTimeout` is deprecated and will be removed
in a future release. Use `waitForStandbyTimeout` instead.
+ * @deprecated AMQ-7514 in the move to inclusive nomenclature
+ * @param waitForSlaveTimeout
+ */
+ @Deprecated
public void setWaitForSlaveTimeout(long waitForSlaveTimeout) {
this.waitForSlaveTimeout = waitForSlaveTimeout;
+ this.waitForStandbyTimeout = waitForSlaveTimeout;
+ LOG.warn("Configuration `waitForSlaveTimeout` is deprecated and will
be removed in a future release. Use `waitForStandbyTimeout` instead.");
+
+ }
+
+ public boolean isWaitForStandby() {
+ return waitForStandby;
}
/**
- * Get the passiveSlave
+ * @org.apache.xbean.Property
propertyEditor="org.apache.activemq.util.BooleanEditor"
+ */
+ public void setWaitForStandby(boolean waitForStandby) {
+ this.waitForStandby = waitForStandby;
+ this.waitForSlave = waitForStandby;
+ }
+
+ public long getWaitForStandbyTimeout() {
+ return this.waitForStandbyTimeout;
+ }
+
+ public void setWaitForStandbyTimeout(long waitForStandbyTimeout) {
+ this.waitForSlaveTimeout = waitForStandbyTimeout;
+ this.waitForStandbyTimeout = waitForStandbyTimeout;
+ }
+
+ /**
+ * Configuration `passiveSlave` is deprecated and will be removed in a
future release. Use `standbyInstance` instead.
+ * @deprecated AMQ-7514 in the move to inclusive nomenclature
* @return the passiveSlave
*/
+ @Deprecated
public boolean isPassiveSlave() {
+ LOG.warn("Configuration `passiveSlave` is deprecated and will be
removed in a future release. Use `standbyInstance` instead.");
return this.passiveSlave;
}
/**
- * Set the passiveSlave
+ * Configuration `passiveSlave` is deprecated and will be removed in a
future release. Use `standbyInstance` instead.
+ * @deprecated AMQ-7514 in the move to inclusive nomenclature
* @param passiveSlave the passiveSlave to set
* @org.apache.xbean.Property
propertyEditor="org.apache.activemq.util.BooleanEditor"
*/
+ @Deprecated
public void setPassiveSlave(boolean passiveSlave) {
this.passiveSlave = passiveSlave;
+ this.standbyInstance = passiveSlave;
+ LOG.warn("Configuration `passiveSlave` is deprecated and will be
removed in a future release. Use `standbyInstance` instead.");
Review comment:
Yes, I think we break-up the PR's a bit. Removing deprecated methods can
be its own thing
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 621609)
Time Spent: 4h 40m (was: 4.5h)
> Replace non-inclusive use of terms throughout source code, comments and
> documentation
> -------------------------------------------------------------------------------------
>
> Key: AMQ-7514
> URL: https://issues.apache.org/jira/browse/AMQ-7514
> Project: ActiveMQ
> Issue Type: Task
> Reporter: Bruce Snyder
> Priority: Major
> Time Spent: 4h 40m
> Remaining Estimate: 0h
>
> Given the racial charged nature of certain terms in today's world, we must
> pull together to create a plan for changing any such terms throughout all the
> ActiveMQ projects and in the git repos themselves.
>
> Example: [https://activemq.apache.org/masterslave.html]
>
> Here are just a few terms that should be changed: * The following terms are
> being targeted for change:
> *
> ** 'master' and 'slave' should be replaced with the terms 'live' and 'backup'
> ** 'whitelist' and 'blacklist' should be replaced with the terms 'allowlist'
> and 'denylist'
> * Rename all the git 'master' branches to the term 'main'
> Proposal notes from activemq-dev mailing list
> Phase 1:
> 1. Deprecate terms such as ‘master’ and ’slave
> 2. log.warn any configuration change notifications
> 3. Provide compatibility under the covers for deprecated terms
> 4. Provide any openwire compatibility changes b/w ActiveMQ 5 and Artemis
> 5. Notify users in an announcement and provide a conversion HOWTO
> Phase 2:
> 1. Remove terminology as part of a major or minor release (SEMVER where ‘y’
> in ‘x.y.z’ is minor version number)
> New terms:
> a. For shared storage: ‘active’ and ’standby’
> b. For replication: ‘primary’ and ‘replica'
> c. For 'white list' and 'blacklist': 'allow list' and 'deny list'
> For example:
> ‘master’ -> ‘active’
> ’slave’ -> ’standby'
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
