[geode] branch develop updated: GEODE-7943 add synchronization to Subscriptions class (#4913)
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 51477e9 GEODE-7943 add synchronization to Subscriptions class (#4913)
51477e9 is described below
commit 51477e91cd65a14e9396fb7da2876cd8bf2b7dee
Author: Jens Deppe
AuthorDate: Thu Apr 9 23:45:41 2020 -0700
GEODE-7943 add synchronization to Subscriptions class (#4913)
* Add synchronized to size()
* Move test to integrationTest
* Switch to CopyOnWriteList (it appears not to really introduce memory
issues)
* Fix a small cleanup issue in ExpireAtIntegrationTest
Authored-by: Jens Deppe
---
.../redis/general/ExpireAtIntegrationTest.java | 17 +-
.../geode/redis/internal/DummySubscription.java| 47 +
.../internal/SubscriptionsIntegrationTest.java | 194 +
.../apache/geode/redis/internal/Subscriptions.java | 19 +-
4 files changed, 268 insertions(+), 9 deletions(-)
diff --git
a/geode-redis/src/integrationTest/java/org/apache/geode/redis/general/ExpireAtIntegrationTest.java
b/geode-redis/src/integrationTest/java/org/apache/geode/redis/general/ExpireAtIntegrationTest.java
index 5d80d31..9ea5dd4 100644
---
a/geode-redis/src/integrationTest/java/org/apache/geode/redis/general/ExpireAtIntegrationTest.java
+++
b/geode-redis/src/integrationTest/java/org/apache/geode/redis/general/ExpireAtIntegrationTest.java
@@ -15,6 +15,9 @@
package org.apache.geode.redis.general;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
@@ -24,6 +27,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import redis.clients.jedis.Jedis;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.GemFireCache;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.redis.GeodeRedisServer;
import org.apache.geode.test.awaitility.GeodeAwaitility;
@@ -35,13 +40,19 @@ public class ExpireAtIntegrationTest {
private static GeodeRedisServer server;
private long unixTimeStampInTheFutureInSeconds;
private long unixTimeStampFromThePast = 0L;
- String key = "key";
- String value = "value";
+ private static String key = "key";
+ private static String value = "value";
+ private static GemFireCache cache;
@BeforeClass
public static void setUp() {
int port = AvailablePortHelper.getRandomAvailableTCPPort();
+CacheFactory cf = new CacheFactory();
+cf.set(LOG_LEVEL, "error");
+cf.set(MCAST_PORT, "0");
+cf.set(LOCATORS, "");
+cache = cf.create();
server = new GeodeRedisServer("localhost", port);
server.start();
jedis = new Jedis("localhost", port, REDIS_CLIENT_TIMEOUT);
@@ -52,7 +63,6 @@ public class ExpireAtIntegrationTest {
unixTimeStampInTheFutureInSeconds = (System.currentTimeMillis() / 1000) +
60;
}
-
@After
public void testLevelTearDown() {
jedis.flushAll();
@@ -61,6 +71,7 @@ public class ExpireAtIntegrationTest {
@AfterClass
public static void classLevelTearDown() {
jedis.close();
+cache.close();
server.shutdown();
}
diff --git
a/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/DummySubscription.java
b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/DummySubscription.java
new file mode 100644
index 000..8868ad4
--- /dev/null
+++
b/geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/DummySubscription.java
@@ -0,0 +1,47 @@
+/*
+ * 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.redis.internal;
+
+import java.util.List;
+
+public class DummySubscription implements Subscription {
+
+ @Override
+ public boolean isEqualTo(Object channelOrPattern, Client client) {
+return false;
+ }
+
+ @Override
+ public PublishResult publishMessage(String channel, byte[]
[geode] branch develop updated: Revert "GEODE-7852: test SNI client against a geode (2-node) cluster (#4925)" (#4940)
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 b93cc01 Revert "GEODE-7852: test SNI client against a geode (2-node)
cluster (#4925)" (#4940)
b93cc01 is described below
commit b93cc01b443497217819c748ac265e887f36fec0
Author: Bill Burcham
AuthorDate: Thu Apr 9 23:32:21 2020 -0700
Revert "GEODE-7852: test SNI client against a geode (2-node) cluster
(#4925)" (#4940)
This reverts commit 4f2a6047d5b272982595e3b7e71c624d61c69415.
---
...tanceTest.java => ClientSNIAcceptanceTest.java} | 17 +--
.../client/sni/DualServerSNIAcceptanceTest.java| 169 -
.../client/sni/geode-config/locator-keystore.jks | Bin 0 -> 2028 bytes
.../sni/geode-config/locator-maeve-keystore.jks| Bin 2048 -> 0 bytes
.../geode-config/server-clementine-keystore.jks| Bin 2059 -> 0 bytes
.../sni/geode-config/server-dolores-keystore.jks | Bin 2050 -> 0 bytes
.../client/sni/geode-config/server-keystore.jks| Bin 0 -> 2025 bytes
.../geode/client/sni/geode-config/truststore.jks | Bin 8095 -> 6023 bytes
.../org/apache/geode/client/sni/haproxy.cfg| 14 +-
.../geode/client/sni/scripts/geode-starter-2.gfsh | 23 ---
.../geode/client/sni/scripts/geode-starter.gfsh| 4 +-
11 files changed, 11 insertions(+), 216 deletions(-)
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/SingleServerSNIAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.java
similarity index 84%
rename from
geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/SingleServerSNIAcceptanceTest.java
rename to
geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.java
index bb7de3d..8c8f397 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/SingleServerSNIAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.java
@@ -43,19 +43,10 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.proxy.ProxySocketFactories;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
-/**
- * This test runs against a 1-server, 1-locator Geode cluster. The server and
locator run inside
- * a (single) Docker container and are not route-able from the host (where
this JUnit test is
- * running). Another Docker container is running the HAProxy image and it's
set up as an SNI
- * gateway. The test connects to the gateway via SNI and the gateway (in one
Docker container)
- * forwards traffic to Geode members (running in the other Docker container).
- *
- * This test connects to the server and verifies it can write and read data in
the region.
- */
-public class SingleServerSNIAcceptanceTest {
+public class ClientSNIAcceptanceTest {
private static final URL DOCKER_COMPOSE_PATH =
- SingleServerSNIAcceptanceTest.class.getResource("docker-compose.yml");
+ ClientSNIAcceptanceTest.class.getResource("docker-compose.yml");
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes
into play
@@ -73,7 +64,7 @@ public class SingleServerSNIAcceptanceTest {
@Before
public void before() throws IOException, InterruptedException {
trustStorePath =
-createTempFileFromResource(SingleServerSNIAcceptanceTest.class,
+createTempFileFromResource(ClientSNIAcceptanceTest.class,
"geode-config/truststore.jks")
.getAbsolutePath();
docker.exec(options("-T"), "geode",
@@ -96,7 +87,7 @@ public class SingleServerSNIAcceptanceTest {
.port(15443)
.getExternalPort();
ClientCache cache = new ClientCacheFactory(gemFireProps)
-.addPoolLocator("locator-maeve", 10334)
+.addPoolLocator("locator", 10334)
.setPoolSocketFactory(ProxySocketFactories.sni("localhost",
proxyPort))
.create();
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/DualServerSNIAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/DualServerSNIAcceptanceTest.java
deleted file mode 100644
index a94b16d..000
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/DualServerSNIAcceptanceTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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 compli
[geode] branch develop updated: GEODE-7779: Concourse BumpXYZ does not include {prerelease} (#4684)
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 7763ce5 GEODE-7779: Concourse BumpXYZ does not include {prerelease}
(#4684)
7763ce5 is described below
commit 7763ce55919442d88cc35c201de7d938a658e210
Author: Bala Kaza Venkata <43208983+balak...@users.noreply.github.com>
AuthorDate: Fri Apr 10 02:30:40 2020 -0400
GEODE-7779: Concourse BumpXYZ does not include {prerelease} (#4684)
Update the bump jobs to increment and add the semver release token which
clears the wrong semver picking happening in past few days.
Signed-off-by: Robert Houghton
Signed-off-by: Bala Kaza Venkata
---
ci/pipelines/geode-build/jinja.template.yml | 6 --
ci/pipelines/shared/jinja.variables.yml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index da6e399..b797759 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -186,7 +186,7 @@ resources:
driver: gcs
initial_version: {{ metadata.initial_version }}
json_key: ((!concourse-gcp-key))
-key: semvers/((pipeline-prefix))((geode-build-branch))/version
+key: semvers/((pipeline-prefix))((geode-build-branch))/number
- name: geode-passing-tokens
type: gcs-resource
source:
@@ -238,7 +238,9 @@ jobs:
serial: true
plan:
- get: geode-build-version
-params: { bump: {{ semverPiece }} }
+params: { bump: {{ semverPiece }},
+ pre: ((semver-prerelease-token)),
+ pre_without_version: true }
- put: geode-build-version
params:
file: geode-build-version/number
diff --git a/ci/pipelines/shared/jinja.variables.yml
b/ci/pipelines/shared/jinja.variables.yml
index a82cdca..1c9f746 100644
--- a/ci/pipelines/shared/jinja.variables.yml
+++ b/ci/pipelines/shared/jinja.variables.yml
@@ -66,7 +66,7 @@ java_test_versions:
version: 11
metadata:
- initial_version: 1.13.0
+ initial_version: 1.13.0-((semver-prerelease-token))
publish_artifacts:
CPUS: '8'
[geode] branch develop updated: GEODE-7838: getNumOfServers while rebalance is executed (#4815)
This is an automated email from the ASF dual-hosted git repository.
mkevo 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 93e460b GEODE-7838: getNumOfServers while rebalance is executed
(#4815)
93e460b is described below
commit 93e460bb12c05c9351db0b8d6cb8b9179f18caec
Author: Mario Kevo <48509719+mk...@users.noreply.github.com>
AuthorDate: Fri Apr 10 07:28:49 2020 +0200
GEODE-7838: getNumOfServers while rebalance is executed (#4815)
* GEODE-7383: getNumOfServers while rebalance is executed
---
.../control/RebalanceOperationDistributedTest.java | 1 +
.../geode/cache/control/RebalanceResults.java | 7 +++
.../cache/partition/PartitionRebalanceInfo.java| 7 +++
.../control/PartitionRebalanceDetailsImpl.java | 6 ++
.../cache/control/RebalanceResultsImpl.java| 9 +++
.../internal/functions/RebalanceFunction.java | 2 +-
.../geode/management/internal/i18n/CliStrings.java | 2 +
.../operation/RebalanceOperationPerformer.java | 4 +-
.../sanctioned-geode-core-serializables.txt| 4 +-
.../operation/RebalanceOperationPerformerTest.java | 2 +-
.../gfsh/command-pages/rebalance.html.md.erb | 28 +-
.../RebalanceCommandDistributedTestBase.java | 65 +-
.../internal/cli/commands/RebalanceCommand.java| 12 +++-
.../operation/RebalanceRegionResultImpl.java | 11
.../management/runtime/RebalanceRegionResult.java | 5 ++
.../sanctioned-geode-management-serializables.txt | 2 +-
.../management/operation/RebalanceResultTest.java | 4 +-
17 files changed, 146 insertions(+), 25 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
index 7f43087..f77193e 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationDistributedTest.java
@@ -1055,6 +1055,7 @@ public class RebalanceOperationDistributedTest extends
CacheTestCase {
assertThat(details.getPrimaryTransfersCompleted()).isEqualTo(0);
assertThat(details.getBucketTransferBytes()).isGreaterThan(0);
assertThat(details.getBucketTransfersCompleted()).isEqualTo(3);
+ assertThat(details.getNumberOfMembersExecutedOn()).isEqualTo(2);
Set afterDetails =
details.getPartitionMemberDetailsAfter();
assertThat(afterDetails).hasSize(2);
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
index e2e0134..fd6f28a 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/control/RebalanceResults.java
@@ -99,4 +99,11 @@ public interface RebalanceResults {
* @return the total time, in milliseconds, spent transferring primaries
*/
long getTotalPrimaryTransferTime();
+
+ /**
+ * Returns the total number of members on which command is executed.
+ *
+ * @return the total number of members on which command is executed
+ */
+ int getTotalMembersExecutedOn();
}
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
index cf69ce8..437e8cf 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionRebalanceInfo.java
@@ -137,4 +137,11 @@ public interface PartitionRebalanceInfo {
* @return the time, in milliseconds, spent transferring primaries for this
region
*/
long getPrimaryTransferTime();
+
+ /**
+ * Returns the total number of members on which command is executed.
+ *
+ * @return the total number of members on which command is executed
+ */
+ int getNumberOfMembersExecutedOn();
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl.java
index 8a6c4f9..5eeb8aa 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl.java
@@ -46,6 +46,7 @@ public class PartitionRebalanceDetailsImpl
private int primaryTransfersCompleted;
private final transient PartitionedRegion region;
private long time;
+ private int numOfMembers;
[geode] branch support/1.12 updated: use 1.12.0 as baseline for benchmarking 1.12.x
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 8951390 use 1.12.0 as baseline for benchmarking 1.12.x 8951390 is described below commit 8951390481b37ce73eeda9904cc1adc87be9 Author: Owen Nichols AuthorDate: Thu Apr 9 19:04:38 2020 -0700 use 1.12.0 as baseline for benchmarking 1.12.x --- ci/pipelines/shared/jinja.variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipelines/shared/jinja.variables.yml b/ci/pipelines/shared/jinja.variables.yml index 95ed8dd..1027cc2 100644 --- a/ci/pipelines/shared/jinja.variables.yml +++ b/ci/pipelines/shared/jinja.variables.yml @@ -17,7 +17,7 @@ benchmarks: baseline_branch: '' - baseline_version: '1.10.0' + baseline_version: '1.12.0' benchmark_branch: develop flavors: - title: '_base'
[geode] branch revert-4925-feature/GEODE-7852-test-cluster created (now 13cb552)
This is an automated email from the ASF dual-hosted git repository. burcham pushed a change to branch revert-4925-feature/GEODE-7852-test-cluster in repository https://gitbox.apache.org/repos/asf/geode.git. at 13cb552 Revert "GEODE-7852: test SNI client against a geode (2-node) cluster (#4925)" This branch includes the following new commits: new 13cb552 Revert "GEODE-7852: test SNI client against a geode (2-node) cluster (#4925)" 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] 01/01: Revert "GEODE-7852: test SNI client against a geode (2-node) cluster (#4925)"
This is an automated email from the ASF dual-hosted git repository.
burcham pushed a commit to branch revert-4925-feature/GEODE-7852-test-cluster
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 13cb5523e16783b2c2bf16d31b3b7ec427641889
Author: Bill Burcham
AuthorDate: Thu Apr 9 17:27:53 2020 -0700
Revert "GEODE-7852: test SNI client against a geode (2-node) cluster
(#4925)"
This reverts commit 4f2a6047d5b272982595e3b7e71c624d61c69415.
---
...tanceTest.java => ClientSNIAcceptanceTest.java} | 17 +--
.../client/sni/DualServerSNIAcceptanceTest.java| 169 -
.../client/sni/geode-config/locator-keystore.jks | Bin 0 -> 2028 bytes
.../sni/geode-config/locator-maeve-keystore.jks| Bin 2048 -> 0 bytes
.../geode-config/server-clementine-keystore.jks| Bin 2059 -> 0 bytes
.../sni/geode-config/server-dolores-keystore.jks | Bin 2050 -> 0 bytes
.../client/sni/geode-config/server-keystore.jks| Bin 0 -> 2025 bytes
.../geode/client/sni/geode-config/truststore.jks | Bin 8095 -> 6023 bytes
.../org/apache/geode/client/sni/haproxy.cfg| 14 +-
.../geode/client/sni/scripts/geode-starter-2.gfsh | 23 ---
.../geode/client/sni/scripts/geode-starter.gfsh| 4 +-
11 files changed, 11 insertions(+), 216 deletions(-)
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/SingleServerSNIAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.java
similarity index 84%
rename from
geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/SingleServerSNIAcceptanceTest.java
rename to
geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.java
index bb7de3d..8c8f397 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/SingleServerSNIAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/ClientSNIAcceptanceTest.java
@@ -43,19 +43,10 @@ import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.proxy.ProxySocketFactories;
import org.apache.geode.test.junit.rules.IgnoreOnWindowsRule;
-/**
- * This test runs against a 1-server, 1-locator Geode cluster. The server and
locator run inside
- * a (single) Docker container and are not route-able from the host (where
this JUnit test is
- * running). Another Docker container is running the HAProxy image and it's
set up as an SNI
- * gateway. The test connects to the gateway via SNI and the gateway (in one
Docker container)
- * forwards traffic to Geode members (running in the other Docker container).
- *
- * This test connects to the server and verifies it can write and read data in
the region.
- */
-public class SingleServerSNIAcceptanceTest {
+public class ClientSNIAcceptanceTest {
private static final URL DOCKER_COMPOSE_PATH =
- SingleServerSNIAcceptanceTest.class.getResource("docker-compose.yml");
+ ClientSNIAcceptanceTest.class.getResource("docker-compose.yml");
// Docker compose does not work on windows in CI. Ignore this test on windows
// Using a RuleChain to make sure we ignore the test before the rule comes
into play
@@ -73,7 +64,7 @@ public class SingleServerSNIAcceptanceTest {
@Before
public void before() throws IOException, InterruptedException {
trustStorePath =
-createTempFileFromResource(SingleServerSNIAcceptanceTest.class,
+createTempFileFromResource(ClientSNIAcceptanceTest.class,
"geode-config/truststore.jks")
.getAbsolutePath();
docker.exec(options("-T"), "geode",
@@ -96,7 +87,7 @@ public class SingleServerSNIAcceptanceTest {
.port(15443)
.getExternalPort();
ClientCache cache = new ClientCacheFactory(gemFireProps)
-.addPoolLocator("locator-maeve", 10334)
+.addPoolLocator("locator", 10334)
.setPoolSocketFactory(ProxySocketFactories.sni("localhost",
proxyPort))
.create();
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/DualServerSNIAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/DualServerSNIAcceptanceTest.java
deleted file mode 100644
index a94b16d..000
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/DualServerSNIAcceptanceTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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 w
[geode] branch develop updated: GEODE-7765: Update dependencies for v1.13
This is an automated email from the ASF dual-hosted git repository. abaker 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 e9993c1 GEODE-7765: Update dependencies for v1.13 e9993c1 is described below commit e9993c15d88a5edd2a486fd64339deba37c24945 Author: Anthony Baker AuthorDate: Sat Mar 28 15:35:15 2020 -0700 GEODE-7765: Update dependencies for v1.13 Update many but not all dependencies. --- .../src/test/resources/expected-pom.xml| 96 +++--- .../gradle/plugins/DependencyConstraints.groovy| 62 +++--- .../apache/geode/session/tests/TomcatInstall.java | 4 +- .../MissingDiskStoreAcceptanceTest.java| 2 +- ...tandaloneClientManagementAPIAcceptanceTest.java | 2 +- .../integrationTest/resources/assembly_content.txt | 42 +- .../resources/dependency_classpath.txt | 54 ++-- .../integrationTest/resources/expected_jars.txt| 22 +++-- .../geode/ClusterCommunicationsDUnitTest.java | 2 +- .../api/AlertingServiceDistributedTest.java| 2 +- .../ResourceManagerWithQueryMonitorDUnitTest.java | 2 +- .../apache/geode/cache30/ReconnectDUnitTest.java | 4 +- ...ReconnectWithClusterConfigurationDUnitTest.java | 2 +- .../apache/geode/distributed/LocatorDUnitTest.java | 2 +- .../internal/DistributionAdvisorDUnitTest.java | 2 +- ...rverReadConflictTransactionDistributedTest.java | 2 +- ...ntServerTransactionFailoverDistributedTest.java | 2 +- .../internal/cache/DeltaPropagationDUnitTest.java | 4 +- .../cache/PartitionedRegionSingleHopDUnitTest.java | 4 +- .../control/RebalanceOperationDistributedTest.java | 2 +- ...istributedRegionFunctionExecutionDUnitTest.java | 6 +- ...tColocatedPartitionedRegionDistributedTest.java | 2 +- ...tPartitionHangsDuringRestartRegressionTest.java | 2 +- ...PersistentPartitionedRegionDistributedTest.java | 2 +- .../PersistentRVVRecoveryDUnitTest.java| 2 +- .../PersistentRecoveryOrderDUnitTest.java | 2 +- .../sockets/RedundancyLevelPart1DUnitTest.java | 2 +- .../sockets/RedundancyLevelPart3DUnitTest.java | 2 +- .../MeterSubregistryReconnectDistributedTest.java | 2 +- .../LoggingWithReconnectDistributedTest.java | 2 +- ...butedSystemMXBeanWithAlertsDistributedTest.java | 2 +- ...stemMXBeanWithNotificationsDistributedTest.java | 2 +- .../management/JMXMBeanReconnectDUnitTest.java | 2 +- .../DeprecatedAgentLauncherIntegrationTest.java| 2 +- .../AlertingServiceWithClusterIntegrationTest.java | 2 +- .../distributed/LauncherIntegrationTestCase.java | 2 +- .../ServerLauncherRemoteIntegrationTestCase.java | 2 +- .../cache/PartitionedRegionCreationJUnitTest.java | 4 +- .../cache/TXDetectReadConflictJUnitTest.java | 8 +- .../backup/IncrementalBackupIntegrationTest.java | 2 +- .../tier/sockets/ConnectionProxyJUnitTest.java | 7 +- .../logging/MergeLogFilesIntegrationTest.java | 2 +- .../DistributedSystemMXBeanIntegrationTest.java| 2 +- .../cache/control/InternalResourceManagerTest.java | 2 +- .../SingleThreadColocationLoggerTest.java | 2 +- .../executor/AbstractExecutorGroupJUnitTest.java | 2 +- .../concurrent/StoppableCountDownLatchTest.java| 4 +- .../cache/PutAllClientServerDistributedTest.java | 2 +- .../cache/tier/sockets/DurableClientTestBase.java | 16 ++-- .../tests/DistributedExecutorServiceRuleTest.java | 2 +- .../MemberStarterRuleAwaitIntegrationTest.java | 2 +- .../tests/SharedCountersRuleDistributedTest.java | 2 +- .../AsyncInvocationTimeoutDistributedTest.java | 2 +- .../dunit/tests/StackTraceDistributedTest.java | 2 +- .../dunit/tests/VMDumpThreadsDistributedTest.java | 2 +- .../apache/geode/test/dunit/AsyncInvocation.java | 2 +- .../test/dunit/internal/VMEventNotifierTest.java | 2 +- .../cli/util/LogExporterFileIntegrationTest.java | 4 +- .../web/http/support/HttpRequesterTest.java| 3 +- .../geode/test/awaitility/GeodeAwaitility.java | 26 ++ .../apache/geode/test/process/ProcessWrapper.java | 2 +- .../geode/test/awaitility/GeodeAwaitilityTest.java | 23 ++ .../rules/ExecutorServiceRuleGetThreadsTest.java | 2 +- .../test/junit/rules/ExpectedTimeoutRuleTest.java | 2 +- .../gms/fd/GMSHealthMonitorJUnitTest.java | 2 +- .../org/apache/geode/redis/RedisDistDUnitTest.java | 2 +- .../org/apache/geode/redis/internal/GeoCoder.java | 8 +- geode-wan/build.gradle | 2 +- 68 files changed, 233 insertions(+), 264 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 3ff2ecf..cbea352 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resour
[geode] branch feature/GEODE-7852query created (now e4820c0)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7852query in repository https://gitbox.apache.org/repos/asf/geode.git. at e4820c0 GEODE-7852: Add client side configuration option to support a SNI proxy No new revisions were added by this update.
[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run
This is an automated email from the ASF dual-hosted git repository.
igodwin pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git
commit e30246c714ea20d6f9e50ccac7b2190a81cfbd7a
Author: Mark Hanson
AuthorDate: Mon Jan 27 15:27:19 2020 -0800
remove meta-* jobs that we won't use for mass-test-run
---
ci/pipelines/meta/jinja.template.yml | 206 +--
1 file changed, 1 insertion(+), 205 deletions(-)
diff --git a/ci/pipelines/meta/jinja.template.yml
b/ci/pipelines/meta/jinja.template.yml
index 792254f..a67e377 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -51,13 +51,7 @@ resources:
branch: ((!geode-build-branch))
paths:
- ci/pipelines/images/*
-- name: geode-reaper-pipeline
- type: git
- source:
-{{ github_access() | indent(4) }}
-branch: ((!geode-build-branch))
-paths:
-- ci/pipelines/reaper/*
+
- name: meta-mini-dockerfile
type: git
source:
@@ -71,35 +65,6 @@ resources:
username: ((!docker-username))
password: ((!docker-password))
repository:
gcr.io/((!gcp-project))/((!sanitized-geode-fork))-((!sanitized-geode-build-branch))-meta-img
-{% if repository.fork == repository.upstream_fork %}
-- name: geode-examples-pipeline
- type: git
- source:
-{{ github_access() | indent(4) }}
-branch: ((!geode-build-branch))
-paths:
-- ci/pipelines/examples/*
-- ci/pipelines/shared/*
-- ci/pipelines/render.py
-- ci/pipelines/meta/meta.properties
-- name: geode-pr-pipeline
- type: git
- source:
-{{ github_access() | indent(4) }}
-branch: ((!geode-build-branch))
-paths:
-- ci/pipelines/pull-request/*
-- ci/pipelines/shared/*
-- ci/pipelines/render.py
-- ci/pipelines/meta/meta.properties
-{% endif %}
-- name: geode-metrics-pipeline
- type: git
- source:
-{{ github_access() | indent(4) }}
-branch: ((!geode-build-branch))
-paths:
-- ci/pipelines/metrics/*
jobs:
- name: set-images-pipeline
@@ -187,175 +152,6 @@ jobs:
- results/pipeline-vars.yml
-{% if repository.fork == repository.upstream_fork %}
-- name: set-examples-pipeline
- serial: true
- public: ((!public-pipelines))
- plan:
- - get: geode-examples-pipeline
-trigger: true
- - get: meta-mini-image
-trigger: true
-passed: [build-meta-mini-docker-image]
- - task: deploy-build
-image: meta-mini-image
-config:
- platform: linux
- inputs:
-- name: geode-examples-pipeline
- outputs:
-- name: results
- params:
-OUTPUT_DIRECTORY: results
-GEODE_BRANCH: ((geode-build-branch))
-GEODE_FORK: ((geode-fork))
-GEODE_REPO_NAME: ((geode-repo-name))
-REPOSITORY_PUBLIC: {{ repository.public }}
-ARTIFACT_BUCKET: ((artifact-bucket))
-UPSTREAM_FORK: {{ repository.upstream_fork }}
-PIPELINE_PREFIX: ((pipeline-prefix))
-SANITIZED_GEODE_BRANCH: ((sanitized-geode-build-branch))
-SANITIZED_GEODE_FORK: ((sanitized-geode-fork))
-GCP_PROJECT: ((gcp-project))
-PUBLIC_PIPELINES: ((public-pipelines))
-SEMVER_PRERELEASE_TOKEN: ((semver-prerelease-token))
- run:
-path: geode-examples-pipeline/ci/pipelines/examples/deploy_pipeline.sh
- - put: concourse
-params:
- pipelines:
- - name: ((!pipeline-prefix))examples
-team: ((!concourse-team))
-config_file: results/generated-pipeline.yml
-vars_files:
-- results/pipeline-vars.yml
-
-- name: set-pr-pipeline
- serial: true
- public: ((!public-pipelines))
- plan:
- - get: geode-pr-pipeline
-trigger: true
- - get: meta-mini-image
-trigger: true
-passed: [build-meta-mini-docker-image]
- - task: deploy-pr
-image: meta-mini-image
-config:
- platform: linux
- inputs:
-- name: geode-pr-pipeline
- outputs:
-- name: results
- params:
-OUTPUT_DIRECTORY: results
-GEODE_BRANCH: ((!geode-build-branch))
-GEODE_FORK: ((!geode-fork))
-GEODE_REPO_NAME: ((geode-repo-name))
-REPOSITORY_PUBLIC: {{ repository.public }}
-ARTIFACT_BUCKET: ((artifact-bucket))
-UPSTREAM_FORK: {{ repository.upstream_fork }}
-PIPELINE_PREFIX: ((pipeline-prefix))
-GCP_PROJECT: ((gcp-project))
-PUBLIC_PIPELINES: ((public-pipelines))
-GRADLE_GLOBAL_ARGS: ((gradle-global-args))
- run:
-path: geode-pr-pipeline/ci/pipelines/pull-request/deploy_pr_pipeline.sh
- - put: concourse
-params:
- pipelines:
- - name: ((!pipeline-prefix))pr
-team: ((!concourse-team))
-config_file: results/generated-pipeline.yml
-vars_files:
-- results/pipeline-vars.yml
-
-{% endif %}
-
-- name: set-metrics-pipeline
- serial: true
- public: ((!public-pipelines))
- plan:
-- get: geode-metrics-pipeline
- trigger: true
-- g
[geode] 01/02: Mass-test-run branch, no windows or publication jobs
This is an automated email from the ASF dual-hosted git repository.
igodwin pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 80321e8f80946ce5f87efea0c723ec165d17dc76
Author: Robert Houghton
AuthorDate: Mon Jan 27 15:20:46 2020 -0800
Mass-test-run branch, no windows or publication jobs
Co-authored-by: Robert Houghton
Co-authored-by: Mark Hanson
---
ci/pipelines/geode-build/jinja.template.yml | 310 +---
ci/pipelines/shared/jinja.variables.yml | 77 +--
2 files changed, 9 insertions(+), 378 deletions(-)
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index da6e399..f9dcbda 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -92,66 +92,6 @@ GRADLE_GLOBAL_ARGS: ((gradle-global-args))
{%- endfor -%}
{% endmacro %}
-groups:
-- name: main
- jobs:
- - {{ build_test.name }}
- {{- all_gating_jobs() | indent(2) }}
- - UpdatePassingTokens
- {%- if repository.upstream_fork != "apache" or repository.branch ==
"develop" %}
- - PublishArtifacts
- {%- endif %}
- {%- for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
- {%- endfor %}
-- name: complete
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if not test.name=="StressNew" -%}
-{%- for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
-{%- endfor -%}
- {%- endfor %}
- - UpdatePassingTokens
- {%- if repository.upstream_fork != "apache" or repository.branch ==
"develop" %}
- - PublishArtifacts
- {%- endif %}
- {%- for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
- {%- endfor %}
-- name: linux
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if test.PLATFORM=="linux" and not
test.name=="StressNew" -%}
-{% for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
-{%- endfor -%}
- {%- endfor %}
- {%- for flavor in (benchmarks.flavors) %}
- - Benchmark{{flavor.title}}
- {%- endfor %}
-- name: windows
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if test.PLATFORM=="windows" -%}
-{% for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
-{%- endfor -%}
- {%- endfor %}
-{%- for java_test_version in (java_test_versions) %}
-- name: {{java_test_version.name}}
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if not test.name=="StressNew" %}
- - {{test.name}}Test{{java_test_version.name}}
- {%- endfor -%}
-{%- endfor %}
-- name: Semver Management
- jobs:
- {%- for semverPiece in ['major', 'minor', 'patch'] %}
- - Bump{{ semverPiece.title() }}
- {%- endfor %}
-
resources:
- name: concourse-metadata-resource
type: concourse-metadata-resource
@@ -173,12 +113,7 @@ resources:
paths:
- ci/*
{{ github_access() | indent(4) }}
-- name: geode-benchmarks
- type: git
- source:
-branch: {{benchmarks.benchmark_branch}}
-depth: 1
-uri: https://github.com/apache/geode-benchmarks.git
+
- name: geode-build-version
type: semver
source:
@@ -187,12 +122,7 @@ resources:
initial_version: {{ metadata.initial_version }}
json_key: ((!concourse-gcp-key))
key: semvers/((pipeline-prefix))((geode-build-branch))/version
-- name: geode-passing-tokens
- type: gcs-resource
- source:
-bucket: ((artifact-bucket))
-json_key: ((concourse-gcp-key))
-versioned_file:
semvers/((pipeline-prefix))((geode-build-branch))/passing-build-tokens.json
+
- name: alpine-tools-image
type: docker-image
source:
@@ -201,12 +131,6 @@ resources:
repository: gcr.io/((gcp-project))/((pipeline-prefix))alpine-tools
tag: latest
-- name: windows-builder-image-family
- type: gci
- source:
-key: ((concourse-gcp-key))
-family_project: ((gcp-project))
-family: ((pipeline-prefix))windows-geode-builder
- name: linux-builder-image-family
type: gci
@@ -233,16 +157,8 @@ resource_types:
source:
repository: frodenas/gcs-resource
jobs:
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
- serial: true
- plan:
- - get: geode-build-version
-params: { bump: {{ semverPiece }} }
- - put: geode-build-version
-params:
- file: geode-build-version/number
-{% endfor %}
+
+
- name: {{build_test.name}}
public: true
max_in_flight: {{build_test.MAX_IN_FLIGHT}}
@@ -388,224 +304,6 @@ jobs:
- name: instance-data
timeout: 1h
-- name: UpdatePassingTokens
- public: true
- serial: true
- plan:
- - aggregate:
-- get: alpine-tools-image
-- get: geode
- passed: &update-token-passed-anchor
-{%- if repository.upstream_fork != "apache" or repository.branch == "develop"
%}
- - PublishArtifacts
-{% else %}
- {% for flavor in (benchmarks.flavo
[geode] branch mass-test-run updated (ccedf05 -> e30246c)
This is an automated email from the ASF dual-hosted git repository.
igodwin pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard ccedf05 remove meta-* jobs that we won't use for mass-test-run
discard 2a828ad Mass-test-run branch, no windows or publication jobs
add 2ac3de7 GEODE-7921: NullPointerExceptions logged during
auto-reconnect (#4898)
add 88c165c GEODE-7926: GMSMemberData is doing unnecessary reverse-DNS
lookups
add 5864f2a GEODE-7926: GMSMemberData is doing unnecessary reverse-DNS
lookups (#4894)
add 8f24abb GEODE-7920: Geode UDP INT thread found processing cache
operations
add 6f8c74b removing commented-out code
add 6312b32 Merge pull request #4893 from apache/feature/GEODE-7920
add 189ae76 GEODE-7939: membership heartbeat messages aren't designated
high-priority
add 8fd0f6f Merge pull request #4892 from apache/feature/GEODE-7939
add 3c99931 GEODE-7946: Fix redis publish/subscribe leaking netty buffers
(#4902)
add abd0f54 GEODE-7098: Tomcat8SessionsClientServerDUnitTest Tests were
getting bind failures (#4903)
add 24203d8 GEODE-7892: Code improvements in ConnectionProxyJUnitTest
add 087e47a Merge pull request #4827 from Nordix/feature/GEODE-7892
add 552cdea GEODE-7917: change thrown exception type for SSL to
IOException (#4858)
add e7f6faf GEODE-7950: Force TLS1.2 for installing PackageProvider=NuGet
(#4908)
add d2f18fd GEODE-7156: add docs for
security-auth-token-enabled-components (#4910)
add d663864 GEODE-7864: Remove null checks that are not required Part-2.
(#4881)
add d4b7c14 GEODE-7864: Closing the query statements after execution.
(#4873)
add 1b1ad6b GEODE-7947 Implement tests for EXPIRE-related functionality
(#4904)
add 27614c2 GEODE-7864: Prevented non synchronized override of
synchronized methods. (#4872)
add 7d8834f GEODE-7460: Disable network partition detection, which is not
needed for this test and is causing flakiness (#4911)
add 6263f1f GEODE-7938: added keys query param to GET, PUT, and DELETE
/{region} endpoints (#4901)
add ead319c GEODE-7970: bump spring to latest (#4927)
add e8a5dbf GEODE-7966: User Guide - properties list - reformat oversized
table (#4923)
add b4fb6c8 Revert "GEODE-7938: added keys query param to GET, PUT, and
DELETE /{region} endpoints (#4901)"
add 8e3c7a2 Merge pull request #4929 from jmelchio/slash-revert
add 37e2d98 GEODE-7945: Replace Map with ConcurrentMap for
GemFireCacheImpl.rootRegions (#4899)
add 8f9f4b7 GEODE-7969: bump netty version to latest (#4933)
add 2765825 GEODE-7852: SNI extension support
add 1260318 addressing reviews
add d301de9 addressing reviews
add 381714e fixing new assertions in unit test and retriggering CI tasks
add 47cc74f reverting ProcessManager changes - evidently the rolling
upgrade test code needs some of this stuff
add a12d1fe Merge pull request #4920 from apache/feature/GEODE-7852doc
add a73dffc GEODE-7976: make "config" param optional when deploy using
CMS. (#4930)
add 4f2a604 GEODE-7852: test SNI client against a geode (2-node) cluster
(#4925)
add 464c749 GEODE-7965: Modify Redis SADD command to use region.compute
(#4918)
add 3062423 Geode 7751: fix for
Tomcat9CachingClientServerTest.containersShouldExpireInSetTimeframe (#4931)
add 63c681d GEODE-7664: calling RegionConfigRealizer.exists methods
doesn't need … (#4932)
new 80321e8 Mass-test-run branch, no windows or publication jobs
new e30246c remove meta-* jobs that we won't use for mass-test-run
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 (ccedf05)
\
N -- N -- N refs/heads/mass-test-run (e30246c)
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 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:
.../src/test/resources/expected-pom.xml| 38 ++---
.../gradle/plugins/DependencyConstraints.groovy| 6 +-
.../google-windows-geode-builder/build_image.sh| 3 +-
.../windows-packer.json| 1 +
.../modules/session/TestSessionsTomcat8Base.java | 23 +--
.../Tomcat8Sessi
[geode] branch develop updated (3062423 -> 63c681d)
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 3062423 Geode 7751: fix for Tomcat9CachingClientServerTest.containersShouldExpireInSetTimeframe (#4931) add 63c681d GEODE-7664: calling RegionConfigRealizer.exists methods doesn't need … (#4932) No new revisions were added by this update. Summary of changes: .../realizers/RegionConfigRealizer.java| 18 ++- .../realizers/RegionConfigRealizerTest.java| 27 ++ 2 files changed, 44 insertions(+), 1 deletion(-)
[geode] branch develop updated (464c749 -> 3062423)
This is an automated email from the ASF dual-hosted git repository. mhanson pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 464c749 GEODE-7965: Modify Redis SADD command to use region.compute (#4918) add 3062423 Geode 7751: fix for Tomcat9CachingClientServerTest.containersShouldExpireInSetTimeframe (#4931) No new revisions were added by this update. Summary of changes: .../apache/geode/session/tests/CargoTestBase.java | 121 +++-- .../session/tests/TomcatClientServerTest.java | 7 +- .../tcpserver/AdvancedSocketCreatorImpl.java | 10 +- 3 files changed, 74 insertions(+), 64 deletions(-)
[geode] branch develop updated (4f2a604 -> 464c749)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 4f2a604 GEODE-7852: test SNI client against a geode (2-node) cluster (#4925) add 464c749 GEODE-7965: Modify Redis SADD command to use region.compute (#4918) No new revisions were added by this update. Summary of changes: .../org/apache/geode/redis/RedisDistDUnitTest.java | 93 ++ .../apache/geode/redis/SetsIntegrationTest.java| 43 +- .../redis/internal/ExecutionHandlerContext.java| 6 +- .../redis/internal/executor/set/SAddExecutor.java | 57 ++--- 4 files changed, 149 insertions(+), 50 deletions(-)
[geode] branch develop updated (a73dffc -> 4f2a604)
This is an automated email from the ASF dual-hosted git repository.
burcham pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from a73dffc GEODE-7976: make "config" param optional when deploy using
CMS. (#4930)
add 4f2a604 GEODE-7852: test SNI client against a geode (2-node) cluster
(#4925)
No new revisions were added by this update.
Summary of changes:
...eTest.java => DualServerSNIAcceptanceTest.java} | 126 +++--
...est.java => SingleServerSNIAcceptanceTest.java} | 17 ++-
.../client/sni/geode-config/locator-keystore.jks | Bin 2028 -> 0 bytes
.../sni/geode-config/locator-maeve-keystore.jks| Bin 0 -> 2048 bytes
.../geode-config/server-clementine-keystore.jks| Bin 0 -> 2059 bytes
.../sni/geode-config/server-dolores-keystore.jks | Bin 0 -> 2050 bytes
.../client/sni/geode-config/server-keystore.jks| Bin 2025 -> 0 bytes
.../geode/client/sni/geode-config/truststore.jks | Bin 6023 -> 8095 bytes
.../org/apache/geode/client/sni/haproxy.cfg| 14 ++-
.../geode/client/sni/scripts/geode-starter-2.gfsh | 23
.../geode/client/sni/scripts/geode-starter.gfsh| 4 +-
11 files changed, 141 insertions(+), 43 deletions(-)
copy
geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/{ClientSNIAcceptanceTest.java
=> DualServerSNIAcceptanceTest.java} (50%)
rename
geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/{ClientSNIAcceptanceTest.java
=> SingleServerSNIAcceptanceTest.java} (84%)
delete mode 100644
geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/locator-keystore.jks
create mode 100644
geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/locator-maeve-keystore.jks
create mode 100644
geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/server-clementine-keystore.jks
create mode 100644
geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/server-dolores-keystore.jks
delete mode 100644
geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/server-keystore.jks
create mode 100644
geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter-2.gfsh
[geode] branch develop updated (a12d1fe -> a73dffc)
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 a12d1fe Merge pull request #4920 from apache/feature/GEODE-7852doc
add a73dffc GEODE-7976: make "config" param optional when deploy using
CMS. (#4930)
No new revisions were added by this update.
Summary of changes:
.../geode/management/configuration/HasFile.java| 2 +
...ionTest.java => DeploymentIntegrationTest.java} | 65 +++---
.../DeploymentManagementController.java| 14 +++--
.../DeploymentManagementControllerTest.java| 4 +-
4 files changed, 45 insertions(+), 40 deletions(-)
copy
geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/{JsonSerializationTest.java
=> DeploymentIntegrationTest.java} (57%)
[geode] 01/01: Merge pull request #4920 from apache/feature/GEODE-7852doc
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit a12d1fe3e1f66adfcdc8ff5c414abb69f3c8f3cd Merge: 8f9f4b7 47cc74f Author: Bruce Schuchardt AuthorDate: Thu Apr 9 07:21:12 2020 -0700 Merge pull request #4920 from apache/feature/GEODE-7852doc GEODE-7852: SNI extension support .../geode/client/sni/ClientSNIAcceptanceTest.java | 6 + .../cache/client/ClientCacheFactoryJUnitTest.java | 10 +++- .../ClientCacheFactoryJUnitTest_single_pool.xml| 9 +++ .../geode/cache/client/proxy/SniSocketFactory.java | 30 +++--- .../topics/client-cache-elements-list.html.md.erb | 1 + .../reference/topics/client-cache.html.md.erb | 26 +++ .../setting_up_a_client_server_system.html.md.erb | 17 ++-- .../geode/test/dunit/internal/ProcessManager.java | 7 ++--- 8 files changed, 97 insertions(+), 9 deletions(-)
[geode] branch develop updated (8f9f4b7 -> a12d1fe)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 8f9f4b7 GEODE-7969: bump netty version to latest (#4933)
add 2765825 GEODE-7852: SNI extension support
add 1260318 addressing reviews
add d301de9 addressing reviews
add 381714e fixing new assertions in unit test and retriggering CI tasks
add 47cc74f reverting ProcessManager changes - evidently the rolling
upgrade test code needs some of this stuff
new a12d1fe Merge pull request #4920 from apache/feature/GEODE-7852doc
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:
.../geode/client/sni/ClientSNIAcceptanceTest.java | 6 +
.../cache/client/ClientCacheFactoryJUnitTest.java | 10 +++-
.../ClientCacheFactoryJUnitTest_single_pool.xml| 9 +++
.../geode/cache/client/proxy/SniSocketFactory.java | 30 +++---
.../topics/client-cache-elements-list.html.md.erb | 1 +
.../reference/topics/client-cache.html.md.erb | 26 +++
.../setting_up_a_client_server_system.html.md.erb | 17 ++--
.../geode/test/dunit/internal/ProcessManager.java | 7 ++---
8 files changed, 97 insertions(+), 9 deletions(-)
rename geode-core/src/{test =>
integrationTest}/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
(82%)
[geode] branch develop updated (37e2d98 -> 8f9f4b7)
This is an automated email from the ASF dual-hosted git repository. jjramos pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 37e2d98 GEODE-7945: Replace Map with ConcurrentMap for GemFireCacheImpl.rootRegions (#4899) add 8f9f4b7 GEODE-7969: bump netty version to latest (#4933) No new revisions were added by this update. Summary of changes: 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(-)
[geode] branch support/1.12 updated: GEODE-7969: bump netty version on support/1.12 to match develop
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 071be54 GEODE-7969: bump netty version on support/1.12 to match
develop
071be54 is described below
commit 071be54787f295062a6e4f7bd6e65822eb9bfa0d
Author: Owen Nichols
AuthorDate: Thu Apr 9 00:21:28 2020 -0700
GEODE-7969: bump netty version on support/1.12 to match develop
---
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 017db34..434fbfe 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -214,7 +214,7 @@
io.netty
netty-all
-4.1.45.Final
+4.1.48.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 9dbcc86..7ea6d32 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
@@ -113,7 +113,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.45.Final')
+api(group: 'io.netty', name: 'netty-all', version: '4.1.48.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 36df74c..7e93ca3 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1040,7 +1040,7 @@ lib/micrometer-core-1.2.1.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.45.Final.jar
+lib/netty-all-4.1.48.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 fea157e..37e9d7f 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -87,6 +87,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.45.Final.jar
+netty-all-4.1.48.Final.jar
grumpy-core-0.2.2.jar
commons-math3-3.2.jar
