You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2018/03/09 15:11:07 UTC
[1/2] activemq-artemis git commit: This closes #1946
Repository: activemq-artemis
Updated Branches:
refs/heads/master 2cc163da7 -> c16387ef2
This closes #1946
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c16387ef
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c16387ef
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c16387ef
Branch: refs/heads/master
Commit: c16387ef2cae18903fe6cf884bff591725036355
Parents: 2cc163d 3c6876e
Author: Justin Bertram <jb...@apache.org>
Authored: Fri Mar 9 09:10:55 2018 -0600
Committer: Justin Bertram <jb...@apache.org>
Committed: Fri Mar 9 09:10:55 2018 -0600
----------------------------------------------------------------------
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 5 +++++
.../activemq/artemis/core/server/cluster/ClusterController.java | 4 ++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1741 - log warning if a
node isnt configured for quorum voting
Posted by jb...@apache.org.
ARTEMIS-1741 - log warning if a node isnt configured for quorum voting
https://issues.apache.org/jira/browse/ARTEMIS-1741
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3c6876ec
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3c6876ec
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3c6876ec
Branch: refs/heads/master
Commit: 3c6876ece61880dbe1a5ea0f50f43e13b803dded
Parents: 2cc163d
Author: andytaylor <an...@gmail.com>
Authored: Fri Mar 9 10:19:34 2018 +0000
Committer: Justin Bertram <jb...@apache.org>
Committed: Fri Mar 9 09:10:55 2018 -0600
----------------------------------------------------------------------
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 5 +++++
.../activemq/artemis/core/server/cluster/ClusterController.java | 4 ++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3c6876ec/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index ce04f14..4d25c58 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1918,4 +1918,9 @@ public interface ActiveMQServerLogger extends BasicLogger {
@LogMessage(level = Logger.Level.WARN)
@Message(id = 224089, value = "Failed to calculate persistent size", format = Message.Format.MESSAGE_FORMAT)
void errorCalculatePersistentSize(@Cause Throwable e);
+
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 224090, value = "This node is not configured for Quorum Voting, all nodes must be configured for HA", format = Message.Format.MESSAGE_FORMAT)
+ void noVoteHandlerConfigured();
+
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3c6876ec/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
index 464e945..c77b297 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java
@@ -378,6 +378,10 @@ public class ClusterController implements ActiveMQComponent {
} else if (packet.getType() == PacketImpl.QUORUM_VOTE) {
QuorumVoteMessage quorumVoteMessage = (QuorumVoteMessage) packet;
QuorumVoteHandler voteHandler = quorumManager.getVoteHandler(quorumVoteMessage.getHandler());
+ if (voteHandler == null) {
+ ActiveMQServerLogger.LOGGER.noVoteHandlerConfigured();
+ return;
+ }
quorumVoteMessage.decode(voteHandler);
ActiveMQServerLogger.LOGGER.receivedQuorumVoteRequest(quorumVoteMessage.getVote().toString());
Vote vote = quorumManager.vote(quorumVoteMessage.getHandler(), quorumVoteMessage.getVote());