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

[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 4740ab6  fix-2
4740ab6 is described below

commit 4740ab618fb39521ad3ba255cf451d4fc11f4866
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Wed Jan 26 11:18:06 2022 -0800

    fix-2
---
 .../main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java  | 2 +-
 .../main/java/org/apache/geode/internal/cache/DistributedRegion.java   | 2 +-
 .../geode/internal/cache/persistence/PersistenceAdvisorImpl.java       | 3 ---
 3 files changed, 2 insertions(+), 5 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 f80889a5..4798b81 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);
+    logger.info("GGG:memberOffline:" + persistentID.getTimeStamp());
     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/DistributedRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 5c8b50a..da762a3 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -1087,7 +1087,7 @@ public class DistributedRegion extends LocalRegion 
implements InternalDistribute
             logger.debug("DistributedRegion.getInitialImageAndRecovery: 
Finished Recovery");
           }
           persistentMemberId = dskRgn.getMyPersistentID();
-          logger.info("GGG: recovered my oldId "
+          logger.info("GGG:Recovered my oldId "
               + (persistentMemberId == null ? null : 
persistentMemberId.getTimeStamp()) + " for "
               + getFullPath());
         }
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 9077ea2..584a37c 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
@@ -1250,9 +1250,6 @@ public class PersistenceAdvisorImpl implements 
InternalPersistenceAdvisor {
       if (cp.persistentID != null && cp.persistenceInitialized) {
         memberOnline(profile.getDistributedMember(), cp.persistentID);
         logger.info("GGG:memberOnline:" + cp.persistentID.getTimeStamp());
-      } else if (cp.persistentID != null) {
-        logger.info(
-            "GGG:initialized?" + cp.persistenceInitialized + ":" + 
cp.persistentID.getTimeStamp());
       }
     }