[geode] branch develop updated: GEODE-9669: Improve reporting of Radish mem_fragmentation_ratio (#7127)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe 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 e69590e GEODE-9669: Improve reporting of Radish
mem_fragmentation_ratio (#7127)
e69590e is described below
commit e69590e1061c0184385c1b2305f7593b1ec3f01a
Author: Jens Deppe
AuthorDate: Tue Nov 30 05:13:35 2021 -0800
GEODE-9669: Improve reporting of Radish mem_fragmentation_ratio (#7127)
- For this implementation, this value is the ratio of total amount of
memory available to the JVM (Java heap) vs. the amount of memory
used by the JVM.
---
.../AbstractRedisInfoStatsIntegrationTest.java | 2 --
.../AbstractAppendMemoryIntegrationTest.java | 16 +
.../commands/executor/server/InfoExecutor.java | 38 +-
3 files changed, 40 insertions(+), 16 deletions(-)
diff --git
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/server/AbstractRedisInfoStatsIntegrationTest.java
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/server/AbstractRedisInfoStatsIntegrationTest.java
index 480619f..30c1edc 100644
---
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/server/AbstractRedisInfoStatsIntegrationTest.java
+++
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/server/AbstractRedisInfoStatsIntegrationTest.java
@@ -28,7 +28,6 @@ import org.assertj.core.data.Offset;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import redis.clients.jedis.Jedis;
@@ -142,7 +141,6 @@ public abstract class AbstractRedisInfoStatsIntegrationTest
implements RedisInte
assertThat(Long.valueOf(getInfo(jedis).get(USED_MEMORY))).isGreaterThan(0);
}
- @Ignore("tracked by GEODE-9669") // currently we return 1.0
@Test
public void memFragmentation_shouldBeGreaterThanOne() {
for (int i = 0; i < 1; i++) {
diff --git
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/string/AbstractAppendMemoryIntegrationTest.java
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/string/AbstractAppendMemoryIntegrationTest.java
index 05bea0b..e1e44e9 100644
---
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/string/AbstractAppendMemoryIntegrationTest.java
+++
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/string/AbstractAppendMemoryIntegrationTest.java
@@ -16,6 +16,7 @@ package
org.apache.geode.redis.internal.commands.executor.string;
import static org.assertj.core.api.Assertions.assertThat;
+import java.time.Duration;
import java.util.Map;
import org.junit.After;
@@ -45,21 +46,24 @@ public abstract class AbstractAppendMemoryIntegrationTest
implements RedisIntegr
@Test
public void testAppend_actuallyIncreasesBucketSize() {
-int listSize = 1000;
+int listSize = 100_000;
String key = "key";
-Map info = RedisTestHelper.getInfo(jedis);
-Long previousMemValue = Long.valueOf(info.get("used_memory"));
+System.gc();
+Long startingMemValue = getUsedMemory(jedis);
jedis.set(key, "initial");
for (int i = 0; i < listSize; i++) {
jedis.append(key, "morestuff");
}
-info = RedisTestHelper.getInfo(jedis);
-Long finalMemValue = Long.valueOf(info.get("used_memory"));
+
GeodeAwaitility.await().atMost(Duration.ofSeconds(20)).pollInterval(Duration.ofSeconds(1))
+.untilAsserted(() ->
assertThat(getUsedMemory(jedis)).isGreaterThan(startingMemValue));
+ }
-assertThat(finalMemValue).isGreaterThan(previousMemValue);
+ private Long getUsedMemory(Jedis jedis) {
+Map info = RedisTestHelper.getInfo(jedis);
+return Long.valueOf(info.get("used_memory"));
}
}
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/server/InfoExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/server/InfoExecutor.java
index 2a3c420..08192df 100644
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/server/InfoExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/server/InfoExecutor.java
@@ -31,7 +31,6 @@ import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.List;
-import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.redis.internal.commands.Command;
import org.apache.geode.redis.internal.commands.executor.CommandExecutor;
import org.apache.geode.redis.internal.commands.executor.RedisResponse;
@@ -77,7 +76,7
[geode-benchmarks] branch develop updated: GEODE-9862: protect from jgit6.0.0 when building older Geodes for benchmarks
This is an automated email from the ASF dual-hosted git repository.
rhoughton pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new caa17e2 GEODE-9862: protect from jgit6.0.0 when building older Geodes
for benchmarks
caa17e2 is described below
commit caa17e273b04eabf13b66a014042b73f97e457d0
Author: Sean Goller
AuthorDate: Tue Nov 30 09:29:00 2021 -0800
GEODE-9862: protect from jgit6.0.0 when building older Geodes for benchmarks
---
infrastructure/scripts/aws/run_tests.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure/scripts/aws/run_tests.sh
b/infrastructure/scripts/aws/run_tests.sh
index 9617658..64f1233 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -171,6 +171,7 @@ if [[ -z "${VERSION}" ]]; then
|| remoteShell rm -rf geode '&&' git clone "${REPO}" geode
fi
remoteShell "cd geode && git checkout \"${BRANCH}\" && [ \"\$(git rev-parse
--abbrev-ref --symbolic-full-name HEAD)\" == \"HEAD\" ] || git reset --hard
\"origin/${BRANCH}\""
+ remoteShell "cd geode && echo \"dependencies {
runtimeOnly('org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r') }\" >>
./buildSrc/build.gradle"
set +e
for i in {1..5}; do
[geode] branch develop updated (607c30c -> a24fceb)
This is an automated email from the ASF dual-hosted git repository. burcham pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 607c30c GEODE-9811: Turn UnavailableSecurityManagerException into CacheClosedException (#7148) add a24fceb GEODE-9396: Translate Old Member IP to Name for Endpoint ID (#7119) No new revisions were added by this update. Summary of changes: .../DeploymentManagementUpgradeTest.java | 4 +- .../management/OperationManagementUpgradeTest.java | 16 +- .../RollingUpgradeWithGfshDUnitTest.java | 25 +- .../management/RollingUpgradeWithSslDUnitTest.java | 276 + .../org/apache/geode/management/gemfire.properties | 3 +- .../RestrictUseOfInetAddressJUnitTest.java | 2 +- .../apache/geode/internal/net/SocketCreator.java | 6 +- .../org/apache/geode/internal/tcp/Connection.java | 137 ++ .../geode/test/junit/rules/gfsh/GfshRule.java | 10 +- 9 files changed, 403 insertions(+), 76 deletions(-) create mode 100644 geode-assembly/src/upgradeTest/java/org/apache/geode/management/RollingUpgradeWithSslDUnitTest.java copy geode-core/src/main/resources/META-INF/services/org.apache.geode.internal.version.ComponentVersion => geode-assembly/src/upgradeTest/resources/org/apache/geode/management/gemfire.properties (92%)
[geode] branch develop updated (e69590e -> 2b523e1)
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 e69590e GEODE-9669: Improve reporting of Radish mem_fragmentation_ratio (#7127) add 2b523e1 GEODE-9855: Radish authentication during HA test (#7146) No new revisions were added by this update. Summary of changes: .../test/dunit/rules/SerializableFunction.java | 7 ++ .../test/dunit/rules/RedisClusterStartupRule.java | 18 ++- .../auth/AuthWhileServersRestartDUnitTest.java | 130 + 3 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/executor/auth/AuthWhileServersRestartDUnitTest.java
[geode] branch develop updated (2b523e1 -> 607c30c)
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 2b523e1 GEODE-9855: Radish authentication during HA test (#7146) add 607c30c GEODE-9811: Turn UnavailableSecurityManagerException into CacheClosedException (#7148) No new revisions were added by this update. Summary of changes: .../internal/security/IntegratedSecurityService.java | 18 +++--- .../security/IntegratedSecurityServiceTest.java| 12 2 files changed, 27 insertions(+), 3 deletions(-)
[geode] 01/01: GEODE-9862: pin Gradle use of jgit (#7152)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch geode-for-redis-benchmark-baseline
in repository https://gitbox.apache.org/repos/asf/geode.git
commit fd3396a114b65ac74161a24610a3160c55b4ff8e
Author: Robert Houghton
AuthorDate: Mon Nov 29 16:12:07 2021 -0800
GEODE-9862: pin Gradle use of jgit (#7152)
* dependency of grgit used in GemFireVersion.properties
Authored-by: Robert Houghton
(cherry picked from commit 5d89d4f6e6ded010d05434e76d7baed6c7e9db28)
---
buildSrc/build.gradle | 3 +++
1 file changed, 3 insertions(+)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 5116d5b..70e4d46 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -38,6 +38,9 @@ dependencies {
implementation('me.champeau.gradle:japicmp-gradle-plugin:0.3.0')
implementation('junit:junit:4.13.2')
+ // Pin jgit to 5.13.0 to fix grgit having open dependencies on jgit, which
rolled to java 11 with version 6.
+ runtimeOnly('org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r')
+
testAnnotationProcessor(this.project)
}
[geode] branch geode-for-redis-benchmark-baseline created (now fd3396a)
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a change to branch geode-for-redis-benchmark-baseline in repository https://gitbox.apache.org/repos/asf/geode.git. at fd3396a GEODE-9862: pin Gradle use of jgit (#7152) This branch includes the following new commits: new fd3396a GEODE-9862: pin Gradle use of jgit (#7152) The 1 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.
[geode-benchmarks] branch develop updated: Revert "GEODE-9862: protect from jgit6.0.0 when building older Geodes for benchmarks"
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/develop by this push:
new 8bdfeb6 Revert "GEODE-9862: protect from jgit6.0.0 when building
older Geodes for benchmarks"
8bdfeb6 is described below
commit 8bdfeb6790ffd1af5cfe6bba6392ee594824ea3d
Author: Jens Deppe
AuthorDate: Tue Nov 30 15:08:37 2021 -0800
Revert "GEODE-9862: protect from jgit6.0.0 when building older Geodes for
benchmarks"
This reverts commit caa17e273b04eabf13b66a014042b73f97e457d0.
---
infrastructure/scripts/aws/run_tests.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/infrastructure/scripts/aws/run_tests.sh
b/infrastructure/scripts/aws/run_tests.sh
index 64f1233..9617658 100755
--- a/infrastructure/scripts/aws/run_tests.sh
+++ b/infrastructure/scripts/aws/run_tests.sh
@@ -171,7 +171,6 @@ if [[ -z "${VERSION}" ]]; then
|| remoteShell rm -rf geode '&&' git clone "${REPO}" geode
fi
remoteShell "cd geode && git checkout \"${BRANCH}\" && [ \"\$(git rev-parse
--abbrev-ref --symbolic-full-name HEAD)\" == \"HEAD\" ] || git reset --hard
\"origin/${BRANCH}\""
- remoteShell "cd geode && echo \"dependencies {
runtimeOnly('org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r') }\" >>
./buildSrc/build.gradle"
set +e
for i in {1..5}; do
[geode] branch develop updated (a24fceb -> 673d447)
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 a24fceb GEODE-9396: Translate Old Member IP to Name for Endpoint ID (#7119) add 673d447 GEODE-9863: Point redis benchmarks at geode-for-redis-benchmark-baseline branch (#7154) No new revisions were added by this update. Summary of changes: ci/pipelines/shared/jinja.variables.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
