This is an automated email from the ASF dual-hosted git repository.
eshu11 pushed a commit to branch feature/GEODE-7530
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-7530 by this
push:
new cd70683 GEODE-7530: returns localSize on ParallelGatewaySenderQueue
cd70683 is described below
commit cd706839dcd2010c9a1b18ede603ed5813963dbd
Author: Eric Shu <[email protected]>
AuthorDate: Wed Dec 4 15:13:53 2019 -0800
GEODE-7530: returns localSize on ParallelGatewaySenderQueue
* returns localSize on ParallelGatewaySenderQueue for eventQueueSize.
---
.../wan/AbstractGatewaySenderEventProcessor.java | 10 +---
...currentParallelGatewaySenderEventProcessor.java | 6 ++
.../ParallelGatewaySenderEventProcessor.java | 6 ++
.../AbstractGatewaySenderEventProcessorTest.java | 52 +++++++++++++++++
...entParallelGatewaySenderEventProcessorTest.java | 65 +++++++++++++++++++++
.../ParallelGatewaySenderEventProcessorTest.java | 67 ++++++++++++++++++++++
6 files changed, 197 insertions(+), 9 deletions(-)
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 0cfee64..87b8085 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
@@ -260,15 +260,7 @@ public abstract class AbstractGatewaySenderEventProcessor
extends LoggingThread
}
public int eventQueueSize() {
- if (queue == null) {
- return 0;
- }
-
- // This should be local size instead of pr size
- if (this.queue instanceof ConcurrentParallelGatewaySenderQueue) {
- return ((ConcurrentParallelGatewaySenderQueue) queue).localSize();
- }
- return this.queue.size();
+ return getQueue() == null ? 0 : getQueue().size();
}
public int secondaryEventQueueSize() {
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
index ef4d3e8..6e6ae7c 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
@@ -125,6 +125,12 @@ public class ConcurrentParallelGatewaySenderEventProcessor
}
@Override
+ public int eventQueueSize() {
+ ConcurrentParallelGatewaySenderQueue queue =
(ConcurrentParallelGatewaySenderQueue) getQueue();
+ return queue == null ? 0 : queue.localSize();
+ }
+
+ @Override
public void enqueueEvent(EnumListenerEvent operation, EntryEvent event,
Object substituteValue)
throws IOException, CacheException {
Region region = event.getRegion();
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
index 27bc865..b5b4cbd 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessor.java
@@ -89,6 +89,12 @@ public class ParallelGatewaySenderEventProcessor extends
AbstractGatewaySenderEv
}
@Override
+ public int eventQueueSize() {
+ ParallelGatewaySenderQueue queue = (ParallelGatewaySenderQueue) getQueue();
+ return queue == null ? 0 : queue.localSize();
+ }
+
+ @Override
public void enqueueEvent(EnumListenerEvent operation, EntryEvent event,
Object substituteValue)
throws IOException, CacheException {
GatewaySenderEventImpl gatewayQueueEvent = null;
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessorTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessorTest.java
new file mode 100644
index 0000000..e9c83d6
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessorTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.wan;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+
+import org.apache.geode.internal.cache.RegionQueue;
+
+public class AbstractGatewaySenderEventProcessorTest {
+
+ private RegionQueue queue = mock(RegionQueue.class);
+
+ @Test
+ public void eventQueueSizeReturnsQueueSize() {
+ AbstractGatewaySenderEventProcessor processor =
mock(AbstractGatewaySenderEventProcessor.class);
+ when(processor.getQueue()).thenReturn(queue);
+ doCallRealMethod().when(processor).eventQueueSize();
+
+ processor.eventQueueSize();
+
+ verify(queue).size();
+ }
+
+ @Test
+ public void eventQueueSizeReturnsZeroIfRegionQueueIsNull() {
+ AbstractGatewaySenderEventProcessor processor =
mock(AbstractGatewaySenderEventProcessor.class);
+ doCallRealMethod().when(processor).eventQueueSize();
+
+ assertThat(processor.eventQueueSize()).isEqualTo(0);
+
+ verify(queue, never()).size();
+ }
+}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessorTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessorTest.java
new file mode 100644
index 0000000..74d5f55
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessorTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.wan.parallel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
+import org.apache.geode.internal.monitoring.ThreadsMonitoring;
+
+public class ConcurrentParallelGatewaySenderEventProcessorTest {
+ private AbstractGatewaySender sender = mock(AbstractGatewaySender.class);
+ private ConcurrentParallelGatewaySenderQueue queue =
+ mock(ConcurrentParallelGatewaySenderQueue.class);
+
+ @Before
+ public void setup() {
+ when(sender.getCache()).thenReturn(mock(InternalCache.class));
+ }
+
+ @Test
+ public void eventQueueSizeReturnsQueueLocalSize() {
+ ConcurrentParallelGatewaySenderEventProcessor processor =
+ spy(new ConcurrentParallelGatewaySenderEventProcessor(sender, mock(
+ ThreadsMonitoring.class)));
+ doReturn(queue).when(processor).getQueue();
+
+ processor.eventQueueSize();
+
+ verify(queue).localSize();
+ }
+
+ @Test
+ public void eventQueueSizeReturnsZeroIfQueueIsNull() {
+ ConcurrentParallelGatewaySenderEventProcessor processor =
+ spy(new ConcurrentParallelGatewaySenderEventProcessor(sender, mock(
+ ThreadsMonitoring.class)));
+ doReturn(null).when(processor).getQueue();
+
+ assertThat(processor.eventQueueSize()).isEqualTo(0);
+
+ verify(queue, never()).localSize();
+ }
+}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorTest.java
new file mode 100644
index 0000000..afef2fc
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderEventProcessorTest.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.wan.parallel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
+import org.apache.geode.internal.monitoring.ThreadsMonitoring;
+
+public class ParallelGatewaySenderEventProcessorTest {
+
+ private AbstractGatewaySender sender = mock(AbstractGatewaySender.class);
+ private ParallelGatewaySenderQueue queue =
mock(ParallelGatewaySenderQueue.class);
+
+ @Before
+ public void setup() {
+ when(sender.getCache()).thenReturn(mock(InternalCache.class));
+ when(sender.getCancelCriterion()).thenReturn(mock(CancelCriterion.class));
+ }
+
+ @Test
+ public void eventQueueSizeReturnsQueueLocalSize() {
+ ParallelGatewaySenderEventProcessor processor =
+ spy(new ParallelGatewaySenderEventProcessor(sender, mock(
+ ThreadsMonitoring.class)));
+ doReturn(queue).when(processor).getQueue();
+
+ processor.eventQueueSize();
+
+ verify(queue).localSize();
+ }
+
+ @Test
+ public void eventQueueSizeReturnsZeroIfQueueIsNull() {
+ ParallelGatewaySenderEventProcessor processor =
+ spy(new ParallelGatewaySenderEventProcessor(sender, mock(
+ ThreadsMonitoring.class)));
+ doReturn(null).when(processor).getQueue();
+
+ assertThat(processor.eventQueueSize()).isEqualTo(0);
+
+ verify(queue, never()).localSize();
+ }
+}
