[geode] 01/01: GEODE-5249: add test code to display serial gateway sender queue's content

2018-05-24 Thread zhouxj
This is an automated email from the ASF dual-hosted git repository.

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

commit 4f5e41f429ca49490e9ace6db99ef182bea50eca
Author: zhouxh 
AuthorDate: Wed May 23 17:50:28 2018 -0700

GEODE-5249: add test code to display serial gateway sender queue's content
---
 .../wan/AbstractGatewaySenderEventProcessor.java   |  9 +
 ...oncurrentSerialGatewaySenderEventProcessor.java | 16 +
 .../serial/SerialGatewaySenderEventProcessor.java  | 17 +
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  4 +++
 ...SerialGatewaySenderEventProcessorJUnitTest.java | 33 ++
 .../geode/internal/cache/wan/WANTestBase.java  | 40 ++
 .../SerialGatewaySenderOperationsDUnitTest.java| 34 ++
 7 files changed, 153 insertions(+)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 89fa586..0004789 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -1380,4 +1380,13 @@ public abstract class 
AbstractGatewaySenderEventProcessor extends Thread {
   return true;
 }
   }
+
+  public String printUnprocessedEvents() {
+return null;
+  }
+
+  public String printUnprocessedTokens() {
+return null;
+  }
+
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
index 8ec6ce1..195e1a7 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
@@ -396,4 +396,20 @@ public class ConcurrentSerialGatewaySenderEventProcessor
   serialProcessor.enqueueEvent(event);
 }
   }
+
+  public String printUnprocessedEvents() {
+StringBuffer sb = new StringBuffer();
+for (SerialGatewaySenderEventProcessor serialProcessor : this.processors) {
+  sb.append(serialProcessor.printUnprocessedEvents() + "\n");
+}
+return sb.toString();
+  }
+
+  public String printUnprocessedTokens() {
+StringBuffer sb = new StringBuffer();
+for (SerialGatewaySenderEventProcessor serialProcessor : this.processors) {
+  sb.append(serialProcessor.printUnprocessedTokens() + "\n");
+}
+return sb.toString();
+  }
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
index 39609c7..121469f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
@@ -20,12 +20,14 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.Logger;
 
@@ -902,4 +904,19 @@ public class SerialGatewaySenderEventProcessor extends 
AbstractGatewaySenderEven
 this.getSender().setModifiedEventId(droppedEvent);
 sendBatchDestroyOperationForDroppedEvent(droppedEvent, -1);
   }
+
+  private String printEventIdList(Set eventIds) {
+StringBuffer sb = new StringBuffer().append("[").append(
+eventIds.stream().map(entry -> 
entry.expensiveToString()).collect(Collectors.joining(", ")))
+.append("]");
+return sb.toString();
+  }
+
+  public String printUnprocessedEvents() {
+return printEventIdList(this.unprocessedEvents.keySet());
+  }
+
+  public String printUnprocessedTokens() {
+return printEventIdList(this.unprocessedTokens.keySet());
+  }
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 64e3a6a..6cfe7f4 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ 

[geode] 01/01: GEODE-5249: add test code to display serial gateway sender queue's content

2018-05-24 Thread zhouxj
This is an automated email from the ASF dual-hosted git repository.

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

commit 40f51112fb8759c4063f650b3bb7b7a90cac59dc
Author: zhouxh 
AuthorDate: Wed May 23 17:50:28 2018 -0700

GEODE-5249: add test code to display serial gateway sender queue's content
---
 .../wan/AbstractGatewaySenderEventProcessor.java   |  9 +
 ...oncurrentSerialGatewaySenderEventProcessor.java | 16 +
 .../serial/SerialGatewaySenderEventProcessor.java  | 17 +
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  4 +++
 ...SerialGatewaySenderEventProcessorJUnitTest.java | 33 ++
 .../geode/internal/cache/wan/WANTestBase.java  | 40 ++
 .../SerialGatewaySenderOperationsDUnitTest.java| 34 ++
 7 files changed, 153 insertions(+)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 89fa586..0004789 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -1380,4 +1380,13 @@ public abstract class 
AbstractGatewaySenderEventProcessor extends Thread {
   return true;
 }
   }
+
+  public String printUnprocessedEvents() {
+return null;
+  }
+
+  public String printUnprocessedTokens() {
+return null;
+  }
+
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
index 8ec6ce1..195e1a7 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
@@ -396,4 +396,20 @@ public class ConcurrentSerialGatewaySenderEventProcessor
   serialProcessor.enqueueEvent(event);
 }
   }
