You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/11 16:20:28 UTC
[1/2] activemq-artemis git commit: ACTIVEMQ6-102 - fix check for
scaledown when creating journal loader
Repository: activemq-artemis
Updated Branches:
refs/heads/master 18c9e790f -> 0f724aea5
ACTIVEMQ6-102 - fix check for scaledown when creating journal loader
https://issues.apache.org/jira/browse/ACTIVEMQ6-102
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/60906e37
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/60906e37
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/60906e37
Branch: refs/heads/master
Commit: 60906e375421a0f51cd568f7da205a127f6828ab
Parents: 18c9e79
Author: Andy Taylor <an...@gmail.com>
Authored: Mon May 11 13:22:09 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 11 10:19:32 2015 -0400
----------------------------------------------------------------------
.../artemis/core/server/impl/SharedNothingBackupActivation.java | 2 +-
.../artemis/core/server/impl/SharedStoreBackupActivation.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/60906e37/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
index 7d081fa..e8013f0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
@@ -339,7 +339,7 @@ public final class SharedNothingBackupActivation extends Activation
@Override
public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, ActiveMQServer parentServer) throws ActiveMQException
{
- if (replicaPolicy.getScaleDownPolicy() != null)
+ if (replicaPolicy.getScaleDownPolicy() != null && replicaPolicy.getScaleDownPolicy().isEnabled())
{
return new BackupRecoveryJournalLoader(postOffice,
pagingManager,
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/60906e37/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
index 90b2f81..ee6f2f3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
@@ -194,7 +194,7 @@ public final class SharedStoreBackupActivation extends Activation
@Override
public JournalLoader createJournalLoader(PostOffice postOffice, PagingManager pagingManager, StorageManager storageManager, QueueFactory queueFactory, NodeManager nodeManager, ManagementService managementService, GroupingHandler groupingHandler, Configuration configuration, ActiveMQServer parentServer) throws ActiveMQException
{
- if (sharedStoreSlavePolicy.getScaleDownPolicy() != null)
+ if (sharedStoreSlavePolicy.getScaleDownPolicy() != null && sharedStoreSlavePolicy.getScaleDownPolicy().isEnabled())
{
return new BackupRecoveryJournalLoader(postOffice,
pagingManager,
[2/2] activemq-artemis git commit: This closes #239 - scaledown check
on the journal
Posted by cl...@apache.org.
This closes #239 - scaledown check on the journal
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0f724aea
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0f724aea
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0f724aea
Branch: refs/heads/master
Commit: 0f724aea53d1f0a2148e22662d51ef9bd68367fe
Parents: 18c9e79 60906e3
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon May 11 10:20:00 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon May 11 10:20:00 2015 -0400
----------------------------------------------------------------------
.../artemis/core/server/impl/SharedNothingBackupActivation.java | 2 +-
.../artemis/core/server/impl/SharedStoreBackupActivation.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------