You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2020/07/15 04:25:39 UTC
[geode] branch feature/GEODE-8360 created (now b2087a8)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-8360
in repository https://gitbox.apache.org/repos/asf/geode.git.
at b2087a8 Revert "GEODE-7384: Members's old Persistent Member Id should be removed (#4257)"
This branch includes the following new commits:
new b2087a8 Revert "GEODE-7384: Members's old Persistent Member Id should be removed (#4257)"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[geode] 01/01: Revert "GEODE-7384: Members's old Persistent Member
Id should be removed (#4257)"
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-8360
in repository https://gitbox.apache.org/repos/asf/geode.git
commit b2087a84ee1c2febefa150f072b6502727c3a64c
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Tue Jul 14 21:23:15 2020 -0700
Revert "GEODE-7384: Members's old Persistent Member Id should be removed (#4257)"
This reverts commit ba21b6345c0e9158549d2958a268d1fc0b7f38f7.
---
.../cache/persistence/PersistenceAdvisorImpl.java | 7 ++++---
.../cache/persistence/PersistenceAdvisorImplTest.java | 17 -----------------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
index 11f2563..2f52340 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
@@ -655,8 +655,7 @@ public class PersistenceAdvisorImpl implements InternalPersistenceAdvisor {
}
}
- @VisibleForTesting
- void memberRemoved(PersistentMemberID id, boolean revoked) {
+ private void memberRemoved(PersistentMemberID id, boolean revoked) {
if (logger.isDebugEnabled(LogMarker.PERSIST_ADVISOR_VERBOSE)) {
logger.debug(LogMarker.PERSIST_ADVISOR_VERBOSE, "{}-{}: Member removed. persistentID={}",
shortDiskStoreId(), regionPath, id);
@@ -767,7 +766,9 @@ public class PersistenceAdvisorImpl implements InternalPersistenceAdvisor {
// The oldId and newId could be the same if the member is retrying a GII. See bug #42051
if (oldId != null && !oldId.equals(newId)) {
- memberRemoved(oldId, false);
+ if (initialized) {
+ memberRemoved(oldId, false);
+ }
}
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImplTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImplTest.java
index 6ca52d1..38a3d74 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImplTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImplTest.java
@@ -22,9 +22,7 @@ import static org.apache.geode.cache.Region.SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -196,21 +194,6 @@ public class PersistenceAdvisorImplTest {
}
@Test
- public void prepareNewMemberRemovesOldPersistentMemberId() {
- InternalDistributedMember sender = mock(InternalDistributedMember.class);
- PersistentMemberID oldId = mock(PersistentMemberID.class);
- PersistentMemberID newId = mock(PersistentMemberID.class);
- when(cacheDistributionAdvisor.containsId(sender)).thenReturn(true);
- PersistenceAdvisorImpl spy = spy(persistenceAdvisorImpl);
- doNothing().when(spy).memberRemoved(oldId, false);
-
- spy.prepareNewMember(sender, oldId, newId);
-
- verify(persistentMemberView).memberOnline(newId);
- verify(spy).memberRemoved(oldId, false);
- }
-
- @Test
public void waitingForMembersMessage_logsMessage1_whenHasOfflineMembersWaitingFor() {
DistributedLockService distributedLockService = mock(DistributedLockService.class);
String regionPath = SEPARATOR + "region";