[geode-native] branch develop updated (e28693188 -> d4d09908d)
This is an automated email from the ASF dual-hosted git repository. alberto pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git from e28693188 GEODE-10089: Bump Geode version to 1.15.0 (#976) new e2ebf323a GEODE-10371: C++ client: Improve dispersion on connections expiration new 6160f974e GEODE-10371: Changes after review new d4d09908d Merge pull request #974 from Nordix/feature/GEODE-10371 The 1493 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. Summary of changes: cppcache/src/TcrConnection.cpp | 25 +++- cppcache/src/TcrConnection.hpp | 4 +- cppcache/test/CMakeLists.txt| 1 + cppcache/test/TcrConnectionTest.cpp | 77 + 4 files changed, 87 insertions(+), 20 deletions(-) create mode 100644 cppcache/test/TcrConnectionTest.cpp
[geode] branch develop updated: GEODE-10392: When gw sender started with cleanqueue remove EvictionController from diskstore (#7817)
This is an automated email from the ASF dual-hosted git repository. mivanac pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new d6261cc3cc GEODE-10392: When gw sender started with cleanqueue remove EvictionController from diskstore (#7817) d6261cc3cc is described below commit d6261cc3cce1b661714fb136c732addb8c11a33e Author: Mario Ivanac <48509724+miva...@users.noreply.github.com> AuthorDate: Tue Jul 5 13:24:48 2022 +0200 GEODE-10392: When gw sender started with cleanqueue remove EvictionController from diskstore (#7817) --- .../apache/geode/internal/cache/DiskStoreImpl.java | 9 + .../geode/internal/cache/PartitionedRegion.java| 9 + .../wan/parallel/ParallelGatewaySenderQueue.java | 1 + .../ParallelWANOverflowStatsDistributedTest.java | 367 + 4 files changed, 386 insertions(+) diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java index 0f9865b720..19990c7030 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java @@ -4079,6 +4079,15 @@ public class DiskStoreImpl implements DiskStore { } } + void clearExistingPREvictionContoller(PartitionedRegion pr) { +final String prName = pr.getFullPath(); +synchronized (prEvictionControllerMap) { + prEvictionControllerMap.remove(prName); +} + } + + + /** * Lock the disk store to prevent updates. This is the first step of the backup process. Once all * disk stores on all members are locked, we still move on to prepareBackup. diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java index 896af32576..e14a159fc2 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java @@ -556,6 +556,15 @@ public class PartitionedRegion extends LocalRegion return result; } + + public void clearPREvictionControllerFromDiskInitialization() { +if (getDiskStore() != null) { + getDiskStore().clearExistingPREvictionContoller(this); +} + } + + + @Override public boolean remove(Object key, Object value, Object callbackArg) { final long startTime = prStats.getTime(); diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java index c37b4aefc8..7dc5f18e63 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java @@ -497,6 +497,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue { if ((prQ != null) && (index == 0) && cleanQueues) { cleanOverflowStats(cache); +prQ.clearPREvictionControllerFromDiskInitialization(); prQ.destroyRegion(null); prQ = null; } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANOverflowStatsDistributedTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANOverflowStatsDistributedTest.java new file mode 100644 index 00..3e99d320f9 --- /dev/null +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANOverflowStatsDistributedTest.java @@ -0,0 +1,367 @@ +/* + * 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.apache.geode.test.awaitility.GeodeAwaitility.await; +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.g
[geode-native] branch develop updated: GEODE-10089: Bump Geode version to 1.15.0 (#976)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git The following commit(s) were added to refs/heads/develop by this push: new e28693188 GEODE-10089: Bump Geode version to 1.15.0 (#976) e28693188 is described below commit e28693188546e56f2b4e9f89ebf4105629a9c758 Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Tue Jul 5 01:16:41 2022 -0700 GEODE-10089: Bump Geode version to 1.15.0 (#976) Native client hardcodes Geode version to test with in several places. Update those variables to latest-and-greatest apache-geode 1.15.0 --- .lgtm.yml | 2 +- docker/centos-7/Dockerfile | 2 +- docker/centos-8/Dockerfile | 2 +- docker/rhel-7/Dockerfile | 2 +- docker/rhel-8/Dockerfile | 2 +- docker/ubuntu-16.04/Dockerfile | 2 +- docker/ubuntu-18.04/Dockerfile | 2 +- docker/ubuntu-20.04/Dockerfile | 2 +- docker/windows/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index 2f0029df0..7e28511f3 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -2,7 +2,7 @@ extraction: cpp: configure: command: -- GEODE_VERSION=1.14.4 +- GEODE_VERSION=1.15.0 - mkdir _lgtm_build_dir - cd _lgtm_build_dir - wget -O apache-geode.tgz https://downloads.apache.org/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz diff --git a/docker/centos-7/Dockerfile b/docker/centos-7/Dockerfile index 6fb0ca11b..cb4f50886 100644 --- a/docker/centos-7/Dockerfile +++ b/docker/centos-7/Dockerfile @@ -51,7 +51,7 @@ RUN installer=$(mktemp) \ && bash ${installer} --skip-license --prefix=/usr/local \ && rm ${installer} -ARG GEODE_VERSION=1.14.4 +ARG GEODE_VERSION=1.15.0 ENV GEODE_HOME /apache-geode-${GEODE_VERSION} RUN curl -L -s "https://www.apache.org/dyn/closer.lua/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz?action=download"; | tar -zxvf - --exclude javadoc diff --git a/docker/centos-8/Dockerfile b/docker/centos-8/Dockerfile index 7bd2cfbf4..2c00b 100644 --- a/docker/centos-8/Dockerfile +++ b/docker/centos-8/Dockerfile @@ -53,7 +53,7 @@ RUN installer=$(mktemp) \ && bash ${installer} --skip-license --prefix=/usr/local \ && rm ${installer} -ARG GEODE_VERSION=1.14.4 +ARG GEODE_VERSION=1.15.0 ENV GEODE_HOME /apache-geode-${GEODE_VERSION} RUN curl -L -s "https://www.apache.org/dyn/closer.lua/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz?action=download"; | tar -zxvf - --exclude javadoc diff --git a/docker/rhel-7/Dockerfile b/docker/rhel-7/Dockerfile index 45b164a9c..79f363145 100644 --- a/docker/rhel-7/Dockerfile +++ b/docker/rhel-7/Dockerfile @@ -54,7 +54,7 @@ RUN installer=$(mktemp) \ && bash ${installer} --skip-license --prefix=/usr/local \ && rm ${installer} -ARG GEODE_VERSION=1.14.4 +ARG GEODE_VERSION=1.15.0 ENV GEODE_HOME /apache-geode-${GEODE_VERSION} RUN curl -L -s "https://www.apache.org/dyn/closer.lua/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz?action=download"; | tar -zxvf - --exclude javadoc diff --git a/docker/rhel-8/Dockerfile b/docker/rhel-8/Dockerfile index 940e8323e..f73b20fe0 100644 --- a/docker/rhel-8/Dockerfile +++ b/docker/rhel-8/Dockerfile @@ -54,7 +54,7 @@ RUN installer=$(mktemp) \ && bash ${installer} --skip-license --prefix=/usr/local \ && rm ${installer} -ARG GEODE_VERSION=1.14.4 +ARG GEODE_VERSION=1.15.0 ENV GEODE_HOME /apache-geode-${GEODE_VERSION} RUN curl -L -s "https://www.apache.org/dyn/closer.lua/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz?action=download"; | tar -zxvf - --exclude javadoc diff --git a/docker/ubuntu-16.04/Dockerfile b/docker/ubuntu-16.04/Dockerfile index 50b24c368..eefa2efea 100644 --- a/docker/ubuntu-16.04/Dockerfile +++ b/docker/ubuntu-16.04/Dockerfile @@ -66,7 +66,7 @@ RUN installer=$(mktemp) \ && bash ${installer} --skip-license --prefix=/usr/local \ && rm ${installer} -ARG GEODE_VERSION=1.14.4 +ARG GEODE_VERSION=1.15.0 ENV GEODE_HOME /apache-geode-${GEODE_VERSION} RUN curl -L -s "https://www.apache.org/dyn/closer.lua/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz?action=download"; | tar -zxvf - --exclude javadoc diff --git a/docker/ubuntu-18.04/Dockerfile b/docker/ubuntu-18.04/Dockerfile index 9b9e0b3ff..44b854eea 100644 --- a/docker/ubuntu-18.04/Dockerfile +++ b/docker/ubuntu-18.04/Dockerfile @@ -66,7 +66,7 @@ RUN installer=$(mktemp) \ && bash ${installer} --skip-license --prefix=/usr/local \ && rm ${installer} -ARG GEODE_VERSION=1.14.4 +ARG GEODE_VERSION=1.15.0 ENV GEODE_HOME /apache-geode-${GEODE_VERSION} RUN curl -L -s "https://www.apache.org/dyn/closer.lua/geode/${GEODE_VERSION}/apache-geode-${GEODE_VERSION}.tgz?action=download"; | tar -zxvf - --exclude javadoc diff --git a/docker/ubuntu-20.04/Docker