[geode] branch support/1.15 updated: GEODE-10047: Fix expiration interval log (#7359)
This is an automated email from the ASF dual-hosted git repository.
donalevans pushed a commit to branch support/1.15
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push:
new 9f4f66e GEODE-10047: Fix expiration interval log (#7359)
9f4f66e is described below
commit 9f4f66ed9ed0f8fdba432c6df92184ee5adcc7eb
Author: Donal Evans
AuthorDate: Tue Feb 15 15:34:27 2022 -0800
GEODE-10047: Fix expiration interval log (#7359)
- Change naming of passive expiration to active expiration throughout
the geode-for-redis module so as to be consistent with Redis' language
- Replace hard-coded expiration interval of 1 second with a reference to
the configured expiration interval in log message in
PassiveExpirationManager (now named ActiveExpirationManager)
Authored-by: Donal Evans
(cherry picked from commit cd0b52e02bb4aeef7b35a2c5015cb7333481232e)
---
.../key/AbstractPexpireIntegrationTest.java| 2 +-
.../geode/redis/internal/GeodeRedisServer.java | 8 ++---
...onManager.java => ActiveExpirationManager.java} | 21 +++--
.../redis/internal/statistics/GeodeRedisStats.java | 36 +++---
.../redis/internal/statistics/RedisStats.java | 7 ++---
5 files changed, 37 insertions(+), 37 deletions(-)
diff --git
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/key/AbstractPexpireIntegrationTest.java
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/key/AbstractPexpireIntegrationTest.java
index 3e06c07..d673a73 100644
---
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/key/AbstractPexpireIntegrationTest.java
+++
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/key/AbstractPexpireIntegrationTest.java
@@ -99,7 +99,7 @@ public abstract class AbstractPexpireIntegrationTest
implements RedisIntegration
}
@Test
- public void should_passivelyExpireKeys() {
+ public void should_activelyExpireKeys() {
jedis.sadd("{tag1}key", "value");
jedis.pexpire("{tag1}key", 100);
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
index e53d44f..15bc0ce 100644
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/GeodeRedisServer.java
@@ -34,7 +34,7 @@ import org.apache.geode.redis.internal.netty.NettyRedisServer;
import org.apache.geode.redis.internal.pubsub.PubSub;
import org.apache.geode.redis.internal.pubsub.PubSubImpl;
import org.apache.geode.redis.internal.pubsub.Subscriptions;
-import org.apache.geode.redis.internal.services.PassiveExpirationManager;
+import org.apache.geode.redis.internal.services.ActiveExpirationManager;
import org.apache.geode.redis.internal.services.RegionProvider;
import org.apache.geode.redis.internal.services.cluster.RedisMemberInfo;
import
org.apache.geode.redis.internal.services.cluster.RedisMemberInfoRetrievalFunction;
@@ -59,7 +59,7 @@ public class GeodeRedisServer {
public static final String ENABLE_UNSUPPORTED_COMMANDS_PARAM =
"enable-unsupported-commands";
private static boolean unsupportedCommandsEnabled;
private static final Logger logger = LogService.getLogger();
- private final PassiveExpirationManager passiveExpirationManager;
+ private final ActiveExpirationManager activeExpirationManager;
private final NettyRedisServer nettyRedisServer;
private final RegionProvider regionProvider;
private final PubSub pubSub;
@@ -86,7 +86,7 @@ public class GeodeRedisServer {
regionProvider = new RegionProvider(cache, stripedCoordinator, redisStats);
pubSub = new PubSubImpl(new Subscriptions(redisStats), regionProvider,
redisStats);
-passiveExpirationManager = new PassiveExpirationManager(regionProvider);
+activeExpirationManager = new ActiveExpirationManager(regionProvider);
DistributedMember member =
cache.getDistributedSystem().getDistributedMember();
RedisSecurityService securityService = new
RedisSecurityService(cache.getSecurityService());
@@ -159,7 +159,7 @@ public class GeodeRedisServer {
if (!shutdown) {
logger.info("GeodeRedisServer shutting down");
pubSub.close();
- passiveExpirationManager.stop();
+ activeExpirationManager.stop();
nettyRedisServer.stop();
redisStats.close();
shutdown = true;
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/PassiveExpirationManager.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/ActiveExpirationManager.java
similarity index 83%
rename from
geode-for-redis/src/main/java/org/apache/geode/redis/inte
[geode-native] branch GEODE-10040-increase-gfsh-wait-timeout created (now 642dbfd)
This is an automated email from the ASF dual-hosted git repository. mmartell pushed a change to branch GEODE-10040-increase-gfsh-wait-timeout in repository https://gitbox.apache.org/repos/asf/geode-native.git. at 642dbfd GEODE-10040: Increase MaxWaitMillis to 5min This branch includes the following new commits: new 642dbfd GEODE-10040: Increase MaxWaitMillis to 5min 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-native] 01/01: GEODE-10040: Increase MaxWaitMillis to 5min
This is an automated email from the ASF dual-hosted git repository. mmartell pushed a commit to branch GEODE-10040-increase-gfsh-wait-timeout in repository https://gitbox.apache.org/repos/asf/geode-native.git commit 642dbfd613bd08e944c51cae44acb7af005bc52d Author: Mike Martell AuthorDate: Tue Feb 15 15:39:05 2022 -0800 GEODE-10040: Increase MaxWaitMillis to 5min --- clicache/integration-test/CacheHelperN.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clicache/integration-test/CacheHelperN.cs b/clicache/integration-test/CacheHelperN.cs index d97b708..a7e5a05 100644 --- a/clicache/integration-test/CacheHelperN.cs +++ b/clicache/integration-test/CacheHelperN.cs @@ -316,7 +316,7 @@ namespace Apache.Geode.Client.UnitTests private const string JavaServerStopArgs = "stop server"; private const string LocatorStartArgs = "start locator --max-heap=512m"; private const string LocatorStopArgs = "stop locator"; -private const int MaxWaitMillis = 6; +private const int MaxWaitMillis = 6*5; private static string m_testDir = null; private static Dictionary m_runningJavaServers =
[geode] branch develop updated (f20888e -> cd0b52e)
This is an automated email from the ASF dual-hosted git repository.
donalevans pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from f20888e GEODE-10019: Obey rules on release commits (#7341)
add cd0b52e GEODE-10047: Fix expiration interval log (#7359)
No new revisions were added by this update.
Summary of changes:
.../key/AbstractPexpireIntegrationTest.java| 2 +-
.../geode/redis/internal/GeodeRedisServer.java | 8 ++---
...onManager.java => ActiveExpirationManager.java} | 21 +++--
.../redis/internal/statistics/GeodeRedisStats.java | 36 +++---
.../redis/internal/statistics/RedisStats.java | 7 ++---
5 files changed, 37 insertions(+), 37 deletions(-)
rename
geode-for-redis/src/main/java/org/apache/geode/redis/internal/services/{PassiveExpirationManager.java
=> ActiveExpirationManager.java} (83%)
[geode] branch develop updated (5d69a61 -> f20888e)
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 5d69a61 GEODE-10046: bump dependencies (#7360) add f20888e GEODE-10019: Obey rules on release commits (#7341) No new revisions were added by this update. Summary of changes: dev-tools/release/commit_rc.sh | 27 --- dev-tools/release/create_support_branches.sh | 33 + dev-tools/release/prepare_rc.sh | 21 + dev-tools/release/promote_rc.sh | 70 +--- dev-tools/release/set_copyright.sh | 17 +-- dev-tools/release/set_versions.sh| 29 6 files changed, 146 insertions(+), 51 deletions(-)
[geode] branch develop updated (9eeeb2d -> 5d69a61)
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 9eeeb2d GEODE-9981: Use API to get crypto oid (#7298) add 5d69a61 GEODE-10046: bump dependencies (#7360) No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml| 52 +++--- build.gradle | 8 ++-- .../gradle/plugins/DependencyConstraints.groovy| 26 +-- dev-tools/dependencies/bump.sh | 6 ++- .../apache/geode/session/tests/TomcatInstall.java | 2 +- .../integrationTest/resources/assembly_content.txt | 28 ++-- .../resources/gfsh_dependency_classpath.txt| 28 ++-- geode-connectors/build.gradle | 2 +- .../cli/CreateDataSourceCommandDUnitTest.java | 2 +- .../cli/DeregisterDriverCommandDUnitTest.java | 2 +- .../internal/cli/ListDriversCommandDUnitTest.java | 4 +- .../cli/RegisterDriverCommandDUnitTest.java| 2 +- .../http_session_mgmt/quick_start.html.md.erb | 4 +- .../tomcat_installing_the_module.html.md.erb | 4 +- .../tomcat_setting_up_the_module.html.md.erb | 2 +- .../resources/dependency_classpath.txt | 28 ++-- 16 files changed, 101 insertions(+), 99 deletions(-)
[geode] branch develop updated (0f0edbe -> 9eeeb2d)
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 0f0edbe GEODE-10002: Remove in documentation obligation for parallel … (#7345) add 9eeeb2d GEODE-9981: Use API to get crypto oid (#7298) No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/geode/cache/ssl/CertificateBuilder.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[geode] branch develop updated (592dd65 -> 0f0edbe)
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 592dd65 GEODE-10042: do not make ClientUserAuths null when we are not unregister client yet. (#7357) add 0f0edbe GEODE-10002: Remove in documentation obligation for parallel … (#7345) No new revisions were added by this update. Summary of changes: geode-docs/managing/disk_storage/using_disk_stores.html.md.erb | 5 - geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb | 2 +- .../topology_concepts/multisite_overview.html.md.erb | 5 - 3 files changed, 1 insertion(+), 11 deletions(-)
[geode] branch GEODE-9892-Create-Infrastructure-for-Redis-Lists updated (5bb3d3a -> 017e26c)
This is an automated email from the ASF dual-hosted git repository. ringles pushed a change to branch GEODE-9892-Create-Infrastructure-for-Redis-Lists in repository https://gitbox.apache.org/repos/asf/geode.git. from 5bb3d3a GEODE-9892: Add initial support for RedisLists - implements LPUSH, LPOP, LLEN add 2a3713f Ensure lpush atomic add 017e26c Remove unneeded test condition No new revisions were added by this update. Summary of changes: .../redis/internal/commands/executor/list/LPushDUnitTest.java | 2 -- .../commands/executor/list/AbstractLPopIntegrationTest.java| 10 +- .../commands/executor/list/AbstractLPushIntegrationTest.java | 10 ++ .../apache/geode/redis/internal/commands/RedisCommandType.java | 3 ++- .../java/org/apache/geode/redis/internal/data/RedisList.java | 7 +++ 5 files changed, 20 insertions(+), 12 deletions(-)
[geode] branch support/1.15 updated: GEODE-10042: do not make ClientUserAuths null when we are not unregister client yet. (#7357)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch support/1.15
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push:
new 5a656ce GEODE-10042: do not make ClientUserAuths null when we are not
unregister client yet. (#7357)
5a656ce is described below
commit 5a656ce402280c377f72f9baf23e422dea528afd
Author: Jinmei Liao
AuthorDate: Tue Feb 15 10:37:18 2022 -0800
GEODE-10042: do not make ClientUserAuths null when we are not unregister
client yet. (#7357)
* make cleanUserAuths synchronized to avoid NPE
* This also pass down client termination reason when we clean up client
threads.
* since we introduced a lock object for clientUserAuths, revert some old
code to not to catch NPE but use the lock
* synchronize all clientUserAuths updates.
(cherry picked from commit 592dd652c263c2f043c6f6a11c5fd7f8a61c84a6)
---
.../cache/tier/sockets/CacheClientProxyTest.java | 16 +++-
.../cache/tier/sockets/CacheClientProxy.java | 43 ++-
.../cache/tier/sockets/ClientHealthMonitor.java| 14 ++--
.../cache/tier/sockets/ServerConnection.java | 86 --
.../cache/tier/sockets/ServerConnectionTest.java | 48 +++-
5 files changed, 141 insertions(+), 66 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyTest.java
index ca7acf0..62736ff 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyTest.java
@@ -26,8 +26,11 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import java.io.File;
+import java.io.FileNotFoundException;
import java.net.InetAddress;
import java.net.Socket;
+import java.util.Scanner;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
@@ -52,7 +55,7 @@ import org.apache.geode.test.junit.rules.ServerStarterRule;
public class CacheClientProxyTest {
@Rule
- public ServerStarterRule serverRule = new
ServerStarterRule().withAutoStart();
+ public ServerStarterRule serverRule = new
ServerStarterRule().withLogFile().withAutoStart();
@Rule
public ExecutorServiceRule executorServiceRule = new ExecutorServiceRule();
@@ -96,11 +99,20 @@ public class CacheClientProxyTest {
}
@Test
- public void closeSocket1000Times() {
+ public void closeSocket1000Times() throws FileNotFoundException {
// run it for 1000 times to introduce conflicts between threads
for (int i = 0; i < 1000; i++) {
closeSocketShouldBeAtomic();
}
+
+// make sure there is no NPE warning in the log file
+File logFile = new File(serverRule.getWorkingDir(), "server.log");
+Scanner scanner = new Scanner(logFile);
+while (scanner.hasNextLine()) {
+ String line = scanner.nextLine();
+ assertThat(line).describedAs("File: %s, Line: %s",
logFile.getAbsolutePath(), line)
+ .doesNotContain("NullPointerException");
+}
}
@Test
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 87ac740..43be442 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -785,24 +785,7 @@ public class CacheClientProxy implements ClientSession {
// Close the Authorization callback or subject if we are not keeping the
proxy
try {
if (!pauseDurable) {
-// single user case -- old security
-if (postAuthzCallback != null) {
- postAuthzCallback.close();
- postAuthzCallback = null;
-}
-// single user case -- integrated security
-// connection is closed, so we can log out this subject
-else if (subject != null) {
- secureLogger.debug("CacheClientProxy.close, logging out {}. ",
subject.getPrincipal());
- subject.logout();
- subject = null;
-}
-// for multiUser case, in non-durable case, we are closing the
connection
-else if (clientUserAuths != null) {
- secureLogger.debug("CacheClientProxy.close, cleanup all client
subjects. ");
- clientUserAuths.cleanup(true);
- clientUserAuths = null;
-}
+cleanClientAuths();
}
} catch (Exception ex) {
logger.warn("{}", this, ex);
@@ -812,6 +795,30 @@ public class Cache
[geode] branch develop updated (fc3f991 -> 592dd65)
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 fc3f991 GEODE-10032: Add Category to RedisCommandType (#7354) add 592dd65 GEODE-10042: do not make ClientUserAuths null when we are not unregister client yet. (#7357) No new revisions were added by this update. Summary of changes: .../cache/tier/sockets/CacheClientProxyTest.java | 16 +++- .../cache/tier/sockets/CacheClientProxy.java | 43 ++- .../cache/tier/sockets/ClientHealthMonitor.java| 14 ++-- .../cache/tier/sockets/ServerConnection.java | 86 -- .../cache/tier/sockets/ServerConnectionTest.java | 48 +++- 5 files changed, 141 insertions(+), 66 deletions(-)
[geode] branch WIP-GEODE-9892 updated (b1ff4dd -> 2a3713f)
This is an automated email from the ASF dual-hosted git repository. ringles pushed a change to branch WIP-GEODE-9892 in repository https://gitbox.apache.org/repos/asf/geode.git. discard b1ff4dd MOVED fix, more transactional lpush discard 0844500 experimentally reduce stress discard 0e68d87 Yet more debug discard f2b4c4c More debug discard 45c688e Give cluster more time to init discard 1cea1ef LPUSH failing to update list length discard 165e128 Give server a chance to fully join cluster discard d64606c More cleanup of test code discard 2f6032d clean up lpop verification logic discard b4852a3 update previousElement in case of skips discard 9f1baa3 Slow the roll on the bucket moves discard a134aad no buckets discard f547a09 loop termination condition fix discard fbd06b9 list not zero at end? discard 701b99d fix the loop termination condition discard bd91218 if the list shrinks, track it in the loop discard 136982f count things but only once discard 23bd71b count things discard c262a61 More test threshold experiment + spA discard 17d8100 More test threshold experiment discard 1f0c6e1 Test threshold experiment discard eb9f517 More debug discard 71c9b40 Handle initial difference count discard 83e708b Skip validation in case of single LPOP repeat discard 8e463d3 Account for possible repeated LPOPS discard f1ac323 More debug discard b09987c Use logger to get useful logs discard 2fc88f1 More debug for dunitrunner discard 39a3312 Improve assertion messages discard 6c42172 Fix serialization error from logging, bump test iterations back up discard 31b7460 Account for potentially duplicated operations discard c78064c Debug updates to look for duplicate commands discard b15187b Enable more logging for debug discard 280b940 Temporary change for CI test purposes discard 6047b2e Update test condition to account for non-idempotency discard f71d3c6 LPush DUnit tests discard 8aafc50 Update LPushDUnitTest discard 621136e Fix rebase error. discard 74e9e2b Comment fix, rebase discard 026e0fc GEODE-9892: Add initial support for RedisLists - implements LPUSH, LPOP, LLEN add 1da9039 GEODE-10015: Set java.rmi.server.hostname when SSL enabled. (#7337) add e7094ee GEODE-9985: add region redundancy to avoid data loss. (#7308) add 551d7d7 GEODE-10009: Invoked internalClose with keepAlive true (#7332) add ce57e9f GEODE-9980: Improve error handling of serial filters (#7299) add fbe4e66 GEODE-10022: fix the logging to log the entire stack trace. (#7349) add 8825d95 GEODE-10018: Remove redundant TX flag from SetOptions (#7352) add 21215d8 GEODE-9845: Refactor OutOfMemoryDUnitTest (#7338) add 9fa1c1b GEODE-10021: Clean up RemoteTransactionDUnitTest (#7339) add a98197b GEODE-9990: turn DiskAccessException into CacheClosedException (#7334) add fc3f991 GEODE-10032: Add Category to RedisCommandType (#7354) add 5bb3d3a GEODE-9892: Add initial support for RedisLists - implements LPUSH, LPOP, LLEN new 2a3713f Ensure lpush atomic 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 (b1ff4dd) \ N -- N -- N refs/heads/WIP-GEODE-9892 (2a3713f) 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. 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. Summary of changes: .../src/test/resources/expected-pom.xml|5 + .../gradle/plugins/DependencyConstraints.groovy|1 + geode-core/build.gradle|1 + .../cache/ClientServerTransactionDUnitTest.java| 565 +++--- .../internal/cache/RemoteTransactionDUnitTest.java | 2009 +--- .../tier/sockets/SlowDispatcherDUnitTest.java | 16 +- .../client/internal/QueueManagerJUnitTest.java | 28 +- .../internal/cache/DiskInitFileJUnitTest.java | 72 + .../filter/SerialFilterAssertions.java | 30 +- .../internal/ManagementAgentIntegrationTest.java | 161 +- .../client/internal/ConnectionFactoryImpl.java | 11 +- .../cache/client/internal/QueueManagerImpl.java|2 +- .../apache/geode/distributed/LocatorLauncher.java | 16 +- .../apache/geode/distributed/ServerLauncher.java | 16 +- .../geode/internal/InternalDataSerializer.java | 29
[geode] 01/01: Ensure lpush atomic
This is an automated email from the ASF dual-hosted git repository.
ringles pushed a commit to branch WIP-GEODE-9892
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2a3713f1caf6655897c720c2be0791a4e098875a
Author: Ray Ingles
AuthorDate: Tue Feb 15 13:21:25 2022 -0500
Ensure lpush atomic
---
.../commands/executor/list/AbstractLPopIntegrationTest.java| 10 +-
.../commands/executor/list/AbstractLPushIntegrationTest.java | 10 ++
.../apache/geode/redis/internal/commands/RedisCommandType.java | 3 ++-
.../java/org/apache/geode/redis/internal/data/RedisList.java | 7 +++
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPopIntegrationTest.java
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPopIntegrationTest.java
index fd7979d..3457635 100755
---
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPopIntegrationTest.java
+++
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPopIntegrationTest.java
@@ -96,8 +96,8 @@ public abstract class AbstractLPopIntegrationTest implements
RedisIntegrationTes
@Test
public void lpop_withConcurrentLPush_returnsCorrectValue() {
-String[] valuesInitial = new String[] {"one", "two", "three"};
-String[] valuesToAdd = new String[] {"pear", "apple", "plum", "orange",
"peach"};
+String[] valuesInitial = new String[] {"un", "deux", "troix"};
+String[] valuesToAdd = new String[] {"plum", "peach", "orange"};
jedis.lpush(KEY, valuesInitial);
final AtomicReference lpopReference = new AtomicReference<>();
@@ -106,9 +106,9 @@ public abstract class AbstractLPopIntegrationTest
implements RedisIntegrationTes
i -> lpopReference.set(jedis.lpop(KEY)))
.runWithAction(() -> {
assertThat(lpopReference).satisfiesAnyOf(
- lpopResult ->
assertThat(lpopReference.get()).isEqualTo("peach"),
- lpopResult ->
assertThat(lpopReference.get()).isEqualTo("three"),
- lpopResult -> assertThat(lpopResult.get()).isNull());
+ lpopResult ->
assertThat(lpopReference.get()).isEqualTo("orange"),
+ lpopResult ->
assertThat(lpopReference.get()).isEqualTo("troix"),
+ lpopResult -> assertThat(lpopReference.get()).isNull());
jedis.del(KEY);
jedis.lpush(KEY, valuesInitial);
});
diff --git
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPushIntegrationTest.java
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPushIntegrationTest.java
index f3ecf43..25959fd 100755
---
a/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPushIntegrationTest.java
+++
b/geode-for-redis/src/integrationTest/java/org/apache/geode/redis/internal/commands/executor/list/AbstractLPushIntegrationTest.java
@@ -95,8 +95,18 @@ public abstract class AbstractLPushIntegrationTest
implements RedisIntegrationTe
@Test
public void lpush_addsElementsInCorrectOrder_givenMultipleElements() {
jedis.lpush(KEY, "e1", "e2", "e3");
+jedis.lpush(KEY, "e4", "e5", "e6");
String result = jedis.lpop(KEY);
+assertThat(result).isEqualTo("e6");
+
+result = jedis.lpop(KEY);
+assertThat(result).isEqualTo("e5");
+
+result = jedis.lpop(KEY);
+assertThat(result).isEqualTo("e4");
+
+result = jedis.lpop(KEY);
assertThat(result).isEqualTo("e3");
result = jedis.lpop(KEY);
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java
index e5ea743..d67a7a1 100755
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/RedisCommandType.java
@@ -382,7 +382,8 @@ public enum RedisCommandType {
LLEN(new LLenExecutor(), Category.LIST, SUPPORTED, new
Parameter().exact(2).flags(READONLY, FAST)),
LPOP(new LPopExecutor(), Category.LIST, SUPPORTED, new
Parameter().exact(2).flags(WRITE, FAST)),
- LPUSH(new LPushExecutor(), Category.LIST, SUPPORTED, new
Parameter().min(3).flags(WRITE, DENYOOM, FAST)),
+ LPUSH(new LPushExecutor(), Category.LIST, SUPPORTED,
+ new Parameter().min(3).flags(WRITE, DENYOOM, FAST)),
/** Publish Subscribe **/
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList
[geode-native] branch develop updated (cd38c21 -> 64e728e)
This is an automated email from the ASF dual-hosted git repository. mmartell pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git. from cd38c21 GEODE-100043: Solve TransactionCleaningTest errors (#923) add 64e728e GEODE-10004: support older geode versions (#917) No new revisions were added by this update. Summary of changes: cmake/CheckJavaClassExists.cmake | 47 tests/javaobject/CMakeLists.txt | 9 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 cmake/CheckJavaClassExists.cmake
