[geode] branch feature/GEODE-9989 updated: fix-3

[zhouxj]

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

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


The following commit(s) were added to refs/heads/feature/GEODE-9989 by this 
push:
     new f5c0b5d  fix-3
f5c0b5d is described below

commit f5c0b5d4444cf48457046b027b57b1e6ab69a117
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Wed Jan 26 13:52:53 2022 -0800

    fix-3
---
 .../main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java  | 2 +-
 .../geode/internal/cache/persistence/PersistenceAdvisorImpl.java       | 3 ++-
 .../internal/cache/persistence/PrepareNewPersistentMemberMessage.java  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
index 4798b81..ce9fac3 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java
@@ -549,7 +549,7 @@ public abstract class AbstractDiskRegion implements 
DiskRegionView {
   @Override
   public void memberOffline(PersistentMemberID persistentID) {
     ds.memberOffline(this, persistentID);
-    logger.info("GGG:memberOffline:" + persistentID.getTimeStamp());
+    logger.info("GGG:memberOffline:" + persistentID.getTimeStamp() + " for 
region " + getName());
     if (logger.isTraceEnabled(LogMarker.PERSIST_VERBOSE)) {
       logger.trace(LogMarker.PERSIST_VERBOSE, "PersistentView {} - {} - member 
offline {}",
           getDiskStoreID().abbrev(), getName(), persistentID);
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 584a37c..760ce14 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
@@ -673,7 +673,8 @@ public class PersistenceAdvisorImpl implements 
InternalPersistenceAdvisor {
       logger.debug(LogMarker.PERSIST_ADVISOR_VERBOSE, "{}-{}: Member removed. 
persistentID={}",
           shortDiskStoreId(), regionPath, id);
     }
-    logger.info("GGG:Member removed, id=" + (id == null ? null : 
id.getTimeStamp()));
+    logger.info("GGG:Member removed, id=" + (id == null ? null : 
id.getTimeStamp()) + " for region "
+        + regionPath);
 
     synchronized (lock) {
       recoveredMembers.remove(id);
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage.java
index 412784e..d894138 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage.java
@@ -78,7 +78,7 @@ public class PrepareNewPersistentMemberMessage extends 
HighPriorityDistributionM
         new PrepareNewPersistentMemberMessage(regionPath, oldId, newId, 
processor.getProcessorId());
     logger.info("GGG:Sending PrepareNewPersistentMemberMessage oldId="
         + (oldId == null ? null : oldId.getTimeStamp()) + ",newId="
-        + (newId == null ? null : newId.getTimeStamp()));
+        + (newId == null ? null : newId.getTimeStamp()) + " for region " + 
regionPath);
     msg.setRecipients(members);
     dm.putOutgoing(msg);
     processor.waitForRepliesUninterruptibly();