[geode] branch develop updated (cff59ed -> 4a3ac92)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from cff59ed GEODE-8736: maintain geode version for native and docs (#5765) add 4a3ac92 GEODE-8740: increase test job timeouts (#5771) No new revisions were added by this update. Summary of changes: ci/pipelines/geode-build/jinja.template.yml | 2 +- ci/pipelines/shared/jinja.variables.yml | 7 +-- 2 files changed, 6 insertions(+), 3 deletions(-)
[geode] branch support/1.13 updated: GEODE-8744: fix multiple versions of json-smart (#5776)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new a53be62 GEODE-8744: fix multiple versions of json-smart (#5776)
a53be62 is described below
commit a53be62e1390d6032d2e077829a904d29fa42040
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Mon Nov 30 16:43:23 2020 -0800
GEODE-8744: fix multiple versions of json-smart (#5776)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 6 ++
.../org/apache/geode/gradle/plugins/DependencyConstraints.groovy| 1 +
2 files changed, 7 insertions(+)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 4e3dcb9..625f2d8 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -344,6 +344,12 @@
compile
+net.minidev
+json-smart
+2.3
+compile
+
+
net.openhft
compiler
2.3.5
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 3295d8e..985f534 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -135,6 +135,7 @@ class DependencyConstraints implements Plugin {
api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
api(group: 'net.java.dev.jna', name: 'jna', version: '5.5.0')
api(group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0')
+api(group: 'net.minidev', name: 'json-smart', version: '2.3')
api(group: 'net.openhft', name: 'compiler', version: '2.3.5')
api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
api(group: 'net.sourceforge.pmd', name: 'pmd-java', version: '6.22.0')
[geode] branch develop updated (790af0d -> cff59ed)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 790af0d GEODE-8734: Parse netstat file to ensure correct stats are retrieved (#5764) add cff59ed GEODE-8736: maintain geode version for native and docs (#5765) No new revisions were added by this update. Summary of changes: dev-tools/release/create_support_branches.sh | 4 +- dev-tools/release/deploy_rc_pipeline.sh | 12 +++-- dev-tools/release/prepare_rc.sh | 1 + dev-tools/release/promote_rc.sh | 67 +--- dev-tools/release/set_versions.sh| 17 +-- 5 files changed, 87 insertions(+), 14 deletions(-)
[geode-kafka-connector] branch master updated: Correcting Kafka spelling (#4)
This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/geode-kafka-connector.git The following commit(s) were added to refs/heads/master by this push: new f47ce7f Correcting Kafka spelling (#4) f47ce7f is described below commit f47ce7fe4e1d6fafbb8e62dba73dc7156a2ee82a Author: Ashish Choudhary AuthorDate: Tue Dec 1 04:29:57 2020 +0530 Correcting Kafka spelling (#4) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b3a3a2..8c6956b 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,7 @@ Kafka Connect Apache Geode https://geode.apache.org/docs/ -The Apache Geode connector can be used to move data from Kakfa to Geode and vice versa. The Sink take data from a Kafka topic and puts in a region in Geode, while the Source will move any data inserted into Geode region, to Kafka topics . +The Apache Geode connector can be used to move data from Kafka to Geode and vice versa. The Sink take data from a Kafka topic and puts in a region in Geode, while the Source will move any data inserted into Geode region, to Kafka topics . Apache Geode is an in-memory data grid which stores data in a key-value format. When the Geode acts as a Sink, the key value pair is extracted from the Sink Record from the Kafka topic and that key-value pair is stored in Geode regions. When Geode acts as a Source, whenever a key-value pair is inserted into the region, an event is sent to connector containing the data. This data is then placed into the Kafka topic.
[geode] branch support/1.12 updated: GEODE-8419: SSL/TLS protocol and cipher suite configuration is ignored (#5465)
This is an automated email from the ASF dual-hosted git repository.
burcham pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new a6f3ea2 GEODE-8419: SSL/TLS protocol and cipher suite configuration
is ignored (#5465)
a6f3ea2 is described below
commit a6f3ea2f47b5d22410c96293794f62440b79edf4
Author: Bill Burcham
AuthorDate: Fri Oct 2 15:22:08 2020 -0700
GEODE-8419: SSL/TLS protocol and cipher suite configuration is ignored
(#5465)
Configure cipher suites when creating an SSLEngine
(cherry picked from commit 537721ff815cf40eff85fde65db9b5e787471c89)
---
...LSocketHostNameVerificationIntegrationTest.java | 4 +-
.../internal/net/SSLSocketIntegrationTest.java | 5 +-
.../apache/geode/internal/net/SocketCreator.java | 136 +
.../org/apache/geode/internal/tcp/Connection.java | 3 +-
.../geode/internal/net/SocketCreatorJUnitTest.java | 56 +
5 files changed, 176 insertions(+), 28 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
index 91e5f55..a70f3b1 100755
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketHostNameVerificationIntegrationTest.java
@@ -168,7 +168,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
this.clientSocket = clientChannel.socket();
SSLEngine sslEngine =
-this.socketCreator.createSSLEngine(this.localHost.getHostName(), 1234);
+this.socketCreator.createSSLEngine(this.localHost.getHostName(), 1234,
true);
try {
this.socketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
@@ -200,7 +200,7 @@ public class SSLSocketHostNameVerificationIntegrationTest {
try {
socket = serverSocket.accept();
SocketCreator sc =
SocketCreatorFactory.getSocketCreatorForComponent(CLUSTER);
-final SSLEngine sslEngine =
sc.createSSLEngine(this.localHost.getHostName(), 1234);
+final SSLEngine sslEngine =
sc.createSSLEngine(this.localHost.getHostName(), 1234, false);
engine =
sc.handshakeSSLSocketChannel(socket.getChannel(),
sslEngine,
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index 7a3759b..e7ac191 100755
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -217,7 +217,7 @@ public class SSLSocketIntegrationTest {
clientSocket = clientChannel.socket();
NioSslEngine engine =
clusterSocketCreator.handshakeSSLSocketChannel(clientSocket.getChannel(),
-clusterSocketCreator.createSSLEngine("localhost", 1234), 0, true,
+clusterSocketCreator.createSSLEngine("localhost", 1234, true), 0,
true,
ByteBuffer.allocate(65535), new BufferPool(mock(DMStats.class)));
clientChannel.configureBlocking(true);
@@ -264,7 +264,8 @@ public class SSLSocketIntegrationTest {
socket = serverSocket.accept();
SocketCreator sc =
SocketCreatorFactory.getSocketCreatorForComponent(CLUSTER);
engine =
-sc.handshakeSSLSocketChannel(socket.getChannel(),
sc.createSSLEngine("localhost", 1234),
+sc.handshakeSSLSocketChannel(socket.getChannel(),
sc.createSSLEngine("localhost", 1234,
+false),
timeoutMillis,
false,
ByteBuffer.allocate(65535),
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
index 427e758..a232fca 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java
@@ -38,6 +38,8 @@ import java.security.PrivateKey;
import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -47,6 +49,8 @@ import javax.net.ServerSocketFactory;
import javax.net.SocketFactory;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SNIHostName;
+import javax.net.ssl.SNIServerName;
import
[geode] branch feature/GEODE-8419-backport updated (524dd58 -> 467ee63)
This is an automated email from the ASF dual-hosted git repository. burcham pushed a change to branch feature/GEODE-8419-backport in repository https://gitbox.apache.org/repos/asf/geode.git. discard 524dd58 GEODE-8419: backported forward add ee4ff0e GEODE-8432: use regionPath directly instead of getRegion when put eve… (#5464) add 9c22643 GEODE-8475: Resolve a potential dead lock in ParallelGatewaySenderQueue (#5492) add 2ccaf7b GEODE-8584: Message transmission fails with IllegalStateException in socket i/o code (#5605) add 21d77a8 GEODE-8608: StateFlush could hang when the target member is shutdown (#5624) add 65e20b5 GEODE-8651: MsgReader's readHeader and readMessage should be synchron… (#5665) add 06642ea GEODE-8652: NioSslEngine.close() Bypasses Locks (#5666) add 5f14c41 Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 add 43f4890 GEODE-8496: fix rest management test after dependency bump (#5547) add 4060542 Revert "GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020" add bec4704 Revert "GEODE-8652: NioSslEngine.close() Bypasses Locks (#5666)" add 798a245 GEODE-7727: modify sender thread to detect relese of connection (#4751) add 9b2aea9 GEODE-8603: Potentially expand classes identified for CI stressing to include subclasses (#5601) (#5674) add 7f8f882 GEODE-8681: peer-to-peer message loss due to sending connection closing with TLS enabled (#5699) add 3660bb5 Update NioSslEngineTest.java add f80d41a GEODE-8681: peer-to-peer message loss due to sending connection closing with TLS enabled (#5699) (#5714) add 3a89ae5 GEODE-6008: CI Failure: ClientServerHostNameVerificationDistributedTe… (#4839) add 68b8559 * GEODE-8652: NioSslEngine.close() Bypasses Locks (#5712) add d682b66 GEODE-8261: Added a null check for the proxyID. (#5251) add e3ea0ad GEODE-8536: Allow limited retries when creating Lucene IndexWriter (#5659) add 7ef6802 GEODE-8686: Prevent potential deadlock during GII and tombstone GC (#5707) add 6fec62f GEODE-7884: server hangs due to IllegalStateException (#4822) add b027331 GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733) add 741b0b4 GEODE-8682: Bump jetty from 9.4.21.v20190926 to 9.4.33.v20201020 add 3d92903 GEODE-8718: Bump shiro from 1.6.0 to 1.7.0 add ed4644f [GEODE-8661] Use version provided by *-builder-image-family. (#5681) add c9795c3 Update exmples CI to use the builder_image (#5685) add 080c45d cache 1.12 dependencies (not develop) for 1.12 images add 1d0cd58 GEODE-8725: Bump jetty from 9.4.33.v20201020 to 9.4.34.v20201102 add 467ee63 GEODE-8419: SSL/TLS protocol and cipher suite configuration is ignored (#5465) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (524dd58) \ N -- N -- N refs/heads/feature/GEODE-8419-backport (467ee63) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml| 6 +- build.gradle | 29 ++ .../gradle/plugins/DependencyConstraints.groovy| 4 +- ci/docker/cache_dependencies.sh| 2 +- .../scripts/cache_dependencies.sh | 2 +- ci/pipelines/examples/jinja.template.yml | 2 + ci/pipelines/geode-build/jinja.template.yml| 8 +- ci/pipelines/pull-request/jinja.template.yml | 4 + ci/pipelines/shared/jinja.variables.yml| 2 +- ci/scripts/create_instance.sh | 9 +- ci/scripts/repeat-new-tests.sh | 54 ++- .../rest/ListIndexManagementDUnitTest.java | 3 +- .../session/tests/GenericAppServerInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 34 +- .../resources/dependency_classpath.txt | 34 +- .../geode/ClusterCommunicationsDUnitTest.java | 85 +++- ...tServerHostNameVerificationDistributedTest.java | 4 + .../ClusterDistributionManagerDUnitTest.java | 30 ++ .../cache/versions/TombstoneDUnitTest.java | 290 ++--- .../geode/internal/tcp/CloseConnectionTest.java| 89 .../tcp/ConnectionCloseSSLTLSDUnitTest.java| 235 ++ .../geode/internal/tcp/TCPConduitDUnitTest.java| 4 +-
[geode-native] branch develop updated (cbe2528 -> b74f474)
This is an automated email from the ASF dual-hosted git repository.
bbender pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git.
from cbe2528 GEODE-8537: Solve memory increase when LRU eviction is
enabled (#687)
add b74f474 GEODE-8614: Add LowMemoryException exceptions (#688)
No new revisions were added by this update.
Summary of changes:
cppcache/include/geode/ExceptionTypes.hpp | 26 ++
cppcache/integration/test/CMakeLists.txt | 1 +
...PutAllTest.cpp => ExceptionTranslationTest.cpp} | 90 +++--
...n_cacheserver.xml => lowmemory_cacheserver.xml} | 6 +-
cppcache/src/ErrType.hpp | 2 +
cppcache/src/ExceptionTypes.cpp| 385 ++---
cppcache/src/ThinClientRegion.cpp | 7 +
cppcache/test/ExceptionTypesTest.cpp | 16 +
8 files changed, 296 insertions(+), 237 deletions(-)
copy cppcache/integration/test/{RegionPutAllTest.cpp =>
ExceptionTranslationTest.cpp} (52%)
copy cppcache/integration/test/resources/{pdxjson_cacheserver.xml =>
lowmemory_cacheserver.xml} (90%)
[geode] branch develop updated: GEODE-8734: Parse netstat file to ensure correct stats are retrieved (#5764)
This is an automated email from the ASF dual-hosted git repository.
donalevans 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 790af0d GEODE-8734: Parse netstat file to ensure correct stats are
retrieved (#5764)
790af0d is described below
commit 790af0d473bbe2444fb896d8b77c64116c463774
Author: Donal Evans
AuthorDate: Mon Nov 30 12:46:29 2020 -0800
GEODE-8734: Parse netstat file to ensure correct stats are retrieved (#5764)
Authored-by: Donal Evans
---
.../internal/statistics/LinuxSystemStatsTest.java | 66 -
.../statistics/platform/LinuxProcFsStatistics.java | 64 +++--
.../statistics/platform/LinuxSystemStats.java | 280 +
3 files changed, 277 insertions(+), 133 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
index e096be0..61e8766 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/LinuxSystemStatsTest.java
@@ -14,6 +14,14 @@
*/
package org.apache.geode.internal.statistics;
+import static
org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics.TCP_LISTEN_DROPS_NAME;
+import static
org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics.TCP_LISTEN_OVERFLOWS_NAME;
+import static
org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics.TCP_SYNCOOKIES_RECV_NAME;
+import static
org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics.TCP_SYNCOOKIES_SENT_NAME;
+import static
org.apache.geode.internal.statistics.platform.LinuxSystemStats.TCP_EXT_LISTEN_DROPS;
+import static
org.apache.geode.internal.statistics.platform.LinuxSystemStats.TCP_EXT_LISTEN_OVERFLOWS;
+import static
org.apache.geode.internal.statistics.platform.LinuxSystemStats.TCP_EXT_SYN_COOKIES_RECV;
+import static
org.apache.geode.internal.statistics.platform.LinuxSystemStats.TCP_EXT_SYN_COOKIES_SENT;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
@@ -93,7 +101,7 @@ public class LinuxSystemStatsTest extends
StatSamplerTestCase {
// add on 4 clicks 4 idle 0 steal
"cpu 0 0 0 4 0 0 0 0 0 0"};
-doTest(results, 0);
+doStealTimeTest(results, 0);
}
@Test
@@ -102,7 +110,7 @@ public class LinuxSystemStatsTest extends
StatSamplerTestCase {
// add on 4 clicks 3 idle 1 steal
"cpu 0 0 0 3 0 0 0 1 0 0"};
-doTest(results, 25);
+doStealTimeTest(results, 25);
}
@Test
@@ -111,7 +119,7 @@ public class LinuxSystemStatsTest extends
StatSamplerTestCase {
// add on 3 clicks 1 idle 2 steal
"cpu 0 0 0 1 0 0 0 2 0 0"};
-doTest(results, 66);
+doStealTimeTest(results, 66);
}
@Test
@@ -120,10 +128,38 @@ public class LinuxSystemStatsTest extends
StatSamplerTestCase {
// add on 1 clicks 0 idle 1 steal
"cpu 0 0 0 0 0 0 0 1 0 0"};
-doTest(results, 100);
+doStealTimeTest(results, 100);
}
- private void doTest(String[] results, int expectedStatValue) throws
Exception {
+ @Test
+ public void netstatStatsTest() throws Exception {
+long expectedSyncookiesSent = 1L;
+long expectedSyncookiesRecv = 2L;
+long dummyStatValue = -1L;
+long expectedListenOverflows = 3L;
+long expectedListenDrops = 4L;
+
+// This string simulates the contents of the /proc/net/netstat file,
omitting all stats that
+// aren't parsed in the LinuxProcFsStatistics.getNetStatStats() method and
including a dummy
+// stat that should not be parsed
+String mockNetstatStats = "TcpExt: " + TCP_SYNCOOKIES_SENT_NAME + " " +
TCP_SYNCOOKIES_RECV_NAME
++ " DummyStat " + TCP_LISTEN_OVERFLOWS_NAME + " " +
TCP_LISTEN_DROPS_NAME + "\n"
++ "TcpExt: " + expectedSyncookiesSent + " " + expectedSyncookiesRecv +
" " + dummyStatValue
++ " " + expectedListenOverflows + " " + expectedListenDrops;
+
+Answer answer = new MyNetstatAnswer(mockNetstatStats);
+
PowerMockito.whenNew(FileInputStream.class).withArguments(anyString()).thenAnswer(answer);
+
+LinuxProcFsStatistics.refreshSystem(localStats);
+
+Statistics statistics =
getStatisticsManager().findStatisticsByTextId("LinuxSystemStats")[0];
+
assertThat(statistics.getLong(TCP_EXT_SYN_COOKIES_SENT)).isEqualTo(expectedSyncookiesSent);
+
assertThat(statistics.getLong(TCP_EXT_SYN_COOKIES_RECV)).isEqualTo(expectedSyncookiesRecv);
+
assertThat(statistics.getLong(TCP_EXT_LISTEN_OVERFLOWS)).isEqualTo(expectedListenOverflows);
+
assertThat(statistics.getLong(TCP_EXT_LISTEN_DROPS)).isEqualTo(expectedListenDrops);
+ }
+
+ private
[geode] branch develop updated: GEODE-8623: Retry getting local host if it fails. (#5743)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao 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 5deb409 GEODE-8623: Retry getting local host if it fails. (#5743)
5deb409 is described below
commit 5deb409fe5498845b1365463b11f7a8d558c55f7
Author: Jinmei Liao
AuthorDate: Mon Nov 30 11:39:18 2020 -0800
GEODE-8623: Retry getting local host if it fails. (#5743)
Co-authored-by: Jacob Barrett
---
geode-common/build.gradle | 1 +
...utRequiredForBackwardsCompatibilityTesting.java | 48 ++
...eprecationForBackwardsCompatibilityTesting.java | 46 ++
.../main/java/org/apache/geode/internal/Retry.java | 101 +
.../apache/geode/internal/inet/LocalHostUtil.java | 31 +--
.../java/org/apache/geode/internal/RetryTest.java | 93 +++
.../apache/geode/internal/net/SocketCreator.java | 5 +-
.../org/apache/geode/test/dunit/NetworkUtils.java | 3 +
.../TcpServerProductVersionDUnitTest.java | 2 +
9 files changed, 322 insertions(+), 8 deletions(-)
diff --git a/geode-common/build.gradle b/geode-common/build.gradle
index c61a74f..60f867d 100755
--- a/geode-common/build.gradle
+++ b/geode-common/build.gradle
@@ -30,6 +30,7 @@ dependencies {
// test
testImplementation('junit:junit')
testImplementation('org.assertj:assertj-core')
+ testImplementation('org.mockito:mockito-core')
// jmhTest
diff --git
a/geode-common/src/main/java/org/apache/geode/annotations/internal/DeprecatedButRequiredForBackwardsCompatibilityTesting.java
b/geode-common/src/main/java/org/apache/geode/annotations/internal/DeprecatedButRequiredForBackwardsCompatibilityTesting.java
new file mode 100644
index 000..de8f08f
--- /dev/null
+++
b/geode-common/src/main/java/org/apache/geode/annotations/internal/DeprecatedButRequiredForBackwardsCompatibilityTesting.java
@@ -0,0 +1,48 @@
+/*
+ * 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.annotations.internal;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.LOCAL_VARIABLE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PACKAGE;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates a deprecated element that must remain in place for backwards
compatibility testing.
+ * Tests which utilize this element should be marked with
+ * {@link SuppressDeprecationForBackwardsCompatibilityTesting}.
+ *
+ * Should be paired with {@link Deprecated}.
+ */
+@Documented
+@Retention(RetentionPolicy.SOURCE)
+@Target(value = {CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE,
PARAMETER, TYPE})
+@Inherited
+public @interface DeprecatedButRequiredForBackwardsCompatibilityTesting {
+
+ /** Optional description */
+ String value() default "";
+
+}
diff --git
a/geode-common/src/main/java/org/apache/geode/annotations/internal/SuppressDeprecationForBackwardsCompatibilityTesting.java
b/geode-common/src/main/java/org/apache/geode/annotations/internal/SuppressDeprecationForBackwardsCompatibilityTesting.java
new file mode 100644
index 000..5a8af6c
--- /dev/null
+++
b/geode-common/src/main/java/org/apache/geode/annotations/internal/SuppressDeprecationForBackwardsCompatibilityTesting.java
@@ -0,0 +1,46 @@
+/*
+ * 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
[geode] branch develop updated (b7afc60 -> a6942e7)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from b7afc60 GEODE-8721: member that should become coordinator never detects loss of current coordinator (#5758) add a6942e7 GEODE-8664: Nest errors in DistributionImpl.start (#5751) No new revisions were added by this update. Summary of changes: .../apache/geode/distributed/LocatorDUnitTest.java | 3 +-- .../distributed/LocatorUDPSecurityDUnitTest.java | 2 +- .../distributed/internal/DistributionImpl.java | 4 ++-- .../distributed/internal/DistributionTest.java | 26 +- 4 files changed, 29 insertions(+), 6 deletions(-)
[geode-native] branch develop updated (fcf95b3 -> cbe2528)
This is an automated email from the ASF dual-hosted git repository.
bbender pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git.
from fcf95b3 parameterize GEODE_VERSION so that Geode release scripts can
maintain this going forward
add cbe2528 GEODE-8537: Solve memory increase when LRU eviction is
enabled (#687)
No new revisions were added by this update.
Summary of changes:
cppcache/integration-test/CMakeLists.txt | 1 -
cppcache/integration-test/testLRUList.cpp | 194 --
cppcache/integration-test/testRegionMap.cpp| 47
cppcache/integration/test/CMakeLists.txt | 1 +
cppcache/integration/test/LRUEvictionTest.cpp | 294 +
cppcache/src/EvictionController.cpp| 158 +--
cppcache/src/EvictionController.hpp| 40 ++-
cppcache/src/EvictionThread.cpp| 77 --
cppcache/src/EvictionThread.hpp| 61 -
cppcache/src/LRUAction.cpp | 4 +-
cppcache/src/LRUEntriesMap.cpp | 141 +-
cppcache/src/LRUEntriesMap.hpp | 12 +-
.../LRUEntryProperties.hpp}| 56 ++--
cppcache/src/LRUExpMapEntry.hpp| 2 +-
cppcache/src/LRUList.cpp | 138 --
cppcache/src/LRUList.hpp | 161 ---
cppcache/src/LRUMapEntry.hpp | 2 +-
cppcache/src/LRUQueue.cpp | 87 ++
cppcache/src/LRUQueue.hpp | 99 +++
cppcache/src/LocalRegion.cpp | 4 +-
cppcache/src/LocalRegion.hpp | 2 +-
cppcache/src/RegionInternal.hpp| 2 +-
cppcache/test/CMakeLists.txt | 6 +-
cppcache/test/LRUQueueTest.cpp | 149 +++
.../mock/MapEntryImplMock.hpp} | 30 ++-
25 files changed, 832 insertions(+), 936 deletions(-)
delete mode 100644 cppcache/integration-test/testLRUList.cpp
create mode 100644 cppcache/integration/test/LRUEvictionTest.cpp
delete mode 100644 cppcache/src/EvictionThread.cpp
delete mode 100644 cppcache/src/EvictionThread.hpp
copy cppcache/{include/geode/DefaultResultCollector.hpp =>
src/LRUEntryProperties.hpp} (52%)
delete mode 100644 cppcache/src/LRUList.cpp
delete mode 100644 cppcache/src/LRUList.hpp
create mode 100644 cppcache/src/LRUQueue.cpp
create mode 100644 cppcache/src/LRUQueue.hpp
create mode 100644 cppcache/test/LRUQueueTest.cpp
copy cppcache/{include/geode/ResultSet.hpp => test/mock/MapEntryImplMock.hpp}
(60%)
[geode] branch develop updated (217be41 -> b7afc60)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 217be41 GEODE-8496: top up dependency updates (#5772) add b7afc60 GEODE-8721: member that should become coordinator never detects loss of current coordinator (#5758) No new revisions were added by this update. Summary of changes: .../gms/fd/GMSHealthMonitorJUnitTest.java | 51 ++ .../membership/gms/fd/GMSHealthMonitor.java| 19 ++-- 2 files changed, 66 insertions(+), 4 deletions(-)
