geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject geode git commit: GEODE-2816: Redundancy recovery inititated even if redundancy set to 0
Date Wed, 26 Apr 2017 21:01:28 GMT
Repository: geode
Updated Branches:
  refs/heads/develop 13824f486 -> 70340783a


GEODE-2816: Redundancy recovery inititated even if redundancy set to 0


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/70340783
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/70340783
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/70340783

Branch: refs/heads/develop
Commit: 70340783a4617f141b937ee960a0a373ebe0f46e
Parents: 13824f4
Author: nabarun <nnag@pivotal.io>
Authored: Mon Apr 24 10:50:06 2017 -0700
Committer: nabarunnag <nag@cs.wisc.edu>
Committed: Wed Apr 26 13:55:25 2017 -0700

----------------------------------------------------------------------
 .../org/apache/geode/internal/cache/PRHARedundancyProvider.java | 2 +-
 .../java/org/apache/geode/internal/cache/PartitionedRegion.java | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/70340783/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
index d2f44e8..6fc4ba0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java
@@ -1537,7 +1537,7 @@ public class PRHARedundancyProvider {
       delay = this.prRegion.getPartitionAttributes().getRecoveryDelay();
       movePrimaries = false;
     }
-    final boolean requiresRedundancyRecovery = delay >= 0 && redundantCopies >
0;
+    final boolean requiresRedundancyRecovery = delay >= 0;
 
     if (!requiresRedundancyRecovery) {
       return;

http://git-wip-us.apache.org/repos/asf/geode/blob/70340783/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index e15eb2a..e0aae5d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -958,10 +958,7 @@ public class PartitionedRegion extends LocalRegion
     try {
       if (storesData) {
         this.redundancyProvider.scheduleCreateMissingBuckets();
-
-        if (this.redundantCopies > 0) {
-          this.redundancyProvider.startRedundancyRecovery();
-        }
+        this.redundancyProvider.startRedundancyRecovery();
       }
     } catch (RegionDestroyedException rde) {
       // Do nothing.


Mime
View raw message