[geode] branch develop updated: GEODE-8496: Bump dependencies once more (#5883)
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.git
The following commit(s) were added to refs/heads/develop by this push:
new dc5dfef GEODE-8496: Bump dependencies once more (#5883)
dc5dfef is described below
commit dc5dfef2c98c99d57a4857bfbabed5c8beff6924
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Thu Jan 7 21:20:08 2021 -0800
GEODE-8496: Bump dependencies once more (#5883)
* Bump mockito from 3.6.28 to 3.7.0
* Bump bouncycastle from 1.67 to 1.68
* Bump cargo from 1.8.3 to 1.8.4
* Bump jedis from 3.4.0 to 3.4.1
* Bump spotless from 5.8.2 to 5.9.0
* Bump nebula.lint from 16.15.9 to 16.17.0
---
boms/geode-all-bom/src/test/resources/expected-pom.xml| 8
build.gradle | 4 ++--
.../org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 8
dev-tools/dependencies/bump.sh| 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
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 acab8be..e1f5a2b 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -424,13 +424,13 @@
org.bouncycastle
bcpkix-jdk15on
-1.67
+1.68
compile
org.codehaus.cargo
cargo-core-uberjar
-1.8.3
+1.8.4
compile
@@ -472,7 +472,7 @@
org.mockito
mockito-core
-3.6.28
+3.7.0
compile
@@ -538,7 +538,7 @@
redis.clients
jedis
-3.4.0
+3.4.1
compile
diff --git a/build.gradle b/build.gradle
index 14cf918..98a557e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -21,9 +21,9 @@ plugins {
id "base"
id "idea"
id "eclipse"
- id "com.diffplug.spotless" version "5.8.2" apply false
+ id "com.diffplug.spotless" version "5.9.0" apply false
id "com.github.ben-manes.versions" version "0.36.0" apply false
- id "nebula.lint" version "16.15.9" apply false
+ id "nebula.lint" version "16.17.0" apply false
id "com.palantir.docker" version "0.22.1" apply false
id "io.spring.dependency-management" version "1.0.10.RELEASE" apply false
id "org.ajoberstar.grgit" version "4.1.0" apply false
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 dd6575b..79f3fad 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
@@ -149,15 +149,15 @@ class DependencyConstraints implements Plugin {
api(group: 'org.apache.shiro', name: 'shiro-core', version:
get('shiro.version'))
api(group: 'org.assertj', name: 'assertj-core', version: '3.18.1')
api(group: 'org.awaitility', name: 'awaitility', version: '4.0.3')
-api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.67')
-api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version:
'1.8.3')
+api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.68')
+api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version:
'1.8.4')
api(group: 'org.eclipse.jetty', name: 'jetty-server', version:
get('jetty.version'))
api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version:
get('jetty.version'))
api(group: 'org.eclipse.persistence', name: 'javax.persistence',
version: '2.2.1')
api(group: 'org.httpunit', name: 'httpunit', version: '1.7.3')
api(group: 'org.iq80.snappy', name: 'snappy', version: '0.4')
api(group: 'org.jgroups', name: 'jgroups', version:
get('jgroups.version'))
-api(group: 'org.mockito', name: 'mockito-core', version: '3.6.28')
+api(group: 'org.mockito', name: 'mockito-core', version: '3.7.0')
api(group: 'org.mortbay.jetty', name: 'servlet-api', version:
'3.0.20100224')
api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.26')
api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
@@ -168,7 +168,7 @@ class DependencyConstraints implements Plugin {
api(group: 'org.springframework.shell', name: 'spring-shell', version:
'1.2.0.RELEASE')
api(group: 'org.testcontainers', name: 'testcontainers', version:
'1.14.3')
api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
-api(group: 'redis.clients', name: 'jedis', version: '3.4.0')
+
[geode] branch develop updated: GEODE-8790: Evicted entries sometimes remain in region map (#5851)
This is an automated email from the ASF dual-hosted git repository.
eshu11 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 2049768 GEODE-8790: Evicted entries sometimes remain in region map
(#5851)
2049768 is described below
commit 2049768ba20aa44a587612f0d328eeaf6e9b1ad8
Author: Louis Jacome
AuthorDate: Thu Jan 7 18:33:15 2021 -0800
GEODE-8790: Evicted entries sometimes remain in region map (#5851)
- Modifies regionMapDestroy.retryRemoveWithTombstone to handle case where
an evicted entry was left in the region map when concurrency checks is enabled
---
.../apache/geode/internal/cache/map/RegionMapDestroy.java| 12 +---
.../apache/geode/internal/cache/AbstractRegionMapTest.java | 6 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/map/RegionMapDestroy.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/map/RegionMapDestroy.java
index c21dddb..5b2e779 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/map/RegionMapDestroy.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/map/RegionMapDestroy.java
@@ -366,11 +366,17 @@ public class RegionMapDestroy {
retry = true;
doContinue = true;
return;
-} else if (!isEviction) {
+} else {
try {
-handleEntryNotFound();
+if (!isEviction) {
+ handleEntryNotFound();
+}
} finally {
-removeEntryOrLeaveTombstone();
+if (isEviction && newRegionEntry.isTombstone()) {
+ return;
+} else {
+ removeEntryOrLeaveTombstone();
+}
}
}
} // synchronized(newRegionEntry)
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
index 987effc..70afcc4 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionMapTest.java
@@ -634,11 +634,7 @@ public class AbstractRegionMapTest {
anyBoolean(), anyBoolean());
verify(arm._getOwner(), never()).basicDestroyPart3(any(), any(),
anyBoolean(), anyBoolean(),
anyBoolean(), any());
-// This seems to be a bug. We should not leave an entry in the map
-// added by the destroy call if destroy returns false.
-assertThat(arm.getEntryMap().containsKey(event.getKey())).isTrue();
-RegionEntry re = (RegionEntry) arm.getEntryMap().get(event.getKey());
-assertThat(re.getValueAsToken()).isEqualTo(Token.REMOVED_PHASE1);
+assertThat(arm.getEntryMap().containsKey(event.getKey())).isFalse();
}
@Test
[geode] branch develop updated (5f2a1fa -> b7774f4)
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 5f2a1fa GEODE-8813: fix the flaky test by not using the same region name in multiple tests (#5884) add b7774f4 GEODE-8819: StressNewTestHelper should handle non org.apache.geode changed files (#5885) No new revisions were added by this update. Summary of changes: .../main/java/org/apache/geode/test/util/StressNewTestHelper.java | 8 +++- .../java/org/apache/geode/test/util/WhatExtendsJUnitTest.java | 6 ++ 2 files changed, 13 insertions(+), 1 deletion(-)
[geode-examples] branch develop updated: GEODE-8496: Bump gradle from 5.4 to 5.5 to match geode
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-examples.git The following commit(s) were added to refs/heads/develop by this push: new 15e25f7 GEODE-8496: Bump gradle from 5.4 to 5.5 to match geode 15e25f7 is described below commit 15e25f7c6a0e1d3f8a1993416d5d77d0d61f4e1c Author: Owen Nichols AuthorDate: Thu Jan 7 12:32:53 2021 -0800 GEODE-8496: Bump gradle from 5.4 to 5.5 to match geode --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e36600c..f7186c7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
[geode] branch develop updated (81cd180 -> 5f2a1fa)
This is an automated email from the ASF dual-hosted git repository. jinmeiliao pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 81cd180 GEODE-8786 redis info command hit miss ratios (#5875) add 5f2a1fa GEODE-8813: fix the flaky test by not using the same region name in multiple tests (#5884) No new revisions were added by this update. Summary of changes: .../cli/commands/CreateRegionCommandDUnitTest.java | 64 +- 1 file changed, 27 insertions(+), 37 deletions(-)
[geode] branch develop updated (5209009 -> 81cd180)
This is an automated email from the ASF dual-hosted git repository.
heybales pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 5209009 GEODE-8814: StressNewTestHelper is not specifying multiple
tests correctly (#5881)
add 81cd180 GEODE-8786 redis info command hit miss ratios (#5875)
No new revisions were added by this update.
Summary of changes:
.../HitsMissesNativeRedisAcceptanceTest.java | 6 -
.../redis/internal/RedisStatsIntegrationTest.java | 42 -
.../server/AbstractHitsMissesIntegrationTest.java | 174 +++--
...ionTest.java => HitsMissesIntegrationTest.java} | 2 +-
.../geode/redis/internal/GeodeRedisServer.java | 2 +-
.../redis/internal/PassiveExpirationManager.java | 2 +-
.../redis/internal/RedisCommandSupportLevel.java | 3 +-
.../geode/redis/internal/RedisCommandType.java | 14 +-
.../geode/redis/internal/data/CommandHelper.java | 53 ---
.../geode/redis/internal/data/NullRedisSet.java| 4 +-
.../geode/redis/internal/data/NullRedisString.java | 2 +-
.../data/RedisHashCommandsFunctionExecutor.java| 38 +++--
.../data/RedisKeyCommandsFunctionExecutor.java | 5 +
.../data/RedisSetCommandsFunctionExecutor.java | 32 ++--
.../data/RedisStringCommandsFunctionExecutor.java | 43 ++---
.../redis/internal/executor/CommandFunction.java | 4 +
.../internal/executor/hash/HScanExecutor.java | 1 +
.../internal/executor/key/RedisKeyCommands.java| 2 +
.../key/RedisKeyCommandsFunctionInvoker.java | 6 +
.../internal/executor/set/RedisSetCommands.java| 2 +
.../set/RedisSetCommandsFunctionInvoker.java | 6 +
.../redis/internal/executor/set/SScanExecutor.java | 1 +
.../redis/internal/statistics/RedisStats.java | 3 -
.../redis/internal/SupportedCommandsJUnitTest.java | 27
24 files changed, 332 insertions(+), 142 deletions(-)
copy
geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/{DBSizeIntegrationTest.java
=> HitsMissesIntegrationTest.java} (92%)
[geode] branch support/1.12 updated: GEODE-8796: doc max-threads incompatible with TLS (#5860)
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 6f1e56a GEODE-8796: doc max-threads incompatible with TLS (#5860) 6f1e56a is described below commit 6f1e56a1ab3ccf8d1a5a2d58121aac26dac16272 Author: Bill Burcham AuthorDate: Fri Dec 18 14:22:23 2020 -0800 GEODE-8796: doc max-threads incompatible with TLS (#5860) (cherry picked from commit 3e4db05c529bfff499b27d3decd0b7a368f9f9a0) --- geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb index 165257e..94e94a0 100644 --- a/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb +++ b/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb @@ -723,7 +723,7 @@ See Overview of \-\-max-threads -Sets the maximum number of threads allowed in this cache server to service client requests. The default of 0 causes the cache server to dedicate a thread for every client connection. +Sets the maximum number of threads allowed in this cache server to service client requests. The default of 0 causes the cache server to dedicate a thread for every client connection. When client-server TLS/SSL is configured, values other than the default are not supported.
[geode] branch support/1.13 updated: GEODE-8796: doc max-threads incompatible with TLS (#5860)
This is an automated email from the ASF dual-hosted git repository. burcham 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 0a6be20 GEODE-8796: doc max-threads incompatible with TLS (#5860) 0a6be20 is described below commit 0a6be203357e69aa727765a8c5205da13b1b2696 Author: Bill Burcham AuthorDate: Fri Dec 18 14:22:23 2020 -0800 GEODE-8796: doc max-threads incompatible with TLS (#5860) (cherry picked from commit 3e4db05c529bfff499b27d3decd0b7a368f9f9a0) --- geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb index 165257e..94e94a0 100644 --- a/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb +++ b/geode-docs/tools_modules/gfsh/command-pages/start.html.md.erb @@ -723,7 +723,7 @@ See Overview of \-\-max-threads -Sets the maximum number of threads allowed in this cache server to service client requests. The default of 0 causes the cache server to dedicate a thread for every client connection. +Sets the maximum number of threads allowed in this cache server to service client requests. The default of 0 causes the cache server to dedicate a thread for every client connection. When client-server TLS/SSL is configured, values other than the default are not supported.
[geode] branch develop updated (17b7911 -> 5209009)
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 17b7911 GEODE-8800: Slower receiver is not allowed with cluster TLS/SSL (#5879) add 5209009 GEODE-8814: StressNewTestHelper is not specifying multiple tests correctly (#5881) No new revisions were added by this update. Summary of changes: .../main/java/org/apache/geode/test/util/StressNewTestHelper.java | 3 +-- .../java/org/apache/geode/test/util/WhatExtendsJUnitTest.java | 8 2 files changed, 5 insertions(+), 6 deletions(-)
