[geode] branch develop updated: GEODE-9747: add expected DistributedSystemDisconnectedException to the test (#7093)
This is an automated email from the ASF dual-hosted git repository.
zhouxj 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 917b83d GEODE-9747: add expected
DistributedSystemDisconnectedException to the test (#7093)
917b83d is described below
commit 917b83d5b4549827eb316f17604816b139c6f584
Author: Xiaojian Zhou
AuthorDate: Tue Nov 9 20:30:10 2021 -0800
GEODE-9747: add expected DistributedSystemDisconnectedException to the test
(#7093)
---
.../partitioned/PersistentPartitionedRegionDistributedTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
index a58faf4..7ca095c 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDistributedTest.java
@@ -1681,8 +1681,9 @@ public class PersistentPartitionedRegionDistributedTest
implements Serializable
private boolean thrownByDiskRecoveryDueToConflictingPersistentDataException(
Throwable expectedException) {
-return expectedException instanceof CacheClosedException
-&& expectedException.getCause() instanceof
ConflictingPersistentDataException;
+return expectedException instanceof DistributedSystemDisconnectedException
+|| (expectedException instanceof CacheClosedException
+&& expectedException.getCause() instanceof
ConflictingPersistentDataException);
}
private boolean
thrownByAsyncFlusherThreadDueToConflictingPersistentDataException(
[geode] 02/02: GEODE-9775: fix remaining pipelines to support k8s (#7099)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 47501fc8eaf573fc0ae9440453c6462775f700c1
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Nov 9 13:13:38 2021 -0800
GEODE-9775: fix remaining pipelines to support k8s (#7099)
(cherry picked from commit beb898c1fa06fc488a553faae2c7d03e0428782b)
(cherry picked from commit 5aa48dadd9370d4f6d0bec36fdc0812c800f2617)
---
ci/pipelines/examples/deploy_pipeline.sh | 10 --
1 file changed, 10 deletions(-)
diff --git a/ci/pipelines/examples/deploy_pipeline.sh
b/ci/pipelines/examples/deploy_pipeline.sh
index 261912b..287f653 100755
--- a/ci/pipelines/examples/deploy_pipeline.sh
+++ b/ci/pipelines/examples/deploy_pipeline.sh
@@ -44,16 +44,6 @@ if [ "${GEODE_BRANCH}" = "HEAD" ]; then
exit 1
fi
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone
${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
pushd ${SCRIPTDIR} 2>&1 > /dev/null
cat > repository.yml <
[geode] 01/02: Add required pipeline path dependencies (#7096)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0cee585a267ffd35234a2d96d75814eb076bd33a
Author: Robert Houghton
AuthorDate: Tue Nov 9 11:07:30 2021 -0800
Add required pipeline path dependencies (#7096)
(cherry picked from commit e34147710bd942594fe5b886289a148eea74757e)
(cherry picked from commit 500f794971d884c7dd13c1ea736ab41ae6e14f1d)
---
ci/pipelines/meta/deploy_meta.sh | 28 +---
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index 6befd51..b5841b2 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -70,10 +70,8 @@ fi
set -e
set -x
-if [[ "${CONCOURSE_HOST}" == "concourse.apachegeode-ci.info" ]]; then
- CONCOURSE_SCHEME=https
-fi
-CONCOURSE_URL=${CONCOURSE_SCHEME:-"http"}://${CONCOURSE_HOST}
+CONCOURSE_SCHEME=https
+CONCOURSE_URL=${CONCOURSE_SCHEME}://${CONCOURSE_HOST}
FLY_TARGET=${CONCOURSE_HOST}-${CONCOURSE_TEAM}
. ${SCRIPTDIR}/../shared/utilities.sh
@@ -132,15 +130,15 @@ YML
set -e
- if [[ ${UPSTREAM_FORK} != "apache" ]]; then
-fly -t ${FLY_TARGET} status || \
-fly -t ${FLY_TARGET} login \
+ if [[ "${UPSTREAM_FORK}" != "apache" ]]; then
+${FLY} -t ${FLY_TARGET} status || \
+${FLY} -t ${FLY_TARGET} login \
--team-name ${CONCOURSE_TEAM} \
--concourse-url=${CONCOURSE_URL}
fi
- fly -t ${FLY_TARGET} sync
- fly -t ${FLY_TARGET} set-pipeline \
+ ${FLY} -t ${FLY_TARGET} sync
+ ${FLY} -t ${FLY_TARGET} set-pipeline \
-p ${META_PIPELINE} \
--config ${SCRIPTDIR}/generated-pipeline.yml \
--var artifact-bucket=${ARTIFACT_BUCKET} \
@@ -168,19 +166,19 @@ popd 2>&1 > /dev/null
function jobStatus {
PIPELINE=$1
JOB=$2
- fly jobs -t ${FLY_TARGET} -p ${PIPELINE}|awk "/${JOB}/"'{if($2=="yes")print
"paused";else if($4!="n/a")print $4; else print $3}'
+ ${FLY} jobs -t ${FLY_TARGET} -p ${PIPELINE}|awk
"/${JOB}/"'{if($2=="yes")print "paused";else if($4!="n/a")print $4; else print
$3}'
}
function triggerJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly trigger-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} trigger-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function pauseJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly pause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} pause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function pauseJobs {
@@ -203,7 +201,7 @@ function pauseNewJobs {
function unpauseJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly unpause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} unpause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function unpauseJobs {
@@ -216,12 +214,12 @@ function unpauseJobs {
function unpausePipeline {
PIPELINE=$1
- (set -x ; fly -t ${FLY_TARGET} unpause-pipeline -p ${PIPELINE})
+ (set -x ; ${FLY} -t ${FLY_TARGET} unpause-pipeline -p ${PIPELINE})
}
function exposePipeline {
PIPELINE=$1
- (set -x ; fly -t ${FLY_TARGET} expose-pipeline -p ${PIPELINE})
+ (set -x ; ${FLY} -t ${FLY_TARGET} expose-pipeline -p ${PIPELINE})
}
function exposePipelines {
[geode] branch support/1.12 updated (26f7c17 -> 47501fc)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch support/1.12 in repository https://gitbox.apache.org/repos/asf/geode.git. from 26f7c17 GEODE-8542: java.lang.IllegalStateException: tcp message exceeded max… (#5562) new 0cee585 Add required pipeline path dependencies (#7096) new 47501fc GEODE-9775: fix remaining pipelines to support k8s (#7099) The 2 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: ci/pipelines/examples/deploy_pipeline.sh | 10 -- ci/pipelines/meta/deploy_meta.sh | 28 +--- 2 files changed, 13 insertions(+), 25 deletions(-)
[geode] 02/02: GEODE-9775: fix remaining pipelines to support k8s (#7099)
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
commit 5aa48dadd9370d4f6d0bec36fdc0812c800f2617
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Nov 9 13:13:38 2021 -0800
GEODE-9775: fix remaining pipelines to support k8s (#7099)
(cherry picked from commit beb898c1fa06fc488a553faae2c7d03e0428782b)
---
ci/pipelines/examples/deploy_pipeline.sh | 10 --
1 file changed, 10 deletions(-)
diff --git a/ci/pipelines/examples/deploy_pipeline.sh
b/ci/pipelines/examples/deploy_pipeline.sh
index 261912b..287f653 100755
--- a/ci/pipelines/examples/deploy_pipeline.sh
+++ b/ci/pipelines/examples/deploy_pipeline.sh
@@ -44,16 +44,6 @@ if [ "${GEODE_BRANCH}" = "HEAD" ]; then
exit 1
fi
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone
${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
pushd ${SCRIPTDIR} 2>&1 > /dev/null
cat > repository.yml <
[geode] 01/02: Add required pipeline path dependencies (#7096)
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
commit 500f794971d884c7dd13c1ea736ab41ae6e14f1d
Author: Robert Houghton
AuthorDate: Tue Nov 9 11:07:30 2021 -0800
Add required pipeline path dependencies (#7096)
(cherry picked from commit e34147710bd942594fe5b886289a148eea74757e)
---
ci/pipelines/meta/deploy_meta.sh | 28 +---
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index fed4f83..2a0bc03 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -70,10 +70,8 @@ fi
set -e
set -x
-if [[ "${CONCOURSE_HOST}" == "concourse.apachegeode-ci.info" ]]; then
- CONCOURSE_SCHEME=https
-fi
-CONCOURSE_URL=${CONCOURSE_SCHEME:-"http"}://${CONCOURSE_HOST}
+CONCOURSE_SCHEME=https
+CONCOURSE_URL=${CONCOURSE_SCHEME}://${CONCOURSE_HOST}
FLY_TARGET=${CONCOURSE_HOST}-${CONCOURSE_TEAM}
. ${SCRIPTDIR}/../shared/utilities.sh
@@ -132,15 +130,15 @@ YML
set -e
- if [[ ${UPSTREAM_FORK} != "apache" ]]; then
-fly -t ${FLY_TARGET} status || \
-fly -t ${FLY_TARGET} login \
+ if [[ "${UPSTREAM_FORK}" != "apache" ]]; then
+${FLY} -t ${FLY_TARGET} status || \
+${FLY} -t ${FLY_TARGET} login \
--team-name ${CONCOURSE_TEAM} \
--concourse-url=${CONCOURSE_URL}
fi
- fly -t ${FLY_TARGET} sync
- fly -t ${FLY_TARGET} set-pipeline \
+ ${FLY} -t ${FLY_TARGET} sync
+ ${FLY} -t ${FLY_TARGET} set-pipeline \
-p ${META_PIPELINE} \
--config ${SCRIPTDIR}/generated-pipeline.yml \
--var artifact-bucket=${ARTIFACT_BUCKET} \
@@ -168,19 +166,19 @@ popd 2>&1 > /dev/null
function jobStatus {
PIPELINE=$1
JOB=$2
- fly jobs -t ${FLY_TARGET} -p ${PIPELINE}|awk "/${JOB}/"'{if($2=="yes")print
"paused";else if($4!="n/a")print $4; else print $3}'
+ ${FLY} jobs -t ${FLY_TARGET} -p ${PIPELINE}|awk
"/${JOB}/"'{if($2=="yes")print "paused";else if($4!="n/a")print $4; else print
$3}'
}
function triggerJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly trigger-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} trigger-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function pauseJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly pause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} pause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function pauseJobs {
@@ -203,7 +201,7 @@ function pauseNewJobs {
function unpauseJob {
PIPELINE=$1
JOB=$2
- (set -x ; fly unpause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
+ (set -x ; ${FLY} unpause-job -t ${FLY_TARGET} -j ${PIPELINE}/${JOB})
}
function unpauseJobs {
@@ -216,12 +214,12 @@ function unpauseJobs {
function unpausePipeline {
PIPELINE=$1
- (set -x ; fly -t ${FLY_TARGET} unpause-pipeline -p ${PIPELINE})
+ (set -x ; ${FLY} -t ${FLY_TARGET} unpause-pipeline -p ${PIPELINE})
}
function exposePipeline {
PIPELINE=$1
- (set -x ; fly -t ${FLY_TARGET} expose-pipeline -p ${PIPELINE})
+ (set -x ; ${FLY} -t ${FLY_TARGET} expose-pipeline -p ${PIPELINE})
}
function exposePipelines {
[geode] branch support/1.13 updated (653e8cd -> 5aa48da)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git. from 653e8cd GEODE-8542: java.lang.IllegalStateException: tcp message exceeded max… (#5562) new 500f794 Add required pipeline path dependencies (#7096) new 5aa48da GEODE-9775: fix remaining pipelines to support k8s (#7099) The 2 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: ci/pipelines/examples/deploy_pipeline.sh | 10 -- ci/pipelines/meta/deploy_meta.sh | 28 +--- 2 files changed, 13 insertions(+), 25 deletions(-)
[geode] branch support/1.12 updated: GEODE-8542: java.lang.IllegalStateException: tcp message exceeded max… (#5562)
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 26f7c17 GEODE-8542: java.lang.IllegalStateException: tcp message
exceeded max… (#5562)
26f7c17 is described below
commit 26f7c17b49b4e83f2af40fca66c8719658a53bf2
Author: Bruce Schuchardt
AuthorDate: Tue Sep 29 10:17:56 2020 -0700
GEODE-8542: java.lang.IllegalStateException: tcp message exceeded max…
(#5562)
Limit the size of message chunks to the maximum message size allowed
by org.apache.geode.internal.tcp.Connection.
(cherry picked from commit b439d3301dc15a81a9917b05ca4bd0717d1718bc)
(cherry picked from commit cb07f831b1ce1023608e59f873b015f1ae2768bc)
---
.../org/apache/geode/internal/tcp/MsgStreamer.java | 9 +-
.../apache/geode/internal/tcp/MsgStreamerTest.java | 129 +
2 files changed, 137 insertions(+), 1 deletion(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
index ed25ce3..69f8047 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
@@ -27,6 +27,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
import org.apache.geode.DataSerializer;
+import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.internal.Assert;
@@ -129,7 +130,8 @@ public class MsgStreamer extends OutputStream
this.stats = stats;
this.msg = msg;
this.cons = cons;
-this.buffer = bufferPool.acquireDirectSenderBuffer(sendBufferSize);
+int bufferSize = Math.min(sendBufferSize, Connection.MAX_MSG_SIZE);
+this.buffer = bufferPool.acquireDirectSenderBuffer(bufferSize);
this.buffer.clear();
this.buffer.position(Connection.MSG_HEADER_BYTES);
this.msgId = MsgIdGenerator.NO_MSG_ID;
@@ -347,6 +349,11 @@ public class MsgStreamer extends OutputStream
this.buffer.position(Connection.MSG_HEADER_BYTES);
}
+ @VisibleForTesting
+ protected ByteBuffer getBuffer() {
+return buffer;
+ }
+
@Override
public void close() throws IOException {
try {
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
b/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
new file mode 100644
index 000..22f5756
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
@@ -0,0 +1,129 @@
+/*
+ * 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.internal.tcp;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.net.ssl.SSLException;
+
+import org.junit.Test;
+
+import org.apache.geode.distributed.internal.DMStats;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.SerialAckedMessage;
+import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.net.BufferPool;
+import org.apache.geode.internal.serialization.Version;
+
+public class MsgStreamerTest {
+ private DMStats stats = mock(DMStats.class);
+ private BufferPool pool = spy(new BufferPool(stats));
+ Connection connection1 = mock(Connection.class);
+ Connection connection2 = mock(Connection.class);
+
+ // This test relies on GEODE-8020 fix,
[geode] branch support/1.13 updated: GEODE-8542: java.lang.IllegalStateException: tcp message exceeded max… (#5562)
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 653e8cd GEODE-8542: java.lang.IllegalStateException: tcp message
exceeded max… (#5562)
653e8cd is described below
commit 653e8cde775bb3f97f21c91017a12a809a54b51e
Author: Bruce Schuchardt
AuthorDate: Tue Sep 29 10:17:56 2020 -0700
GEODE-8542: java.lang.IllegalStateException: tcp message exceeded max…
(#5562)
Limit the size of message chunks to the maximum message size allowed
by org.apache.geode.internal.tcp.Connection.
(cherry picked from commit b439d3301dc15a81a9917b05ca4bd0717d1718bc)
---
.../org/apache/geode/internal/tcp/MsgStreamer.java | 9 ++-
.../apache/geode/internal/tcp/MsgStreamerTest.java | 29 --
2 files changed, 35 insertions(+), 3 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
index 603d2bd..6157928 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/MsgStreamer.java
@@ -27,6 +27,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
import org.apache.geode.DataSerializer;
+import org.apache.geode.annotations.VisibleForTesting;
import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.internal.Assert;
@@ -129,7 +130,8 @@ public class MsgStreamer extends OutputStream
this.stats = stats;
this.msg = msg;
this.cons = cons;
-this.buffer = bufferPool.acquireDirectSenderBuffer(sendBufferSize);
+int bufferSize = Math.min(sendBufferSize, Connection.MAX_MSG_SIZE);
+this.buffer = bufferPool.acquireDirectSenderBuffer(bufferSize);
this.buffer.clear();
this.buffer.position(Connection.MSG_HEADER_BYTES);
this.msgId = MsgIdGenerator.NO_MSG_ID;
@@ -351,6 +353,11 @@ public class MsgStreamer extends OutputStream
this.buffer.position(Connection.MSG_HEADER_BYTES);
}
+ @VisibleForTesting
+ protected ByteBuffer getBuffer() {
+return buffer;
+ }
+
@Override
public void close() throws IOException {
try {
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
b/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
index 1631b08..d1f1509 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/tcp/MsgStreamerTest.java
@@ -77,6 +77,31 @@ public class MsgStreamerTest {
verify(pool, times(2)).releaseSenderBuffer(isA(ByteBuffer.class));
}
+ @Test
+ public void streamerRespectsMaxMessageSize() {
+InternalDistributedMember member1;
+member1 = new InternalDistributedMember("localhost", 1234);
+
+DistributionMessage message = new SerialAckedMessage();
+message.setRecipients(Arrays.asList(member1));
+
+when(connection1.getRemoteAddress()).thenReturn(member1);
+when(connection1.getRemoteVersion()).thenReturn(Version.CURRENT);
+// create a streamer for a Connection that has a buffer size that's larger
than the
+// biggest message we can actually send. This is picked up by the
MsgStreamer to allocate
+// a buffer
+when(connection1.getSendBufferSize()).thenReturn(Connection.MAX_MSG_SIZE +
1);
+List connections = Arrays.asList(connection1);
+
+final BaseMsgStreamer msgStreamer =
+MsgStreamer.create(connections, message, false, stats, pool);
+// the streamer ought to have limited the message buffer to MAX_MSG_SIZE
+assertThat(((MsgStreamer) msgStreamer).getBuffer().capacity())
+.isEqualTo(Connection.MAX_MSG_SIZE);
+ }
+
+
+
protected BaseMsgStreamer createMsgStreamer(boolean
mixedDestinationVersions) {
InternalDistributedMember member1, member2;
@@ -92,9 +117,9 @@ public class MsgStreamerTest {
when(connection2.getRemoteAddress()).thenReturn(member2);
when(connection2.getSendBufferSize()).thenReturn(Connection.SMALL_BUFFER_SIZE);
if (mixedDestinationVersions) {
- when(connection1.getRemoteVersion()).thenReturn(Version.GEODE_1_12_0);
+ when(connection2.getRemoteVersion()).thenReturn(Version.GEODE_1_12_0);
} else {
- when(connection1.getRemoteVersion()).thenReturn(Version.CURRENT);
+ when(connection2.getRemoteVersion()).thenReturn(Version.CURRENT);
}
List connections = Arrays.asList(connection1, connection2);
[geode] 02/02: GEODE-9775: fix remaining pipelines to support k8s (#7099)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 55810c505d8f1429640eb7a7561a5f6cc10165dd
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Nov 9 13:13:38 2021 -0800
GEODE-9775: fix remaining pipelines to support k8s (#7099)
(cherry picked from commit beb898c1fa06fc488a553faae2c7d03e0428782b)
---
ci/pipelines/examples/deploy_pipeline.sh | 10 --
ci/pipelines/mass-test-run/deploy_pipeline.sh | 10 --
2 files changed, 20 deletions(-)
diff --git a/ci/pipelines/examples/deploy_pipeline.sh
b/ci/pipelines/examples/deploy_pipeline.sh
index 261912b..287f653 100755
--- a/ci/pipelines/examples/deploy_pipeline.sh
+++ b/ci/pipelines/examples/deploy_pipeline.sh
@@ -44,16 +44,6 @@ if [ "${GEODE_BRANCH}" = "HEAD" ]; then
exit 1
fi
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone
${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
pushd ${SCRIPTDIR} 2>&1 > /dev/null
cat > repository.yml
[geode] 01/02: Add required pipeline path dependencies (#7096)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 15d974c3fa99f06ed3767394de0ef7cd551d46f8
Author: Robert Houghton
AuthorDate: Tue Nov 9 11:07:30 2021 -0800
Add required pipeline path dependencies (#7096)
(cherry picked from commit e34147710bd942594fe5b886289a148eea74757e)
---
ci/pipelines/meta/deploy_meta.sh | 8 +++-
ci/pipelines/meta/jinja.template.yml | 6 --
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ci/pipelines/meta/deploy_meta.sh b/ci/pipelines/meta/deploy_meta.sh
index f6a46c4..9db9513 100755
--- a/ci/pipelines/meta/deploy_meta.sh
+++ b/ci/pipelines/meta/deploy_meta.sh
@@ -70,10 +70,8 @@ fi
set -e
set -x
-if [[ "${CONCOURSE_HOST}" == "concourse.apachegeode-ci.info" ]]; then
- CONCOURSE_SCHEME=https
-fi
-CONCOURSE_URL=${CONCOURSE_SCHEME:-"http"}://${CONCOURSE_HOST}
+CONCOURSE_SCHEME=https
+CONCOURSE_URL=${CONCOURSE_SCHEME}://${CONCOURSE_HOST}
FLY_TARGET=${CONCOURSE_HOST}-${CONCOURSE_TEAM}
. ${SCRIPTDIR}/../shared/utilities.sh
@@ -133,7 +131,7 @@ YML
FLY=${FLY:-$(which fly)}
set -e
- if [[ ${UPSTREAM_FORK} != "apache" ]]; then
+ if [[ "${UPSTREAM_FORK}" != "apache" ]]; then
${FLY} -t ${FLY_TARGET} status || \
${FLY} -t ${FLY_TARGET} login \
--team-name ${CONCOURSE_TEAM} \
diff --git a/ci/pipelines/meta/jinja.template.yml
b/ci/pipelines/meta/jinja.template.yml
index 8be8b3d..6f1116f 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -46,14 +46,16 @@ resources:
branch: ((geode-build-branch))
paths:
- ci/pipelines/reaper/*
+- ci/pipelines/render.py
- name: geode-mass-test-run-pipeline
type: git
source:
{{ github_access() | indent(4) }}
branch: ((geode-build-branch))
paths:
- - ci/pipelines/mass-test-run/*
- - ci/pipelines/shared/*
+- ci/pipelines/mass-test-run/*
+- ci/pipelines/shared/*
+- ci/pipelines/render.py
- name: meta-mini-dockerfile
type: git
source:
[geode] branch support/1.14 updated (e9ffadf -> 55810c5)
This is an automated email from the ASF dual-hosted git repository. onichols pushed a change to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git. from e9ffadf GEODE-9778: Bump netty from 4.1.67.Final to 4.1.70.Final new 15d974c Add required pipeline path dependencies (#7096) new 55810c5 GEODE-9775: fix remaining pipelines to support k8s (#7099) The 2 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: ci/pipelines/examples/deploy_pipeline.sh | 10 -- ci/pipelines/mass-test-run/deploy_pipeline.sh | 10 -- ci/pipelines/meta/deploy_meta.sh | 8 +++- ci/pipelines/meta/jinja.template.yml | 6 -- 4 files changed, 7 insertions(+), 27 deletions(-)
[geode] branch develop updated: GEODE-9675: remove useless but flaky test (#7095)
This is an automated email from the ASF dual-hosted git repository.
burcham 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 1885f06 GEODE-9675: remove useless but flaky test (#7095)
1885f06 is described below
commit 1885f0606467703487c4bcc056e0c6696280d570
Author: Bill Burcham
AuthorDate: Tue Nov 9 16:00:17 2021 -0800
GEODE-9675: remove useless but flaky test (#7095)
---
.../ClusterDistributionManagerDUnitTest.java| 21 -
1 file changed, 21 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
index d854aaa..c7a5170 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/ClusterDistributionManagerDUnitTest.java
@@ -155,27 +155,6 @@ public class ClusterDistributionManagerDUnitTest extends
CacheTestCase {
}
/**
- * Demonstrate that a new UDP port is used when an attempt is made to
reconnect using a shunned
- * port
- */
- @Test
- public void testConnectAfterBeingShunned() {
-InternalDistributedSystem system = getSystem();
-Distribution membership = MembershipManagerHelper.getDistribution(system);
-InternalDistributedMember memberBefore = membership.getLocalMember();
-
-// TODO GMS needs to have a system property allowing the bind-port to be
set
-System.setProperty(GEMFIRE_PREFIX + "jg-bind-port", "" +
memberBefore.getMembershipPort());
-system.disconnect();
-system = getSystem();
-membership = MembershipManagerHelper.getDistribution(system);
-system.disconnect();
-InternalDistributedMember memberAfter = membership.getLocalMember();
-
-
assertThat(memberAfter.getMembershipPort()).isEqualTo(memberBefore.getMembershipPort());
- }
-
- /**
* Test the handling of "surprise members" in the membership manager. Create
a DistributedSystem
* in this VM and then add a fake member to its surpriseMember set. Then
ensure that it stays in
* the set when a new membership view arrives that doesn't contain it. Then
wait until the member
[geode] branch develop updated (9f41e48 -> 0cb1736)
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 9f41e48 GEODE-9792: synchronize multi-user authentication on different threads (#7088) add 0cb1736 GEODE-9805: Do not log arguments of Radish AUTH command (#7094) No new revisions were added by this update. Summary of changes: .../executor/connection/AuthIntegrationTest.java | 99 +- .../apache/geode/redis/internal/netty/Command.java | 14 +-- .../internal/netty/ExecutionHandlerContext.java| 3 +- .../redis/internal/netty/CommandJUnitTest.java | 38 +++-- 4 files changed, 140 insertions(+), 14 deletions(-)
[geode] branch GEM-3421-Geode-for-Redis-String-TLS-Tests updated: Log the correct item
This is an automated email from the ASF dual-hosted git repository.
ringles pushed a commit to branch GEM-3421-Geode-for-Redis-String-TLS-Tests
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to
refs/heads/GEM-3421-Geode-for-Redis-String-TLS-Tests by this push:
new 356c9df Log the correct item
356c9df is described below
commit 356c9df14a53926a4adb4244471a5a186e3b01b6
Author: Ray Ingles
AuthorDate: Tue Nov 9 17:19:14 2021 -0500
Log the correct item
---
.../apache/geode/redis/internal/executor/cluster/ClusterExecutor.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
index 4d7cf77..ff4f7ce 100644
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
@@ -48,7 +48,6 @@ import org.apache.geode.redis.internal.executor.RedisResponse;
import org.apache.geode.redis.internal.netty.Command;
import org.apache.geode.redis.internal.netty.ExecutionHandlerContext;
import
org.apache.geode.redis.internal.parameters.RedisParametersMismatchException;
-import static org.apache.geode.redis.internal.netty.Coder.bytesToString;
public class ClusterExecutor implements CommandExecutor {
@@ -61,7 +60,7 @@ public class ClusterExecutor implements CommandExecutor {
List args = command.getProcessedCommand();
byte[] subcommand = args.get(1);
-logger.error("CLUSTER, arg is:" + bytesToString(args));
+logger.error("CLUSTER, arg is:" + bytesToString(subcommand));
if (equalsIgnoreCaseBytes(subcommand, bINFO)) {
checkNumArgs(command, subcommand, 2);
[geode] branch develop updated (beb898c -> 9f41e48)
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 beb898c GEODE-9775: fix remaining pipelines to support k8s (#7099)
add 9f41e48 GEODE-9792: synchronize multi-user authentication on
different threads (#7088)
No new revisions were added by this update.
Summary of changes:
.../cache/client/internal/OpExecutorImpl.java | 39 +++---
.../cache/client/internal/UserAttributes.java | 3 ++
.../client/internal/OpExecutorImplUnitTest.java| 63 +++---
.../geode/security/MultiUserAPIDUnitTest.java | 57 ++--
...nit.java => CountableUserPasswordAuthInit.java} | 8 +--
5 files changed, 137 insertions(+), 33 deletions(-)
rename
geode-junit/src/main/java/org/apache/geode/security/templates/{TrackableUserPasswordAuthInit.java
=> CountableUserPasswordAuthInit.java} (86%)
[geode] branch GEM-3421-Geode-for-Redis-String-TLS-Tests updated: Mo logging mo problems
This is an automated email from the ASF dual-hosted git repository.
ringles pushed a commit to branch GEM-3421-Geode-for-Redis-String-TLS-Tests
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to
refs/heads/GEM-3421-Geode-for-Redis-String-TLS-Tests by this push:
new 602c530 Mo logging mo problems
602c530 is described below
commit 602c5303c06b5b9ac3f79b75342c8c843514175f
Author: Ray Ingles
AuthorDate: Tue Nov 9 17:01:22 2021 -0500
Mo logging mo problems
---
.../geode/redis/internal/executor/cluster/ClusterExecutor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
index 0adeb99..4d7cf77 100644
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java
@@ -48,6 +48,7 @@ import org.apache.geode.redis.internal.executor.RedisResponse;
import org.apache.geode.redis.internal.netty.Command;
import org.apache.geode.redis.internal.netty.ExecutionHandlerContext;
import
org.apache.geode.redis.internal.parameters.RedisParametersMismatchException;
+import static org.apache.geode.redis.internal.netty.Coder.bytesToString;
public class ClusterExecutor implements CommandExecutor {
@@ -59,8 +60,8 @@ public class ClusterExecutor implements CommandExecutor {
throws Exception {
List args = command.getProcessedCommand();
-logger.error("CLUSTER, args are:" + args);
byte[] subcommand = args.get(1);
+logger.error("CLUSTER, arg is:" + bytesToString(args));
if (equalsIgnoreCaseBytes(subcommand, bINFO)) {
checkNumArgs(command, subcommand, 2);
@@ -151,7 +152,7 @@ public class ClusterExecutor implements CommandExecutor {
response.append("\n");
}
-
+logger.error("CLUSTER NODES response:" + response.toString());
return RedisResponse.bulkString(response.toString());
}
[geode] branch develop updated: GEODE-9775: fix remaining pipelines to support k8s (#7099)
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 beb898c GEODE-9775: fix remaining pipelines to support k8s (#7099)
beb898c is described below
commit beb898c1fa06fc488a553faae2c7d03e0428782b
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Nov 9 13:13:38 2021 -0800
GEODE-9775: fix remaining pipelines to support k8s (#7099)
---
ci/pipelines/examples/deploy_pipeline.sh | 10 --
ci/pipelines/mass-test-run/deploy_pipeline.sh | 10 --
2 files changed, 20 deletions(-)
diff --git a/ci/pipelines/examples/deploy_pipeline.sh
b/ci/pipelines/examples/deploy_pipeline.sh
index 261912b..287f653 100755
--- a/ci/pipelines/examples/deploy_pipeline.sh
+++ b/ci/pipelines/examples/deploy_pipeline.sh
@@ -44,16 +44,6 @@ if [ "${GEODE_BRANCH}" = "HEAD" ]; then
exit 1
fi
-MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
-MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
-MY_ZONE=${MY_ZONE##*/}
-NETWORK_INTERFACE_INFO="$(gcloud compute instances describe ${MY_NAME} --zone
${MY_ZONE} --format="json(networkInterfaces)")"
-GCP_NETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].network')
-GCP_NETWORK=${GCP_NETWORK##*/}
-GCP_SUBNETWORK=$(echo ${NETWORK_INTERFACE_INFO} | jq -r
'.networkInterfaces[0].subnetwork')
-GCP_SUBNETWORK=${GCP_SUBNETWORK##*/}
-ENV_ID=$(echo ${GCP_NETWORK} | awk -F- '{ print $1}')
-
pushd ${SCRIPTDIR} 2>&1 > /dev/null
cat > repository.yml
[geode] branch develop updated (e341477 -> a8a23ba)
This is an automated email from the ASF dual-hosted git repository. jchen21 pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from e341477 Add required pipeline path dependencies (#7096) add a8a23ba GEODE-9758: Configure locator serialization filtering by default on Java 8 (#6962) No new revisions were added by this update. Summary of changes: .../geode/metrics/MemberTypeCommonTagsTest.java| 3 +- ...orLauncherGlobalSerialFilterAcceptanceTest.java | 119 +++ ...atorLauncherJmxSerialFilterAcceptanceTest.java} | 21 +- ...rverLauncherJmxSerialFilterAcceptanceTest.java} | 21 +- .../ManagementRequestLoggingDistributedTest.java | 3 + ...ctionedSerializablesServiceIntegrationTest.java | 40 +++ .../ConnectorsSanctionedSerializablesService.java | 2 +- ...lization.filter.SanctionedSerializablesService} | 0 geode-core/build.gradle| 2 + ...ValidateSerializableObjectsDistributedTest.java | 180 +++ .../geode/distributed/HostedLocatorsDUnitTest.java | 8 +- .../cache/CompactOfflineDiskStoreDUnitTest.java| 3 + .../cache/ParallelDiskStoreRecoveryDUnitTest.java | 3 + .../cache/PartitionedRegionSingleHopDUnitTest.java | 3 + .../cache/ValidateOfflineDiskStoreDUnitTest.java | 3 + .../cache/snapshot/GFSnapshotDUnitTest.java| 3 + .../MeterSubregistryReconnectDistributedTest.java | 3 + ...rLauncherGlobalSerialFilterDistributedTest.java | 191 +++ .../LoggingWithReconnectDistributedTest.java | 3 + .../JmxLocatorReconnectDistributedTest.java| 3 + .../JmxServerReconnectDistributedTest.java | 3 + .../geode/distributed/LocatorIntegrationTest.java | 180 ++- ...catorLauncherJmxManagerLocalRegressionTest.java | 22 +- ...ctionedSerializablesServiceIntegrationTest.java | 39 +++ ...erSerializableObjectFilterIntegrationTest.java} | 138 ...erSerializableObjectFilterIntegrationTest.java} | 138 ...cherGlobalSerialFilterBlankIntegrationTest.java | 79 + ...herGlobalSerialFilterExistsIntegrationTest.java | 79 + ...rLauncherGlobalSerialFilterIntegrationTest.java | 104 ++ ...alSerialFilterPropertyBlankIntegrationTest.java | 110 +++ ...alSerialFilterPropertyEmptyIntegrationTest.java | 110 +++ ...torLauncherJmxSerialFilterIntegrationTest.java} | 115 --- .../filter/SerialFilterAssertions.java | 64 .../ServerGlobalSerialFilterIntegrationTest.java | 107 +++ ...LauncherGlobalSerialFilterIntegrationTest.java} | 109 ++- ...verLauncherJmxSerialFilterIntegrationTest.java} | 112 --- ...erSerializableObjectFilterIntegrationTest.java} | 155 + .../internal/ManagementAgentIntegrationTest.java | 5 +- .../apache/geode/distributed/LocatorLauncher.java | 46 ++- .../CoreSanctionedSerializablesService.java| 2 +- .../geode/internal/InternalDataSerializer.java | 97 +- .../internal/ObjectInputStreamFilterWrapper.java | 234 -- .../apache/geode/internal/lang/SystemUtils.java| 2 + .../DistributedSerializableObjectConfig.java | 45 +++ .../internal/JmxRmiOpenTypesSerialFilter.java | 148 - .../geode/management/internal/ManagementAgent.java | 7 +- .../internal/ManagementAgentFactory.java | 3 +- .../internal/SystemManagementService.java | 11 +- ...lization.filter.SanctionedSerializablesService} | 0 .../geode/distributed/LocatorLauncherTest.java | 0 ...lDataSerializerSerializationAcceptlistTest.java | 133 +--- .../internal/JmxRmiOpenTypesSerialFilterTest.java | 351 - ...ctionedSerializablesServiceIntegrationTest.java | 39 +++ .../internal/CQSanctionedSerializablesService.java | 2 +- ...lization.filter.SanctionedSerializablesService} | 0 ...ributedReferenceLocatorLauncherExampleTest.java | 2 + ...ctionedSerializablesServiceIntegrationTest.java | 39 +++ .../DUnitSanctionedSerializablesService.java | 2 +- ...lization.filter.SanctionedSerializablesService} | 0 ...ctionedSerializablesServiceIntegrationTest.java | 39 +++ .../RedisSanctionedSerializablesService.java | 2 +- ...lization.filter.SanctionedSerializablesService} | 0 .../cli/commands/ShutdownCommandDUnitTest.java | 3 +- ...ctionedSerializablesServiceIntegrationTest.java | 56 .../GfshSanctionedSerializablesService.java| 2 +- .../internal/cli/commands/StartLocatorCommand.java | 1 + ...lization.filter.SanctionedSerializablesService} | 0 ...ctionedSerializablesServiceIntegrationTest.java | 39 +++ .../apache/geode/codeAnalysis/excludedClasses.txt | 1 + .../geode/codeAnalysis/CompiledClassUtils.java | 8 +- ...nedSerializablesServiceIntegrationTestBase.java | 89 ++ .../categories/SanctionedSerializablesTest.java| 10 +- .../JUnitSanctionedSerializablesService.java | 2 +-
[geode] branch develop updated (276a819 -> e341477)
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 276a819 GEODE-9693:Removed deprecated elements from ListIndexCommandDistributedTestBase (#6958) add e341477 Add required pipeline path dependencies (#7096) No new revisions were added by this update. Summary of changes: ci/pipelines/meta/deploy_meta.sh | 8 +++- ci/pipelines/meta/jinja.template.yml | 6 -- 2 files changed, 7 insertions(+), 7 deletions(-)
[geode] 02/02: Log Jedis and Spring stuff too
This is an automated email from the ASF dual-hosted git repository.
ringles pushed a commit to branch GEM-3421-Geode-for-Redis-String-TLS-Tests
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c676c2692462e1ad0c780b184537a17b379d6c1b
Author: Ray Ingles
AuthorDate: Tue Nov 9 13:39:23 2021 -0500
Log Jedis and Spring stuff too
---
.../org/apache/geode/redis/internal/executor/key/KeysExecutor.java | 3 +++
geode-log4j/src/main/resources/log4j2.xml| 5 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
index a7a3555..c8a686b 100755
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
@@ -42,13 +42,16 @@ public class KeysExecutor implements CommandExecutor {
List matchingKeys = new ArrayList<>();
GlobPattern pattern = new GlobPattern(glob);
+logger.error("KEYS, glob is:" + pattern);
for (RedisKey key : allKeys) {
+ logger.error("KEYS, cur key is:" + key);
byte[] keyBytes = key.toBytes();
if (pattern.matches(keyBytes)) {
matchingKeys.add(keyBytes);
}
}
+logger.error("KEYS, matchingKeys length:" + matchingKeys.size());
return RedisResponse.array(matchingKeys, true);
}
diff --git a/geode-log4j/src/main/resources/log4j2.xml
b/geode-log4j/src/main/resources/log4j2.xml
index 9d266bc..7189404 100755
--- a/geode-log4j/src/main/resources/log4j2.xml
+++ b/geode-log4j/src/main/resources/log4j2.xml
@@ -32,7 +32,10 @@
-
+
+
+
+
[geode] 01/02: more logging and bumped SHA
This is an automated email from the ASF dual-hosted git repository.
ringles pushed a commit to branch GEM-3421-Geode-for-Redis-String-TLS-Tests
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 6506051869323a319931c5821facde78540da72c
Author: Ray Ingles
AuthorDate: Fri Nov 5 16:35:04 2021 -0400
more logging and bumped SHA
---
.../org/apache/geode/redis/internal/executor/key/KeysExecutor.java| 1 +
.../org/apache/geode/redis/internal/executor/key/RenameExecutor.java | 4
2 files changed, 5 insertions(+)
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
index 9777c2d..a7a3555 100755
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/KeysExecutor.java
@@ -36,6 +36,7 @@ public class KeysExecutor implements CommandExecutor {
@Override
public RedisResponse executeCommand(Command command, ExecutionHandlerContext
context) {
List commandElems = command.getProcessedCommand();
+logger.error("KEYS, args are:" + commandElems);
byte[] glob = commandElems.get(1);
Set allKeys = context.getRegion().keySet();
List matchingKeys = new ArrayList<>();
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameExecutor.java
index 16fb23c..fba6134 100644
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/executor/key/RenameExecutor.java
@@ -16,16 +16,20 @@
package org.apache.geode.redis.internal.executor.key;
+import org.apache.logging.log4j.Logger;
+import org.apache.geode.logging.internal.log4j.api.LogService;
import org.apache.geode.redis.internal.data.RedisKey;
import org.apache.geode.redis.internal.executor.RedisResponse;
import org.apache.geode.redis.internal.netty.ExecutionHandlerContext;
public class RenameExecutor extends AbstractRenameExecutor {
+ private static final Logger logger = LogService.getLogger();
@Override
protected boolean executeRenameCommand(RedisKey key, RedisKey newKey,
ExecutionHandlerContext context) {
+logger.error("RENAME, args are:" + key + " " + newKey);
return rename(context, key, newKey, false);
}
[geode] branch GEM-3421-Geode-for-Redis-String-TLS-Tests updated (206d15d -> c676c26)
This is an automated email from the ASF dual-hosted git repository. ringles pushed a change to branch GEM-3421-Geode-for-Redis-String-TLS-Tests in repository https://gitbox.apache.org/repos/asf/geode.git. from 206d15d one more log bump new 6506051 more logging and bumped SHA new c676c26 Log Jedis and Spring stuff too The 2 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: .../org/apache/geode/redis/internal/executor/key/KeysExecutor.java | 4 .../org/apache/geode/redis/internal/executor/key/RenameExecutor.java | 4 geode-log4j/src/main/resources/log4j2.xml| 5 - 3 files changed, 12 insertions(+), 1 deletion(-)
[geode] branch support/1.12 updated: GEODE-9767: Bump netty from 4.1.48.Final to 4.1.68.Final (#7034)
This is an automated email from the ASF dual-hosted git repository.
onichols 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 a91d8fa GEODE-9767: Bump netty from 4.1.48.Final to 4.1.68.Final
(#7034)
a91d8fa is described below
commit a91d8fae76af167f856a9c21aef5fd98aa861c67
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Nov 9 10:36:29 2021 -0800
GEODE-9767: Bump netty from 4.1.48.Final to 4.1.68.Final (#7034)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
geode-assembly/src/integrationTest/resources/assembly_content.txt | 2 +-
geode-assembly/src/integrationTest/resources/dependency_classpath.txt | 2 +-
4 files changed, 4 insertions(+), 4 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 3ca9d07..94f6396 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -220,7 +220,7 @@
io.netty
netty-all
-4.1.48.Final
+4.1.68.Final
compile
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 49bc886..17817bf 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
@@ -114,7 +114,7 @@ class DependencyConstraints implements Plugin {
api(group: 'commons-validator', name: 'commons-validator', version:
get('commons-validator.version'))
api(group: 'io.github.classgraph', name: 'classgraph', version:
'4.8.52')
api(group: 'io.micrometer', name: 'micrometer-core', version:
get('micrometer.version'))
-api(group: 'io.netty', name: 'netty-all', version: '4.1.48.Final')
+api(group: 'io.netty', name: 'netty-all', version: '4.1.68.Final')
api(group: 'it.unimi.dsi', name: 'fastutil', version:
get('fastutil.version'))
api(group: 'javax.annotation', name: 'javax.annotation-api', version:
'1.3.2')
api(group: 'javax.annotation', name: 'jsr250-api', version: '1.0')
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index b29307f..d0f2e50 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1045,7 +1045,7 @@ lib/micrometer-core-1.6.3.jar
lib/mx4j-3.0.2.jar
lib/mx4j-remote-3.0.2.jar
lib/mx4j-tools-3.0.1.jar
-lib/netty-all-4.1.48.Final.jar
+lib/netty-all-4.1.68.Final.jar
lib/protobuf-java-3.10.0.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 673948a..7fe3ffe 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -88,6 +88,6 @@ lucene-core-6.6.6.jar
lucene-queries-6.6.6.jar
protobuf-java-3.10.0.jar
geo-0.7.1.jar
-netty-all-4.1.48.Final.jar
+netty-all-4.1.68.Final.jar
grumpy-core-0.2.2.jar
commons-math3-3.2.jar
[geode] branch support/1.13 updated: GEODE-9767: Bump netty from 4.1.48.Final to 4.1.68.Final (#7033)
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 2c61fe4 GEODE-9767: Bump netty from 4.1.48.Final to 4.1.68.Final
(#7033)
2c61fe4 is described below
commit 2c61fe438d2f9df5844906a1deb5ca0938e4856d
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Tue Nov 9 10:36:04 2021 -0800
GEODE-9767: Bump netty from 4.1.48.Final to 4.1.68.Final (#7033)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
geode-assembly/src/integrationTest/resources/assembly_content.txt | 2 +-
geode-assembly/src/integrationTest/resources/dependency_classpath.txt | 2 +-
4 files changed, 4 insertions(+), 4 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 ab77352..9fb7ed3 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -250,7 +250,7 @@
io.netty
netty-all
-4.1.48.Final
+4.1.68.Final
compile
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 1180e62..1d8ca9d 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
@@ -119,7 +119,7 @@ class DependencyConstraints implements Plugin {
// Careful when upgrading this dependency: see GEODE-7370 and
GEODE-8150.
api(group: 'io.github.classgraph', name: 'classgraph', version:
'4.8.52')
api(group: 'io.micrometer', name: 'micrometer-core', version:
get('micrometer.version'))
-api(group: 'io.netty', name: 'netty-all', version: '4.1.48.Final')
+api(group: 'io.netty', name: 'netty-all', version: '4.1.68.Final')
api(group: 'io.swagger', name: 'swagger-annotations', version:
'1.5.23')
api(group: 'it.unimi.dsi', name: 'fastutil', version:
get('fastutil.version'))
api(group: 'javax.annotation', name: 'javax.annotation-api', version:
'1.3.2')
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 420e7e7..88defbe 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1059,7 +1059,7 @@ lib/micrometer-core-1.6.3.jar
lib/mx4j-3.0.2.jar
lib/mx4j-remote-3.0.2.jar
lib/mx4j-tools-3.0.1.jar
-lib/netty-all-4.1.48.Final.jar
+lib/netty-all-4.1.68.Final.jar
lib/protobuf-java-3.11.4.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 9b14d67..648 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -88,4 +88,4 @@ lucene-core-6.6.6.jar
lucene-queries-6.6.6.jar
protobuf-java-3.11.4.jar
geo-0.7.7.jar
-netty-all-4.1.48.Final.jar
+netty-all-4.1.68.Final.jar
[geode] branch support/1.14 updated (120165b -> e9ffadf)
This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a change to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git. from 120165b GEODE-9797: User guide typo repairs (#7085) new 8ae6f5d GEODE-9050: Putting sleep in PubSubIntegrationTest new e9ffadf GEODE-9778: Bump netty from 4.1.67.Final to 4.1.70.Final The 2 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: boms/geode-all-bom/src/test/resources/expected-pom.xml | 18 -- .../geode/gradle/plugins/DependencyConstraints.groovy | 6 +- geode-apis-compatible-with-redis/build.gradle | 5 - .../executor/pubsub/AbstractPubSubIntegrationTest.java | 6 +- .../src/test/resources/expected-pom.xml| 2 +- .../src/integrationTest/resources/assembly_content.txt | 7 ++- .../integrationTest/resources/dependency_classpath.txt | 7 ++- .../src/integrationTest/resources/expected_jars.txt| 7 ++- 8 files changed, 45 insertions(+), 13 deletions(-)
[geode] 02/02: GEODE-9778: Bump netty from 4.1.67.Final to 4.1.70.Final
This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e9ffadfe1417834b9e53b98021c945b0e8892a5e
Author: Jens Deppe
AuthorDate: Fri Nov 5 05:57:58 2021 -0700
GEODE-9778: Bump netty from 4.1.67.Final to 4.1.70.Final
(cherry picked from commit 7f4bf62a08b24aca81fe05349cdc72d919a6cab7)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 18 --
.../geode/gradle/plugins/DependencyConstraints.groovy | 6 +-
geode-apis-compatible-with-redis/build.gradle | 5 -
.../src/test/resources/expected-pom.xml| 2 +-
.../src/integrationTest/resources/assembly_content.txt | 7 ++-
.../integrationTest/resources/dependency_classpath.txt | 7 ++-
.../src/integrationTest/resources/expected_jars.txt| 7 ++-
7 files changed, 40 insertions(+), 12 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 332ac2d..4d038e1 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -230,12 +230,6 @@
compile
-io.netty
-netty-all
-4.1.59.Final
-compile
-
-
io.swagger
swagger-annotations
1.6.2
@@ -710,6 +704,18 @@
compile
+io.netty
+netty-codec-redis
+4.1.70.Final
+compile
+
+
+io.netty
+netty-handler
+4.1.70.Final
+compile
+
+
org.seleniumhq.selenium
selenium-api
3.141.59
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 3153b56..9c3a9c8 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
@@ -117,7 +117,6 @@ class DependencyConstraints implements Plugin {
// Careful when upgrading this dependency: see GEODE-7370 and
GEODE-8150.
api(group: 'io.github.classgraph', name: 'classgraph', version:
'4.8.52')
api(group: 'io.micrometer', name: 'micrometer-core', version:
get('micrometer.version'))
-api(group: 'io.netty', name: 'netty-all', version: '4.1.59.Final')
api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2')
api(group: 'it.unimi.dsi', name: 'fastutil', version:
get('fastutil.version'))
api(group: 'javax.annotation', name: 'javax.annotation-api', version:
'1.3.2')
@@ -230,6 +229,11 @@ class DependencyConstraints implements Plugin {
entry('powermock-module-junit4')
}
+dependencySet(group: 'io.netty', version: '4.1.70.Final') {
+ entry('netty-codec-redis')
+ entry('netty-handler')
+}
+
dependencySet(group: 'org.seleniumhq.selenium', version: '3.141.59') {
entry('selenium-api')
entry('selenium-chrome-driver')
diff --git a/geode-apis-compatible-with-redis/build.gradle
b/geode-apis-compatible-with-redis/build.gradle
index b13bfc5..4f50fb2 100644
--- a/geode-apis-compatible-with-redis/build.gradle
+++ b/geode-apis-compatible-with-redis/build.gradle
@@ -35,7 +35,7 @@ dependencies {
implementation(project(':geode-core'))
implementation(project(':geode-gfsh'))
implementation('com.github.davidmoten:geo')
- implementation('io.netty:netty-all')
+ implementation('io.netty:netty-handler')
implementation('org.apache.logging.log4j:log4j-api')
implementation('commons-codec:commons-codec')
implementation('org.apache.commons:commons-lang3')
@@ -44,6 +44,7 @@ dependencies {
testImplementation('org.mockito:mockito-core')
testImplementation('redis.clients:jedis')
+ commonTestImplementation('io.netty:netty-codec-redis')
commonTestImplementation(project(':geode-junit'))
commonTestImplementation(project(':geode-dunit'))
commonTestImplementation('org.testcontainers:testcontainers')
@@ -66,6 +67,7 @@ dependencies {
acceptanceTestImplementation(project(':geode-junit'))
acceptanceTestImplementation('redis.clients:jedis')
acceptanceTestImplementation('org.testcontainers:testcontainers')
+ acceptanceTestRuntime('io.netty:netty-codec-redis')
acceptanceTestRuntime(project(':geode-log4j'))
acceptanceTestImplementation('org.springframework.boot:spring-boot-starter-web')
{
exclude module: 'spring-boot-starter-tomcat'
@@ -76,6 +78,7 @@ dependencies {
// This only exists for debugging PubSubNativeRedisAcceptanceTest
acceptanceTestImplementation('org.buildobjects:jproc:2.4.0')
+ distributedTestImplementation('io.netty:netty-codec-redis')
[geode] 01/02: GEODE-9050: Putting sleep in PubSubIntegrationTest
This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a commit to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git commit 8ae6f5d537352ff17633302e902460c4bac466b3 Author: Dan Smith AuthorDate: Mon Nov 8 10:39:26 2021 -0800 GEODE-9050: Putting sleep in PubSubIntegrationTest Working around this issue by putting a sleep in PubSubIntegrationTest. This is not a fix for the underlying race condition in the product but just a workaround to make this test pass so we can continue to upgrade netty on this support branch. The actual fix will in 1.15. --- .../internal/executor/pubsub/AbstractPubSubIntegrationTest.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java b/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java index 832441a..fb6e484 100644 --- a/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java +++ b/geode-apis-compatible-with-redis/src/integrationTest/java/org/apache/geode/redis/internal/executor/pubsub/AbstractPubSubIntegrationTest.java @@ -437,7 +437,7 @@ public abstract class AbstractPubSubIntegrationTest implements RedisPortSupplier AtomicBoolean running = new AtomicBoolean(true); Future future1 = -executor.submit(() -> runSubscribeAndPublish(1, 1, running)); +executor.submit(() -> runSubscribeAndPublish(1, 3, running)); running.set(false); future1.get(); @@ -478,6 +478,10 @@ public abstract class AbstractPubSubIntegrationTest implements RedisPortSupplier mockSubscriber.psubscribe(pChannel); mockSubscriber.awaitPSubscribe(pChannel); + // Workaround for GEODE-9050 - wait for the subscription to finish on the server + // and complete the call to changeChannelEventLoopGroup + Thread.sleep(10_000); + localPublisher.publish(channel, "hello-" + index + "-" + iteration); mockSubscriber.unsubscribe(channel);
