[geode] branch feature/GEODE-6905 updated: GEODE-6905: Do not wait for region initialization.

[es...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

eshu11 pushed a commit to branch feature/GEODE-6905
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-6905 by this push:
     new 3f36e65  GEODE-6905: Do not wait for region initialization.
3f36e65 is described below

commit 3f36e65cc4e3097d851e665bc46136f278893d47
Author: eshu <es...@pivotal.io>
AuthorDate: Tue Jun 25 10:41:39 2019 -0700

    GEODE-6905: Do not wait for region initialization.
    
      * No need to wait for region initialization when scheduling region sync.
        It should be done only before actual executing region sync task.
---
 .../geode/distributed/internal/DistributionAdvisor.java      |  3 ---
 .../geode/distributed/internal/DistributionAdvisorTest.java  | 12 ------------
 2 files changed, 15 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
index 2ed3787..e551157 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionAdvisor.java
@@ -280,9 +280,6 @@ public class DistributionAdvisor {
     // retried operation to be mishandled. See GEODE-5505
     final long delay = getDelay(dr);
 
-    if (!dr.isInitializedWithWait()) {
-      return;
-    }
     if (dr.getDataPolicy().withPersistence() && persistentId == null) {
       // Fix for GEODE-6886 (#46704). The lost member may be an empty accessor
       // of a persistent replicate region. We don't need to do a synchronization
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
index 4ae3bae..cbe10b8 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionAdvisorTest.java
@@ -92,18 +92,6 @@ public class DistributionAdvisorTest {
   }
 
   @Test
-  public void regionSyncIsNotScheduledIfRegionIsNotInitialized() {
-    when(distributedRegion.isInitializedWithWait()).thenReturn(false);
-    doCallRealMethod().when(distributionAdvisor).syncForCrashedMember(member, profile);
-
-    distributionAdvisor.syncForCrashedMember(member, profile);
-
-    verify(distributedRegion, never()).scheduleSynchronizeForLostMember(member, lostVersionID,
-        delay);
-    verify(distributedRegion, never()).setRegionSynchronizeScheduled(lostVersionID);
-  }
-
-  @Test
   public void regionSyncNotInvokedIfLostMemberIsAnEmptyAccessorOfPersistentReplicateRegion() {
     when(dataPolicy.withPersistence()).thenReturn(true);
     when(distributedRegion.getPersistentID()).thenReturn(null);