Repository: activemq-artemis Updated Branches: refs/heads/master 30b346374 -> c35651fd6
This closes #204 failback changes Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c35651fd Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c35651fd Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c35651fd Branch: refs/heads/master Commit: c35651fd6fb2c19fe0f66cd33c3dc993a9c52760 Parents: 30b3463 ef5a980 Author: Clebert Suconic <[email protected]> Authored: Tue Oct 20 14:55:31 2015 -0400 Committer: Clebert Suconic <[email protected]> Committed: Tue Oct 20 14:55:31 2015 -0400 ---------------------------------------------------------------------- .../config/ActiveMQDefaultConfiguration.java | 8 +-- .../core/protocol/core/impl/PacketImpl.java | 2 + .../artemis/core/config/ConfigurationUtils.java | 8 +-- .../config/ha/ReplicaPolicyConfiguration.java | 16 ++++- .../ha/ReplicatedPolicyConfiguration.java | 10 +++ .../SharedStoreMasterPolicyConfiguration.java | 7 +- .../ha/SharedStoreSlavePolicyConfiguration.java | 8 +-- .../deployers/impl/FileConfigurationParser.java | 8 +-- .../core/persistence/StorageManager.java | 5 +- .../impl/journal/JournalStorageManager.java | 5 +- .../impl/nullpm/NullStorageManager.java | 3 +- .../core/protocol/ServerPacketDecoder.java | 6 ++ .../wireformat/ReplicationResponseMessage.java | 6 +- .../ReplicationResponseMessageV2.java | 62 ++++++++++++++++++ .../wireformat/ReplicationStartSyncMessage.java | 12 ++++ .../core/replication/ReplicationEndpoint.java | 15 +++-- .../core/replication/ReplicationManager.java | 24 ++++++- .../core/server/ActiveMQMessageBundle.java | 3 + .../artemis/core/server/NodeManager.java | 4 +- .../core/server/cluster/ha/ReplicaPolicy.java | 21 ++++-- .../server/cluster/ha/ReplicatedPolicy.java | 24 +++++-- .../cluster/ha/SharedStoreMasterPolicy.java | 10 ++- .../cluster/ha/SharedStoreSlavePolicy.java | 13 ++-- .../core/server/impl/FileLockNodeManager.java | 34 +++++++++- .../core/server/impl/InVMNodeManager.java | 36 +++++++++-- .../impl/SharedNothingLiveActivation.java | 10 +-- .../impl/SharedStoreBackupActivation.java | 67 ++++++++++++-------- .../server/impl/SharedStoreLiveActivation.java | 3 +- .../resources/schema/artemis-configuration.xsd | 23 ++++++- .../config/impl/HAPolicyConfigurationTest.java | 33 +++++----- .../resources/colocated-hapolicy-config2.xml | 6 +- .../test/resources/replica-hapolicy-config.xml | 2 +- .../resources/replicated-hapolicy-config.xml | 1 + .../shared-store-master-hapolicy-config.xml | 2 - .../shared-store-slave-hapolicy-config.xml | 1 - .../shared-store-slave-hapolicy-config2.xml | 2 - .../shared-store-slave-hapolicy-config3.xml | 2 - docs/user-manual/en/ha.md | 54 +++++++--------- .../integration/cluster/NodeManagerAction.java | 2 +- .../cluster/failover/FailBackAutoTest.java | 4 +- .../cluster/failover/FailoverListenerTest.java | 4 +- .../cluster/failover/FailoverTestBase.java | 6 +- .../failover/LiveToLiveFailoverTest.java | 4 +- .../MultipleServerFailoverTestBase.java | 3 - .../failover/ReplicatedFailoverTest.java | 2 +- .../cluster/failover/SecurityFailoverTest.java | 2 +- .../cluster/failover/SharedStoreBackupTest.java | 4 +- .../cluster/util/BackupSyncDelay.java | 3 +- .../discovery/DiscoveryBaseTest.java | 24 ++++++- 49 files changed, 421 insertions(+), 193 deletions(-) ----------------------------------------------------------------------
