diff options
| author | Keith Wall <kwall@apache.org> | 2014-10-21 16:11:49 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-10-21 16:11:49 +0000 |
| commit | cfb1b1056e35892c04fbdafd486913bba5054587 (patch) | |
| tree | c045267a61aa7cb2b4299d1ba3275157aec782b6 /qpid/java/broker-core/src | |
| parent | f9b8cebdef0951eb643e6dbd6a41b3f2a70c5104 (diff) | |
| download | qpid-python-cfb1b1056e35892c04fbdafd486913bba5054587.tar.gz | |
QPID-6154: [Java Broker] HA - Handle rollback of node when use of weak durability has allowed nodes to diverge
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633407 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src')
2 files changed, 30 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java index 2234ce6b74..ee29ef6796 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java @@ -57,6 +57,7 @@ public class HighAvailabilityMessages public static final String DELETED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.deleted"; public static final String ROLE_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.role_changed"; public static final String DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.designated_primary_changed"; + public static final String NODE_ROLLEDBACK_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.node_rolledback"; static { @@ -74,6 +75,7 @@ public class HighAvailabilityMessages Logger.getLogger(DELETED_LOG_HIERARCHY); Logger.getLogger(ROLE_CHANGED_LOG_HIERARCHY); Logger.getLogger(DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY); + Logger.getLogger(NODE_ROLLEDBACK_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.HighAvailability_logmessages", _currentLocale); } @@ -479,6 +481,33 @@ public class HighAvailabilityMessages }; } + /** + * Log a HighAvailability message of the Format: + * <pre>HA-1014 : Diverged transactions discarded</pre> + * Optional values are contained in [square brackets] and are numbered + * sequentially in the method call. + * + */ + public static LogMessage NODE_ROLLEDBACK() + { + String rawMessage = _messages.getString("NODE_ROLLEDBACK"); + + final String message = rawMessage; + + return new LogMessage() + { + public String toString() + { + return message; + } + + public String getLogHierarchy() + { + return NODE_ROLLEDBACK_LOG_HIERARCHY; + } + }; + } + private HighAvailabilityMessages() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailability_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailability_logmessages.properties index 1a6bff5353..15e08bdc5a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailability_logmessages.properties +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailability_logmessages.properties @@ -61,4 +61,4 @@ PRIORITY_CHANGED = HA-1012 : Priority : {0} # 0 - new value DESIGNATED_PRIMARY_CHANGED = HA-1013 : Designated primary : {0} - +NODE_ROLLEDBACK = HA-1014 : Diverged transactions discarded |