+
+  public String printUnprocessedEvents() {
+StringBuffer sb = new StringBuffer();
+for (SerialGatewaySenderEventProcessor serialProcessor : this.processors) {
+  sb.append(serialProcessor.printUnprocessedEvents() + "\n");
+}
+return sb.toString();
+  }
+
+  public String printUnprocessedTokens() {
+StringBuffer sb = new StringBuffer();
+for (SerialGatewaySenderEventProcessor serialProcessor : this.processors) {
+  sb.append(serialProcessor.printUnprocessedTokens() + "\n");
+}
+return sb.toString();
+  }
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
index 39609c7..121469f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
@@ -20,12 +20,14 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.Logger;
 
@@ -902,4 +904,19 @@ public class SerialGatewaySenderEventProcessor extends 
AbstractGatewaySenderEven
 this.getSender().setModifiedEventId(droppedEvent);
 sendBatchDestroyOperationForDroppedEvent(droppedEvent, -1);
   }
+
+  private String printEventIdList(Set eventIds) {
+StringBuffer sb = new StringBuffer().append("[").append(
+eventIds.stream().map(entry -> 
entry.expensiveToString()).collect(Collectors.joining(", ")))
+.append("]");
+return sb.toString();
+  }
+
+  public String printUnprocessedEvents() {
+return printEventIdList(this.unprocessedEvents.keySet());
+  }
+
+  public String printUnprocessedTokens() {
+return printEventIdList(this.unprocessedTokens.keySet());
+  }
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 64e3a6a..6cfe7f4 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ 

[geode] 01/01: GEODE-5249: add test code to display serial gateway sender queue's content

2018-05-24 Thread zhouxj
This is an automated email from the ASF dual-hosted git repository.

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

commit 19a00c75da0e3b9d478f33b410e040cff96ea04b
Author: zhouxh 
AuthorDate: Wed May 23 17:50:28 2018 -0700

GEODE-5249: add test code to display serial gateway sender queue's content
---
 .../wan/AbstractGatewaySenderEventProcessor.java   |  9 +
 ...oncurrentSerialGatewaySenderEventProcessor.java | 16 +
 .../serial/SerialGatewaySenderEventProcessor.java  |  8 +
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  4 +++
 ...SerialGatewaySenderEventProcessorJUnitTest.java | 24 +
 .../geode/internal/cache/wan/WANTestBase.java  | 40 ++
 .../SerialGatewaySenderOperationsDUnitTest.java| 34 ++
 7 files changed, 135 insertions(+)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 89fa586..0004789 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -1380,4 +1380,13 @@ public abstract class 
AbstractGatewaySenderEventProcessor extends Thread {
   return true;
 }
   }
+
+  public String printUnprocessedEvents() {
+return null;
+  }
+
+  public String printUnprocessedTokens() {
+return null;
+  }
+
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
index 8ec6ce1..12dacc2 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
@@ -396,4 +396,20 @@ public class ConcurrentSerialGatewaySenderEventProcessor
   serialProcessor.enqueueEvent(event);
 }
   }
+
+  public String printUnprocessedEvents() {
+StringBuffer sb = new StringBuffer();
+for (SerialGatewaySenderEventProcessor serialProcessor : this.processors) {
+  sb.append(serialProcessor.getId() + ":" + 
serialProcessor.printUnprocessedEvents() + "\n");
+}
+return sb.toString();
+  }
+
+  public String printUnprocessedTokens() {
+StringBuffer sb = new StringBuffer();
+for (SerialGatewaySenderEventProcessor serialProcessor : this.processors) {
+  sb.append(serialProcessor.getId() + ":" + 
serialProcessor.printUnprocessedTokens() + "\n");
+}
+return sb.toString();
+  }
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
index 39609c7..501375f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
@@ -902,4 +902,12 @@ public class SerialGatewaySenderEventProcessor extends 
AbstractGatewaySenderEven
 this.getSender().setModifiedEventId(droppedEvent);
 sendBatchDestroyOperationForDroppedEvent(droppedEvent, -1);
   }
+
+  public String printUnprocessedEvents() {
+return this.unprocessedEvents.keySet().toString();
+  }
+
+  public String printUnprocessedTokens() {
+return this.unprocessedTokens.keySet().toString();
+  }
 }
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 64e3a6a..6cfe7f4 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -1294,4 +1294,8 @@ public class SerialGatewaySenderQueue implements 
RegionQueue {
   }
 }
   }
+
+  public String displayContent() {
+return this.region.keySet().toString();
+  }
 }
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
index f21634e..e3f960a 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderEventProcessorJUnitTest.java
+++