[geode] branch develop updated (567460f -> c106e01)
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.git. from 567460f GEODE-9627: Add service provider interface to register DataSerializableFixedIDs (#6891) add c106e01 GEODE-9369: Command to copy region entries from a WAN site to another (#6833) No new revisions were added by this update. Summary of changes: .../source/subnavs/geode-subnav.erb|1 + .../cache30/DistributedAckRegionCCEDUnitTest.java |2 +- .../geode/internal/cache/EnumListenerEvent.java| 24 +- .../apache/geode/internal/cache/LocalRegion.java |7 +- .../cache/tier/sockets/CacheServerStats.java |4 +- .../sockets/command/GatewayReceiverCommand.java| 11 +- .../internal/cache/tier/sockets/command/Put70.java |2 +- .../wan/GatewaySenderEventCallbackDispatcher.java |9 + .../cache/wan/GatewaySenderEventDispatcher.java|9 + .../internal/cache/wan/GatewaySenderEventImpl.java | 13 +- .../internal/cache/EnumListenerEventJUnitTest.java |3 +- .../cache/tier/sockets/command/Put70Test.java |2 +- .../cache/wan/GatewaySenderEventImplTest.java | 36 +- .../gfsh/command-pages/wan_copy_region.html.md.erb | 192 +++ .../gfsh/gfsh_command_index.html.md.erb|5 +- .../gfsh/quick_ref_commands_by_area.html.md.erb|1 + .../GfshParserAutoCompletionIntegrationTest.java |6 +- geode-wan/build.gradle |1 + .../commands/WanCopyRegionCommandDUnitTest.java| 1402 .../geode/internal/cache/wan/WANTestBase.java | 271 ++-- ...arallelWANPropagationClientServerDUnitTest.java |4 +- .../WanCommandAutoCompletionIntegrationTest.java | 50 + .../GatewaySenderEventRemoteDispatcher.java| 20 + .../wan/internal/WanCopyRegionFunctionService.java | 123 ++ ...gionFunctionServiceAlreadyRunningException.java | 10 +- .../cli/commands/WanCopyRegionCommand.java | 138 ++ .../client/locator/GatewaySenderBatchOp.java |6 +- .../cli/functions/WanCopyRegionFunction.java | 209 +++ .../functions/WanCopyRegionFunctionDelegate.java | 386 ++ .../org.apache.geode.internal.cache.CacheService |1 + .../org.springframework.shell.core.CommandMarker |1 + .../sanctioned-geode-wan-serializables.txt |6 + .../internal/WanCopyRegionFunctionServiceTest.java | 186 +++ .../cli/commands/WanCopyRegionCommandTest.java | 49 + .../WanCopyRegionFunctionDelegateTest.java | 575 .../cli/functions/WanCopyRegionFunctionTest.java | 142 ++ geode-wan/src/test/resources/expected-pom.xml |5 + 37 files changed, 3734 insertions(+), 178 deletions(-) create mode 100644 geode-docs/tools_modules/gfsh/command-pages/wan_copy_region.html.md.erb create mode 100644 geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDUnitTest.java create mode 100644 geode-wan/src/integrationTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCommandAutoCompletionIntegrationTest.java create mode 100644 geode-wan/src/main/java/org/apache/geode/cache/wan/internal/WanCopyRegionFunctionService.java copy geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/Identifiable.java => geode-wan/src/main/java/org/apache/geode/cache/wan/internal/WanCopyRegionFunctionServiceAlreadyRunningException.java (76%) create mode 100644 geode-wan/src/main/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommand.java create mode 100644 geode-wan/src/main/java/org/apache/geode/management/internal/cli/functions/WanCopyRegionFunction.java create mode 100644 geode-wan/src/main/java/org/apache/geode/management/internal/cli/functions/WanCopyRegionFunctionDelegate.java create mode 100644 geode-wan/src/main/resources/META-INF/services/org.apache.geode.internal.cache.CacheService create mode 100644 geode-wan/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker create mode 100644 geode-wan/src/test/java/org/apache/geode/cache/wan/internal/WanCopyRegionFunctionServiceTest.java create mode 100644 geode-wan/src/test/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandTest.java create mode 100644 geode-wan/src/test/java/org/apache/geode/management/internal/cli/functions/WanCopyRegionFunctionDelegateTest.java create mode 100644 geode-wan/src/test/java/org/apache/geode/management/internal/cli/functions/WanCopyRegionFunctionTest.java
[geode-benchmarks] branch develop updated: Suppressing extra output in the dump_results.sh script
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout 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 89e016b Suppressing extra output in the dump_results.sh script
89e016b is described below
commit 89e016b0d2a4e18147875cf0f072055703f307b9
Author: Dan Smith
AuthorDate: Wed Oct 13 21:13:47 2021 -0700
Suppressing extra output in the dump_results.sh script
Suppressing gradle and pushd/popd logging in the dump_results.sh script.
---
geode-benchmarks/build.gradle | 2 +-
infrastructure/scripts/aws/dump_results.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/geode-benchmarks/build.gradle b/geode-benchmarks/build.gradle
index 05537ba..73db68c 100644
--- a/geode-benchmarks/build.gradle
+++ b/geode-benchmarks/build.gradle
@@ -57,7 +57,7 @@ configurations {
dependencies {
geodeVersionResolver(group: 'org.apache.geode', name: 'geode-core', version:
geodeVersion)
geodeVersion =
configurations.geodeVersionResolver.resolvedConfiguration.resolvedArtifacts.find
{it.name == 'geode-core'}.moduleVersion.id.version
- println "Building with Geode ${geodeVersion}."
+ logger.info("Building with Geode ${geodeVersion}.")
implementation platform("org.apache.geode:geode-all-bom:${geodeVersion}")
diff --git a/infrastructure/scripts/aws/dump_results.sh
b/infrastructure/scripts/aws/dump_results.sh
index b11cfcd..3d8bf92 100755
--- a/infrastructure/scripts/aws/dump_results.sh
+++ b/infrastructure/scripts/aws/dump_results.sh
@@ -20,6 +20,6 @@ set -e
TOP_DIR=$(git rev-parse --show-toplevel)
WORKING_DIR=$(pwd)
-pushd ${TOP_DIR}
-./gradlew dumpRun -PdumpWorkingDir="${WORKING_DIR}" --args "$*"
-popd
+pushd ${TOP_DIR} > /dev/null
+./gradlew -q dumpRun -PdumpWorkingDir="${WORKING_DIR}" --args "$*"
+popd > /dev/null
[geode] branch develop updated (4497428 -> 567460f)
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 4497428 GEODE-9731: Fix flaky PubSubIntegrationTest (#6991)
add 567460f GEODE-9627: Add service provider interface to register
DataSerializableFixedIDs (#6891)
No new revisions were added by this update.
Summary of changes:
...ackwardCompatibilitySerializationDUnitTest.java | 27 +-
.../org/apache/geode/internal/DSFIDFactory.java| 876 ++---
.../geode/internal/InternalDataSerializer.java | 13 +
.../internal/functions/CliFunctionResult.java | 9 +-
.../geode/internal/offheap/DataTypeJUnitTest.java | 14 +-
.../geode/ClusterCommunicationsDUnitTest.java | 48 +-
.../key/AbstractDumpRestoreIntegrationTest.java| 23 -
.../server/AbstractHitsMissesIntegrationTest.java | 11 -
.../geode/redis/internal/GeodeRedisService.java| 48 +-
.../org.apache.geode.internal.cache.CacheService | 15 +
...erialization.DataSerializableFixedIdRegistrant} | 2 +-
.../geode/redis/internal/data/RedisHashTest.java | 10 -
.../redis/internal/data/RedisKeyJUnitTest.java | 9 -
.../geode/redis/internal/data/RedisSetTest.java| 10 -
.../redis/internal/data/RedisSortedSetTest.java| 10 -
.../geode/redis/internal/data/RedisStringTest.java | 10 -
.../cache/lucene/internal/LuceneServiceImpl.java | 49 +-
...serialization.DataSerializableFixedIdRegistrant | 2 +-
.../LuceneIndexCreationProfileJUnitTest.java | 1 -
.../internal/StringQueryProviderJUnitTest.java | 1 -
.../internal/distributed/EntryScoreJUnitTest.java | 2 -
.../LuceneQueryFunctionContextJUnitTest.java | 3 -
.../distributed/TopEntriesCollectorJUnitTest.java | 3 -
.../internal/distributed/TopEntriesJUnitTest.java | 2 -
.../internal/filesystem/ChunkKeyJUnitTest.java | 2 -
.../lucene/internal/filesystem/FileJUnitTest.java | 2 -
.../internal/results/PageResultsJUnitTest.java | 5 -
...lyzeMembershipSerializablesIntegrationTest.java | 7 +-
.../membership/gms/GMSMemberDataJUnitTest.java | 1 -
.../membership/gms/GMSMembershipJUnitTest.java | 3 +-
.../membership/gms/MembershipIntegrationTest.java | 1 +
.../gms/locator/GMSLocatorIntegrationTest.java | 1 -
.../gms/messenger/JGroupsMessengerJUnitTest.java | 2 +-
.../gms/MembershipLocatorBuilderImpl.java | 1 -
.../internal/membership/gms/Services.java | 47 +-
.../internal/serialization/DSFIDSerializer.java| 9 +-
...java => DataSerializableFixedIdRegistrant.java} | 16 +-
java => DataSerializableFixedIdRegistrar.java} | 11 +-
.../internal/DSFIDSerializerImpl.java | 23 +-
.../internal/SerializationContextImpl.java | 3 +-
.../internal/DSFIDSerializerImplTest.java | 44 ++
.../internal/tcpserver/HostAndPortTest.java| 6 +-
.../internal/client/locator/WANFactoryImpl.java| 47 +-
...erialization.DataSerializableFixedIdRegistrant} | 1 +
44 files changed, 689 insertions(+), 741 deletions(-)
copy geode-for-redis/src/{acceptanceTest/resources/testcontainers.properties
=>
main/resources/META-INF/services/org.apache.geode.internal.serialization.DataSerializableFixedIdRegistrant}
(93%)
copy geode-for-redis/src/acceptanceTest/resources/testcontainers.properties =>
geode-lucene/src/main/resources/META-INF/services/org.apache.geode.internal.serialization.DataSerializableFixedIdRegistrant
(93%)
copy
geode-serialization/src/main/java/org/apache/geode/internal/serialization/{SerializationSanctionedSerializablesService.java
=> DataSerializableFixedIdRegistrant.java} (70%)
copy
geode-serialization/src/main/java/org/apache/geode/internal/serialization/{UnknownVersion.java
=> DataSerializableFixedIdRegistrar.java} (72%)
create mode 100644
geode-serialization/src/test/java/org/apache/geode/internal/serialization/internal/DSFIDSerializerImplTest.java
copy
geode-wan/src/main/resources/META-INF/services/{org.apache.geode.internal.cache.wan.spi.WANFactory
=> org.apache.geode.internal.serialization.DataSerializableFixedIdRegistrant}
(99%)
[geode] branch develop updated (00f92b6 -> 4497428)
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 00f92b6 GEODE-9677: After provider sends ImageReply, requester could finish e… (#6992) add 4497428 GEODE-9731: Fix flaky PubSubIntegrationTest (#6991) No new revisions were added by this update. Summary of changes: .../redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java | 2 ++ 1 file changed, 2 insertions(+)
[geode-benchmarks] branch develop updated: Slight tweak to the widths in DumpResults script
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout 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 e8157e2 Slight tweak to the widths in DumpResults script
e8157e2 is described below
commit e8157e21fe805ac93ca5fc5246b296be376c4282
Author: Dan Smith
AuthorDate: Wed Oct 13 15:12:29 2021 -0700
Slight tweak to the widths in DumpResults script
Increasing the widthe of the test name column to accomodate our largest test
names. Eventually we could switch to a more intelligent table printing
library
but this works for the moment.
---
.../main/java/org/apache/geode/perftest/analysis/DumpResults.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/analysis/DumpResults.java
b/harness/src/main/java/org/apache/geode/perftest/analysis/DumpResults.java
index 4c1f9db..78d964e 100644
--- a/harness/src/main/java/org/apache/geode/perftest/analysis/DumpResults.java
+++ b/harness/src/main/java/org/apache/geode/perftest/analysis/DumpResults.java
@@ -37,7 +37,7 @@ public class DumpResults {
BenchmarkReader reader = new BenchmarkReader();
reader.addProbe(new YardstickHdrHistogramParser());
-System.out.printf("%-40s %-30s %-16s %-16s %-16s\n", "Directory",
"Benchmark", "ops/sec",
+System.out.printf("%-30s %-55s %-16s %-16s %-16s\n", "Directory",
"Benchmark", "ops/sec",
"avg latency(ms)", "99%% latency(ms)");
Arrays.sort(args);
@@ -58,11 +58,9 @@ public class DumpResults {
benchmarkResult.getValue().get(YardstickHdrHistogramParser.PERCENTILE_LATENCY_99).value
/ 1_000_000.0;
-System.out.printf("%-40s %-30s %-16.2f %-16.4f %-16.4f\n",
benchmarkDir.getName(), name,
+System.out.printf("%-30s %-55s %-16.2f %-16.4f %-16.4f\n",
benchmarkDir.getName(), name,
opsPerSec, latency, latency_99);
}
-
-
}
}
}
[geode] branch develop updated (615f180 -> 00f92b6)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 615f180 GEODE-9635: wait for bucket initialization, after clean queue (#6916) add 00f92b6 GEODE-9677: After provider sends ImageReply, requester could finish e… (#6992) No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[geode] branch develop updated (0f36be8 -> 615f180)
This is an automated email from the ASF dual-hosted git repository. mivanac pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 0f36be8 Fix assumeTrue description in AcceptList tests. add 615f180 GEODE-9635: wait for bucket initialization, after clean queue (#6916) No new revisions were added by this update. Summary of changes: .../wan/parallel/ParallelGatewaySenderQueue.java | 6 +- .../ParallelGatewaySenderQueueJUnitTest.java | 70 + ...ANPersistenceEnabledGatewaySenderDUnitTest.java | 110 - 3 files changed, 177 insertions(+), 9 deletions(-)
[geode] branch feature/GEODE-9677 updated (5f76e54 -> 8a8607b)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-9677 in repository https://gitbox.apache.org/repos/asf/geode.git. from 5f76e54 GEODE-9677: After provider sends ImageReply, requester could finish earlier than provider add 8a8607b fix No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[geode] branch develop updated (b39958f -> 0f36be8)
This is an automated email from the ASF dual-hosted git repository. klund pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from b39958f GEODE-9666: Avoid caching InetSocketAddress (#6938) add 905d08a GEODE-9714: Add Shiro packages to sanctioned serializables add 9414f99 Remove unused method add c7cd775 Use clearSerializationFilter after each test. add 883d0c2 Fix javadocs on SANCTIONED_SERIALIZABLES_DEPENDENCIES_PATTERN. add 0f36be8 Fix assumeTrue description in AcceptList tests. No new revisions were added by this update. Summary of changes: .../geode/internal/InternalDataSerializer.java | 17 ++- ...lDataSerializerSerializationAcceptlistTest.java | 11 +- .../InternalDataSerializerShiroAcceptListTest.java | 161 + 3 files changed, 178 insertions(+), 11 deletions(-) create mode 100644 geode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerShiroAcceptListTest.java
[geode] branch support/1.14 updated: GEODE-9625: Only serialize transaction metadata when grouping enabled. (#6984)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 3a7b7ba GEODE-9625: Only serialize transaction metadata when grouping
enabled. (#6984)
3a7b7ba is described below
commit 3a7b7bae47b454b8c9f47f80be3a0a90a4877343
Author: Jacob Barrett
AuthorDate: Wed Oct 13 10:47:48 2021 -0700
GEODE-9625: Only serialize transaction metadata when grouping enabled.
(#6984)
(cherry picked from commit ab651eba9558752fe1336919e462350f4581a22a)
---
.../apache/geode/codeAnalysis/excludedClasses.txt | 3 +-
.../wan/AbstractGatewaySenderEventProcessor.java | 18 -
.../internal/cache/wan/GatewaySenderEventImpl.java | 68 ++---
.../ParallelGatewaySenderEventProcessor.java | 2 +-
.../serial/SerialGatewaySenderEventProcessor.java | 8 +-
.../AbstractGatewaySenderEventProcessorTest.java | 32 +++-
.../cache/wan/GatewaySenderEventImplTest.java | 86 ++
.../wan/parallel/ParallelGatewaySenderHelper.java | 3 +-
...SerialGatewaySenderEventProcessorJUnitTest.java | 2 +-
9 files changed, 187 insertions(+), 35 deletions(-)
diff --git
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 99ab950..675e272 100644
---
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -105,4 +105,5 @@ org/apache/geode/cache/query/internal/xml/ElementType
org/apache/geode/cache/query/internal/xml/ElementType$1
org/apache/geode/cache/query/internal/xml/ElementType$2
org/apache/geode/cache/query/internal/xml/ElementType$3
-org/apache/geode/internal/net/ByteBufferVendor$OpenAttemptTimedOut
\ No newline at end of file
+org/apache/geode/internal/net/ByteBufferVendor$OpenAttemptTimedOut
+org/apache/geode/internal/cache/wan/GatewaySenderEventImpl$TransactionMetadataDisposition
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 8545ab9..4c82b66 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
@@ -14,6 +14,10 @@
*/
package org.apache.geode.internal.cache.wan;
+import static
org.apache.geode.internal.cache.wan.GatewaySenderEventImpl.TransactionMetadataDisposition.EXCLUDE;
+import static
org.apache.geode.internal.cache.wan.GatewaySenderEventImpl.TransactionMetadataDisposition.INCLUDE;
+import static
org.apache.geode.internal.cache.wan.GatewaySenderEventImpl.TransactionMetadataDisposition.INCLUDE_LAST_EVENT;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -886,7 +890,7 @@ public abstract class AbstractGatewaySenderEventProcessor
extends LoggingThread
event.setCallbackArgument(geCallbackArg);
// OFFHEAP: event for pdx type meta data so it should never be
off-heap
GatewaySenderEventImpl pdxSenderEvent =
- new GatewaySenderEventImpl(EnumListenerEvent.AFTER_UPDATE,
event, null, false);
+ new GatewaySenderEventImpl(EnumListenerEvent.AFTER_UPDATE,
event, null);
pdxEventsMap.put(typeEntry.getKey(), pdxSenderEvent);
pdxSenderEventsList.add(pdxSenderEvent);
@@ -1309,6 +1313,18 @@ public abstract class
AbstractGatewaySenderEventProcessor extends LoggingThread
}
+ protected GatewaySenderEventImpl.TransactionMetadataDisposition
getTransactionMetadataDisposition(
+ final boolean isLastEventInTransaction) {
+if (getSender().mustGroupTransactionEvents()) {
+ if (isLastEventInTransaction) {
+return INCLUDE_LAST_EVENT;
+ }
+ return INCLUDE;
+} else {
+ return EXCLUDE;
+}
+ }
+
/**
* Logs a batch of events.
*
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index e4a8b75..47ea4c3 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -15,6 +15,9 @@
package org.apache.geode.internal.cache.wan;
+import static
org.apache.geode.internal.cache.wan.GatewaySenderEventImpl.TransactionMetadataDisposition.EXCLUDE;
+import static
[geode] branch develop updated (220bc2d -> b39958f)
This is an automated email from the ASF dual-hosted git repository. aaronlindsey pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 220bc2d GEODE-9668: Enable ignored HitsMissesIntegrationTest (#6987) add b39958f GEODE-9666: Avoid caching InetSocketAddress (#6938) No new revisions were added by this update. Summary of changes: .../distributed/internal/tcpserver/InetSocketWrapper.java | 8 .../distributed/internal/tcpserver/HostAndPortTest.java| 14 +- 2 files changed, 13 insertions(+), 9 deletions(-)
[geode] branch develop updated: GEODE-9668: Enable ignored HitsMissesIntegrationTest (#6987)
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 220bc2d GEODE-9668: Enable ignored HitsMissesIntegrationTest (#6987)
220bc2d is described below
commit 220bc2d957dfd95aebd4e52beda0cb9d2e62c124
Author: Donal Evans
AuthorDate: Wed Oct 13 10:10:44 2021 -0700
GEODE-9668: Enable ignored HitsMissesIntegrationTest (#6987)
- Un-ignore testMsetnx()
- Remove testPassiveExpiration as it was testing that keys were
expired, not just that we were updating stats for the expire command
- Move testMset() and testMsetnx() from unsupported commands section
- Modify key names to be consistent and use hashtags
- Refactor to remove unnecessary helper methods
- Introduce multi-key helper methods
Authored-by: Donal Evans
---
.../server/AbstractHitsMissesIntegrationTest.java | 281 +++--
1 file changed, 90 insertions(+), 191 deletions(-)
diff --git
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractHitsMissesIntegrationTest.java
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractHitsMissesIntegrationTest.java
index 0c3414e..6e1dc05 100644
---
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractHitsMissesIntegrationTest.java
+++
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/server/AbstractHitsMissesIntegrationTest.java
@@ -18,41 +18,34 @@ package org.apache.geode.redis.internal.executor.server;
import static
org.apache.geode.test.dunit.rules.RedisClusterStartupRule.REDIS_CLIENT_TIMEOUT;
import static org.assertj.core.api.Assertions.assertThat;
-import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
-import org.apache.logging.log4j.util.TriConsumer;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import redis.clients.jedis.BitOP;
import redis.clients.jedis.Jedis;
-import redis.clients.jedis.ZParams;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.serialization.DataSerializableFixedID;
import org.apache.geode.redis.RedisIntegrationTest;
import org.apache.geode.redis.RedisTestHelper;
-import org.apache.geode.redis.internal.PassiveExpirationManager;
import org.apache.geode.redis.internal.data.RedisHash;
-import org.apache.geode.test.awaitility.GeodeAwaitility;
public abstract class AbstractHitsMissesIntegrationTest implements
RedisIntegrationTest {
+ private static final String HASHTAG = "{hashtag}";
private static final String HITS = "keyspace_hits";
private static final String MISSES = "keyspace_misses";
- private static final String STRING_KEY = "string";
- private static final String STRING_INT_KEY = "int";
- private static final String SET_KEY = "set";
- private static final String HASH_KEY = "hash";
- private static final String SORTED_SET_KEY = "sortedSet";
- private static final String MAP_KEY_1 = "mapKey1";
- private static final String MAP_KEY_2 = "mapKey2";
+ private static final String STRING_KEY = HASHTAG + "string";
+ private static final String STRING_INT_KEY = HASHTAG + "int";
+ private static final String SET_KEY = HASHTAG + "set";
+ private static final String HASH_KEY = HASHTAG + "hash";
+ private static final String SORTED_SET_KEY = HASHTAG + "sortedSet";
protected Jedis jedis;
@@ -72,8 +65,6 @@ public abstract class AbstractHitsMissesIntegrationTest
implements RedisIntegrat
jedis.sadd(SET_KEY, "cotton");
jedis.hset(HASH_KEY, "green", "eggs");
jedis.zadd(SORTED_SET_KEY, -2.0, "almonds");
-jedis.set(MAP_KEY_1, "fox");
-jedis.set(MAP_KEY_2, "box");
}
@After
@@ -114,8 +105,8 @@ public abstract class AbstractHitsMissesIntegrationTest
implements RedisIntegrat
@Test
public void testRename() {
-String key1 = "{" + STRING_KEY + "}" + MAP_KEY_1;
-String key2 = "{" + STRING_KEY + "}" + MAP_KEY_2;
+String key1 = HASHTAG + "key1";
+String key2 = HASHTAG + "key2";
jedis.set(key1, "yarn");
runCommandAndAssertNoStatUpdates(key1, k -> jedis.rename(k, key2));
}
@@ -127,47 +118,38 @@ public abstract class AbstractHitsMissesIntegrationTest
implements RedisIntegrat
@Test
public void testExpire() {
-runCommandAndAssertNoStatUpdates(HASH_KEY, (k) -> jedis.expire(k, 5L));
- }
-
- @Test
- public void testPassiveExpiration() {
-runCommandAndAssertNoStatUpdates(HASH_KEY, (k) -> {
- jedis.expire(k, 1L);
-
GeodeAwaitility.await().atMost(Duration.ofMinutes(PassiveExpirationManager.INTERVAL
* 2))
- .until(()
[geode] branch develop updated (8c1fb0b -> 22c21fb)
This is an automated email from the ASF dual-hosted git repository. klund pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 8c1fb0b GEODE-9713: Simplify DistributedExecutorServiceRuleLimitedThreadCountTest add 22c21fb GEODE-9038: Ignore AlertingIOException in ShutdownAllDUnitTest No new revisions were added by this update. Summary of changes: .../apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java | 4 1 file changed, 4 insertions(+)
[geode] branch develop updated (03ea94b -> 8c1fb0b)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 03ea94b GEODE-9534, GEODE-9540: add more tests for peer communication
and bulk operations (#6985)
add 269bda1 GEODE-9713: Support thread count in ExecutorService rules
add b9ed570 Fix geode-junit sanctioned serializables
add d46baf9 Handle BrokenBarrierException when canceled.
add 9a0a7ff Fix geode-dunit sanctioned serializables
add 8c1fb0b GEODE-9713: Simplify
DistributedExecutorServiceRuleLimitedThreadCountTest
No new revisions were added by this update.
Summary of changes:
...dExecutorServiceRuleLimitedThreadCountTest.java | 103 +
...utedExecutorServiceRuleLimitedVmCountTest.java} | 11 +-
...xecutorServiceRuleUnlimitedThreadCountTest.java | 75 ++
.../rules/DistributedExecutorServiceRule.java | 165 -
.../sanctioned-geode-dunit-serializables.txt | 2 +-
.../test/junit/rules/ExecutorServiceRule.java | 69 +++--
.../sanctioned-geode-junit-serializables.txt | 2 +-
7 files changed, 404 insertions(+), 23 deletions(-)
create mode 100644
geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedExecutorServiceRuleLimitedThreadCountTest.java
copy
geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/{DistributedRuleLimitedVmCountTest.java
=> DistributedExecutorServiceRuleLimitedVmCountTest.java} (75%)
create mode 100644
geode-dunit/src/distributedTest/java/org/apache/geode/test/dunit/rules/tests/DistributedExecutorServiceRuleUnlimitedThreadCountTest.java
[geode] 01/01: GEODE-9677: After provider sends ImageReply, requester could finish earlier than provider
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-9677
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5f76e5454715056350a471e03031354c0459ba9f
Author: zhouxh
AuthorDate: Wed Oct 13 09:23:34 2021 -0700
GEODE-9677: After provider sends ImageReply, requester could finish earlier
than provider
---
.../java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
index 3c8a3d0..8722348 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
@@ -1530,8 +1530,8 @@ public class GIIDeltaDUnitTest extends
JUnit4CacheTestCase {
// let GII continue
P.invoke(() -> resetGIITestHook(DuringPackingImage, true));
async3.join(MAX_WAIT * 2);
-count = getDeltaGIICount(P);
-assertEquals(0, count);
+final int countConst = getDeltaGIICount(P);
+GeodeAwaitility.await().untilAsserted(() -> assertEquals(0, countConst));
verifyDeltaSizeFromStats(R, 1, 1); // deltaGII, key1 in delta
// tombstone key2, key5 should still exist and expired at R
[geode] branch feature/GEODE-9677 created (now 5f76e54)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-9677 in repository https://gitbox.apache.org/repos/asf/geode.git. at 5f76e54 GEODE-9677: After provider sends ImageReply, requester could finish earlier than provider This branch includes the following new commits: new 5f76e54 GEODE-9677: After provider sends ImageReply, requester could finish earlier than provider 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] branch develop updated (07eb304 -> 03ea94b)
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 07eb304 GEODE-9705: When create PR failed with DistributedSystemDisconnectedE… (#6964) add 03ea94b GEODE-9534, GEODE-9540: add more tests for peer communication and bulk operations (#6985) No new revisions were added by this update. Summary of changes: .../geode/security/AuthExpirationDUnitTest.java| 17 +-- .../AuthExpirationMultiServerDUnitTest.java| 58 .../geode/security/AuthExpirationDUnitTest.java| 150 +++-- .../geode/cache/query/dunit/SecurityTestUtils.java | 12 ++ 4 files changed, 179 insertions(+), 58 deletions(-)
