[geode] branch develop updated (b207304b98 -> fdb972ecce)

[mhanson]

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 b207304b98 GEODE-10322: Run various Analyze Serialiable tests from 
IntelliJ (#7711)
 add fdb972ecce Removing myself from CODEOWNERS (#7708)

No new revisions were added by this update.

Summary of changes:
 CODEOWNERS | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

[geode] branch develop updated: GEODE-10306 Fixing an order issue that can lead to problems when stopping (#7682)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 20844a8494 GEODE-10306 Fixing an order issue that can lead to problems 
when stopping (#7682)
20844a8494 is described below

commit 20844a84947a746ec4c740acf5af6734bfb272c1
Author: mhansonp 
AuthorDate: Fri May 13 14:31:31 2022 -0700

GEODE-10306 Fixing an order issue that can lead to problems when stopping 
(#7682)

When stopping the cache server, the acceptor is last which should not be 
the case. It should be first so new data stops coming in.
---
 .../geode/internal/cache/CacheServerImpl.java   | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index c8f8b96033..25d6f70b33 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -460,6 +460,16 @@ public class CacheServerImpl extends AbstractCacheServer 
implements Distribution
 }
 
 RuntimeException firstException = null;
+try {
+  if (acceptor != null) {
+acceptor.close();
+  }
+} catch (RuntimeException e) {
+  logger.warn("CacheServer - Error closing acceptor monitor", e);
+  if (firstException != null) {
+firstException = e;
+  }
+}
 
 try {
   if (loadMonitor != null) {
@@ -479,16 +489,7 @@ public class CacheServerImpl extends AbstractCacheServer 
implements Distribution
   firstException = e;
 }
 
-try {
-  if (acceptor != null) {
-acceptor.close();
-  }
-} catch (RuntimeException e) {
-  logger.warn("CacheServer - Error closing acceptor monitor", e);
-  if (firstException != null) {
-firstException = e;
-  }
-}
+
 
 if (firstException != null) {
   throw firstException;

[geode] branch develop updated: GEODE-10248: Adding a new Suspicious Strings exception (#7612)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 718aafeb35 GEODE-10248: Adding a new Suspicious Strings exception 
(#7612)
718aafeb35 is described below

commit 718aafeb35906c6f25dac0bf266a2cdb962bd37a
Author: mhansonp 
AuthorDate: Tue Apr 26 09:33:05 2022 -0700

GEODE-10248: Adding a new Suspicious Strings exception (#7612)


for Management Requests that get logged and a test
---
 .../apache/geode/test/greplogs/LogConsumer.java| 21 ++---
 .../org/apache/geode/test/greplogs/Patterns.java   |  6 ++-
 .../geode/test/greplogs/LogConsumerTest.java   | 52 ++
 3 files changed, 71 insertions(+), 8 deletions(-)

diff --git 
a/geode-dunit/src/main/java/org/apache/geode/test/greplogs/LogConsumer.java 
b/geode-dunit/src/main/java/org/apache/geode/test/greplogs/LogConsumer.java
index c313418344..93da8d05ac 100644
--- a/geode-dunit/src/main/java/org/apache/geode/test/greplogs/LogConsumer.java
+++ b/geode-dunit/src/main/java/org/apache/geode/test/greplogs/LogConsumer.java
@@ -31,6 +31,7 @@ import static 
org.apache.geode.test.greplogs.Patterns.JAVA_LANG_ERROR;
 import static org.apache.geode.test.greplogs.Patterns.LOG_STATEMENT;
 import static org.apache.geode.test.greplogs.Patterns.MALFORMED_I18N_MESSAGE;
 import static org.apache.geode.test.greplogs.Patterns.MALFORMED_LOG4J_MESSAGE;
+import static org.apache.geode.test.greplogs.Patterns.MANAGEMENT_REQUEST;
 import static org.apache.geode.test.greplogs.Patterns.RMI_WARNING;
 import static org.apache.geode.test.greplogs.Patterns.RVV_BIT_SET_MESSAGE;
 import static org.apache.geode.test.greplogs.Patterns.WARN_OR_LESS_LOG_LEVEL;
@@ -43,6 +44,7 @@ import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+
 public class LogConsumer {
 
   /** Limit long errors to this many lines */
@@ -162,13 +164,18 @@ public class LogConsumer {
   }
 
   private boolean isExceptionErrorOrSomeSpecialCase(CharSequence line) {
-return (EXCEPTION.matcher(line).find() ||
-JAVA_LANG_ERROR.matcher(line).find() ||
-MALFORMED_I18N_MESSAGE.matcher(line).find() ||
-MALFORMED_LOG4J_MESSAGE.matcher(line).find()) &&
-!(HYDRA_MASTER_LOCATORS_WILDCARD.matcher(line).find()) &&
-!(WARN_OR_LESS_LOG_LEVEL.matcher(line).find() &&
-RVV_BIT_SET_MESSAGE.matcher(line).find());
+// if one of the following finds is true
+return (EXCEPTION.matcher(line).find() || 
JAVA_LANG_ERROR.matcher(line).find()
+|| MALFORMED_I18N_MESSAGE.matcher(line).find()
+|| MALFORMED_LOG4J_MESSAGE.matcher(line).find()) &&
+// and we don't find the below
+!(HYDRA_MASTER_LOCATORS_WILDCARD.matcher(line).find())
+&& !(WARN_OR_LESS_LOG_LEVEL.matcher(line).find()
+&& MANAGEMENT_REQUEST.matcher(line).find())
+&& !(WARN_OR_LESS_LOG_LEVEL.matcher(line).find() // Warning message or 
lower
+&& RVV_BIT_SET_MESSAGE.matcher(line).find()); // rvv bit sit 
message
+// then it is an exception error or some special case.
+
   }
 
   private void addErrLinesToAll(CharSequence line) {
diff --git 
a/geode-dunit/src/main/java/org/apache/geode/test/greplogs/Patterns.java 
b/geode-dunit/src/main/java/org/apache/geode/test/greplogs/Patterns.java
index 662bad915d..514a7b9e2c 100644
--- a/geode-dunit/src/main/java/org/apache/geode/test/greplogs/Patterns.java
+++ b/geode-dunit/src/main/java/org/apache/geode/test/greplogs/Patterns.java
@@ -58,7 +58,11 @@ public enum Patterns {
   /** "{}" literal which is probably unused Log4J parameter */
   MALFORMED_LOG4J_MESSAGE(compile("\\{\\}")),
   /** "{}" literal used for hydra master locators wildcard */
-  
HYDRA_MASTER_LOCATORS_WILDCARD(compile("hydra\\.MasterDescription\\.master\\.locators=\\{\\}"));
+  
HYDRA_MASTER_LOCATORS_WILDCARD(compile("hydra\\.MasterDescription\\.master\\.locators=\\{\\}")),
+  /**
+   * "Management Request:" messages "Management Request: 
PUT[url=/management/v1/deployments]"
+   */
+  MANAGEMENT_REQUEST(compile("Management Request:"));
 
   private final Pattern pattern;
 
diff --git 
a/geode-dunit/src/test/java/org/apache/geode/test/greplogs/LogConsumerTest.java 
b/geode-dunit/src/test/java/org/apache/geode/test/greplogs/LogConsumerTest.java
index 1380db652c..b221440a5a 100644
--- 
a/geode-dunit/src/test/java/org/apache/geode/test/greplogs/LogConsumerTest.java
+++ 
b/geode-dunit/src/test/java/org/apache/geode/test/greplogs/LogConsumerTest.java
@@ -157,6 +157,58 @@ public class LogConsumerTest {
 assertThat(value).isNull();
   }
 
+  @Test
+  public void close_returnsNull_ifLineContains_ManagementRequest() {
+St

[geode] branch develop updated: GEODE-9704: Ensure that register interest is called before ready for events (#7442)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 30bd1cef01 GEODE-9704: Ensure that register interest is called before 
ready for events (#7442)
30bd1cef01 is described below

commit 30bd1cef01b555c84e970c548cfb0e55f06fbf1c
Author: mhansonp 
AuthorDate: Wed Apr 6 09:27:03 2022 -0700

GEODE-9704: Ensure that register interest is called before ready for events 
(#7442)


- RegisterInterestOps need to happen before ReadyForEventsOp is sent
  These changes make sure that happens.

- Added an InterestResultPolicyCheck

Authored-by: Barry Oglesby 

Un-ignored a test that will reproduce the issue
periodically during a number of runs. It is a flaky
test without the core fix.

Authored-by: Jinmei Liao 
---
 .../tier/sockets/DurableRegistrationDUnitTest.java | 802 -
 .../DurableRegistrationDistributedTest.java| 703 ++
 ...est.java => AuthExpirationDistributedTest.java} |  18 +-
 ...tTest.java => QueueManagerIntegrationTest.java} | 178 +++--
 .../cache/client/internal/QueueManagerImpl.java|  59 +-
 .../cache/client/internal/ReadyForEventsOp.java|   4 +-
 .../client/internal/RegisterInterestListOp.java|   4 +-
 .../client/internal/RegisterInterestTracker.java   |  52 +-
 .../cache/client/internal/ServerRegionProxy.java   |   2 +-
 .../apache/geode/internal/cache/LocalRegion.java   |   8 +-
 .../internal/cache/LocalRegionUpdateUnitTest.java  | 149 
 .../dunit/internal/JUnit4DistributedTestCase.java  |   2 +-
 12 files changed, 1084 insertions(+), 897 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
deleted file mode 100644
index 51e69cff23..00
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
+++ /dev/null
@@ -1,802 +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 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.cache.tier.sockets;
-
-import static 
org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
-import static 
org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static 
org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPort;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheException;
-import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.client.Pool;
-import org.apache.geode.cache.client.PoolFactory;
-import org.apache.geode.cache.client.PoolManager;
-import org.apache.geode.cache30.CacheSerializableRunnable;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.cache.CacheServerImpl;
-import org.apache.geode.internal.cache.FilterProfile;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.PoolFactoryImpl;
-import org.apache.geode.test.awaitility.GeodeAwaitility;
-import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.NetworkUtils;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geod

[geode] branch develop updated (b2417ca -> 83ce65f)

[mhanson]

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 b2417ca  GEODE-9942: Include JUnit 5 tests in stress tests (#7256)
 add 83ce65f  GEODE-9815: Prefer to remove a redundant copy in the same 
zone (#7124)

No new revisions were added by this update.

Summary of changes:
 .../RebalanceOperationComplexDistributedTest.java  |  125 ++-
 ...alanceOperationComplexPart2DistributedTest.java |  223 +
 .../cache/partitioned/rebalance/model/Member.java  |6 +-
 .../model/PartitionedRegionLoadModel.java  |  119 ++-
 .../PartitionedRegionLoadModelJUnitTest.java   | 1057 +++-
 5 files changed, 1261 insertions(+), 269 deletions(-)
 create mode 100644 
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexPart2DistributedTest.java

[geode] 01/01: GEODE-9425: debug messages.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch bugfix/GEODE-9425
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 3d49be9aa2f77439c1d4864761bdff117688b063
Author: Mark Hanson 
AuthorDate: Tue Oct 26 09:53:58 2021 -0700

GEODE-9425: debug messages.
---
 .../internal/AutoConnectionSourceDUnitTest.java| 73 +++---
 .../cache/client/internal/LocatorTestBase.java | 20 +
 .../membership/gms/fd/GMSHealthMonitor.java| 88 +++---
 .../tcpserver/AdvancedSocketCreatorImpl.java   |  3 +-
 4 files changed, 127 insertions(+), 57 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
index eebbde3..6bfff2b 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -30,6 +30,7 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 
+import org.apache.logging.log4j.Logger;
 import org.awaitility.core.ConditionTimeoutException;
 import org.junit.After;
 import org.junit.Assert;
@@ -43,9 +44,11 @@ import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.client.PoolManager;
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.distributed.internal.ServerLocationAndMemberId;
+import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.management.membership.ClientMembership;
 import org.apache.geode.management.membership.ClientMembershipEvent;
 import org.apache.geode.management.membership.ClientMembershipListenerAdapter;
+import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.RMIException;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.junit.categories.ClientServerTest;
@@ -60,6 +63,7 @@ public class AutoConnectionSourceDUnitTest extends 
LocatorTestBase {
   private static final String VALUE = "value";
   private static final Object BRIDGE_LISTENER = "BRIDGE_LISTENER";
   private static final long MAX_WAIT = 6;
+  private Logger logger;
 
   @Override
   public final void postSetUp() {
@@ -189,24 +193,23 @@ public class AutoConnectionSourceDUnitTest extends 
LocatorTestBase {
 final String hostName = getServerHostName();
 VM locator0VM = VM.getVM(0);
 VM locator1VM = VM.getVM(1);
-VM clientVM = VM.getVM(2);
+VM locator2VM = VM.getVM(2);
 VM serverVM = VM.getVM(3);
+VM serverVM2 = VM.getVM(4);
+VM clientVM2 = VM.getVM(5);
+logger = LogService.getLogger();
 
 final int locator0Port = locator0VM.invoke("Start Locator1 ", () -> 
startLocator(hostName, ""));
 final int locator1Port = locator1VM.invoke("Start Locator2 ",
 () -> startLocator(hostName, getLocatorString(hostName, 
locator0Port)));
 assertThat(locator0Port).isGreaterThan(0);
 assertThat(locator1Port).isGreaterThan(0);
+logger.info("MLH starting client Locator 0 = " + locator0Port + " Locator 
1 = " + locator1Port);
 
 startBridgeClient(null, hostName, locator0Port);
 InetSocketAddress locatorToWaitFor = new InetSocketAddress(hostName, 
locator1Port);
-MyLocatorCallback callback = (MyLocatorCallback) 
remoteObjects.get(CALLBACK_KEY);
 
-boolean discovered = callback.waitForDiscovery(locatorToWaitFor, MAX_WAIT);
-Assert.assertTrue(
-"Waited " + MAX_WAIT + " for " + locatorToWaitFor
-+ " to be discovered on client. List is now: " + 
callback.getDiscovered(),
-discovered);
+waitForLocatorDiscovery(VM.getVM(-1), locatorToWaitFor);
 
 InetSocketAddress[] initialLocators =
 new InetSocketAddress[] {new InetSocketAddress(hostName, 
locator0Port)};
@@ -221,20 +224,58 @@ public class AutoConnectionSourceDUnitTest extends 
LocatorTestBase {
 
 verifyLocatorsMatched(expectedLocators, pool.getOnlineLocators());
 
-// stop one of the locators and ensure that the client can find and use a 
server
-locator0VM.invoke("Stop Locator", this::stopLocator);
+logger.info("MLH Locators = " + pool.getLocators().size() + " online 
locators = "
++ pool.getOnlineLocators().size());
 
-await().until(() -> pool.getOnlineLocators().size() == 1);
 
+await().until(() -> pool.getOnlineLocators().size() == 2);
+logger.info("MLH Starting the server");
 int serverPort = serverVM.invoke("Start BridgeServer",
-() -> startBridgeServer(null, getLocatorString(hostName, 
locator1Port)));
+() -> startPartitioned

[geode] branch bugfix/GEODE-9425 created (now 3d49be9)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch bugfix/GEODE-9425
in repository https://gitbox.apache.org/repos/asf/geode.git.


  at 3d49be9  GEODE-9425: debug messages.

This branch includes the following new commits:

 new 3d49be9  GEODE-9425: debug messages.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[geode] branch develop updated (e8942b7 -> 09d840d)

[mhanson]

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 e8942b7  GEODE-9629: remove factory method added to public API (#6978)
 add 09d840d  GEODE-9645: mulituserauth don't do dataserializer 
registrations from client (#6935)

No new revisions were added by this update.

Summary of changes:
 .../internal/cache/PoolManagerIntegrationTest.java | 195 +
 .../cache/client/internal/EndpointManagerImpl.java |   6 +
 .../geode/cache/client/internal/PoolImpl.java  |   6 +-
 .../client/internal/RegisterDataSerializersOp.java |   4 +-
 .../internal/InternalDistributedSystem.java|   5 +
 .../geode/internal/cache/PoolManagerImpl.java  |  16 +-
 6 files changed, 227 insertions(+), 5 deletions(-)
 create mode 100644 
geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PoolManagerIntegrationTest.java

[geode] branch develop updated (c68a770 -> 6dbd219)

[mhanson]

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 c68a770  GEODE-9582: make radish pattern match compatible with redis
 add 6dbd219  GEODE-9365: Removing unnecessary synchronization (#6858)

No new revisions were added by this update.

Summary of changes:
 .../cache/ha/BlockingHARegionJUnitTest.java| 165 ++
 .../org/apache/geode/internal/cache/HARegion.java  |  47 +-
 .../geode/internal/cache/ha/HARegionQueue.java | 553 ++---
 3 files changed, 323 insertions(+), 442 deletions(-)

[geode] branch support/1.12 updated: GEODE-9554 backport to 1.12 (#6857)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 0dfcb06  GEODE-9554 backport to 1.12 (#6857)
0dfcb06 is described below

commit 0dfcb06f2864aa7c93a6ac3c4cacff52de0864b7
Author: mhansonp 
AuthorDate: Fri Sep 10 12:28:10 2021 -0700

GEODE-9554 backport to 1.12 (#6857)

* GEODE-9554 backport (#6856)

* GEODE-9554: Change up the rebalance calls to use new canDelete call 
(#6845) (#6853)

GEODE-9554: Change up the rebalance calls to use new canDelete call

If there is no redundancy zone, exit and allow delete
Adding xml files to git
Adding xml files to git
Added new tests

(cherry picked from commit d1d605b24787698c5d8f47b8538808d6b990c0a4)
(cherry picked from commit 142e06fe001aae428c32ec602992e45bcefa2259)

* GEODE-5994: Cleanup from some additional review comments (#6852)

(cherry picked from commit 7b924b5ccef4646f28615bab290447824f9f9f45)
(cherry picked from commit 69ca9cdf75904f70d6272286f4322ba90ee8bfa3)
(cherry picked from commit d94aa6431c4f19167feea417be4739c6746ab4e3)

* GEODE-9554: modifications for 1.12 support
---
 .../RebalanceOperationComplexDistributedTest.java  | 272 +
 .../cache/RebalanceOperationComplex-client.xml |  35 +++
 .../cache/RebalanceOperationComplex-server.xml |  48 
 .../internal/cache/PartitionedRegionDataStore.java |   9 -
 .../control/PartitionRebalanceDetailsImpl.java |  21 ++
 .../partitioned/PartitionedRegionRebalanceOp.java  |   5 +-
 .../cache/partitioned/rebalance/model/Member.java  |  55 -
 .../model/PartitionedRegionLoadModel.java  |  46 +++-
 .../partitioned/rebalance/model/RefusalReason.java |  13 +-
 .../cache/partitioned/rebalance/MemberTest.java| 107 
 .../PartitionedRegionLoadModelJUnitTest.java   |  65 -
 11 files changed, 644 insertions(+), 32 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
new file mode 100644
index 000..c9da86a
--- /dev/null
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
@@ -0,0 +1,272 @@
+/*
+ * 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.cache.control;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static 
org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+

[geode] branch support/1.13 updated: GEODE-9554 backport (#6856)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 d94aa64  GEODE-9554 backport (#6856)
d94aa64 is described below

commit d94aa6431c4f19167feea417be4739c6746ab4e3
Author: mhansonp 
AuthorDate: Thu Sep 9 21:51:16 2021 -0700

GEODE-9554 backport (#6856)

* GEODE-9554: Change up the rebalance calls to use new canDelete call 
(#6845) (#6853)

GEODE-9554: Change up the rebalance calls to use new canDelete call

If there is no redundancy zone, exit and allow delete
Adding xml files to git
Adding xml files to git
Added new tests

(cherry picked from commit d1d605b24787698c5d8f47b8538808d6b990c0a4)
(cherry picked from commit 142e06fe001aae428c32ec602992e45bcefa2259)

* GEODE-5994: Cleanup from some additional review comments (#6852)

(cherry picked from commit 7b924b5ccef4646f28615bab290447824f9f9f45)
(cherry picked from commit 69ca9cdf75904f70d6272286f4322ba90ee8bfa3)
---
 .../RebalanceOperationComplexDistributedTest.java  | 272 +
 .../cache/RebalanceOperationComplex-client.xml |  35 +++
 .../cache/RebalanceOperationComplex-server.xml |  48 
 .../internal/cache/PartitionedRegionDataStore.java |   9 -
 .../control/PartitionRebalanceDetailsImpl.java |  21 ++
 .../partitioned/PartitionedRegionRebalanceOp.java  |   5 +-
 .../cache/partitioned/rebalance/model/Member.java  |  49 +++-
 .../model/PartitionedRegionLoadModel.java  |  46 +++-
 .../partitioned/rebalance/model/RefusalReason.java |  13 +-
 .../cache/partitioned/rebalance/MemberTest.java| 107 
 .../PartitionedRegionLoadModelJUnitTest.java   |  65 -
 11 files changed, 638 insertions(+), 32 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
new file mode 100644
index 000..9773437
--- /dev/null
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
@@ -0,0 +1,272 @@
+/*
+ * 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.cache.control;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static 
org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+/**
+ * The purpose of RebalanceOperationComplexDistributedTest is to test 
rebalances
+ * across zones and to ensure that enforceUniqueZone behavior of redundancy 
zones
+ * is working corre

[geode] branch support/1.14 updated: GEODE-5994: Cleanup from some additional review comments (#6852)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.14 by this push:
 new 69ca9cd  GEODE-5994: Cleanup from some additional review comments 
(#6852)
69ca9cd is described below

commit 69ca9cdf75904f70d6272286f4322ba90ee8bfa3
Author: mhansonp 
AuthorDate: Thu Sep 9 17:31:02 2021 -0700

GEODE-5994: Cleanup from some additional review comments (#6852)

(cherry picked from commit 7b924b5ccef4646f28615bab290447824f9f9f45)
---
 .../RebalanceOperationComplexDistributedTest.java  | 22 +++---
 .../cache/partitioned/rebalance/model/Member.java  | 20 
 .../PartitionedRegionLoadModelJUnitTest.java   |  8 +++-
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
index eb6d536..9773437 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
@@ -89,7 +89,7 @@ public class RebalanceOperationComplexDistributedTest 
implements Serializable {
   public ClusterStartupRule clusterStartupRule = new ClusterStartupRule(8);
 
   @Before
-  public void setup() {
+  public void setup() throws Exception {
 // Start the locator
 MemberVM locatorVM = clusterStartupRule.startLocatorVM(0);
 locatorPort = locatorVM.getPort();
@@ -98,6 +98,15 @@ public class RebalanceOperationComplexDistributedTest 
implements Serializable {
 
 runID.incrementAndGet();
 cleanOutServerDirectories();
+
+// Startup the servers
+for (Map.Entry entry : SERVER_ZONE_MAP.entrySet()) {
+  startServerInRedundancyZone(entry.getKey(), entry.getValue());
+}
+
+// Put data in the server regions
+clientPopulateServers();
+
   }
 
   @After
@@ -115,16 +124,7 @@ public class RebalanceOperationComplexDistributedTest 
implements Serializable {
   @Test
   @Parameters({"1,2", "1,4", "4,1", "5,6"})
   public void testEnforceZoneWithSixServersAndTwoZones(int rebalanceServer,
-  int serverToBeShutdownAndRestarted)
-  throws Exception {
-
-// Startup the servers
-for (Map.Entry entry : SERVER_ZONE_MAP.entrySet()) {
-  startServerInRedundancyZone(entry.getKey(), entry.getValue());
-}
-
-// Put data in the server regions
-clientPopulateServers();
+  int serverToBeShutdownAndRestarted) {
 
 // Rebalance Server VM will initiate all of the rebalances in this test
 VM rebalanceServerVM = clusterStartupRule.getVM(rebalanceServer);
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
index 462a219..87000f7 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
@@ -20,7 +20,6 @@ import java.util.TreeSet;
 import org.apache.logging.log4j.Logger;
 
 import org.apache.geode.annotations.VisibleForTesting;
-import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionManager;
 import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.logging.internal.log4j.api.LogService;
@@ -67,16 +66,9 @@ public class Member implements Comparable {
* @param bucket -- bucket to be deleted from the member
* @param distributionManager -- used to check members of redundancy zones
*/
-
   public RefusalReason canDelete(Bucket bucket, DistributionManager 
distributionManager) {
 // This code only applies to Clusters.
-if (!(distributionManager instanceof ClusterDistributionManager)) {
-  return RefusalReason.NONE;
-}
-
-ClusterDistributionManager clstrDistrMgr = (ClusterDistributionManager) 
distributionManager;
-String myRedundancyZone = clstrDistrMgr.getRedundancyZone(memberId);
-boolean lastMemberOfZone = true;
+String myRedundancyZone = distributionManager.getRedundancyZone(memberId);
 
 if (myRedundancyZone == null) {
   // Not using redundancy zones, so...
@@ -89,7 +81,7 @@ public class Member implements Comparable {
 continue;
   }
 
-  String memberRedundancyZone = 
clstrDistrMgr.getRedundancyZone(member.memberId);
+  String memberRedundancyZone = 
distributionM

[geode] branch support/1.14 updated: GEODE-9554: Change up the rebalance calls to use new canDelete call (#6845) (#6853)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.14 by this push:
 new 142e06f  GEODE-9554: Change up the rebalance calls to use new 
canDelete call (#6845) (#6853)
142e06f is described below

commit 142e06fe001aae428c32ec602992e45bcefa2259
Author: mhansonp 
AuthorDate: Thu Sep 9 17:31:41 2021 -0700

GEODE-9554: Change up the rebalance calls to use new canDelete call (#6845) 
(#6853)

GEODE-9554: Change up the rebalance calls to use new canDelete call

If there is no redundancy zone, exit and allow delete
Adding xml files to git
Adding xml files to git
Added new tests

(cherry picked from commit d1d605b24787698c5d8f47b8538808d6b990c0a4)
---
 .../RebalanceOperationComplexDistributedTest.java  | 272 +
 .../cache/RebalanceOperationComplex-client.xml |  35 +++
 .../cache/RebalanceOperationComplex-server.xml |  48 
 .../internal/cache/PartitionedRegionDataStore.java |   9 -
 .../control/PartitionRebalanceDetailsImpl.java |  21 ++
 .../partitioned/PartitionedRegionRebalanceOp.java  |   5 +-
 .../cache/partitioned/rebalance/model/Member.java  |  61 -
 .../model/PartitionedRegionLoadModel.java  |  46 +++-
 .../partitioned/rebalance/model/RefusalReason.java |  13 +-
 .../cache/partitioned/rebalance/MemberTest.java| 107 
 .../PartitionedRegionLoadModelJUnitTest.java   |  67 -
 11 files changed, 652 insertions(+), 32 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
new file mode 100644
index 000..eb6d536
--- /dev/null
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
@@ -0,0 +1,272 @@
+/*
+ * 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.cache.control;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
+import static 
org.apache.geode.internal.lang.SystemPropertyHelper.DEFAULT_DISK_DIRS_PROPERTY;
+import static org.apache.geode.internal.lang.SystemPropertyHelper.GEODE_PREFIX;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.logging.internal.log4j.api.LogService;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.ClientVM;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+
+/**
+ * The purpose of RebalanceOperationComplexDistributedTest is to test 
rebalances
+ * across zones and to ensure that enforceUniqueZone behavior of redundancy 
zones
+ * is working correctly.
+ */
+@RunWith(JUnitParamsRunner.class)
+public class RebalanceOperationComplexDistributedTest implements Serializable {
+  public static final int EXPECTED_BUCKET_COUNT = 113;
+  public static final long TIMEOUT_SECONDS = 
GeodeAwaitility.getTimeout().getSeconds();
+  public static fin

[geode] branch develop updated (712cba8 -> d1d605b)

[mhanson]

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 712cba8  GEODE-9561: typo repair (#6849)
 add d1d605b  GEODE-9554: Change up the rebalance calls to use new 
canDelete call (#6845)

No new revisions were added by this update.

Summary of changes:
 .../RebalanceOperationComplexDistributedTest.java  | 272 +
 .../cache/RebalanceOperationComplex-client.xml |  20 +-
 .../cache/RebalanceOperationComplex-server.xml |  48 
 .../internal/cache/PartitionedRegionDataStore.java |   9 -
 .../control/PartitionRebalanceDetailsImpl.java |  21 ++
 .../partitioned/PartitionedRegionRebalanceOp.java  |   5 +-
 .../cache/partitioned/rebalance/model/Member.java  |  61 -
 .../model/PartitionedRegionLoadModel.java  |  46 +++-
 .../partitioned/rebalance/model/RefusalReason.java |  13 +-
 .../cache/partitioned/rebalance/MemberTest.java| 107 
 .../PartitionedRegionLoadModelJUnitTest.java   |  67 -
 11 files changed, 631 insertions(+), 38 deletions(-)
 create mode 100644 
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RebalanceOperationComplexDistributedTest.java
 copy 
geode-wan/src/integrationTest/resources/org/apache/geode/cache/wan/internal/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[XSD].cache.xml
 => 
geode-core/src/distributedTest/resources/org/apache/geode/internal/cache/RebalanceOperationComplex-client.xml
 (70%)
 create mode 100755 
geode-core/src/distributedTest/resources/org/apache/geode/internal/cache/RebalanceOperationComplex-server.xml
 create mode 100644 
geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/rebalance/MemberTest.java

[geode] branch rebalance_bug updated: add colocated property.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch rebalance_bug
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/rebalance_bug by this push:
 new fb69291  add colocated property.
fb69291 is described below

commit fb692917fea7aa377f9b297cfe68f8a2784fc6a6
Author: Mark Hanson 
AuthorDate: Tue Aug 24 11:09:49 2021 -0700

add colocated property.
---
 .../control/RebalanceOperationDistributedTest.java | 60 --
 1 file changed, 45 insertions(+), 15 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 4bb0005..dc0369d 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
@@ -19,6 +19,7 @@ import static 
org.apache.geode.cache.EvictionAction.OVERFLOW_TO_DISK;
 import static 
org.apache.geode.cache.EvictionAttributes.createLRUEntryAttributes;
 import static org.apache.geode.cache.RegionShortcut.PARTITION;
 import static org.apache.geode.cache.RegionShortcut.PARTITION_PERSISTENT;
+import static 
org.apache.geode.cache.RegionShortcut.PARTITION_REDUNDANT_PERSISTENT;
 import static org.apache.geode.cache.RegionShortcut.REPLICATE;
 import static 
org.apache.geode.distributed.ConfigurationProperties.ENFORCE_UNIQUE_HOST;
 import static 
org.apache.geode.distributed.ConfigurationProperties.REDUNDANCY_ZONE;
@@ -379,7 +380,7 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
* copies of a buckets.
*/
   @Test
-  public void testEnforceZoneWithSixServersAndTwoZones() {
+  public void testEnforceZoneWithSixServersAndTwoZones() throws 
InterruptedException {
 VM vm0 = getVM(0);
 VM vm1 = getVM(1);
 VM vm2 = getVM(2);
@@ -390,8 +391,9 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
 Stream.of(vm3, vm4, vm5).forEach(vm -> vm.invoke(() -> 
setRedundancyZone("B")));
 
 Stream.of(vm0, vm1, vm2, vm3, vm4, vm5).forEach(vm -> {
-  vm.invoke(() -> createPartitionedRegion("region1", 1, 113));
-  vm.invoke(() -> createPartitionedRegion("region1Ancillary", 1, 113));
+  vm.invoke(() -> createPartitionedRegion("region1", 1, 113, 
PARTITION_REDUNDANT_PERSISTENT));
+  vm.invoke(() -> createPartitionedRegion("region1Ancillary", 1, 113,
+  PARTITION_REDUNDANT_PERSISTENT, "region1"));
 });
 
 // Create some buckets
@@ -411,6 +413,8 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
 
 // Make sure we still have low redundancy
 vm0.invoke(() -> validateRedundancy("region1", 113, 1, 0));
+logger.info(
+"1 *** *** *** 
*** *** ");
 
 vm0.invoke(() -> {
   InternalResourceManager manager = 
getCache().getInternalResourceManager();
@@ -419,23 +423,38 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
   validateStatistics(manager, results);
 });
 
-vm0.bounceForcibly();
+vm3.invoke(() -> {
+  InternalResourceManager manager = 
getCache().getInternalResourceManager();
+  RebalanceResults results = doRebalance(false, manager);
+  logger.info("Rebalance zone b 1 Results = " + results);
+  validateStatistics(manager, results);
+});
 
-vm1.invoke(() -> {
+vm2.bounceForcibly();
+logger.info(
+"2 *** *** *** 
*** *** ");
+vm0.invoke(() -> {
   InternalResourceManager manager = 
getCache().getInternalResourceManager();
   RebalanceResults results = doRebalance(false, manager);
   logger.info("Rebalance 2 Results = " + results);
 });
+Thread.sleep(3);
 
-vm0.invoke(() -> {
+vm2.invoke(() -> {
   setRedundancyZone("A");
-  createPartitionedRegion("region1", 1, 113);
+  createPartitionedRegion("region1", 1, 113, 
PARTITION_REDUNDANT_PERSISTENT);
+  createPartitionedRegion("region1Ancillary", 1, 113,
+  PARTITION_REDUNDANT_PERSISTENT, "region1");
+
 });
+Thread.sleep(1);
+logger.info(
+"3 *** *** *** 
*** *** ");
 
-vm2.invoke(() -> {
+vm0.invoke(() -> {
   InternalResourceManager manager = 
getCache().getInternalResourceManager();
  

[geode] 02/02: change up the rebalance calls.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch rebalance_bug
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 9624f33f954fc92d2f5be90a228c422118fca8d9
Author: Mark Hanson 
AuthorDate: Tue Aug 24 09:57:40 2021 -0700

change up the rebalance calls.
---
 .../cache/control/RebalanceOperationDistributedTest.java   | 14 ++
 1 file changed, 6 insertions(+), 8 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 3a1bb5e..4bb0005 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
@@ -379,7 +379,7 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
* copies of a buckets.
*/
   @Test
-  public void testEnforceZoneWithSixServersAndTwoZones() throws 
InterruptedException {
+  public void testEnforceZoneWithSixServersAndTwoZones() {
 VM vm0 = getVM(0);
 VM vm1 = getVM(1);
 VM vm2 = getVM(2);
@@ -392,7 +392,6 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
 Stream.of(vm0, vm1, vm2, vm3, vm4, vm5).forEach(vm -> {
   vm.invoke(() -> createPartitionedRegion("region1", 1, 113));
   vm.invoke(() -> createPartitionedRegion("region1Ancillary", 1, 113));
-
 });
 
 // Create some buckets
@@ -420,21 +419,20 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
   validateStatistics(manager, results);
 });
 
-vm2.bounceForcibly();
+vm0.bounceForcibly();
 
-vm0.invoke(() -> {
+vm1.invoke(() -> {
   InternalResourceManager manager = 
getCache().getInternalResourceManager();
   RebalanceResults results = doRebalance(false, manager);
   logger.info("Rebalance 2 Results = " + results);
 });
-// Thread.sleep(2000);
 
-vm2.invoke(() -> {
+vm0.invoke(() -> {
   setRedundancyZone("A");
   createPartitionedRegion("region1", 1, 113);
 });
 
-vm0.invoke(() -> {
+vm2.invoke(() -> {
   InternalResourceManager manager = 
getCache().getInternalResourceManager();
   RebalanceResults results = doRebalance(false, manager);
   logger.info("Rebalance 3 Results = " + results);
@@ -2439,7 +2437,7 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
   }
 
   private void createPartitionedRegion(String regionName, int redundantCopies, 
final int numBuckets,
-   final RegionShortcut regionShortcut) {
+  final RegionShortcut regionShortcut) {
 PartitionAttributesFactory partitionAttributesFactory = new 
PartitionAttributesFactory();
 partitionAttributesFactory.setRedundantCopies(redundantCopies);
 partitionAttributesFactory.setRecoveryDelay(-1);

[geode] 01/02: first cut.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch rebalance_bug
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 120b6620d0cb1caaf9204be279d88fdc95a92a29
Author: Mark Hanson 
AuthorDate: Tue Aug 24 01:24:07 2021 -0700

first cut.
---
 .../control/RebalanceOperationDistributedTest.java | 113 +
 .../internal/cache/PartitionedRegionDataStore.java |  33 ++
 .../control/PartitionRebalanceDetailsImpl.java |  21 
 .../partitioned/PartitionedRegionRebalanceOp.java  |   4 +
 4 files changed, 171 insertions(+)

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 94bd61c..3a1bb5e 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
@@ -54,6 +54,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Stream;
 
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
@@ -76,6 +77,7 @@ import org.apache.geode.cache.LoaderHelper;
 import org.apache.geode.cache.PartitionAttributesFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.asyncqueue.AsyncEvent;
 import org.apache.geode.cache.asyncqueue.AsyncEventListener;
 import org.apache.geode.cache.control.RebalanceOperation;
@@ -108,6 +110,7 @@ import org.apache.geode.test.dunit.SerializableRunnableIF;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.cache.CacheTestCase;
+import org.apache.geode.test.dunit.rules.DistributedDiskDirRule;
 import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
 import org.apache.geode.test.junit.rules.ExecutorServiceRule;
 import org.apache.geode.util.internal.GeodeGlossary;
@@ -131,6 +134,9 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
   @Rule
   public ExecutorServiceRule executorServiceRule = new ExecutorServiceRule();
 
+  @Rule
+  public DistributedDiskDirRule diskDirRule = new DistributedDiskDirRule();
+
   @After
   public void tearDown() {
 invokeInEveryVM(() -> {
@@ -368,6 +374,89 @@ public class RebalanceOperationDistributedTest extends 
CacheTestCase {
 }
   }
 
+  /**
+   * Test that we correctly use the redundancy-zone property to determine 
where to place redundant
+   * copies of a buckets.
+   */
+  @Test
+  public void testEnforceZoneWithSixServersAndTwoZones() throws 
InterruptedException {
+VM vm0 = getVM(0);
+VM vm1 = getVM(1);
+VM vm2 = getVM(2);
+VM vm3 = getVM(3);
+VM vm4 = getVM(4);
+VM vm5 = getVM(5);
+Stream.of(vm0, vm1, vm2).forEach(vm -> vm.invoke(() -> 
setRedundancyZone("A")));
+Stream.of(vm3, vm4, vm5).forEach(vm -> vm.invoke(() -> 
setRedundancyZone("B")));
+
+Stream.of(vm0, vm1, vm2, vm3, vm4, vm5).forEach(vm -> {
+  vm.invoke(() -> createPartitionedRegion("region1", 1, 113));
+  vm.invoke(() -> createPartitionedRegion("region1Ancillary", 1, 113));
+
+});
+
+// Create some buckets
+vm0.invoke(() -> {
+  Map mapOfData = new HashMap<>();
+  for (int i = 0; i < 10; i++) {
+mapOfData.put(i, "A");
+  }
+  Region region = getCache().getRegion("region1");
+  region.putAll(mapOfData);
+  Region region2 = 
getCache().getRegion("region1Ancillary");
+  region2.putAll(mapOfData);
+});
+
+// make sure we can tell that the buckets have low redundancy
+// vm0.invoke(() -> validateRedundancy("region1", 113, 0, 113));
+
+// Make sure we still have low redundancy
+vm0.invoke(() -> validateRedundancy("region1", 113, 1, 0));
+
+vm0.invoke(() -> {
+  InternalResourceManager manager = 
getCache().getInternalResourceManager();
+  RebalanceResults results = doRebalance(false, manager);
+  logger.info("Rebalance 1 Results = " + results);
+  validateStatistics(manager, results);
+});
+
+vm2.bounceForcibly();
+
+vm0.invoke(() -> {
+  InternalResourceManager manager = 
getCache().getInternalResourceManager();
+  RebalanceResults results = doRebalance(false, manager);
+  logger.info("Rebalance 2 Results = " + results);
+});
+// Thread.sleep(2000);
+
+vm2.invoke(() -> {
+ 

[geode] branch rebalance_bug created (now 9624f33)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch rebalance_bug
in repository https://gitbox.apache.org/repos/asf/geode.git.


  at 9624f33  change up the rebalance calls.

This branch includes the following new commits:

 new 120b662  first cut.
 new 9624f33  change up the rebalance calls.

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.

[geode] branch feature/GEODE-7665 updated: GEODE-9194: Feature/region stats update (#6430)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
 new 6754d1a  GEODE-9194: Feature/region stats update (#6430)
6754d1a is described below

commit 6754d1a40822e966d9d420443daed84205d051ce
Author: mhansonp 
AuthorDate: Tue Jul 13 09:34:54 2021 -0700

GEODE-9194: Feature/region stats update (#6430)

* GEODE-9194: add PR Region Clear statistics
---
 .../cache/RegionClearStatsDistributedTest.java |  33 ++--
 .../cache/PartitionedRegionClearDUnitTest.java | 139 ---
 ...tionedRegionLocalMaxMemoryOffHeapDUnitTest.java |   2 +-
 .../partitioned/PRQueryCacheClosedJUnitTest.java   | 116 ++--
 .../cache/query/partitioned/PRQueryJUnitTest.java  |  51 +++---
 .../partitioned/PRQueryRegionClosedJUnitTest.java  | 131 ++
 .../PRQueryRegionDestroyedJUnitTest.java   |   5 +-
 .../geode/internal/cache/ColocatedPRJUnitTest.java |   4 +-
 .../cache/PartitionedRegionCreationJUnitTest.java  |   4 +-
 .../cache/PartitionedRegionStatsJUnitTest.java | 198 -
 .../geode/internal/cache/AbstractRegion.java   |   2 +
 .../geode/internal/cache/AbstractRegionMap.java| 169 +-
 .../apache/geode/internal/cache/BucketRegion.java  |  24 ++-
 .../geode/internal/cache/CachePerfStats.java   |  79 
 .../geode/internal/cache/DummyCachePerfStats.java  |  10 ++
 .../geode/internal/cache/GemFireCacheImpl.java |  15 +-
 .../apache/geode/internal/cache/LocalRegion.java   |  17 +-
 .../geode/internal/cache/PartitionedRegion.java|  31 +++-
 .../internal/cache/PartitionedRegionClear.java |  24 +--
 .../internal/cache/PartitionedRegionStats.java |  47 +
 .../geode/internal/cache/RegionPerfStats.java  |  25 ++-
 .../apache/geode/internal/cache/RegionStats.java   |   4 +-
 .../geode/internal/cache/CachePerfStatsTest.java   |  64 +++
 .../internal/cache/PartitionedRegionTest.java  |  14 +-
 .../cache/PartitionedRegionTestHelper.java | 130 +++---
 25 files changed, 775 insertions(+), 563 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
index 50cea82..888a996 100755
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
@@ -38,7 +38,6 @@ import org.apache.geode.test.dunit.rules.DistributedRule;
 /**
  * verifies the count of clear operation
  */
-@SuppressWarnings("serial")
 public class RegionClearStatsDistributedTest implements Serializable {
 
   private static final String REGION_NAME = 
RegionClearStatsDistributedTest.class.getSimpleName();
@@ -58,7 +57,7 @@ public class RegionClearStatsDistributedTest implements 
Serializable {
   public CacheRule cacheRule = new CacheRule();
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
 server1 = getVM(0);
 client1 = getVM(1);
   }
@@ -68,14 +67,14 @@ public class RegionClearStatsDistributedTest implements 
Serializable {
*/
   @Test
   public void testClearStatsWithNormalRegion() {
-int port = server1.invoke(() -> createServerCache());
+int port = server1.invoke(this::createServerCache);
 client1.invoke(() -> createClientCache(getServerHostName(), port));
 
-client1.invoke(() -> doPutsAndClear());
-client1.invoke(() -> doPutsAndClear());
+client1.invoke(this::doPutsAndClear);
+client1.invoke(this::doPutsAndClear);
 
-client1.invoke(() -> validateClearCountStat());
-server1.invoke(() -> validateClearCountStat());
+client1.invoke(this::validateClearCountStat);
+server1.invoke(this::validateClearCountStat);
   }
 
   /**
@@ -83,20 +82,20 @@ public class RegionClearStatsDistributedTest implements 
Serializable {
*/
   @Test
   public void testClearStatsWithDiskRegion() {
-int port = server1.invoke(() -> createServerCacheWithPersistence());
+int port = server1.invoke(this::createServerCacheWithPersistence);
 client1.invoke(() -> createClientCacheWithPersistence(getServerHostName(), 
port));
 
-client1.invoke(() -> doPutsAndClear());
-client1.invoke(() -> doPutsAndClear());
+client1.invoke(this::doPutsAndClear);
+client1.invoke(this::doPutsAndClear);
 
-client1.invoke(() -> validateClearCountStat());
-server1.invoke(() -> validateClearCountStat());
+client1.invoke(this::validateClearCountStat);
+server1.invoke(this::validateClearCountStat);
   }
 
   private int createCache(DataPolicy dataPolicy) throws IOException {
 cacheRule.createC

[geode] branch feature/GEODE-7665 updated: GEODE-9194: Missing file is causing trouble (#6574)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
 new 83e2e3b  GEODE-9194: Missing file is causing trouble (#6574)
83e2e3b is described below

commit 83e2e3bc6867197feff2f3c7cf340be22f0ee1a3
Author: mhansonp 
AuthorDate: Tue Jun 8 09:41:32 2021 -0700

GEODE-9194: Missing file is causing trouble (#6574)
---
 .../META-INF/services/org.springframework.shell.core.CommandMarker   | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/geode-gfsh/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
 
b/geode-gfsh/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
index 00ae9b2..71b09d2 100644
--- 
a/geode-gfsh/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
+++ 
b/geode-gfsh/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
@@ -6,6 +6,7 @@ 
org.apache.geode.management.internal.cli.commands.AlterRegionCommand
 org.apache.geode.management.internal.cli.commands.AlterRuntimeConfigCommand
 org.apache.geode.management.internal.cli.commands.BackupDiskStoreCommand
 org.apache.geode.management.internal.cli.commands.ChangeLogLevelCommand
+org.apache.geode.management.internal.cli.commands.ClearCommand
 org.apache.geode.management.internal.cli.commands.ClearDefinedIndexesCommand
 org.apache.geode.management.internal.cli.commands.CloseDurableClientCommand
 org.apache.geode.management.internal.cli.commands.CloseDurableCQsCommand

[geode] branch develop updated: Geode 8886 new test (#6128)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 a309bb6  Geode 8886 new test (#6128)
a309bb6 is described below

commit a309bb6c8a58bdb7f9d2b6c0380a9156cfdda869
Author: mhansonp 
AuthorDate: Mon Apr 12 15:02:57 2021 -0700

Geode 8886 new test (#6128)

GEODE-8886: New test with documentation corrections.
---
 ...ANRollingUpgradeVerifyGatewaySenderProfile.java | 48 +-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git 
a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
 
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
index 04bfea8..e7c328c 100644
--- 
a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
+++ 
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
@@ -31,7 +31,7 @@ import org.apache.geode.test.version.VersionManager;
 
 public class WANRollingUpgradeVerifyGatewaySenderProfile extends 
WANRollingUpgradeDUnitTest {
   @Test
-  // Thigit s test verifies that a GatewaySenderProfile serializes properly 
between versions.
+  // This test verifies that a GatewaySenderProfile serializes properly 
between versions new to old.
   public void testVerifyGatewaySenderProfile() {
 final Host host = Host.getHost(0);
 VM oldLocator = host.getVM(oldVersion, 0);
@@ -73,4 +73,50 @@ public class WANRollingUpgradeVerifyGatewaySenderProfile 
extends WANRollingUpgra
   ie.remove();
 }
   }
+
+  @Test
+  // This test verifies that a GatewaySenderProfile serializes properly 
between versions old to new.
+  public void testOldServerCanUnderstandNewGatewaySenderProfile() {
+
+VM oldLocator = VM.getVM(oldVersion, 0);
+VM oldServer = VM.getVM(oldVersion, 1);
+VM currentServer = VM.getVM(VersionManager.CURRENT_VERSION, 2);
+
+// Start locator
+final int port = getRandomAvailableTCPPort();
+oldLocator.invoke(() -> DistributedTestUtils.deleteLocatorStateFile(port));
+final String locators = VM.getHostName() + "[" + port + "]";
+oldLocator.invoke(() -> startLocator(port, 0, locators, ""));
+
+IgnoredException ie =
+IgnoredException.addIgnoredException("could not get remote locator 
information");
+try {
+  String senderId = getName() + "_gatewaysender";
+
+  // Start current server
+  currentServer.invoke(() -> createCache(locators));
+
+  // Create GatewaySender in new server
+  currentServer.invoke(() -> createGatewaySender(senderId, 10,
+  ParallelGatewaySenderQueue.DEFAULT_MESSAGE_SYNC_INTERVAL));
+
+  // Locators before 1.4 handled configuration asynchronously.
+  // We must wait for configuration configuration to be ready, or confirm 
that it is disabled.
+  oldLocator.invoke(
+  () -> await()
+  .untilAsserted(() -> assertTrue(
+  
!InternalLocator.getLocator().getConfig().getEnableClusterConfiguration()
+  || 
InternalLocator.getLocator().isSharedConfigurationRunning(;
+
+  // Start old server
+  oldServer.invoke(() -> createCache(locators));
+
+  // Attempt to create GatewaySender in old server
+  oldServer.invoke(() -> createGatewaySender(senderId, 10,
+  ParallelGatewaySenderQueue.DEFAULT_MESSAGE_SYNC_INTERVAL));
+
+} finally {
+  ie.remove();
+}
+  }
 }

[geode] branch support/1.12 updated: GEODE-9067: register-interest done during rolling upgrade can take longer than needed (#6195)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 e0de72a  GEODE-9067: register-interest done during rolling upgrade can 
take longer than needed (#6195)
e0de72a is described below

commit e0de72a4606d4081f37d9fd2bc7709cd6c46ded5
Author: mhansonp 
AuthorDate: Fri Mar 26 09:28:10 2021 -0700

GEODE-9067: register-interest done during rolling upgrade can take longer 
than needed (#6195)

- Removing code that is no longer needed

(cherry picked from commit 77c0937dd32c311891407ebeba37727938347f9c)
(cherry picked from commit c472411007939a7b43ce4a7a69c49b57906ccc67)
---
 .../geode/internal/cache/PartitionedRegion.java| 122 -
 .../internal/cache/PartitionedRegionTest.java  |  49 -
 2 files changed, 171 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 1834f77..ac056de 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -140,7 +140,6 @@ import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.distributed.DistributedLockService;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.LockServiceDestroyedException;
-import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionAdvisee;
 import org.apache.geode.distributed.internal.DistributionAdvisor;
 import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
@@ -231,7 +230,6 @@ import 
org.apache.geode.internal.cache.tier.sockets.BaseCommand;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import org.apache.geode.internal.cache.tier.sockets.command.Get70;
 import 
org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.cache.versions.RegionVersionVector;
 import org.apache.geode.internal.cache.versions.VersionStamp;
@@ -4532,18 +4530,6 @@ public class PartitionedRegion extends LocalRegion
 }
   }
 
-  // Handle old nodes for Rolling Upgrade support
-  Set failedSet = handleOldNodes(nodeToBuckets, values, servConn);
-  // Add failed buckets to nodeToBuckets map so that these will be tried on
-  // remote nodes.
-  if (!failedSet.isEmpty()) {
-for (Integer bId : failedSet) {
-  failures.put(bId, bucketKeys.get(bId));
-}
-updateNodeToBucketMap(nodeToBuckets, failures);
-failures.clear();
-  }
-
   fetchRemoteEntries(nodeToBuckets, failures, values, servConn);
   if (!failures.isEmpty()) {
 if (retryTime == null) {
@@ -4575,106 +4561,6 @@ public class PartitionedRegion extends LocalRegion
 }
   }
 
-  /**
-   * @return set of bucket-ids that could not be read from.
-   */
-  private Set handleOldNodes(HashMap nodeToBuckets, 
VersionedObjectList values,
-  ServerConnection servConn) throws IOException {
-Set failures = new HashSet();
-HashMap oldFellas = filterOldMembers(nodeToBuckets);
-for (Iterator it = oldFellas.entrySet().iterator(); it.hasNext();) {
-  Map.Entry e = (Map.Entry) it.next();
-  InternalDistributedMember member = (InternalDistributedMember) 
e.getKey();
-  Object bucketInfo = e.getValue();
-
-  HashMap bucketKeys = null;
-  Set buckets = null;
-
-  if (bucketInfo instanceof Set) {
-buckets = (Set) bucketInfo;
-  } else {
-bucketKeys = (HashMap) bucketInfo;
-buckets = bucketKeys.keySet();
-  }
-
-  fetchKeysAndValues(values, servConn, failures, member, bucketKeys, 
buckets);
-}
-return failures;
-  }
-
-  void fetchKeysAndValues(VersionedObjectList values, ServerConnection 
servConn,
-  Set failures, InternalDistributedMember member,
-  HashMap bucketKeys, Set buckets)
-  throws IOException {
-for (Integer bucket : buckets) {
-  Set keys = null;
-  if (bucketKeys == null) {
-try {
-  FetchKeysResponse fetchKeysResponse = getFetchKeysResponse(member, 
bucket);
-  keys = fetchKeysResponse.waitForKeys();
-} catch (ForceReattemptException ignore) {
-  failures.add(bucket);
-}
-  } else {
-keys = bucketKeys.get(bucket);
-  }
-  if (keys != null) {
-getValuesForKeys(values, servConn, keys);
-  }
-}
-  }
-
-  FetchKeysResponse getFetchKeysResponse

[geode] branch support/1.13 updated: GEODE-9067: register-interest done during rolling upgrade can take longer than needed (#6195)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 c472411  GEODE-9067: register-interest done during rolling upgrade can 
take longer than needed (#6195)
c472411 is described below

commit c472411007939a7b43ce4a7a69c49b57906ccc67
Author: mhansonp 
AuthorDate: Fri Mar 26 09:28:10 2021 -0700

GEODE-9067: register-interest done during rolling upgrade can take longer 
than needed (#6195)

- Removing code that is no longer needed

(cherry picked from commit 77c0937dd32c311891407ebeba37727938347f9c)
---
 .../geode/internal/cache/PartitionedRegion.java| 122 -
 .../internal/cache/PartitionedRegionTest.java  |  49 -
 2 files changed, 171 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 7c4e786..c84c0ab 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -140,7 +140,6 @@ import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.distributed.DistributedLockService;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.LockServiceDestroyedException;
-import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionAdvisee;
 import org.apache.geode.distributed.internal.DistributionAdvisor;
 import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
@@ -231,7 +230,6 @@ import 
org.apache.geode.internal.cache.tier.sockets.BaseCommand;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import org.apache.geode.internal.cache.tier.sockets.command.Get70;
 import 
org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.cache.versions.RegionVersionVector;
 import org.apache.geode.internal.cache.versions.VersionStamp;
@@ -4532,18 +4530,6 @@ public class PartitionedRegion extends LocalRegion
 }
   }
 
-  // Handle old nodes for Rolling Upgrade support
-  Set failedSet = handleOldNodes(nodeToBuckets, values, servConn);
-  // Add failed buckets to nodeToBuckets map so that these will be tried on
-  // remote nodes.
-  if (!failedSet.isEmpty()) {
-for (Integer bId : failedSet) {
-  failures.put(bId, bucketKeys.get(bId));
-}
-updateNodeToBucketMap(nodeToBuckets, failures);
-failures.clear();
-  }
-
   fetchRemoteEntries(nodeToBuckets, failures, values, servConn);
   if (!failures.isEmpty()) {
 if (retryTime == null) {
@@ -4575,106 +4561,6 @@ public class PartitionedRegion extends LocalRegion
 }
   }
 
-  /**
-   * @return set of bucket-ids that could not be read from.
-   */
-  private Set handleOldNodes(HashMap nodeToBuckets, 
VersionedObjectList values,
-  ServerConnection servConn) throws IOException {
-Set failures = new HashSet();
-HashMap oldFellas = filterOldMembers(nodeToBuckets);
-for (Iterator it = oldFellas.entrySet().iterator(); it.hasNext();) {
-  Map.Entry e = (Map.Entry) it.next();
-  InternalDistributedMember member = (InternalDistributedMember) 
e.getKey();
-  Object bucketInfo = e.getValue();
-
-  HashMap bucketKeys = null;
-  Set buckets = null;
-
-  if (bucketInfo instanceof Set) {
-buckets = (Set) bucketInfo;
-  } else {
-bucketKeys = (HashMap) bucketInfo;
-buckets = bucketKeys.keySet();
-  }
-
-  fetchKeysAndValues(values, servConn, failures, member, bucketKeys, 
buckets);
-}
-return failures;
-  }
-
-  void fetchKeysAndValues(VersionedObjectList values, ServerConnection 
servConn,
-  Set failures, InternalDistributedMember member,
-  HashMap bucketKeys, Set buckets)
-  throws IOException {
-for (Integer bucket : buckets) {
-  Set keys = null;
-  if (bucketKeys == null) {
-try {
-  FetchKeysResponse fetchKeysResponse = getFetchKeysResponse(member, 
bucket);
-  keys = fetchKeysResponse.waitForKeys();
-} catch (ForceReattemptException ignore) {
-  failures.add(bucket);
-}
-  } else {
-keys = bucketKeys.get(bucket);
-  }
-  if (keys != null) {
-getValuesForKeys(values, servConn, keys);
-  }
-}
-  }
-
-  FetchKeysResponse getFetchKeysResponse(InternalDistributedMember member,
-  Integer bucket)
-  throws

[geode] branch support/1.14 updated: GEODE-9067: register-interest done during rolling upgrade can take longer than needed (#6195)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.14 by this push:
 new 77c0937  GEODE-9067: register-interest done during rolling upgrade can 
take longer than needed (#6195)
77c0937 is described below

commit 77c0937dd32c311891407ebeba37727938347f9c
Author: mhansonp 
AuthorDate: Fri Mar 26 09:28:10 2021 -0700

GEODE-9067: register-interest done during rolling upgrade can take longer 
than needed (#6195)

- Removing code that is no longer needed

(cherry picked from commit 4305808d2350e0f50a1838963296813097bf440f)
---
 .../geode/internal/cache/PartitionedRegion.java| 122 -
 .../internal/cache/PartitionedRegionTest.java  |  49 -
 2 files changed, 171 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 68a039c..4779c52 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -140,7 +140,6 @@ import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.distributed.DistributedLockService;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.LockServiceDestroyedException;
-import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionAdvisee;
 import org.apache.geode.distributed.internal.DistributionAdvisor;
 import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
@@ -233,7 +232,6 @@ import 
org.apache.geode.internal.cache.tier.sockets.BaseCommand;
 import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
-import org.apache.geode.internal.cache.tier.sockets.command.Get70;
 import 
org.apache.geode.internal.cache.versions.ConcurrentCacheModificationException;
 import org.apache.geode.internal.cache.versions.RegionVersionVector;
 import org.apache.geode.internal.cache.versions.VersionStamp;
@@ -4559,18 +4557,6 @@ public class PartitionedRegion extends LocalRegion
 }
   }
 
-  // Handle old nodes for Rolling Upgrade support
-  Set failedSet = handleOldNodes(nodeToBuckets, values, servConn);
-  // Add failed buckets to nodeToBuckets map so that these will be tried on
-  // remote nodes.
-  if (!failedSet.isEmpty()) {
-for (Integer bId : failedSet) {
-  failures.put(bId, bucketKeys.get(bId));
-}
-updateNodeToBucketMap(nodeToBuckets, failures);
-failures.clear();
-  }
-
   fetchRemoteEntries(nodeToBuckets, failures, values, servConn);
   if (!failures.isEmpty()) {
 if (retryTime == null) {
@@ -4602,106 +4588,6 @@ public class PartitionedRegion extends LocalRegion
 }
   }
 
-  /**
-   * @return set of bucket-ids that could not be read from.
-   */
-  private Set handleOldNodes(HashMap nodeToBuckets, 
VersionedObjectList values,
-  ServerConnection servConn) throws IOException {
-Set failures = new HashSet();
-HashMap oldFellas = filterOldMembers(nodeToBuckets);
-for (Iterator it = oldFellas.entrySet().iterator(); it.hasNext();) {
-  Map.Entry e = (Map.Entry) it.next();
-  InternalDistributedMember member = (InternalDistributedMember) 
e.getKey();
-  Object bucketInfo = e.getValue();
-
-  HashMap bucketKeys = null;
-  Set buckets = null;
-
-  if (bucketInfo instanceof Set) {
-buckets = (Set) bucketInfo;
-  } else {
-bucketKeys = (HashMap) bucketInfo;
-buckets = bucketKeys.keySet();
-  }
-
-  fetchKeysAndValues(values, servConn, failures, member, bucketKeys, 
buckets);
-}
-return failures;
-  }
-
-  void fetchKeysAndValues(VersionedObjectList values, ServerConnection 
servConn,
-  Set failures, InternalDistributedMember member,
-  HashMap bucketKeys, Set buckets)
-  throws IOException {
-for (Integer bucket : buckets) {
-  Set keys = null;
-  if (bucketKeys == null) {
-try {
-  FetchKeysResponse fetchKeysResponse = getFetchKeysResponse(member, 
bucket);
-  keys = fetchKeysResponse.waitForKeys();
-} catch (ForceReattemptException ignore) {
-  failures.add(bucket);
-}
-  } else {
-keys = bucketKeys.get(bucket);
-  }
-  if (keys != null) {
-getValuesForKeys(values, servConn, keys);
-  }
-}
-  }
-
-  FetchKeysResponse getFetchKeysResponse(InternalDistributedMember member,
-  Integer bucket)
-  throws

[geode] branch develop updated (d9ec6fb -> 4305808)

[mhanson]

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 d9ec6fb  GEODE-9045: customer facing references to Redis (#6150)
 add 4305808  GEODE-9067: register-interest done during rolling upgrade can 
take longer than needed (#6195)

No new revisions were added by this update.

Summary of changes:
 .../geode/internal/cache/PartitionedRegion.java| 122 -
 .../internal/cache/PartitionedRegionTest.java  |  49 -
 2 files changed, 171 deletions(-)

[geode] 02/02: GEODE-8886: upgradeTest sometimes fails with new test (#6091)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 306d5dc70b72c722f0990cbff7f6c1b346685bb7
Author: mhansonp 
AuthorDate: Thu Mar 4 16:30:18 2021 -0800

GEODE-8886: upgradeTest sometimes fails with new test (#6091)

(cherry picked from commit 46f90a58c234fe0bc2719c9d9c9f8091ad460917)
---
 ...ANRollingUpgradeVerifyGatewaySenderProfile.java | 60 +++---
 1 file changed, 8 insertions(+), 52 deletions(-)

diff --git 
a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
 
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
index 02d3603..04bfea8 100644
--- 
a/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
+++ 
b/geode-wan/src/upgradeTest/java/org/apache/geode/cache/wan/WANRollingUpgradeVerifyGatewaySenderProfile.java
@@ -23,23 +23,25 @@ import org.junit.Test;
 import org.apache.geode.distributed.internal.InternalLocator;
 import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
 import org.apache.geode.test.dunit.DistributedTestUtils;
+import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.version.VersionManager;
 
 public class WANRollingUpgradeVerifyGatewaySenderProfile extends 
WANRollingUpgradeDUnitTest {
   @Test
-
-  // This test verifies that a GatewaySenderProfile serializes properly 
between versions.
+  // Thigit s test verifies that a GatewaySenderProfile serializes properly 
between versions.
   public void testVerifyGatewaySenderProfile() {
-VM oldLocator = VM.getVM(oldVersion, 0);
-VM oldServer = VM.getVM(oldVersion, 1);
-VM currentServer = VM.getVM(VersionManager.CURRENT_VERSION, 2);
+final Host host = Host.getHost(0);
+VM oldLocator = host.getVM(oldVersion, 0);
+VM oldServer = host.getVM(oldVersion, 1);
+VM currentServer = host.getVM(VersionManager.CURRENT_VERSION, 2);
 
 // Start locator
 final int port = getRandomAvailableTCPPort();
 oldLocator.invoke(() -> DistributedTestUtils.deleteLocatorStateFile(port));
-final String locators = VM.getHostName() + "[" + port + "]";
+final String locators = NetworkUtils.getServerHostName(host) + "[" + port 
+ "]";
 oldLocator.invoke(() -> startLocator(port, 0, locators, ""));
 
 IgnoredException ie =
@@ -71,50 +73,4 @@ public class WANRollingUpgradeVerifyGatewaySenderProfile 
extends WANRollingUpgra
   ie.remove();
 }
   }
-
-  @Test
-  // This test verifies that a GatewaySenderProfile serializes properly 
between versions.
-  public void testOldServerCanUnderstandNewGatewaySenderProfile() {
-
-VM oldLocator = VM.getVM(oldVersion, 0);
-VM oldServer = VM.getVM(oldVersion, 1);
-VM currentServer = VM.getVM(VersionManager.CURRENT_VERSION, 2);
-
-// Start locator
-final int port = getRandomAvailableTCPPort();
-oldLocator.invoke(() -> DistributedTestUtils.deleteLocatorStateFile(port));
-final String locators = VM.getHostName() + "[" + port + "]";
-oldLocator.invoke(() -> startLocator(port, 0, locators, ""));
-
-IgnoredException ie =
-IgnoredException.addIgnoredException("could not get remote locator 
information");
-try {
-  String senderId = getName() + "_gatewaysender";
-
-  // Start current server
-  currentServer.invoke(() -> createCache(locators));
-
-  // Create GatewaySender in new server
-  currentServer.invoke(() -> createGatewaySender(senderId, 10,
-  ParallelGatewaySenderQueue.DEFAULT_MESSAGE_SYNC_INTERVAL));
-
-  // Locators before 1.4 handled configuration asynchronously.
-  // We must wait for configuration configuration to be ready, or confirm 
that it is disabled.
-  oldLocator.invoke(
-  () -> await()
-  .untilAsserted(() -> assertTrue(
-  
!InternalLocator.getLocator().getConfig().getEnableClusterConfiguration()
-  || 
InternalLocator.getLocator().isSharedConfigurationRunning(;
-
-  // Start old server
-  oldServer.invoke(() -> createCache(locators));
-
-  // Attempt to create GatewaySender in old server
-  oldServer.invoke(() -> createGatewaySender(senderId, 10,
-  ParallelGatewaySenderQueue.DEFAULT_MESSAGE_SYNC_INTERVAL));
-
-} finally {
-  ie.remove();
-}
-  }
 }

[geode] branch support/1.14 updated (fbef055 -> 306d5dc)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git.


from fbef055  GEODE-8374 - User Guide: ViewAckTimeout Configuration (#6099)
 new 9b26445  GEODE-8886 fix (#6059)
 new 306d5dc  GEODE-8886: upgradeTest sometimes fails with new test (#6091)

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:
 .../codeAnalysis/sanctionedDataSerializables.txt   |  4 +-
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  2 -
 .../cache/wan/GatewaySenderAdvisorTest.java| 93 ++
 ...ANRollingUpgradeVerifyGatewaySenderProfile.java |  2 +-
 4 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 
geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisorTest.java

[geode] 01/02: GEODE-8886 fix (#6059)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 9b26445521d86a985d140eceaf160ea6c60feae1
Author: mhansonp 
AuthorDate: Tue Mar 2 14:26:36 2021 -0800

GEODE-8886 fix (#6059)

Getting rid of a write and a read in the wrong place...
sanctionedDataSerializables.txt needed updating.
New test for encoding and decoding of packets.
New test for backwards compatibility

(cherry picked from commit dcb1096130925e2794010c7a7ab8accfbf49cb3e)
---
 .../codeAnalysis/sanctionedDataSerializables.txt   |  4 +-
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  2 -
 .../cache/wan/GatewaySenderAdvisorTest.java| 93 ++
 ...ANRollingUpgradeVerifyGatewaySenderProfile.java | 58 --
 4 files changed, 146 insertions(+), 11 deletions(-)

diff --git 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 058733c..03e7c5b 100644
--- 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1912,10 +1912,10 @@ toData,254
 
 org/apache/geode/internal/cache/wan/GatewaySenderAdvisor$GatewaySenderProfile,6
 fromData,17
-fromDataPre_GEODE_1_14_0_0,293
+fromDataPre_GEODE_1_14_0_0,283
 fromDataPre_GFE_8_0_0_0,188
 toData,17
-toDataPre_GEODE_1_14_0_0,281
+toDataPre_GEODE_1_14_0_0,271
 toDataPre_GFE_8_0_0_0,236
 
 org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument,2
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
index 6af0866..38b608c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
@@ -595,7 +595,6 @@ public class GatewaySenderAdvisor extends 
DistributionAdvisor {
 this.serverLocation = new ServerLocation();
 InternalDataSerializer.invokeFromData(this.serverLocation, in);
   }
-  this.enforceThreadsConnectSameReceiver = in.readBoolean();
 }
 
 @Override
@@ -641,7 +640,6 @@ public class GatewaySenderAdvisor extends 
DistributionAdvisor {
   if (serverLocationFound) {
 InternalDataSerializer.invokeToData(serverLocation, out);
   }
-  out.writeBoolean(enforceThreadsConnectSameReceiver);
 }
 
 public void fromDataPre_GFE_8_0_0_0(DataInput in, DeserializationContext 
context)
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisorTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisorTest.java
new file mode 100644
index 000..d130e93
--- /dev/null
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisorTest.java
@@ -0,0 +1,93 @@
+/*
+ * 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.cache.wan;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.geode.DataSerializer;
+import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.serialization.KnownVersion;
+import org.apache.geode.internal.serialization.VersionedDataInputStream;
+import org.apache.geode.internal.serialization.VersionedDataOutputStream;
+import org.apache.geode.internal.tcp.ByteBufferInputStream;
+
+public class GatewaySenderAdvisorTest {
+
+  @Before
+  public void setUp() throws Exception {}
+
+  @After
+  public void tearDown() throws Exception {}
+
+
+  @Test
+  public void testGatewaySenderProfileSerializeAndDeserializeCur

[geode] branch develop updated (52e7411 -> 46f90a5)

[mhanson]

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 52e7411  GEODE-8979: CI Failure: 
SSLSocketHostNameVerificationIntegrationTest (#6079)
 add 46f90a5  GEODE-8886: upgradeTest sometimes fails with new test (#6091)

No new revisions were added by this update.

Summary of changes:
 ...ANRollingUpgradeVerifyGatewaySenderProfile.java | 60 +++---
 1 file changed, 8 insertions(+), 52 deletions(-)

[geode] branch support/1.12 updated: GEODE-8958: When timestamps get corrupted.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 3ffc6a6  GEODE-8958: When timestamps get corrupted.
3ffc6a6 is described below

commit 3ffc6a6aaaf9a0ed9245d7069dd6cfdc68d5c936
Author: Mark Hanson 
AuthorDate: Wed Mar 3 15:45:58 2021 -0800

GEODE-8958: When timestamps get corrupted.

Fixing an import issue.

(cherry picked from commit 3e1e3b0a7114801c3ce832a6e164e35ff9edd7d7)
---
 .../cache/versions/TombstoneDUnitTest.java | 32 +++---
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 9471e0a..b03b298 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -14,6 +14,9 @@
  */
 package org.apache.geode.internal.cache.versions;
 
+import static org.apache.geode.cache.RegionShortcut.PARTITION;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE_PERSISTENT;
 import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -23,7 +26,6 @@ import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -45,7 +47,6 @@ import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.cache.TombstoneService;
-import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.DistributedTestUtils;
 import org.apache.geode.test.dunit.NetworkUtils;
@@ -80,12 +81,12 @@ public class TombstoneDUnitTest implements Serializable {
 VM vm1 = VM.getVM(1);
 
 vm0.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
+  createCacheAndRegion(REPLICATE_PERSISTENT);
   region.put("K1", "V1");
   region.put("K2", "V2");
 });
 
-vm1.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+vm1.invoke(() -> createCacheAndRegion(REPLICATE));
 
 vm0.invoke(() -> {
   // Send tombstone gc message to vm1.
@@ -121,13 +122,13 @@ public class TombstoneDUnitTest implements Serializable {
 
 // Create a cache and load some boiler plate entries
 server1.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.REPLICATE);
+  createCacheAndRegion(REPLICATE);
   for (int i = 0; i < count; i++) {
 region.put("K" + i, "V" + i);
   }
 });
 
-server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+server2.invoke(() -> createCacheAndRegion(REPLICATE));
 
 server1.invoke(() -> {
 
@@ -165,16 +166,15 @@ public class TombstoneDUnitTest implements Serializable {
 VM server2 = VM.getVM(1);
 final int FAR_INTO_THE_FUTURE = 100; // 1 million millis into the 
future
 final int count = 2000;
-Logger logger = LogService.getLogger();
 // Create a cache and load some boiler plate entries
 server1.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.PARTITION);
+  createCacheAndRegion(PARTITION);
   for (int i = 0; i < count; i++) {
 region.put("K" + i, "V" + i);
   }
 });
 
-server2.invoke(() -> createCacheAndRegion(RegionShortcut.PARTITION));
+server2.invoke(() -> createCacheAndRegion(PARTITION));
 
 server1.invoke(() -> {
 
@@ -217,13 +217,13 @@ public class TombstoneDUnitTest implements Serializable {
 VM server2 = VM.getVM(1);
 final int count = 10;
 server1.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.REPLICATE);
+  createCacheAndRegion(REPLICATE);
   for (int i = 0; i < count; i++) {
 region.put("K" + i, "V" + i);
   }
 });
 
-server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+server2.invoke(() -> createCacheAndRegion(REPLICATE));
 
 server1.invoke(() -> {
   TombstoneService.TombstoneSweeper tombstoneSweeper =
@@ -249,7 +249,7 @@ public class TombstoneDUnitTest implements Serializable {
 
 // Fire up the server a

[geode] branch support/1.13 updated: GEODE-8958: When timestamps get corrupted.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 3e1e3b0  GEODE-8958: When timestamps get corrupted.
3e1e3b0 is described below

commit 3e1e3b0a7114801c3ce832a6e164e35ff9edd7d7
Author: Mark Hanson 
AuthorDate: Wed Mar 3 15:45:58 2021 -0800

GEODE-8958: When timestamps get corrupted.

Fixing an import issue.
---
 .../cache/versions/TombstoneDUnitTest.java | 32 +++---
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 9471e0a..b03b298 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -14,6 +14,9 @@
  */
 package org.apache.geode.internal.cache.versions;
 
+import static org.apache.geode.cache.RegionShortcut.PARTITION;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE;
+import static org.apache.geode.cache.RegionShortcut.REPLICATE_PERSISTENT;
 import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
@@ -23,7 +26,6 @@ import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -45,7 +47,6 @@ import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.cache.TombstoneService;
-import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.DistributedTestUtils;
 import org.apache.geode.test.dunit.NetworkUtils;
@@ -80,12 +81,12 @@ public class TombstoneDUnitTest implements Serializable {
 VM vm1 = VM.getVM(1);
 
 vm0.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
+  createCacheAndRegion(REPLICATE_PERSISTENT);
   region.put("K1", "V1");
   region.put("K2", "V2");
 });
 
-vm1.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+vm1.invoke(() -> createCacheAndRegion(REPLICATE));
 
 vm0.invoke(() -> {
   // Send tombstone gc message to vm1.
@@ -121,13 +122,13 @@ public class TombstoneDUnitTest implements Serializable {
 
 // Create a cache and load some boiler plate entries
 server1.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.REPLICATE);
+  createCacheAndRegion(REPLICATE);
   for (int i = 0; i < count; i++) {
 region.put("K" + i, "V" + i);
   }
 });
 
-server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+server2.invoke(() -> createCacheAndRegion(REPLICATE));
 
 server1.invoke(() -> {
 
@@ -165,16 +166,15 @@ public class TombstoneDUnitTest implements Serializable {
 VM server2 = VM.getVM(1);
 final int FAR_INTO_THE_FUTURE = 100; // 1 million millis into the 
future
 final int count = 2000;
-Logger logger = LogService.getLogger();
 // Create a cache and load some boiler plate entries
 server1.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.PARTITION);
+  createCacheAndRegion(PARTITION);
   for (int i = 0; i < count; i++) {
 region.put("K" + i, "V" + i);
   }
 });
 
-server2.invoke(() -> createCacheAndRegion(RegionShortcut.PARTITION));
+server2.invoke(() -> createCacheAndRegion(PARTITION));
 
 server1.invoke(() -> {
 
@@ -217,13 +217,13 @@ public class TombstoneDUnitTest implements Serializable {
 VM server2 = VM.getVM(1);
 final int count = 10;
 server1.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.REPLICATE);
+  createCacheAndRegion(REPLICATE);
   for (int i = 0; i < count; i++) {
 region.put("K" + i, "V" + i);
   }
 });
 
-server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+server2.invoke(() -> createCacheAndRegion(REPLICATE));
 
 server1.invoke(() -> {
   TombstoneService.TombstoneSweeper tombstoneSweeper =
@@ -249,7 +249,7 @@ public class TombstoneDUnitTest implements Serializable {
 
 // Fire up the server and put in some data that is deletable
 server.invoke(() -> {
-  c

[geode] branch support/1.12 updated: GEODE-8958: When tombstone timestamps get corrupted. (#6042)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 15af30d  GEODE-8958: When tombstone timestamps get corrupted. (#6042)
15af30d is described below

commit 15af30d4f0a89df4168dcd5d80697143da944936
Author: mhansonp 
AuthorDate: Mon Mar 1 14:28:23 2021 -0800

GEODE-8958: When tombstone timestamps get corrupted. (#6042)

- The system would wait, now it does expires it and moves on.

(cherry picked from commit 1fdcf3220704c858b64b053b0c27fb37c481b4a8)
---
 .../cache/versions/TombstoneDUnitTest.java | 134 +++--
 .../geode/internal/cache/TombstoneService.java |  38 --
 2 files changed, 147 insertions(+), 25 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 8cb94e5..9471e0a 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
+import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -41,7 +42,10 @@ import org.apache.geode.internal.cache.DestroyOperation;
 import org.apache.geode.internal.cache.DistributedTombstoneOperation;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.cache.TombstoneService;
+import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.DistributedTestUtils;
 import org.apache.geode.test.dunit.NetworkUtils;
@@ -107,35 +111,139 @@ public class TombstoneDUnitTest implements Serializable {
 });
   }
 
+
   @Test
-  public void testGetOldestTombstoneTimeReplicate() {
+  public void 
testWhenAnOutOfRangeTimeStampIsSeenWeExpireItInReplicateTombstoneSweeper() {
 VM server1 = VM.getVM(0);
 VM server2 = VM.getVM(1);
+final int FAR_INTO_THE_FUTURE = 100; // 1 million millis into the 
future
+final int count = 10;
 
+// Create a cache and load some boiler plate entries
 server1.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
-  region.put("K1", "V1");
-  region.put("K2", "V2");
+  createCacheAndRegion(RegionShortcut.REPLICATE);
+  for (int i = 0; i < count; i++) {
+region.put("K" + i, "V" + i);
+  }
 });
 
 server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
 
 server1.invoke(() -> {
-  // Send tombstone gc message to vm1.
-  region.destroy("K1");
 
+  // Now that we have a cache and a region specifically with data, we can 
start the real work
   TombstoneService.TombstoneSweeper tombstoneSweeper =
   ((InternalCache) 
cache).getTombstoneService().getSweeper((LocalRegion) region);
 
-  assertThat(tombstoneSweeper.getOldestTombstoneTime()).isGreaterThan(0)
-  .isLessThan(((InternalCache) cache).cacheTimeMillis());
-  performGC(1);
+  // Get one of the entries
+  RegionEntry regionEntry = ((LocalRegion) region).getRegionEntry("K0");
+
+  /*
+   * Create a version tag with a timestamp far off in the future...
+   * It should be in the near past, but we are testing that a future 
tombstone will be cleared
+   */
+  VersionTag versionTag = regionEntry.getVersionStamp().asVersionTag();
+  versionTag.setVersionTimeStamp(System.currentTimeMillis() + 
FAR_INTO_THE_FUTURE);
+
+  // Create the forged tombstone with the versionTag from the future
+  TombstoneService.Tombstone modifiedTombstone =
+  new TombstoneService.Tombstone(regionEntry, (LocalRegion) region,
+  versionTag);
+
+  // Add it to the list of tombstones so that when checkOldestUnexpired is 
called it will see it
+  tombstoneSweeper.tombstones.add(modifiedTombstone);
+  tombstoneSweeper.checkOldestUnexpired(System.currentTimeMillis());
+
+  // Validate that the tombstone was cleared.
+  assertThat(tombstoneSweeper.getOldestTombstoneTime()).isEqualTo(0);
+});
+  }
+
+  @Test
+  public void 
testWhenAnOutOfRangeTimeStampIsSeenWeExpireItInNonReplicateTombstoneSweeper() {
+VM server1 = VM.getVM(0);
+VM server2 = VM.getVM(1);
+final 

[geode] branch support/1.13 updated: GEODE-8958: When tombstone timestamps get corrupted. (#6042)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 a125d37  GEODE-8958: When tombstone timestamps get corrupted. (#6042)
a125d37 is described below

commit a125d370cc737e87514ce97226b065362cb33a0b
Author: mhansonp 
AuthorDate: Mon Mar 1 14:28:23 2021 -0800

GEODE-8958: When tombstone timestamps get corrupted. (#6042)

- The system would wait, now it does expires it and moves on.

(cherry picked from commit 465ff56ccc7430ee7676bc8e8ae354e35fed3b3e)
---
 .../cache/versions/TombstoneDUnitTest.java | 134 +++--
 .../geode/internal/cache/TombstoneService.java |  38 --
 2 files changed, 147 insertions(+), 25 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 8cb94e5..9471e0a 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
+import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -41,7 +42,10 @@ import org.apache.geode.internal.cache.DestroyOperation;
 import org.apache.geode.internal.cache.DistributedTombstoneOperation;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.cache.TombstoneService;
+import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.DistributedTestUtils;
 import org.apache.geode.test.dunit.NetworkUtils;
@@ -107,35 +111,139 @@ public class TombstoneDUnitTest implements Serializable {
 });
   }
 
+
   @Test
-  public void testGetOldestTombstoneTimeReplicate() {
+  public void 
testWhenAnOutOfRangeTimeStampIsSeenWeExpireItInReplicateTombstoneSweeper() {
 VM server1 = VM.getVM(0);
 VM server2 = VM.getVM(1);
+final int FAR_INTO_THE_FUTURE = 100; // 1 million millis into the 
future
+final int count = 10;
 
+// Create a cache and load some boiler plate entries
 server1.invoke(() -> {
-  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
-  region.put("K1", "V1");
-  region.put("K2", "V2");
+  createCacheAndRegion(RegionShortcut.REPLICATE);
+  for (int i = 0; i < count; i++) {
+region.put("K" + i, "V" + i);
+  }
 });
 
 server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
 
 server1.invoke(() -> {
-  // Send tombstone gc message to vm1.
-  region.destroy("K1");
 
+  // Now that we have a cache and a region specifically with data, we can 
start the real work
   TombstoneService.TombstoneSweeper tombstoneSweeper =
   ((InternalCache) 
cache).getTombstoneService().getSweeper((LocalRegion) region);
 
-  assertThat(tombstoneSweeper.getOldestTombstoneTime()).isGreaterThan(0)
-  .isLessThan(((InternalCache) cache).cacheTimeMillis());
-  performGC(1);
+  // Get one of the entries
+  RegionEntry regionEntry = ((LocalRegion) region).getRegionEntry("K0");
+
+  /*
+   * Create a version tag with a timestamp far off in the future...
+   * It should be in the near past, but we are testing that a future 
tombstone will be cleared
+   */
+  VersionTag versionTag = regionEntry.getVersionStamp().asVersionTag();
+  versionTag.setVersionTimeStamp(System.currentTimeMillis() + 
FAR_INTO_THE_FUTURE);
+
+  // Create the forged tombstone with the versionTag from the future
+  TombstoneService.Tombstone modifiedTombstone =
+  new TombstoneService.Tombstone(regionEntry, (LocalRegion) region,
+  versionTag);
+
+  // Add it to the list of tombstones so that when checkOldestUnexpired is 
called it will see it
+  tombstoneSweeper.tombstones.add(modifiedTombstone);
+  tombstoneSweeper.checkOldestUnexpired(System.currentTimeMillis());
+
+  // Validate that the tombstone was cleared.
+  assertThat(tombstoneSweeper.getOldestTombstoneTime()).isEqualTo(0);
+});
+  }
+
+  @Test
+  public void 
testWhenAnOutOfRangeTimeStampIsSeenWeExpireItInNonReplicateTombstoneSweeper() {
+VM server1 = VM.getVM(0);
+VM server2 = VM.getVM(1);
+final 

[geode] branch support/1.14 updated: GEODE-8958: When tombstone timestamps get corrupted. (#6042)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.14 by this push:
 new 1986468  GEODE-8958: When tombstone timestamps get corrupted. (#6042)
1986468 is described below

commit 1986468212d50ae7c91d839209bf24c89449f1ac
Author: mhansonp 
AuthorDate: Mon Mar 1 14:28:23 2021 -0800

GEODE-8958: When tombstone timestamps get corrupted. (#6042)

- The system would wait, now it does expires it and moves on.

(cherry picked from commit ab59830ecf754957b76e5fba068f653b03d467a9)
---
 .../cache/versions/TombstoneDUnitTest.java | 136 ++---
 .../geode/internal/cache/TombstoneService.java |  38 --
 2 files changed, 148 insertions(+), 26 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index bb75eca..a576706 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -28,6 +28,7 @@ import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
+import org.apache.logging.log4j.Logger;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -48,7 +49,10 @@ import 
org.apache.geode.internal.cache.DistributedTombstoneOperation;
 import org.apache.geode.internal.cache.InitialImageOperation;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.cache.TombstoneService;
+import org.apache.geode.logging.internal.log4j.api.LogService;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;
@@ -117,35 +121,139 @@ public class TombstoneDUnitTest implements Serializable {
 });
   }
 
+
   @Test
-  public void testGetOldestTombstoneTimeReplicate() {
+  public void 
testWhenAnOutOfRangeTimeStampIsSeenWeExpireItInReplicateTombstoneSweeper() {
 VM server1 = VM.getVM(0);
 VM server2 = VM.getVM(1);
+final int FAR_INTO_THE_FUTURE = 100; // 1 million millis into the 
future
+final int count = 10;
 
+// Create a cache and load some boiler plate entries
 server1.invoke(() -> {
-  createCacheAndRegion(REPLICATE_PERSISTENT);
-  region.put("K1", "V1");
-  region.put("K2", "V2");
+  createCacheAndRegion(RegionShortcut.REPLICATE);
+  for (int i = 0; i < count; i++) {
+region.put("K" + i, "V" + i);
+  }
 });
 
-server2.invoke(() -> createCacheAndRegion(REPLICATE));
+server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
 
 server1.invoke(() -> {
-  // Send tombstone gc message to vm1.
-  region.destroy("K1");
 
+  // Now that we have a cache and a region specifically with data, we can 
start the real work
   TombstoneService.TombstoneSweeper tombstoneSweeper =
   ((InternalCache) 
cache).getTombstoneService().getSweeper((LocalRegion) region);
 
-  assertThat(tombstoneSweeper.getOldestTombstoneTime()).isGreaterThan(0)
-  .isLessThan(((InternalCache) cache).cacheTimeMillis());
-  performGC(1);
+  // Get one of the entries
+  RegionEntry regionEntry = ((LocalRegion) region).getRegionEntry("K0");
+
+  /*
+   * Create a version tag with a timestamp far off in the future...
+   * It should be in the near past, but we are testing that a future 
tombstone will be cleared
+   */
+  VersionTag versionTag = regionEntry.getVersionStamp().asVersionTag();
+  versionTag.setVersionTimeStamp(System.currentTimeMillis() + 
FAR_INTO_THE_FUTURE);
+
+  // Create the forged tombstone with the versionTag from the future
+  TombstoneService.Tombstone modifiedTombstone =
+  new TombstoneService.Tombstone(regionEntry, (LocalRegion) region,
+  versionTag);
+
+  // Add it to the list of tombstones so that when checkOldestUnexpired is 
called it will see it
+  tombstoneSweeper.tombstones.add(modifiedTombstone);
+  tombstoneSweeper.checkOldestUnexpired(System.currentTimeMillis());
+
+  // Validate that the tombstone was cleared.
   assertThat(tombstoneSweeper.getOldestTombstoneTime()).isEqualTo(0);
 });
   }
 
   @Test
-  public void testGetOldestTombstoneTimeNonReplicate() {
+  public void 
testWhenAnOutOfRangeTimeStampIsSeenWeExpireItInNonReplica

[geode] branch develop updated (a9b25a14 -> dcb1096)

[mhanson]

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 a9b25a14 GEODE-8975: Deprecate old format. (#6058)
 add dcb1096  GEODE-8886 fix (#6059)

No new revisions were added by this update.

Summary of changes:
 .../codeAnalysis/sanctionedDataSerializables.txt   |  4 +-
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  2 -
 .../cache/wan/GatewaySenderAdvisorTest.java| 93 ++
 ...ANRollingUpgradeVerifyGatewaySenderProfile.java | 58 --
 4 files changed, 146 insertions(+), 11 deletions(-)
 create mode 100644 
geode-core/src/test/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisorTest.java

[geode] branch develop updated (6edf695 -> ab59830)

[mhanson]

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 6edf695  GEODE-8919: undid polymorphic naming for processMessage 
methods. (#6055)
 add ab59830  GEODE-8958: When tombstone timestamps get corrupted. (#6042)

No new revisions were added by this update.

Summary of changes:
 .../cache/versions/TombstoneDUnitTest.java | 136 ++---
 .../geode/internal/cache/TombstoneService.java |  38 --
 2 files changed, 148 insertions(+), 26 deletions(-)

[geode] branch bugfix/StatusReporter updated (5b7ae8c -> 47a9bcf)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch bugfix/StatusReporter
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 5b7ae8c  removing a print stack trace. (+11 squashed commits) Squashed 
commits: [2b22101819] remove some problem causing logging. [b0cdb82f85] process 
message debugging [b218425165] process message debugging [4161f89af4] process 
message debugging [2c9490accd] reply message debugging [f877930405] reply 
message debugging [490996a7b3] deeper debugging. [e18a539346] Status Report 
implementation... [f3739e1c68] Status Report implementation... [f4e25743a4] 
more logging. [27f6f03256] Ad [...]
 discard 9db2a1d  GEODE-8886: Turning up logging.
 new 47a9bcf   Adding GatewaySender logging.

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   (5b7ae8c)
\
 N -- N -- N   refs/heads/bugfix/StatusReporter (47a9bcf)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[geode] 01/01: Adding GatewaySender logging.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch bugfix/StatusReporter
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 47a9bcf3be7d7f0d70ebeb97b485a7b0ac868bed
Author: Mark Hanson 
AuthorDate: Thu Jan 28 15:31:14 2021 -0800

 Adding GatewaySender logging.
---
 .../java/org/apache/geode/ComponentStatus.java |   9 +
 .../main/java/org/apache/geode/StatusReporter.java |  99 ++
 .../apache/geode/distributed/ServerLauncher.java   |  31 ++-
 .../geode/distributed/internal/ReplyMessage.java   |   4 +
 .../distributed/internal/ReplyProcessor21.java |  21 +-
 .../internal/cache/DistributedCacheOperation.java  |  82 ++--
 .../geode/internal/cache/GemFireCacheImpl.java |  90 +++--
 .../internal/cache/wan/AbstractGatewaySender.java  |  43 ++--
 .../wan/AbstractGatewaySenderEventProcessor.java   |  62 ++
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  89 +
 .../wan/GatewaySenderEventCallbackDispatcher.java  |   8 +-
 ...aySenderQueueEntrySynchronizationOperation.java |  34 ++--
 ...currentParallelGatewaySenderEventProcessor.java |  40 ++--
 .../ParallelGatewaySenderEventProcessor.java   |  20 +-
 .../wan/parallel/ParallelGatewaySenderQueue.java   | 216 +++--
 ...tilParallelGatewaySenderFlushedCoordinator.java |  36 ++--
 ...oncurrentSerialGatewaySenderEventProcessor.java |  52 ++---
 .../serial/SerialGatewaySenderEventProcessor.java  |  95 -
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  86 +++-
 .../wan/serial/SerialSecondaryGatewayListener.java |   6 +-
 .../java/org/apache/geode/StatusReporterTest.java  | 105 ++
 .../cache/wan/serial/SerialGatewaySenderImpl.java  |  27 ++-
 22 files changed, 687 insertions(+), 568 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/ComponentStatus.java 
b/geode-core/src/main/java/org/apache/geode/ComponentStatus.java
new file mode 100644
index 000..6018d0a
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/ComponentStatus.java
@@ -0,0 +1,9 @@
+package org.apache.geode;
+
+public interface ComponentStatus {
+  String name();
+
+  String getStatusString();
+
+  void print();
+}
diff --git a/geode-core/src/main/java/org/apache/geode/StatusReporter.java 
b/geode-core/src/main/java/org/apache/geode/StatusReporter.java
new file mode 100644
index 000..4a437fd
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/StatusReporter.java
@@ -0,0 +1,99 @@
+package org.apache.geode;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class StatusReporter {
+  protected static Logger logger = LogService.getLogger();
+
+  public static boolean isComponentRegistered(ComponentStatus componentStatus) 
{
+synchronized (componentStatusSet) {
+  return componentStatusSet.contains(componentStatus);
+}
+  }
+
+  enum State {
+SR_RUNNING, SR_NOT_STARTED
+  }
+
+  private static final Set componentStatusSet = new 
HashSet<>();
+  private static State status = State.SR_NOT_STARTED;
+  private static final Semaphore stopSem = new Semaphore(1);
+
+  static final Thread statusReporterThread = new Thread(() -> {
+status = State.SR_RUNNING;
+logger.info("StatusReporter Started thread.");
+try {
+  stopSem.acquire();
+} catch (InterruptedException e) {
+  e.printStackTrace();
+}
+while (true) {
+  try {
+if (stopSem.tryAcquire(5000, TimeUnit.MILLISECONDS)) {
+  break;
+}
+StatusReporter.getStatusReport();
+  } catch (Exception e) {
+return;
+  }
+}
+logger.info("StatusReporter Stopping thread.");
+status = State.SR_NOT_STARTED;
+  });
+
+  public static State getStatus() {
+State tempState;
+synchronized (statusReporterThread) {
+  if(status != State.SR_RUNNING) {
+StatusReporter.start();
+  }
+  tempState = status;
+}
+return tempState;
+  }
+
+  public static void start() {
+synchronized (statusReporterThread) {
+  statusReporterThread.start();
+}
+  }
+
+  public static void stop() throws InterruptedException {
+synchronized (statusReporterThread) {
+  stopSem.release();
+}
+statusReporterThread.join();
+  }
+
+  public static boolean registerComponent(ComponentStatus componentStatus) {
+synchronized (componentStatusSet) {
+  return componentStatusSet.add(componentStatus);
+}
+  }
+
+  public static boolean removeComponent(ComponentStatus componentStatus) {
+synchronized (componentStatusSet) {
+  return componentStatusSet.remove(componentStatus);
+}
+  }
+
+  public static boolean getStatusReport() {
+synchronized (statusReporterThread) {
+  if (componentStatusSet.isEmp

[geode] 02/02: removing a print stack trace. (+11 squashed commits) Squashed commits: [2b22101819] remove some problem causing logging. [b0cdb82f85] process message debugging [b218425165] process mess

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch bugfix/StatusReporter
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 5b7ae8c9d742d72dfd44224327da626b9c9446da
Author: Mark Hanson 
AuthorDate: Wed Feb 3 17:57:40 2021 -0800

removing a print stack trace. (+11 squashed commits)
Squashed commits:
[2b22101819] remove some problem causing logging.
[b0cdb82f85] process message debugging
[b218425165] process message debugging
[4161f89af4] process message debugging
[2c9490accd] reply message debugging
[f877930405] reply message debugging
[490996a7b3] deeper debugging.
[e18a539346] Status Report implementation...
[f3739e1c68] Status Report implementation...
[f4e25743a4] more logging.
[27f6f03256] Adding GatewaySender logging.
---
 .../java/org/apache/geode/ComponentStatus.java |   9 ++
 .../main/java/org/apache/geode/StatusReporter.java |  99 +++
 .../apache/geode/distributed/ServerLauncher.java   |  31 +-
 .../geode/distributed/internal/ReplyMessage.java   |   4 +
 .../distributed/internal/ReplyProcessor21.java |  21 -
 .../internal/cache/DistributedCacheOperation.java  |  82 
 .../geode/internal/cache/GemFireCacheImpl.java |  90 ++
 .../internal/cache/wan/AbstractGatewaySender.java  |  17 +++-
 .../wan/AbstractGatewaySenderEventProcessor.java   |   2 +
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  31 +-
 .../serial/SerialGatewaySenderEventProcessor.java  |  43 +++--
 .../java/org/apache/geode/StatusReporterTest.java  | 105 +
 .../cache/wan/serial/SerialGatewaySenderImpl.java  |  27 +-
 13 files changed, 464 insertions(+), 97 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/ComponentStatus.java 
b/geode-core/src/main/java/org/apache/geode/ComponentStatus.java
new file mode 100644
index 000..6018d0a
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/ComponentStatus.java
@@ -0,0 +1,9 @@
+package org.apache.geode;
+
+public interface ComponentStatus {
+  String name();
+
+  String getStatusString();
+
+  void print();
+}
diff --git a/geode-core/src/main/java/org/apache/geode/StatusReporter.java 
b/geode-core/src/main/java/org/apache/geode/StatusReporter.java
new file mode 100644
index 000..4a437fd
--- /dev/null
+++ b/geode-core/src/main/java/org/apache/geode/StatusReporter.java
@@ -0,0 +1,99 @@
+package org.apache.geode;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.Logger;
+
+import org.apache.geode.logging.internal.log4j.api.LogService;
+
+public class StatusReporter {
+  protected static Logger logger = LogService.getLogger();
+
+  public static boolean isComponentRegistered(ComponentStatus componentStatus) 
{
+synchronized (componentStatusSet) {
+  return componentStatusSet.contains(componentStatus);
+}
+  }
+
+  enum State {
+SR_RUNNING, SR_NOT_STARTED
+  }
+
+  private static final Set componentStatusSet = new 
HashSet<>();
+  private static State status = State.SR_NOT_STARTED;
+  private static final Semaphore stopSem = new Semaphore(1);
+
+  static final Thread statusReporterThread = new Thread(() -> {
+status = State.SR_RUNNING;
+logger.info("StatusReporter Started thread.");
+try {
+  stopSem.acquire();
+} catch (InterruptedException e) {
+  e.printStackTrace();
+}
+while (true) {
+  try {
+if (stopSem.tryAcquire(5000, TimeUnit.MILLISECONDS)) {
+  break;
+}
+StatusReporter.getStatusReport();
+  } catch (Exception e) {
+return;
+  }
+}
+logger.info("StatusReporter Stopping thread.");
+status = State.SR_NOT_STARTED;
+  });
+
+  public static State getStatus() {
+State tempState;
+synchronized (statusReporterThread) {
+  if(status != State.SR_RUNNING) {
+StatusReporter.start();
+  }
+  tempState = status;
+}
+return tempState;
+  }
+
+  public static void start() {
+synchronized (statusReporterThread) {
+  statusReporterThread.start();
+}
+  }
+
+  public static void stop() throws InterruptedException {
+synchronized (statusReporterThread) {
+  stopSem.release();
+}
+statusReporterThread.join();
+  }
+
+  public static boolean registerComponent(ComponentStatus componentStatus) {
+synchronized (componentStatusSet) {
+  return componentStatusSet.add(componentStatus);
+}
+  }
+
+  public static boolean removeComponent(ComponentStatus componentStatus) {
+synchronized (componentStatusSet) {
+  return componentStatusSet.remove(componentStatus);
+}
+  }
+
+  public static boolean getStatusReport() {
+synchronized (statusReporterThread) {
+  if (componentStatusSet.isEmp

[geode] 01/02: GEODE-8886: Turning up logging.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch bugfix/StatusReporter
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 9db2a1dcafe33d60e9acf1846a90d92e30a29d37
Author: Mark Hanson 
AuthorDate: Thu Jan 28 15:31:14 2021 -0800

GEODE-8886: Turning up logging.
---
 .../internal/cache/wan/AbstractGatewaySender.java  |  26 +--
 .../wan/AbstractGatewaySenderEventProcessor.java   |  60 ++
 .../internal/cache/wan/GatewaySenderAdvisor.java   |  58 ++
 .../wan/GatewaySenderEventCallbackDispatcher.java  |   8 +-
 ...aySenderQueueEntrySynchronizationOperation.java |  34 ++--
 ...currentParallelGatewaySenderEventProcessor.java |  40 ++--
 .../ParallelGatewaySenderEventProcessor.java   |  20 +-
 .../wan/parallel/ParallelGatewaySenderQueue.java   | 216 +++--
 ...tilParallelGatewaySenderFlushedCoordinator.java |  36 ++--
 ...oncurrentSerialGatewaySenderEventProcessor.java |  52 ++---
 .../serial/SerialGatewaySenderEventProcessor.java  |  52 ++---
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  86 +++-
 .../wan/serial/SerialSecondaryGatewayListener.java |   6 +-
 13 files changed, 223 insertions(+), 471 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 4ea2c6d..0ec0e78 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -613,9 +613,7 @@ public abstract class AbstractGatewaySender implements 
InternalGatewaySender, Di
   // close the GatewaySenderAdvisor
   GatewaySenderAdvisor advisor = this.getSenderAdvisor();
   if (advisor != null) {
-if (logger.isDebugEnabled()) {
-  logger.debug("Stopping the GatewaySender advisor");
-}
+logger.debug("Stopping the GatewaySender advisor");
 advisor.close();
   }
 
@@ -1130,9 +1128,7 @@ public abstract class AbstractGatewaySender implements 
InternalGatewaySender, Di
   this.eventProcessor.registerEventDroppedInPrimaryQueue(event);
 } else {
   tmpDroppedEvents.add(event);
-  if (logger.isDebugEnabled()) {
-logger.debug("added to tmpDroppedEvents event: {}", event);
-  }
+  logger.debug("added to tmpDroppedEvents event: {}", event);
 }
   }
 
@@ -1169,10 +1165,8 @@ public abstract class AbstractGatewaySender implements 
InternalGatewaySender, Di
 synchronized (this.queuedEventsSync) {
   while ((nextEvent = tmpQueuedEvents.poll()) != null) {
 try {
-  if (logger.isDebugEnabled()) {
-logger.debug("Event :{} is enqueued to GatewaySenderQueue from 
TempQueue",
-nextEvent);
-  }
+  logger.debug("Event :{} is enqueued to GatewaySenderQueue from 
TempQueue",
+  nextEvent);
   stats.decTempQueueSize();
   this.eventProcessor.enqueueEvent(nextEvent.getOperation(), 
nextEvent.getEvent(),
   nextEvent.getSubstituteValue());
@@ -1204,11 +1198,9 @@ public abstract class AbstractGatewaySender implements 
InternalGatewaySender, Di
   while (itr.hasNext()) {
 TmpQueueEvent event = itr.next();
 if (tailKey.equals(event.getEvent().getTailKey())) {
-  if (logger.isDebugEnabled()) {
-logger.debug(
-"shadowKey {} is found in tmpQueueEvents at 
AbstractGatewaySender level. Removing from there..",
-tailKey);
-  }
+  logger.debug(
+  "shadowKey {} is found in tmpQueueEvents at 
AbstractGatewaySender level. Removing from there..",
+  tailKey);
   event.release();
   itr.remove();
   return true;
@@ -1304,9 +1296,7 @@ public abstract class AbstractGatewaySender implements 
InternalGatewaySender, Di
 
 // Store the index locally
 this.eventIdIndex = index;
-if (logger.isDebugEnabled()) {
-  logger.debug("{}: {} event id index: {}", this, messagePrefix, 
this.eventIdIndex);
-}
+logger.debug("{}: {} event id index: {}", this, messagePrefix, 
this.eventIdIndex);
   }
 } finally {
   // Unlock the lock if necessary
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 294121a..1d732c5 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySen

[geode] branch bugfix/StatusReporter created (now 5b7ae8c)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch bugfix/StatusReporter
in repository https://gitbox.apache.org/repos/asf/geode.git.


  at 5b7ae8c  removing a print stack trace. (+11 squashed commits) Squashed 
commits: [2b22101819] remove some problem causing logging. [b0cdb82f85] process 
message debugging [b218425165] process message debugging [4161f89af4] process 
message debugging [2c9490accd] reply message debugging [f877930405] reply 
message debugging [490996a7b3] deeper debugging. [e18a539346] Status Report 
implementation... [f3739e1c68] Status Report implementation... [f4e25743a4] 
more logging. [27f6f03256] Ad [...]

This branch includes the following new commits:

 new 9db2a1d  GEODE-8886: Turning up logging.
 new 5b7ae8c  removing a print stack trace. (+11 squashed commits) Squashed 
commits: [2b22101819] remove some problem causing logging. [b0cdb82f85] process 
message debugging [b218425165] process message debugging [4161f89af4] process 
message debugging [2c9490accd] reply message debugging [f877930405] reply 
message debugging [490996a7b3] deeper debugging. [e18a539346] Status Report 
implementation... [f3739e1c68] Status Report implementation... [f4e25743a4] 
more logging. [27f6f03256] Ad [...]

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.

[geode] 01/03: trying to capture the time shift

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch bugfix/GEODE-8958
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 44b18e2cbed9f3749eba2b215e1a77303d1ed1f2
Author: Mark Hanson 
AuthorDate: Thu Feb 11 16:18:48 2021 -0800

trying to capture the time shift
---
 .../cache/versions/TombstoneDUnitTest.java | 38 +++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index dacd3ac..ba126db 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -133,6 +133,35 @@ public class TombstoneDUnitTest implements Serializable {
 });
   }
 
+
+  @Test
+  public void testGetOldestTombstoneTimeReplicateForTimestamp() {
+VM server1 = VM.getVM(0);
+VM server2 = VM.getVM(1);
+final int count = 10;
+server1.invoke(() -> {
+  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
+  for (int i = 0; i < count; i++) {
+region.put("K" + i, "V" + i);
+  }
+});
+
+server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+
+server1.invoke(() -> {
+  TombstoneService.TombstoneSweeper tombstoneSweeper =
+  ((InternalCache) 
cache).getTombstoneService().getSweeper((LocalRegion) region);
+  // Send tombstone gc message to vm1.
+  for (int i = 0; i < count; i++) {
+region.destroy("K" + i);
+assertThat(tombstoneSweeper.getOldestTombstoneTime() + 3 - 
System.currentTimeMillis()).isGreaterThan(0);
+performGC(1);
+  }
+
+  assertThat(tombstoneSweeper.getOldestTombstoneTime()).isEqualTo(0);
+});
+  }
+
   @Test
   public void testGetOldestTombstoneTimeNonReplicate() {
 VM client = VM.getVM(0);
@@ -169,8 +198,8 @@ public class TombstoneDUnitTest implements Serializable {
   }
 
   /**
-   * The purpose of this test is for a replicate region scenario to get the 
oldest tombstone
-   * and validate that it matches the tombstone of the entry we removed.
+   * The purpose of this test is for a replicate region scenario to get the 
oldest tombstone and
+   * validate that it matches the tombstone of the entry we removed.
*/
   @Test
   public void testGetOldestTombstoneReplicate() {
@@ -200,9 +229,8 @@ public class TombstoneDUnitTest implements Serializable {
 
 
   /**
-   * The purpose of this test is for a non-replicate region scenario to get 
the oldest tombstone
-   * and validate that it matches the tombstone of the entry we removed. This 
is done through a
-   * client
+   * The purpose of this test is for a non-replicate region scenario to get 
the oldest tombstone and
+   * validate that it matches the tombstone of the entry we removed. This is 
done through a client
* as a client is required to have this non-replicate tombstone.
*/
   @Test

[geode] branch bugfix/GEODE-8958 created (now 674c369)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch bugfix/GEODE-8958
in repository https://gitbox.apache.org/repos/asf/geode.git.


  at 674c369  GEODE-8695: When timestamps get corrupted.

This branch includes the following new commits:

 new 44b18e2  trying to capture the time shift
 new bbd9e62  trying to capture the time shift
 new 674c369  GEODE-8695: When timestamps get corrupted.

The 3 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] 02/03: trying to capture the time shift

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch bugfix/GEODE-8958
in repository https://gitbox.apache.org/repos/asf/geode.git

commit bbd9e62dd0321b918290eb71980d4d8983a9e3ff
Author: Mark Hanson 
AuthorDate: Thu Feb 11 17:59:18 2021 -0800

trying to capture the time shift
---
 .../org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index ba126db..70800cb 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -138,7 +138,7 @@ public class TombstoneDUnitTest implements Serializable {
   public void testGetOldestTombstoneTimeReplicateForTimestamp() {
 VM server1 = VM.getVM(0);
 VM server2 = VM.getVM(1);
-final int count = 10;
+final int count = 10;
 server1.invoke(() -> {
   createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
   for (int i = 0; i < count; i++) {

[geode] 03/03: GEODE-8695: When timestamps get corrupted.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch bugfix/GEODE-8958
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 674c369e3369fc32401736288c663375514f9589
Author: Mark Hanson 
AuthorDate: Fri Feb 19 15:23:39 2021 -0800

GEODE-8695: When timestamps get corrupted.

The system waits forever. Now it will not.
---
 .../cache/versions/TombstoneDUnitTest.java | 43 +++-
 .../geode/internal/cache/TombstoneService.java | 82 +-
 2 files changed, 91 insertions(+), 34 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 70800cb..9f63381 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -41,6 +41,7 @@ import org.apache.geode.internal.cache.DestroyOperation;
 import org.apache.geode.internal.cache.DistributedTombstoneOperation;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.RegionEntry;
 import org.apache.geode.internal.cache.TombstoneService;
 import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.NetworkUtils;
@@ -133,6 +134,45 @@ public class TombstoneDUnitTest implements Serializable {
 });
   }
 
+  @Test
+  public void testRewriteBadOldestTombstoneTimeReplicateForTimestamp() {
+VM server1 = VM.getVM(-1);
+VM server2 = VM.getVM(1);
+final int count = 10;
+server1.invoke(() -> {
+  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
+  for (int i = 0; i < count; i++) {
+region.put("K" + i, "V" + i);
+  }
+});
+
+server2.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
+
+server1.invoke(() -> {
+  TombstoneService.TombstoneSweeper tombstoneSweeper =
+  ((InternalCache) 
cache).getTombstoneService().getSweeper((LocalRegion) region);
+
+  RegionEntry regionEntry = ((LocalRegion) region).getRegionEntry("K0");
+  VersionTag versionTag = regionEntry.getVersionStamp()
+  .asVersionTag();
+  versionTag.setVersionTimeStamp(System.currentTimeMillis() + 10);
+  TombstoneService.Tombstone
+  modifiedTombstone =
+  new TombstoneService.Tombstone(regionEntry, (LocalRegion) region,
+  versionTag);
+  tombstoneSweeper.tombstones.add(modifiedTombstone);
+  if (tombstoneSweeper.getOldestTombstoneTime() > 0) {
+System.out.println("We have a problem");
+  }
+  else {
+System.out.println("It works.");
+  }
+  tombstoneSweeper.checkOldestUnexpired(System.currentTimeMillis());
+  // Send tombstone gc message to vm1.
+  assertThat(tombstoneSweeper.getOldestTombstoneTime()).isEqualTo(0);
+});
+  }
+
 
   @Test
   public void testGetOldestTombstoneTimeReplicateForTimestamp() {
@@ -154,7 +194,8 @@ public class TombstoneDUnitTest implements Serializable {
   // Send tombstone gc message to vm1.
   for (int i = 0; i < count; i++) {
 region.destroy("K" + i);
-assertThat(tombstoneSweeper.getOldestTombstoneTime() + 3 - 
System.currentTimeMillis()).isGreaterThan(0);
+assertThat(tombstoneSweeper.getOldestTombstoneTime() + 3 - 
System.currentTimeMillis())
+.isGreaterThan(0);
 performGC(1);
   }
 
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
index da99590..c745328 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
@@ -71,7 +71,7 @@ public class TombstoneService {
* This is the period over which the destroy operation may conflict with 
another operation. After
* this timeout elapses the tombstone is put into a GC set for removal. 
Removal is typically
* triggered by the size of the GC set, but could be influenced by resource 
managers.
-   *
+   * 
* The default is 600,000 milliseconds (10 minutes).
*/
   @MutableForTesting
@@ -129,21 +129,27 @@ public class TombstoneService {
   @VisibleForTesting
   public static final boolean FORCE_GC_MEMORY_EVENTS_DEFAULT = false;
 
-  /** this is a test hook for causing the tombstone service to act as though 
free memory is low */
+  /**
+   * this is a test hook for causing the tombstone service to act as though 
free memory is low
+   */
   @MutableForTesting
   public static boolean FORCE_GC_MEMO

[geode] branch develop updated (5c6546b -> fe80728)

[mhanson]

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 5c6546b  GEODE-8827: Modified LocalRegion.initializeStats to increment 
bytesOnlyOnDisk
 add fe80728  Adding code owners with their permission and mine (#5936)

No new revisions were added by this update.

Summary of changes:
 CODEOWNERS | 108 ++---
 1 file changed, 54 insertions(+), 54 deletions(-)

[geode] branch support/1.12 updated: GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 b027331  GEODE-8607: Adding some test API to get oldest tombstone 
(#5623) (#5733)
b027331 is described below

commit b027331aa47e51c492c9a2aab414b6abfb69bd51
Author: mhansonp 
AuthorDate: Wed Nov 11 17:09:45 2020 -0800

GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)

- Adding some test API to get oldest tombstone timestamp
- Adding some test API for getting the oldest tombstone

(cherry picked from commit eb91e9517f579c005c7b69937b8cfced7d3cc37e)
(cherry picked from commit 3890db1cd755dfbbd28816055fab2a3f34385542)
---
 .../cache/versions/TombstoneDUnitTest.java | 348 -
 .../geode/internal/cache/TombstoneService.java |  47 ++-
 2 files changed, 245 insertions(+), 150 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 8c7fc3a..8cb94e5 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -14,220 +14,296 @@
  */
 package org.apache.geode.internal.cache.versions;
 
-import static org.apache.geode.cache.RegionShortcut.REPLICATE_PERSISTENT;
-import static 
org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType.AfterReceivedRequestImage;
-import static 
org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType.DuringApplyDelta;
 import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
+import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.DistributionMessageObserver;
 import org.apache.geode.internal.cache.DestroyOperation;
 import org.apache.geode.internal.cache.DistributedTombstoneOperation;
-import org.apache.geode.internal.cache.InitialImageOperation;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.TombstoneService;
 import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.DistributedTestUtils;
+import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.rules.DistributedRule;
 
 
-public class TombstoneDUnitTest extends JUnit4CacheTestCase {
+public class TombstoneDUnitTest implements Serializable {
+  private static final long serialVersionUID = 2992716917694662945L;
+  private static Cache cache;
+  private static Region region;
+  final String REGION_NAME = "TestRegion";
+
+  @Rule
+  public DistributedRule distributedRule = new DistributedRule();
+
+  @After
+  public void close() {
+for (VM vm : Arrays.asList(VM.getVM(0), VM.getVM(1))) {
+  vm.invoke(() -> {
+region = null;
+if (cache != null) {
+  cache.close();
+}
+  });
+}
+  }
 
   @Test
-  public void 
testTombstoneGcMessagesBetweenPersistnentAndNonPersistentRegion() {
-Host host = Host.getHost(0);
-VM vm0 = host.getVM(0);
-VM vm1 = host.getVM(1);
+  public void testTombstoneGcMessagesBetweenPersistentAndNonPersistentRegion() 
{
+VM vm0 = VM.getVM(0);
+VM vm1 = VM.getVM(1);
 
 vm0.invoke(() -> {
-  createRegion("TestRegion", true);
-  Region region = getCache().getRegion("TestRegion");
+  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
   region.put("K1", "V1");
   region.put("K2", "V2");
 });
 
-vm1.invoke(() -> {
-  createRegion("TestRegion", false);
-});
+vm1.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE))

[geode] branch support/1.12 updated: GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 b027331  GEODE-8607: Adding some test API to get oldest tombstone 
(#5623) (#5733)
b027331 is described below

commit b027331aa47e51c492c9a2aab414b6abfb69bd51
Author: mhansonp 
AuthorDate: Wed Nov 11 17:09:45 2020 -0800

GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)

- Adding some test API to get oldest tombstone timestamp
- Adding some test API for getting the oldest tombstone

(cherry picked from commit eb91e9517f579c005c7b69937b8cfced7d3cc37e)
(cherry picked from commit 3890db1cd755dfbbd28816055fab2a3f34385542)
---
 .../cache/versions/TombstoneDUnitTest.java | 348 -
 .../geode/internal/cache/TombstoneService.java |  47 ++-
 2 files changed, 245 insertions(+), 150 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 8c7fc3a..8cb94e5 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -14,220 +14,296 @@
  */
 package org.apache.geode.internal.cache.versions;
 
-import static org.apache.geode.cache.RegionShortcut.REPLICATE_PERSISTENT;
-import static 
org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType.AfterReceivedRequestImage;
-import static 
org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType.DuringApplyDelta;
 import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
+import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.DistributionMessageObserver;
 import org.apache.geode.internal.cache.DestroyOperation;
 import org.apache.geode.internal.cache.DistributedTombstoneOperation;
-import org.apache.geode.internal.cache.InitialImageOperation;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.TombstoneService;
 import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.DistributedTestUtils;
+import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.rules.DistributedRule;
 
 
-public class TombstoneDUnitTest extends JUnit4CacheTestCase {
+public class TombstoneDUnitTest implements Serializable {
+  private static final long serialVersionUID = 2992716917694662945L;
+  private static Cache cache;
+  private static Region region;
+  final String REGION_NAME = "TestRegion";
+
+  @Rule
+  public DistributedRule distributedRule = new DistributedRule();
+
+  @After
+  public void close() {
+for (VM vm : Arrays.asList(VM.getVM(0), VM.getVM(1))) {
+  vm.invoke(() -> {
+region = null;
+if (cache != null) {
+  cache.close();
+}
+  });
+}
+  }
 
   @Test
-  public void 
testTombstoneGcMessagesBetweenPersistnentAndNonPersistentRegion() {
-Host host = Host.getHost(0);
-VM vm0 = host.getVM(0);
-VM vm1 = host.getVM(1);
+  public void testTombstoneGcMessagesBetweenPersistentAndNonPersistentRegion() 
{
+VM vm0 = VM.getVM(0);
+VM vm1 = VM.getVM(1);
 
 vm0.invoke(() -> {
-  createRegion("TestRegion", true);
-  Region region = getCache().getRegion("TestRegion");
+  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
   region.put("K1", "V1");
   region.put("K2", "V2");
 });
 
-vm1.invoke(() -> {
-  createRegion("TestRegion", false);
-});
+vm1.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE))

[geode] branch support/1.13 updated: GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 3890db1  GEODE-8607: Adding some test API to get oldest tombstone 
(#5623) (#5733)
3890db1 is described below

commit 3890db1cd755dfbbd28816055fab2a3f34385542
Author: mhansonp 
AuthorDate: Wed Nov 11 17:09:45 2020 -0800

GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)

- Adding some test API to get oldest tombstone timestamp
- Adding some test API for getting the oldest tombstone

(cherry picked from commit eb91e9517f579c005c7b69937b8cfced7d3cc37e)
---
 .../cache/versions/TombstoneDUnitTest.java | 348 -
 .../geode/internal/cache/TombstoneService.java |  47 ++-
 2 files changed, 245 insertions(+), 150 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 8c7fc3a..8cb94e5 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -14,220 +14,296 @@
  */
 package org.apache.geode.internal.cache.versions;
 
-import static org.apache.geode.cache.RegionShortcut.REPLICATE_PERSISTENT;
-import static 
org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType.AfterReceivedRequestImage;
-import static 
org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType.DuringApplyDelta;
 import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
+import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.DistributionMessageObserver;
 import org.apache.geode.internal.cache.DestroyOperation;
 import org.apache.geode.internal.cache.DistributedTombstoneOperation;
-import org.apache.geode.internal.cache.InitialImageOperation;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.TombstoneService;
 import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.DistributedTestUtils;
+import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.rules.DistributedRule;
 
 
-public class TombstoneDUnitTest extends JUnit4CacheTestCase {
+public class TombstoneDUnitTest implements Serializable {
+  private static final long serialVersionUID = 2992716917694662945L;
+  private static Cache cache;
+  private static Region region;
+  final String REGION_NAME = "TestRegion";
+
+  @Rule
+  public DistributedRule distributedRule = new DistributedRule();
+
+  @After
+  public void close() {
+for (VM vm : Arrays.asList(VM.getVM(0), VM.getVM(1))) {
+  vm.invoke(() -> {
+region = null;
+if (cache != null) {
+  cache.close();
+}
+  });
+}
+  }
 
   @Test
-  public void 
testTombstoneGcMessagesBetweenPersistnentAndNonPersistentRegion() {
-Host host = Host.getHost(0);
-VM vm0 = host.getVM(0);
-VM vm1 = host.getVM(1);
+  public void testTombstoneGcMessagesBetweenPersistentAndNonPersistentRegion() 
{
+VM vm0 = VM.getVM(0);
+VM vm1 = VM.getVM(1);
 
 vm0.invoke(() -> {
-  createRegion("TestRegion", true);
-  Region region = getCache().getRegion("TestRegion");
+  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
   region.put("K1", "V1");
   region.put("K2", "V2");
 });
 
-vm1.invoke(() -> {
-  createRegion("TestRegion", false);
-});
+vm1.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
 
 vm0.invoke(() -> {
   // Send tombstone gc messa

[geode] branch support/1.13 updated: GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 3890db1  GEODE-8607: Adding some test API to get oldest tombstone 
(#5623) (#5733)
3890db1 is described below

commit 3890db1cd755dfbbd28816055fab2a3f34385542
Author: mhansonp 
AuthorDate: Wed Nov 11 17:09:45 2020 -0800

GEODE-8607: Adding some test API to get oldest tombstone (#5623) (#5733)

- Adding some test API to get oldest tombstone timestamp
- Adding some test API for getting the oldest tombstone

(cherry picked from commit eb91e9517f579c005c7b69937b8cfced7d3cc37e)
---
 .../cache/versions/TombstoneDUnitTest.java | 348 -
 .../geode/internal/cache/TombstoneService.java |  47 ++-
 2 files changed, 245 insertions(+), 150 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
index 8c7fc3a..8cb94e5 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/TombstoneDUnitTest.java
@@ -14,220 +14,296 @@
  */
 package org.apache.geode.internal.cache.versions;
 
-import static org.apache.geode.cache.RegionShortcut.REPLICATE_PERSISTENT;
-import static 
org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType.AfterReceivedRequestImage;
-import static 
org.apache.geode.internal.cache.InitialImageOperation.GIITestHookType.DuringApplyDelta;
 import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 
+import org.junit.After;
+import org.junit.Rule;
 import org.junit.Test;
 
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientCacheFactory;
+import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.DistributionMessageObserver;
 import org.apache.geode.internal.cache.DestroyOperation;
 import org.apache.geode.internal.cache.DistributedTombstoneOperation;
-import org.apache.geode.internal.cache.InitialImageOperation;
+import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.TombstoneService;
 import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.DistributedTestUtils;
+import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.dunit.rules.DistributedRule;
 
 
-public class TombstoneDUnitTest extends JUnit4CacheTestCase {
+public class TombstoneDUnitTest implements Serializable {
+  private static final long serialVersionUID = 2992716917694662945L;
+  private static Cache cache;
+  private static Region region;
+  final String REGION_NAME = "TestRegion";
+
+  @Rule
+  public DistributedRule distributedRule = new DistributedRule();
+
+  @After
+  public void close() {
+for (VM vm : Arrays.asList(VM.getVM(0), VM.getVM(1))) {
+  vm.invoke(() -> {
+region = null;
+if (cache != null) {
+  cache.close();
+}
+  });
+}
+  }
 
   @Test
-  public void 
testTombstoneGcMessagesBetweenPersistnentAndNonPersistentRegion() {
-Host host = Host.getHost(0);
-VM vm0 = host.getVM(0);
-VM vm1 = host.getVM(1);
+  public void testTombstoneGcMessagesBetweenPersistentAndNonPersistentRegion() 
{
+VM vm0 = VM.getVM(0);
+VM vm1 = VM.getVM(1);
 
 vm0.invoke(() -> {
-  createRegion("TestRegion", true);
-  Region region = getCache().getRegion("TestRegion");
+  createCacheAndRegion(RegionShortcut.REPLICATE_PERSISTENT);
   region.put("K1", "V1");
   region.put("K2", "V2");
 });
 
-vm1.invoke(() -> {
-  createRegion("TestRegion", false);
-});
+vm1.invoke(() -> createCacheAndRegion(RegionShortcut.REPLICATE));
 
 vm0.invoke(() -> {
   // Send tombstone gc messa

[geode] branch feature/GEODE-7665 updated: GEODE-7845: Now behaving with clients of various versions. (#5645)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
 new 05055cf  GEODE-7845: Now behaving with clients of various versions. 
(#5645)
05055cf is described below

commit 05055cf4f4066b65e93f905648dbd4957ae6ef72
Author: mhansonp 
AuthorDate: Thu Oct 22 09:46:47 2020 -0700

GEODE-7845: Now behaving with clients of various versions. (#5645)

- added functionality that would allow the tests to be run using various 
versions of the clients against and and new versions of the server.
---
 .../integrationTest/resources/assembly_content.txt |  1 -
 .../main/java/org/apache/geode/cache/Region.java   |  2 +-
 .../cache/ServerVersionMismatchException.java  | 34 
 .../internal/cache/PartitionedRegionClear.java |  8 +-
 .../sanctioned-geode-core-serializables.txt|  1 -
 .../internal/cache/PartitionedRegionClearTest.java |  5 +-
 ...ePartitionRegionClearServerVersionMismatch.java | 94 +++---
 7 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt 
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 553785a..549150f 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -245,7 +245,6 @@ javadoc/org/apache/geode/cache/RoleEvent.html
 javadoc/org/apache/geode/cache/RoleException.html
 javadoc/org/apache/geode/cache/Scope.html
 javadoc/org/apache/geode/cache/SerializedCacheValue.html
-javadoc/org/apache/geode/cache/ServerVersionMismatchException.html
 javadoc/org/apache/geode/cache/StatisticsDisabledException.html
 javadoc/org/apache/geode/cache/SubscriptionAttributes.html
 javadoc/org/apache/geode/cache/SynchronizationCommitConflictException.html
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Region.java 
b/geode-core/src/main/java/org/apache/geode/cache/Region.java
index 5162bd5..1961e81 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Region.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Region.java
@@ -1307,7 +1307,7 @@ public interface Region extends ConcurrentMap 
{
* @throws PartitionedRegionPartialClearException when data is partially 
cleared on partitioned
* region. It is caller responsibility to handle the partial data 
clear either by retrying
* the clear operation or continue working with the partially 
cleared partitioned region.
-   * @throws ServerVersionMismatchException when data was not cleared because 
one or more
+   * @throws UnsupportedOperationException when data was not cleared because 
one or more
* of the member servers' version was too old to understand the 
clear message.
*/
   @Override
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
 
b/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
deleted file mode 100644
index 1d4231a..000
--- 
a/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
+++ /dev/null
@@ -1,34 +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 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.cache;
-
-import java.util.List;
-
-/**
- * Indicates a failure to perform an operation on a Partitioned Region due to
- * server versions not meeting requirements.
- *
- * @since GEODE 1.14.0
- */
-public class ServerVersionMismatchException extends CacheRuntimeException {
-  private static final long serialVersionUID = -3004093739855972548L;
-
-  public ServerVersionMismatchException(List members, String 
featureName,
-  String version) {
-super(
-"A server's " + members + " version was too old (< " + version + ") 
for : " + featureName);
-
-  }
-}
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionClear.jav

[geode] branch develop updated (047f9a0 -> eb91e95)

[mhanson]

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 047f9a0  GEODE-8632: Redis Unknown command error message has should 
have trailing space (#5646)
 add eb91e95  GEODE-8607: Adding some test API to get oldest tombstone 
(#5623)

No new revisions were added by this update.

Summary of changes:
 .../cache/versions/TombstoneDUnitTest.java | 289 -
 .../geode/internal/cache/TombstoneService.java |  47 +++-
 2 files changed, 262 insertions(+), 74 deletions(-)

[geode] branch develop updated (047f9a0 -> eb91e95)

[mhanson]

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 047f9a0  GEODE-8632: Redis Unknown command error message has should 
have trailing space (#5646)
 add eb91e95  GEODE-8607: Adding some test API to get oldest tombstone 
(#5623)

No new revisions were added by this update.

Summary of changes:
 .../cache/versions/TombstoneDUnitTest.java | 289 -
 .../geode/internal/cache/TombstoneService.java |  47 +++-
 2 files changed, 262 insertions(+), 74 deletions(-)

[geode] branch feature/GEODE-7665 updated: GEODE-7845: Adding a cleaner simpler test. (#5622)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
 new 41bd59b  GEODE-7845: Adding a cleaner simpler test. (#5622)
41bd59b is described below

commit 41bd59ba62fa6c64c4a7a99e7ac80bec3644ef22
Author: mhansonp 
AuthorDate: Tue Oct 13 17:09:03 2020 -0700

GEODE-7845: Adding a cleaner simpler test. (#5622)

- Changed the test for ServerVersionMismatchException to be more readable.
---
 ...ionRegionClearMixedServerPartitionedRegion.java | 412 -
 ...ePartitionRegionClearServerVersionMismatch.java | 174 +
 2 files changed, 174 insertions(+), 412 deletions(-)

diff --git 
a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradePartitionRegionClearMixedServerPartitionedRegion.java
 
b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradePartitionRegionClearMixedServerPartitionedRegion.java
deleted file mode 100644
index bfcd651..000
--- 
a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradePartitionRegionClearMixedServerPartitionedRegion.java
+++ /dev/null
@@ -1,412 +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 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.cache.rollingupgrade;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.Logger;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionFactory;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.ServerVersionMismatchException;
-import org.apache.geode.cache.client.ClientCache;
-import org.apache.geode.cache.client.ClientCacheFactory;
-import org.apache.geode.cache.client.ClientRegionShortcut;
-import org.apache.geode.cache.client.ServerOperationException;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.logging.internal.log4j.api.LogService;
-import org.apache.geode.test.dunit.DistributedTestUtils;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.dunit.Invoke;
-import org.apache.geode.test.dunit.NetworkUtils;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.internal.DUnitLauncher;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import 
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.apache.geode.test.version.VersionManager;
-
-@RunWith(Parameterized.class)
-@UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
-public class RollingUpgradePartitionRegionClearMixedServerPartitionedRegion
-extends JUnit4DistributedTestCase {
-
-  protected static final Logger logger = LogService.getLogger();
-  protected static GemFireCache cache;
-  protected static ClientCache clientcache;
-
-  @Parameter
-  public String oldVersion;
-
-  @Parameters(name = "from_v{0}")
- 

[geode] branch feature/GEODE-7665 updated: GEODE-7845: Adding a cleaner simpler test. (#5622)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
 new 41bd59b  GEODE-7845: Adding a cleaner simpler test. (#5622)
41bd59b is described below

commit 41bd59ba62fa6c64c4a7a99e7ac80bec3644ef22
Author: mhansonp 
AuthorDate: Tue Oct 13 17:09:03 2020 -0700

GEODE-7845: Adding a cleaner simpler test. (#5622)

- Changed the test for ServerVersionMismatchException to be more readable.
---
 ...ionRegionClearMixedServerPartitionedRegion.java | 412 -
 ...ePartitionRegionClearServerVersionMismatch.java | 174 +
 2 files changed, 174 insertions(+), 412 deletions(-)

diff --git 
a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradePartitionRegionClearMixedServerPartitionedRegion.java
 
b/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradePartitionRegionClearMixedServerPartitionedRegion.java
deleted file mode 100644
index bfcd651..000
--- 
a/geode-core/src/upgradeTest/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradePartitionRegionClearMixedServerPartitionedRegion.java
+++ /dev/null
@@ -1,412 +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 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.cache.rollingupgrade;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.logging.log4j.Logger;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.GemFireCache;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionFactory;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.ServerVersionMismatchException;
-import org.apache.geode.cache.client.ClientCache;
-import org.apache.geode.cache.client.ClientCacheFactory;
-import org.apache.geode.cache.client.ClientRegionShortcut;
-import org.apache.geode.cache.client.ServerOperationException;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.logging.internal.log4j.api.LogService;
-import org.apache.geode.test.dunit.DistributedTestUtils;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.dunit.Invoke;
-import org.apache.geode.test.dunit.NetworkUtils;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.internal.DUnitLauncher;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import 
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.apache.geode.test.version.VersionManager;
-
-@RunWith(Parameterized.class)
-@UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
-public class RollingUpgradePartitionRegionClearMixedServerPartitionedRegion
-extends JUnit4DistributedTestCase {
-
-  protected static final Logger logger = LogService.getLogger();
-  protected static GemFireCache cache;
-  protected static ClientCache clientcache;
-
-  @Parameter
-  public String oldVersion;
-
-  @Parameters(name = "from_v{0}")
- 

[geode] branch feature/GEODE-7665 updated: GEODE-7845 blocking PR region clear if one or more server versions are too old (#5577)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
 new 0d3  GEODE-7845 blocking PR region clear if one or more server 
versions are too old (#5577)
0d3 is described below

commit 0d31e2fcf63c22eef9153bdc0ac3ec4ba575
Author: mhansonp 
AuthorDate: Tue Oct 13 10:10:25 2020 -0700

GEODE-7845 blocking PR region clear if one or more server versions are too 
old (#5577)

- if a server is running an old version when a PR clear is invoked
by the client, the client will receive a ServerOperationException
with a cause of ServerVersionMismatchException.
---
 .../integrationTest/resources/assembly_content.txt |   1 +
 .../main/java/org/apache/geode/cache/Region.java   |   2 +
 .../cache/ServerVersionMismatchException.java  |  34 ++
 .../geode/internal/cache/PartitionedRegion.java|   1 +
 .../internal/cache/PartitionedRegionClear.java |  34 +-
 .../sanctioned-geode-core-serializables.txt|   1 +
 .../internal/cache/PartitionedRegionClearTest.java | 109 --
 .../RollingUpgrade2DUnitTestBase.java  |   4 +-
 ...ionRegionClearMixedServerPartitionedRegion.java | 412 +
 9 files changed, 571 insertions(+), 27 deletions(-)

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt 
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 549150f..553785a 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -245,6 +245,7 @@ javadoc/org/apache/geode/cache/RoleEvent.html
 javadoc/org/apache/geode/cache/RoleException.html
 javadoc/org/apache/geode/cache/Scope.html
 javadoc/org/apache/geode/cache/SerializedCacheValue.html
+javadoc/org/apache/geode/cache/ServerVersionMismatchException.html
 javadoc/org/apache/geode/cache/StatisticsDisabledException.html
 javadoc/org/apache/geode/cache/SubscriptionAttributes.html
 javadoc/org/apache/geode/cache/SynchronizationCommitConflictException.html
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Region.java 
b/geode-core/src/main/java/org/apache/geode/cache/Region.java
index 4707a46..5162bd5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Region.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Region.java
@@ -1307,6 +1307,8 @@ public interface Region extends ConcurrentMap 
{
* @throws PartitionedRegionPartialClearException when data is partially 
cleared on partitioned
* region. It is caller responsibility to handle the partial data 
clear either by retrying
* the clear operation or continue working with the partially 
cleared partitioned region.
+   * @throws ServerVersionMismatchException when data was not cleared because 
one or more
+   * of the member servers' version was too old to understand the 
clear message.
*/
   @Override
   void clear();
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
 
b/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
new file mode 100644
index 000..1d4231a
--- /dev/null
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
@@ -0,0 +1,34 @@
+/*
+ * 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.cache;
+
+import java.util.List;
+
+/**
+ * Indicates a failure to perform an operation on a Partitioned Region due to
+ * server versions not meeting requirements.
+ *
+ * @since GEODE 1.14.0
+ */
+public class ServerVersionMismatchException extends CacheRuntimeException {
+  private static final long serialVersionUID = -3004093739855972548L;
+
+  public ServerVersionMismatchException(List members, String 
featureName,
+  String version) {
+super(
+"A server's " + members + " version was too old (< " + version + ") 
for : " + featureName);
+
+  }
+}
diff --git 
a/geode-core/src/main/java/org/apache/

[geode] branch feature/GEODE-7665 updated: GEODE-7845 blocking PR region clear if one or more server versions are too old (#5577)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
 new 0d3  GEODE-7845 blocking PR region clear if one or more server 
versions are too old (#5577)
0d3 is described below

commit 0d31e2fcf63c22eef9153bdc0ac3ec4ba575
Author: mhansonp 
AuthorDate: Tue Oct 13 10:10:25 2020 -0700

GEODE-7845 blocking PR region clear if one or more server versions are too 
old (#5577)

- if a server is running an old version when a PR clear is invoked
by the client, the client will receive a ServerOperationException
with a cause of ServerVersionMismatchException.
---
 .../integrationTest/resources/assembly_content.txt |   1 +
 .../main/java/org/apache/geode/cache/Region.java   |   2 +
 .../cache/ServerVersionMismatchException.java  |  34 ++
 .../geode/internal/cache/PartitionedRegion.java|   1 +
 .../internal/cache/PartitionedRegionClear.java |  34 +-
 .../sanctioned-geode-core-serializables.txt|   1 +
 .../internal/cache/PartitionedRegionClearTest.java | 109 --
 .../RollingUpgrade2DUnitTestBase.java  |   4 +-
 ...ionRegionClearMixedServerPartitionedRegion.java | 412 +
 9 files changed, 571 insertions(+), 27 deletions(-)

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt 
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 549150f..553785a 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -245,6 +245,7 @@ javadoc/org/apache/geode/cache/RoleEvent.html
 javadoc/org/apache/geode/cache/RoleException.html
 javadoc/org/apache/geode/cache/Scope.html
 javadoc/org/apache/geode/cache/SerializedCacheValue.html
+javadoc/org/apache/geode/cache/ServerVersionMismatchException.html
 javadoc/org/apache/geode/cache/StatisticsDisabledException.html
 javadoc/org/apache/geode/cache/SubscriptionAttributes.html
 javadoc/org/apache/geode/cache/SynchronizationCommitConflictException.html
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Region.java 
b/geode-core/src/main/java/org/apache/geode/cache/Region.java
index 4707a46..5162bd5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Region.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Region.java
@@ -1307,6 +1307,8 @@ public interface Region extends ConcurrentMap 
{
* @throws PartitionedRegionPartialClearException when data is partially 
cleared on partitioned
* region. It is caller responsibility to handle the partial data 
clear either by retrying
* the clear operation or continue working with the partially 
cleared partitioned region.
+   * @throws ServerVersionMismatchException when data was not cleared because 
one or more
+   * of the member servers' version was too old to understand the 
clear message.
*/
   @Override
   void clear();
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
 
b/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
new file mode 100644
index 000..1d4231a
--- /dev/null
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
@@ -0,0 +1,34 @@
+/*
+ * 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.cache;
+
+import java.util.List;
+
+/**
+ * Indicates a failure to perform an operation on a Partitioned Region due to
+ * server versions not meeting requirements.
+ *
+ * @since GEODE 1.14.0
+ */
+public class ServerVersionMismatchException extends CacheRuntimeException {
+  private static final long serialVersionUID = -3004093739855972548L;
+
+  public ServerVersionMismatchException(List members, String 
featureName,
+  String version) {
+super(
+"A server's " + members + " version was too old (< " + version + ") 
for : " + featureName);
+
+  }
+}
diff --git 
a/geode-core/src/main/java/org/apache/

[geode] branch feature/GEODE-7665 updated: GEODE-7845 blocking PR region clear if one or more server versions are too old (#5577)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-7665 by this 
push:
 new 0d3  GEODE-7845 blocking PR region clear if one or more server 
versions are too old (#5577)
0d3 is described below

commit 0d31e2fcf63c22eef9153bdc0ac3ec4ba575
Author: mhansonp 
AuthorDate: Tue Oct 13 10:10:25 2020 -0700

GEODE-7845 blocking PR region clear if one or more server versions are too 
old (#5577)

- if a server is running an old version when a PR clear is invoked
by the client, the client will receive a ServerOperationException
with a cause of ServerVersionMismatchException.
---
 .../integrationTest/resources/assembly_content.txt |   1 +
 .../main/java/org/apache/geode/cache/Region.java   |   2 +
 .../cache/ServerVersionMismatchException.java  |  34 ++
 .../geode/internal/cache/PartitionedRegion.java|   1 +
 .../internal/cache/PartitionedRegionClear.java |  34 +-
 .../sanctioned-geode-core-serializables.txt|   1 +
 .../internal/cache/PartitionedRegionClearTest.java | 109 --
 .../RollingUpgrade2DUnitTestBase.java  |   4 +-
 ...ionRegionClearMixedServerPartitionedRegion.java | 412 +
 9 files changed, 571 insertions(+), 27 deletions(-)

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt 
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 549150f..553785a 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -245,6 +245,7 @@ javadoc/org/apache/geode/cache/RoleEvent.html
 javadoc/org/apache/geode/cache/RoleException.html
 javadoc/org/apache/geode/cache/Scope.html
 javadoc/org/apache/geode/cache/SerializedCacheValue.html
+javadoc/org/apache/geode/cache/ServerVersionMismatchException.html
 javadoc/org/apache/geode/cache/StatisticsDisabledException.html
 javadoc/org/apache/geode/cache/SubscriptionAttributes.html
 javadoc/org/apache/geode/cache/SynchronizationCommitConflictException.html
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Region.java 
b/geode-core/src/main/java/org/apache/geode/cache/Region.java
index 4707a46..5162bd5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Region.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Region.java
@@ -1307,6 +1307,8 @@ public interface Region extends ConcurrentMap 
{
* @throws PartitionedRegionPartialClearException when data is partially 
cleared on partitioned
* region. It is caller responsibility to handle the partial data 
clear either by retrying
* the clear operation or continue working with the partially 
cleared partitioned region.
+   * @throws ServerVersionMismatchException when data was not cleared because 
one or more
+   * of the member servers' version was too old to understand the 
clear message.
*/
   @Override
   void clear();
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
 
b/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
new file mode 100644
index 000..1d4231a
--- /dev/null
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/ServerVersionMismatchException.java
@@ -0,0 +1,34 @@
+/*
+ * 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.cache;
+
+import java.util.List;
+
+/**
+ * Indicates a failure to perform an operation on a Partitioned Region due to
+ * server versions not meeting requirements.
+ *
+ * @since GEODE 1.14.0
+ */
+public class ServerVersionMismatchException extends CacheRuntimeException {
+  private static final long serialVersionUID = -3004093739855972548L;
+
+  public ServerVersionMismatchException(List members, String 
featureName,
+  String version) {
+super(
+"A server's " + members + " version was too old (< " + version + ") 
for : " + featureName);
+
+  }
+}
diff --git 
a/geode-core/src/main/java/org/apache/

[geode] branch support/1.13 updated: Changes to help reduce the occurence of GEODE-8422 (#5447)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 0f8500a  Changes to help reduce the occurence of GEODE-8422 (#5447)
0f8500a is described below

commit 0f8500a4cfa3c9ad575ddd41b37f0a78b4569cc1
Author: mhansonp 
AuthorDate: Wed Aug 12 16:34:47 2020 -0700

Changes to help reduce the occurence of GEODE-8422 (#5447)

* Changes to help reduce the occurence of GEODE-8422

* Added a unit test for the case where we don't want
to remove a tombstone with the region is not initialized.
* fix the dunit tests' behavior
Co-authored-by: agingade 
Co-authored-by: zhouxh < zho...@vmware.com>

(cherry picked from commit cf27a6a68f0ff89513e4c3a0c0a7a6235ab61e7f)
---
 .../geode/internal/cache/GIIDeltaDUnitTest.java| 15 ++--
 .../geode/internal/cache/TombstoneService.java | 28 ---
 .../geode/internal/cache/TombstoneServiceTest.java | 89 ++
 3 files changed, 113 insertions(+), 19 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
index 26a979c..0ec9ceb 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
@@ -497,7 +497,7 @@ public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
 
 // If fullGII, the key size in gii chunk is 3, i.e. key1,key3,key5. key2 
is GCed.
 // If delta GII, the key size should be 1 (key5(T) which is unfinished 
operation)
-verifyDeltaSizeFromStats(R, 3, 0);
+verifyDeltaSizeFromStats(R, 1, 1);
   }
 
   /**
@@ -1534,9 +1534,9 @@ public class GIIDeltaDUnitTest extends 
JUnit4CacheTestCase {
 assertEquals(0, count);
 verifyDeltaSizeFromStats(R, 1, 1); // deltaGII, key1 in delta
 
-// tombstone key2, key5 should be GCed at R
-verifyTombstoneExist(R, "key2", false, false);
-verifyTombstoneExist(R, "key5", false, false);
+// tombstone key2, key5 should still exist and expired at R
+verifyTombstoneExist(R, "key2", true, true);
+verifyTombstoneExist(R, "key5", true, true);
 
 // tombstone key2, key5 should still exist and expired at P
 verifyTombstoneExist(P, "key2", true, true);
@@ -1544,10 +1544,10 @@ public class GIIDeltaDUnitTest extends 
JUnit4CacheTestCase {
 
 RegionVersionVector p_rvv = getRVV(P);
 RegionVersionVector r_rvv = getRVV(R);
-out.println("GGG:p_rvv=" + p_rvv.fullToString() + ":r_rvv=" + 
r_rvv.fullToString());
+out.println("p_rvv=" + p_rvv.fullToString() + ":r_rvv=" + 
r_rvv.fullToString());
 
-waitForToVerifyRVV(R, memberP, 7, null, 4); // R's rvv=p7, gc=4
-waitForToVerifyRVV(R, memberR, 6, null, 5); // R's rvv=r6, gc=5
+waitForToVerifyRVV(R, memberP, 7, null, 0); // R's rvv=p7, gc=0
+waitForToVerifyRVV(R, memberR, 6, null, 0); // R's rvv=r6, gc=0
 waitForToVerifyRVV(P, memberP, 7, null, 0); // P's rvv=p7, gc=0
 waitForToVerifyRVV(P, memberR, 6, null, 0); // P's rvv=r6, gc=0
   }
@@ -2704,7 +2704,6 @@ public class GIIDeltaDUnitTest extends 
JUnit4CacheTestCase {
   assertTrue(entry != null && entry.getRegionEntry().isTombstone());
 }
 
-System.out.println("GGG:new timeout=" + 
TombstoneService.REPLICATE_TOMBSTONE_TIMEOUT);
 if (entry == null || !entry.getRegionEntry().isTombstone()) {
   return (false == expectExist);
 } else {
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
index 416e20a..6ca640f 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TombstoneService.java
@@ -373,7 +373,7 @@ public class TombstoneService {
 return this.replicatedTombstoneSweeper.getBlockGCLock();
   }
 
-  private static class Tombstone extends CompactVersionHolder {
+  protected static class Tombstone extends CompactVersionHolder {
 // tombstone overhead size
 public static final int PER_TOMBSTONE_OVERHEAD =
 ReflectionSingleObjectSizer.REFERENCE_SIZE // queue's reference to the 
tombstone
@@ -452,7 +452,7 @@ public class TombstoneService {
 protected void beforeSleepChecks() {}
   }
 
-  private static class ReplicateTombstoneSweeper extends TombstoneSweeper {
+  protected static class ReplicateTombstoneSweeper extends TombstoneSweeper {
 /**
  * Used to execute batch gc message executio

[geode] branch develop updated (140de5d -> cf27a6a)

[mhanson]

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 140de5d  GEODE-8423: Updates Redis API for Geode docs 1.13 (#5449)
 add cf27a6a  Changes to help reduce the occurence of GEODE-8422 (#5447)

No new revisions were added by this update.

Summary of changes:
 .../geode/internal/cache/GIIDeltaDUnitTest.java| 15 ++--
 .../geode/internal/cache/TombstoneService.java | 28 ---
 .../geode/internal/cache/TombstoneServiceTest.java | 89 ++
 3 files changed, 113 insertions(+), 19 deletions(-)
 create mode 100644 
geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneServiceTest.java

[geode] branch develop updated (140de5d -> cf27a6a)

[mhanson]

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 140de5d  GEODE-8423: Updates Redis API for Geode docs 1.13 (#5449)
 add cf27a6a  Changes to help reduce the occurence of GEODE-8422 (#5447)

No new revisions were added by this update.

Summary of changes:
 .../geode/internal/cache/GIIDeltaDUnitTest.java| 15 ++--
 .../geode/internal/cache/TombstoneService.java | 28 ---
 .../geode/internal/cache/TombstoneServiceTest.java | 89 ++
 3 files changed, 113 insertions(+), 19 deletions(-)
 create mode 100644 
geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneServiceTest.java

[geode] branch develop updated (86e3266 -> 85ab541)

[mhanson]

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 86e3266  GEODE-8358: Run Geode Redis session tests against native 
Redis (#5373)
 add 85ab541  GEODE-8359 (#5371)

No new revisions were added by this update.

Summary of changes:
 .../tier/sockets/command/RegisterInterest.java | 55 +--
 .../tier/sockets/command/RegisterInterest61.java   | 60 +---
 .../tier/sockets/command/RegisterInterestList.java | 82 --
 .../sockets/command/RegisterInterestList61.java| 79 -
 .../sockets/command/RegisterInterestList66.java| 50 +++--
 .../tier/sockets/command/UnregisterInterest.java   | 69 ++
 .../sockets/command/UnregisterInterestList.java| 75 ++--
 7 files changed, 163 insertions(+), 307 deletions(-)

[geode] branch support/1.13 updated: GEODE-8095: Changes to make GEODE Respond to Restore Redundancy REST Command (#5300) (#5327)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 9255163  GEODE-8095: Changes to make GEODE Respond to Restore 
Redundancy REST Command (#5300) (#5327)
9255163 is described below

commit 9255163a026d5571a89ba6aad950b75539261414
Author: mhansonp 
AuthorDate: Tue Jun 30 10:35:55 2020 -0700

GEODE-8095: Changes to make GEODE Respond to Restore Redundancy REST 
Command (#5300) (#5327)

* GEODE-8095: Changes to make GEODE Respond to Restore Redundancy

(cherry picked from commit f5c5e2cc7860c132074a16351ca4db847f64d6f7)

Co-authored-by: Jinmei Liao 
---
 .../rest/RestoreRedundancyManagementDUnitTest.java | 345 +
 .../internal/operation/OperationManager.java   |   2 +
 ...rializableRestoreRedundancyResultsImplTest.java |   5 +-
 ...RedundancyRequestControllerIntegrationTest.java | 174 +++
 .../RestoreRedundancyOperationController.java  |  74 +
 5 files changed, 596 insertions(+), 4 deletions(-)

diff --git 
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
 
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
new file mode 100644
index 000..3464fe7
--- /dev/null
+++ 
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
@@ -0,0 +1,345 @@
+/*
+ * 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.management.internal.rest;
+
+import static 
org.apache.geode.cache.PartitionAttributesFactory.GLOBAL_MAX_BUCKETS_DEFAULT;
+import static org.apache.geode.cache.Region.SEPARATOR;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.IntStream;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.PartitionAttributesImpl;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.management.api.ClusterManagementOperationResult;
+import org.apache.geode.management.api.ClusterManagementService;
+import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.operation.RestoreRedundancyRequest;
+import org.apache.geode.management.runtime.RegionRedundancyStatus;
+import org.apache.geode.management.runtime.RestoreRedundancyResults;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.rules.MemberStarterRule;
+
+/**
+ * This class borrows very heavily from the RestoreRedundancyCommandDUnitTest
+ *
+ */
+
+public class RestoreRedundancyManagementDUnitTest {
+
+  @Rule
+  public ClusterStartupRule cluster = new ClusterStartupRule();
+
+  private MemberVM locator;
+  private List servers;
+  private static final int SERVERS_TO_START = 3;
+  private static final String HIGH_REDUNDANCY_REGION_NAME = "highRedundancy";
+  private static final int HIGH_REDUNDANCY_COPIES = SERVERS_TO_START - 1;
+  private static final String LOW_REDUNDANCY_REGION_NAME = "lowRedundancy";
+  private static final String PARENT_REGION_NAME = "colocatedParent";
+  private static final String CHILD_REGION_NAME = "colocatedChild";
+  private static final int SINGLE_REDUNDANT_COPY = 1;
+  private static final String NO_CONFIGURED_REDU

[geode] branch support/1.13 updated: GEODE-8095: Changes to make GEODE Respond to Restore Redundancy REST Command (#5300) (#5327)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 9255163  GEODE-8095: Changes to make GEODE Respond to Restore 
Redundancy REST Command (#5300) (#5327)
9255163 is described below

commit 9255163a026d5571a89ba6aad950b75539261414
Author: mhansonp 
AuthorDate: Tue Jun 30 10:35:55 2020 -0700

GEODE-8095: Changes to make GEODE Respond to Restore Redundancy REST 
Command (#5300) (#5327)

* GEODE-8095: Changes to make GEODE Respond to Restore Redundancy

(cherry picked from commit f5c5e2cc7860c132074a16351ca4db847f64d6f7)

Co-authored-by: Jinmei Liao 
---
 .../rest/RestoreRedundancyManagementDUnitTest.java | 345 +
 .../internal/operation/OperationManager.java   |   2 +
 ...rializableRestoreRedundancyResultsImplTest.java |   5 +-
 ...RedundancyRequestControllerIntegrationTest.java | 174 +++
 .../RestoreRedundancyOperationController.java  |  74 +
 5 files changed, 596 insertions(+), 4 deletions(-)

diff --git 
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
 
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
new file mode 100644
index 000..3464fe7
--- /dev/null
+++ 
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
@@ -0,0 +1,345 @@
+/*
+ * 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.management.internal.rest;
+
+import static 
org.apache.geode.cache.PartitionAttributesFactory.GLOBAL_MAX_BUCKETS_DEFAULT;
+import static org.apache.geode.cache.Region.SEPARATOR;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.IntStream;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.PartitionAttributesImpl;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.management.api.ClusterManagementOperationResult;
+import org.apache.geode.management.api.ClusterManagementService;
+import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.operation.RestoreRedundancyRequest;
+import org.apache.geode.management.runtime.RegionRedundancyStatus;
+import org.apache.geode.management.runtime.RestoreRedundancyResults;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.rules.MemberStarterRule;
+
+/**
+ * This class borrows very heavily from the RestoreRedundancyCommandDUnitTest
+ *
+ */
+
+public class RestoreRedundancyManagementDUnitTest {
+
+  @Rule
+  public ClusterStartupRule cluster = new ClusterStartupRule();
+
+  private MemberVM locator;
+  private List servers;
+  private static final int SERVERS_TO_START = 3;
+  private static final String HIGH_REDUNDANCY_REGION_NAME = "highRedundancy";
+  private static final int HIGH_REDUNDANCY_COPIES = SERVERS_TO_START - 1;
+  private static final String LOW_REDUNDANCY_REGION_NAME = "lowRedundancy";
+  private static final String PARENT_REGION_NAME = "colocatedParent";
+  private static final String CHILD_REGION_NAME = "colocatedChild";
+  private static final int SINGLE_REDUNDANT_COPY = 1;
+  private static final String NO_CONFIGURED_REDU

[geode] branch develop updated (34cfe04 -> f5c5e2c)

[mhanson]

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 34cfe04  GEODE-8176: Fix flakiness in testPingWrongServer (#5303)
 add f5c5e2c  GEODE-8095: Changes to make GEODE Respond to Restore 
Redundancy REST Command (#5300)

No new revisions were added by this update.

Summary of changes:
 .../rest/RestoreRedundancyManagementDUnitTest.java | 345 +
 .../internal/operation/OperationManager.java   |   2 +
 ...rializableRestoreRedundancyResultsImplTest.java |   5 +-
 ...edundancyRequestControllerIntegrationTest.java} |  40 +--
 ...a => RestoreRedundancyOperationController.java} |  39 +--
 5 files changed, 391 insertions(+), 40 deletions(-)
 create mode 100644 
geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
 copy 
geode-web-management/src/integrationTest/java/org/apache/geode/management/internal/rest/{RebalanceIntegrationTest.java
 => RestoreRedundancyRequestControllerIntegrationTest.java} (82%)
 copy 
geode-web-management/src/main/java/org/apache/geode/management/internal/rest/controllers/{RebalanceOperationController.java
 => RestoreRedundancyOperationController.java} (60%)

[geode] branch support/1.13 updated: GEODE-8095 backport to 1.13 (#5305)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson 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 161564c  GEODE-8095 backport to 1.13 (#5305)
161564c is described below

commit 161564ca82282637173774fd2da51fa5ce6a4af7
Author: mhansonp 
AuthorDate: Mon Jun 29 09:46:52 2020 -0700

GEODE-8095 backport to 1.13 (#5305)

(cherry picked from commit 5732a1c1ef9c8ccb979770a963d5c4b1b7324f1a)

Co-authored-by: Mark Hanson 
---
 .../RestoreRedundancyOperationDUnitTest.java   |   4 +-
 .../codeAnalysis/sanctionedDataSerializables.txt   |   4 +-
 .../SerializableRestoreRedundancyResultsImpl.java  |  16 +--
 ...rializableRestoreRedundancyResultsImplTest.java |  98 ---
 .../internal/cli/commands/RedundancyCommand.java   |   2 +-
 .../operation/RegionRedundancyStatusImpl.java  |  16 +++
 .../operation/RestoreRedundancyResultsImpl.java| 108 +
 .../operation/RestoreRedundancyRequest.java|   2 +-
 .../management/runtime/RegionRedundancyStatus.java |   6 +-
 .../runtime/RestoreRedundancyResults.java  |   9 +-
 .../sanctioned-geode-management-serializables.txt  |   3 +-
 11 files changed, 178 insertions(+), 90 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RestoreRedundancyOperationDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RestoreRedundancyOperationDUnitTest.java
index d7c1d4b..9722461 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RestoreRedundancyOperationDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/control/RestoreRedundancyOperationDUnitTest.java
@@ -123,7 +123,7 @@ public class RestoreRedundancyOperationDUnitTest {
   RestoreRedundancyResults results = restoreRedundancyAndGetResults(null, 
null, true);
   assertThat(results.getRegionOperationStatus(), is(SUCCESS));
   assertThat(results.getTotalPrimaryTransfersCompleted() > 0, is(true));
-  assertThat(results.getTotalPrimaryTransferTime().toMillis() > 0, 
is(true));
+  assertThat(results.getTotalPrimaryTransferTime() > 0, is(true));
   assertThat(results.getRegionResult(PARENT_REGION_NAME).getStatus(), 
is(SATISFIED));
   assertThat(results.getRegionResult(CHILD_REGION_NAME).getStatus(), 
is(SATISFIED));
   
assertThat(results.getRegionResult(LOW_REDUNDANCY_REGION_NAME).getStatus(), 
is(SATISFIED));
@@ -146,7 +146,7 @@ public class RestoreRedundancyOperationDUnitTest {
 
   assertThat(results.getRegionOperationStatus(), is(SUCCESS));
   assertThat(results.getTotalPrimaryTransfersCompleted(), is(0));
-  assertThat(results.getTotalPrimaryTransferTime().toMillis(), is(0L));
+  assertThat(results.getTotalPrimaryTransferTime(), is(0L));
   assertThat(results.getRegionResult(PARENT_REGION_NAME).getStatus(), 
is(SATISFIED));
   assertThat(results.getRegionResult(CHILD_REGION_NAME).getStatus(), 
is(SATISFIED));
   
assertThat(results.getRegionResult(LOW_REDUNDANCY_REGION_NAME).getStatus(), 
is(SATISFIED));
diff --git 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 4d7b7db..094a8ea 100644
--- 
a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ 
b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1364,8 +1364,8 @@ fromData,42
 toData,37
 
 
org/apache/geode/internal/cache/control/SerializableRestoreRedundancyResultsImpl,2
-fromData,65
-toData,61
+fromData,68
+toData,64
 
 org/apache/geode/internal/cache/event/EventSequenceNumberHolder,2
 fromData,22
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/control/SerializableRestoreRedundancyResultsImpl.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/control/SerializableRestoreRedundancyResultsImpl.java
index e02d8a4..c9f80f0 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/control/SerializableRestoreRedundancyResultsImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/control/SerializableRestoreRedundancyResultsImpl.java
@@ -38,8 +38,8 @@ public class SerializableRestoreRedundancyResultsImpl
 
   public void addPrimaryReassignmentDetails(PartitionRebalanceInfo details) {
 totalPrimaryTransfersCompleted += details.getPrimaryTransfersCompleted();
-totalPrimaryTransferTime =
-totalPrimaryTransferTime.plusMillis(details.getPrimaryTransferTime());
+totalPrimaryTransferTime += details.getPrimaryTransferTime();
+
   }
 
   @Override
@@ -49,9 +49,9 @@ pub

[geode] branch develop updated (ab83b61 -> 5732a1c)

[mhanson]

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 ab83b61  GEODE-8285: Change location of generated test file to build 
dir and fix error message path for sanctioned text file (#5280)
 add 5732a1c  GEODE-8095 Further rework of the RestoreRedundancy data 
objects for serialization (#5281)

No new revisions were added by this update.

Summary of changes:
 .../RestoreRedundancyOperationDUnitTest.java   |   4 +-
 .../codeAnalysis/sanctionedDataSerializables.txt   |   4 +-
 .../SerializableRestoreRedundancyResultsImpl.java  |  16 +--
 ...rializableRestoreRedundancyResultsImplTest.java |  98 ---
 .../internal/cli/commands/RedundancyCommand.java   |   2 +-
 .../operation/RegionRedundancyStatusImpl.java  |  16 +++
 .../operation/RestoreRedundancyResultsImpl.java| 108 +
 .../operation/RestoreRedundancyRequest.java|   2 +-
 .../management/runtime/RegionRedundancyStatus.java |   6 +-
 .../runtime/RestoreRedundancyResults.java  |   9 +-
 .../sanctioned-geode-management-serializables.txt  |   3 +-
 11 files changed, 178 insertions(+), 90 deletions(-)

[geode] branch mass-test-run updated (7843270 -> 564f43f)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 7843270  remove meta-* jobs that we won't use for mass-test-run
 discard 631f33b  Mass-test-run branch, no windows or publication jobs
 add e023b54  GEODE-8226: change publish to work with non-redis servers 
present  (#5215)
 add bc0090d  GEODE-8029: Delete orphaned drf files (2nd try) (#5099)
 add 3a0aeb5  GEODE-8223: Update documentation of expiration accuracy as 
well as supported, unsupported, and unimplemented commands in Redis API for 
Geode docs (#5214)
 add 9e2891c  GEODE-7971: Added extra check in test case to find possible 
flaky test case (#5221)
 add 11e80c3  GEODE-8233: add equals and hashCode to RedisData classes 
(#5220)
 add 20ed5a8  GEODE-8232: add better error message for unimplemented redis 
commands (#5219)
 add 6dabaeb  GEODE-8176: Add more checks in the flaky ping test (#5176)
 add 6e65b07  GEODE-8234: change redis functions to implement 
InternalFunction (#5229)
 add f65ea45  GEODE-8230: run benchmarks in parallel with other CI jobs 
(#5217)
 add 1231db1  GEODE-8205: add gfsh redis command (#5226)
 add ece3a5a  GEODE-8238: message loss during shutdown in Shutdown Hook 
when JVM exits (#5232)
 add fe43bc6  GEODE-8205: fix locally failing tests
 add 3a2cf76  GEODE-8197: Add launcher acceptance tests for custom logging 
config (#5196)
 add 3897ab1  GEODE-8151: Convert remaining commands to use RedisResponse 
(#5228)
 add 4a0eeeb  GEODE-8222: Also ignore EntryDestroyedException during 
passive expiration (#5239)
 add d82e30d  GEODE-8243: Use java.exe on Windows in Launcher tests (#5241)
 add cb5990c  GEODE-8221: Refactor tests to run in appropriate projects. 
(#5244)
 add 4477013  GEODE-8179: gfsh query cmd returns incorrect results if '=' 
sign is missing (#5187)
 new 4e9da8f  Mass-test-run branch, no windows or publication jobs
 new 564f43f  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   (7843270)
\
 N -- N -- N   refs/heads/mass-test-run (564f43f)

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:
 ci/pipelines/geode-build/jinja.template.yml|   7 +-
 ci/pipelines/shared/jinja.variables.yml|   1 +
 ...SessionsBase.java => AbstractSessionsTest.java} | 143 -
 ...t.java => AbstractDeltaSessionManagerTest.java} | 187 +--
 .../ClientServerSessionCacheJUnitTest.java | 319 ---
 ...ionsJUnitTest.java => Tomcat7SessionsTest.java} |  10 +-
 ...st.java => Tomcat7DeltaSessionManagerTest.java} |   6 +-
 ...st.java => Tomcat8DeltaSessionManagerTest.java} |   2 +-
 ...st.java => Tomcat9DeltaSessionManagerTest.java} |   2 +-
 extensions/geode-modules/build.gradle  |   4 +-
 ...ionsJUnitTest.java => Tomcat6SessionsTest.java} |   4 +-
 .../catalina/AbstractSessionCacheTest.java}|  29 +-
 .../catalina/ClientServerSessionCacheTest.java | 303 +-
 .../session/catalina/DeltaSessionFacadeTest.java}  |   6 +-
 .../session/catalina/DeltaSessionTest.java}|  74 ++---
 .../catalina/PeerToPeerSessionCacheTest.java}  |  26 +-
 .../SessionExpirationCacheListenerTest.java}   |  10 +-
 .../DeltaSessionAttributeEventBatchTest.java}  |  17 +-
 .../DeltaSessionDestroyAttributeEventTest.java}|   9 +-
 .../internal/DeltaSessionStatisticsTest.java}  |  11 +-
 .../DeltaSessionUpdateAttributeEventTest.java} |  10 +-
 .../modules/util/CreateRegionFunctionTest.java}|  17 +-
 ...TouchPartitionedRegionEntriesFunctionTest.java} |  16 +-
 .../TouchReplicatedRegionEntriesFunctionTest.java} |  20 +-
 ...rLauncherWithCustomLogConfigAcceptanceTest.java | 201 
 .../LocatorLauncherWithPulseAcceptanceTest.java| 136 
 ...rWithPulseAndCustomLogConfigAcceptanceTest.java | 304 ++
 ...rLauncherWithCustomLogConfigAcceptanceTest.java | 179 +++
 ...orLauncherWithCustomLogConfigAcceptanceTest.xml |  39 

[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 564f43fa844b53de16550df9841aa94eb08ad83d
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 | 207 +--
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml 
b/ci/pipelines/meta/jinja.template.yml
index 5fd8ee3..3fd622f 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -52,13 +52,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:
@@ -72,35 +66,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
@@ -188,176 +153,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))
-MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-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

[geode] branch mass-test-run updated (7843270 -> 564f43f)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 7843270  remove meta-* jobs that we won't use for mass-test-run
 discard 631f33b  Mass-test-run branch, no windows or publication jobs
 add e023b54  GEODE-8226: change publish to work with non-redis servers 
present  (#5215)
 add bc0090d  GEODE-8029: Delete orphaned drf files (2nd try) (#5099)
 add 3a0aeb5  GEODE-8223: Update documentation of expiration accuracy as 
well as supported, unsupported, and unimplemented commands in Redis API for 
Geode docs (#5214)
 add 9e2891c  GEODE-7971: Added extra check in test case to find possible 
flaky test case (#5221)
 add 11e80c3  GEODE-8233: add equals and hashCode to RedisData classes 
(#5220)
 add 20ed5a8  GEODE-8232: add better error message for unimplemented redis 
commands (#5219)
 add 6dabaeb  GEODE-8176: Add more checks in the flaky ping test (#5176)
 add 6e65b07  GEODE-8234: change redis functions to implement 
InternalFunction (#5229)
 add f65ea45  GEODE-8230: run benchmarks in parallel with other CI jobs 
(#5217)
 add 1231db1  GEODE-8205: add gfsh redis command (#5226)
 add ece3a5a  GEODE-8238: message loss during shutdown in Shutdown Hook 
when JVM exits (#5232)
 add fe43bc6  GEODE-8205: fix locally failing tests
 add 3a2cf76  GEODE-8197: Add launcher acceptance tests for custom logging 
config (#5196)
 add 3897ab1  GEODE-8151: Convert remaining commands to use RedisResponse 
(#5228)
 add 4a0eeeb  GEODE-8222: Also ignore EntryDestroyedException during 
passive expiration (#5239)
 add d82e30d  GEODE-8243: Use java.exe on Windows in Launcher tests (#5241)
 add cb5990c  GEODE-8221: Refactor tests to run in appropriate projects. 
(#5244)
 add 4477013  GEODE-8179: gfsh query cmd returns incorrect results if '=' 
sign is missing (#5187)
 new 4e9da8f  Mass-test-run branch, no windows or publication jobs
 new 564f43f  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   (7843270)
\
 N -- N -- N   refs/heads/mass-test-run (564f43f)

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:
 ci/pipelines/geode-build/jinja.template.yml|   7 +-
 ci/pipelines/shared/jinja.variables.yml|   1 +
 ...SessionsBase.java => AbstractSessionsTest.java} | 143 -
 ...t.java => AbstractDeltaSessionManagerTest.java} | 187 +--
 .../ClientServerSessionCacheJUnitTest.java | 319 ---
 ...ionsJUnitTest.java => Tomcat7SessionsTest.java} |  10 +-
 ...st.java => Tomcat7DeltaSessionManagerTest.java} |   6 +-
 ...st.java => Tomcat8DeltaSessionManagerTest.java} |   2 +-
 ...st.java => Tomcat9DeltaSessionManagerTest.java} |   2 +-
 extensions/geode-modules/build.gradle  |   4 +-
 ...ionsJUnitTest.java => Tomcat6SessionsTest.java} |   4 +-
 .../catalina/AbstractSessionCacheTest.java}|  29 +-
 .../catalina/ClientServerSessionCacheTest.java | 303 +-
 .../session/catalina/DeltaSessionFacadeTest.java}  |   6 +-
 .../session/catalina/DeltaSessionTest.java}|  74 ++---
 .../catalina/PeerToPeerSessionCacheTest.java}  |  26 +-
 .../SessionExpirationCacheListenerTest.java}   |  10 +-
 .../DeltaSessionAttributeEventBatchTest.java}  |  17 +-
 .../DeltaSessionDestroyAttributeEventTest.java}|   9 +-
 .../internal/DeltaSessionStatisticsTest.java}  |  11 +-
 .../DeltaSessionUpdateAttributeEventTest.java} |  10 +-
 .../modules/util/CreateRegionFunctionTest.java}|  17 +-
 ...TouchPartitionedRegionEntriesFunctionTest.java} |  16 +-
 .../TouchReplicatedRegionEntriesFunctionTest.java} |  20 +-
 ...rLauncherWithCustomLogConfigAcceptanceTest.java | 201 
 .../LocatorLauncherWithPulseAcceptanceTest.java| 136 
 ...rWithPulseAndCustomLogConfigAcceptanceTest.java | 304 ++
 ...rLauncherWithCustomLogConfigAcceptanceTest.java | 179 +++
 ...orLauncherWithCustomLogConfigAcceptanceTest.xml |  39 

[geode] 01/02: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 4e9da8f048458184c745098a3f8394efaa69a30c
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 | 302 +---
 ci/pipelines/shared/jinja.variables.yml |  90 +
 2 files changed, 7 insertions(+), 385 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index bc71092..d4ca428 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -95,61 +95,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" or repository.branch.startswith("support/") %}
-  - PublishArtifacts
-  {%- endif %}
-- name: complete
-  jobs:
-  - {{ build_test.name }}
-  {{- all_gating_jobs() | indent(2) }}
-  {%- if repository.upstream_fork != "apache" or repository.branch == 
"develop" or repository.branch.startswith("support/") %}
-  - PublishArtifacts
-  {%- endif %}
-  - UpdatePassingTokens
-- 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) if ((not test.ONLY_JDK is 
defined) or test.ONLY_JDK==java_test_version.version) %}
-  - {{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) if ((not test.ONLY_JDK is 
defined) or test.ONLY_JDK==java_test_version.version) %}
-  - {{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") and ((not 
test.ONLY_JDK is defined) or test.ONLY_JDK==java_test_version.version) %}
-  - {{test.name}}Test{{java_test_version.name}}
-  {%- endfor -%}
-{%- endfor %}
-- name: Benchmarks
-  jobs:
-  {%- for run_var in (benchmarks.flavors) %}
-  - Benchmark{{ run_var.title }}
-  {%- endfor %}
-- name: Semver Management
-  jobs:
-  {%- for semverPiece in ['major', 'minor', 'patch'] %}
-  - Bump{{ semverPiece.title() }}
-  {%- endfor %}
-
 resources:
 - name: concourse-metadata-resource
   type: concourse-metadata-resource
@@ -171,12 +116,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:
@@ -185,12 +125,7 @@ resources:
 initial_version: {{ metadata.initial_version }}
 json_key: ((!concourse-gcp-key))
 key: semvers/((pipeline-prefix))((geode-build-branch))/number
-- name: geode-passing-tokens
-  type: json-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:
@@ -199,12 +134,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
@@ -238,18 +167,6 @@ resource_types:
 repository: 
gcr.io/((gcp-project))/((pipeline-prefix))gcs-resource-with-json-content
 tag: latest
 jobs:
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-params: { bump: {{ semverPiece }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - 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}}
@@ -395,221 +312,6 @@ jobs:
   - name: instance-

[geode] 01/02: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 4e9da8f048458184c745098a3f8394efaa69a30c
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 | 302 +---
 ci/pipelines/shared/jinja.variables.yml |  90 +
 2 files changed, 7 insertions(+), 385 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index bc71092..d4ca428 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -95,61 +95,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" or repository.branch.startswith("support/") %}
-  - PublishArtifacts
-  {%- endif %}
-- name: complete
-  jobs:
-  - {{ build_test.name }}
-  {{- all_gating_jobs() | indent(2) }}
-  {%- if repository.upstream_fork != "apache" or repository.branch == 
"develop" or repository.branch.startswith("support/") %}
-  - PublishArtifacts
-  {%- endif %}
-  - UpdatePassingTokens
-- 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) if ((not test.ONLY_JDK is 
defined) or test.ONLY_JDK==java_test_version.version) %}
-  - {{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) if ((not test.ONLY_JDK is 
defined) or test.ONLY_JDK==java_test_version.version) %}
-  - {{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") and ((not 
test.ONLY_JDK is defined) or test.ONLY_JDK==java_test_version.version) %}
-  - {{test.name}}Test{{java_test_version.name}}
-  {%- endfor -%}
-{%- endfor %}
-- name: Benchmarks
-  jobs:
-  {%- for run_var in (benchmarks.flavors) %}
-  - Benchmark{{ run_var.title }}
-  {%- endfor %}
-- name: Semver Management
-  jobs:
-  {%- for semverPiece in ['major', 'minor', 'patch'] %}
-  - Bump{{ semverPiece.title() }}
-  {%- endfor %}
-
 resources:
 - name: concourse-metadata-resource
   type: concourse-metadata-resource
@@ -171,12 +116,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:
@@ -185,12 +125,7 @@ resources:
 initial_version: {{ metadata.initial_version }}
 json_key: ((!concourse-gcp-key))
 key: semvers/((pipeline-prefix))((geode-build-branch))/number
-- name: geode-passing-tokens
-  type: json-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:
@@ -199,12 +134,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
@@ -238,18 +167,6 @@ resource_types:
 repository: 
gcr.io/((gcp-project))/((pipeline-prefix))gcs-resource-with-json-content
 tag: latest
 jobs:
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-params: { bump: {{ semverPiece }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - 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}}
@@ -395,221 +312,6 @@ jobs:
   - name: instance-

[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 564f43fa844b53de16550df9841aa94eb08ad83d
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 | 207 +--
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml 
b/ci/pipelines/meta/jinja.template.yml
index 5fd8ee3..3fd622f 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -52,13 +52,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:
@@ -72,35 +66,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
@@ -188,176 +153,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))
-MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-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

[geode] branch mass-test-run updated (7eaf4a5 -> 7843270)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 7eaf4a5  remove meta-* jobs that we won't use for mass-test-run
 discard 7dba154  Mass-test-run branch, no windows or publication jobs
 add ba8a552  GEODE-8132: Remove ability to set Redis region type (#5117)
 add a235c7c  GEODE-8078: log and report error at the correct place. (#5111)
 add 4fff1f9  GEODE-8094: Create HA test to ensure Spring Boot sessions 
expire correctly (#5079)
 add 32a0177  GEODE-8133: Fix task chaining for 'devBuild' (#5118)
 add e084aa4  GEODE-8130: use a single region for redis Sets and Hashes  
(#5120)
 add 0d602cc  GEODE-8035: Parallel Disk Store Recovery when Cluster 
Restarts (#5014)
 add 334e24f  GEODE-8096: Providing unique names for the JARs in the tests 
(#5119)
 add fff9853  GEODE-8069: fix release script issues (#5050)
 add 4c12d70  GEODE-8122: Update Geode Redis API docs (#5122)
 add b38ae30  GEODE-7792: configure logging for geode-membership 
integration tests (#5116)
 add 1af3be3  GEODE-8100: update cluster-management-service documentation 
(#5121)
 add 6aa2420  Introduce RedisResponse to SET executors (#5114)
 add 7e222df  GEODE-8147: change redis DELETE and EXISTS to use 
Function+Delta (#5128)
 add 47a5709  GEODE-8095: refactor operation BiFunction into a specific 
OperationPerformer interface (#5135)
 add aca029e  GEODE-8100: Update cluster management service docs - style 
edit (#5141)
 add 7538de5  GEODE-8167: bump spring security to recommended version 
(#5144)
 add 19d5f78  GEODE-7458: Adding option in gfsh command "start gateway 
sender" to control clearing of existing queues (#4387)
 add c3c226a  GEODE-8119:closing threads when offline disk store is 
executed (#5106)
 add 07bf3dd  GEODE-8150: Downgrade classgraph to 4.8.52 (#5138)
 add d08847b  GEODE-8112: Add --member option in query command. (#5102)
 add 9a0563e  GEODE-8170: change all hash and set commands to use function 
(#5125)
 add 0f8da9e  GEODE-8145: Add Redis configuration properties to 
gemfire_properties.html (#5130)
 add f2392d0  GEODE-8146: use latest winrm in tools image (#5134)
 add 358fd70  GEODE-8131: reader thread blocked attempting to issue an 
alert (#5132)
 add e0cbd78  GEODE-8127: ensure that redis function executes on primary  
(#5133)
 add d47e073  GEODE-8138: Improve semantics of the redis-port option (#5142)
 add 0a7f8ae  GEODE-8168: Redis pipelined command responses can be 
corrupted (#5145)
 add af1ea6d  GEODE-8151: Convert hash commands to return RedisResponse 
(#5140)
 add f243c4d  Revert GEODE-8127: the test is flakey (#5153)
 add a05b86d  GEODE-8175: remove unsupported redis commands (#5146)
 add 03355b9  GEODE-8175: fix compile error (#5156)
 add e5e803e  GEODE-8180: add 1.14 to management wiki (#5154)
 add 99b12ed  GEODE-8108: Remove System.out.println calls from geode-redis 
(#5149)
 add c79905f  Revert "GEODE-8119:closing threads when offline disk store is 
executed (#5106)" (#5158)
 add e432855  GEODE-7971: Gw sender deliver TX events atomically to Gw 
receivers (#4928)
 add b22df8c  GEODE-8144: endpoint identification in servers is not working 
(#5131)
 add 253d667  GEODE-8136: Move UncheckedUtils to geode-common (#5123)
 add 5e00b10  GEODE-8134: convert String commands to use Function+Delta 
(#5160)
 add bef07b3  GEODE-8174: Fix ConcurrentModificationException when using 
JTA transaction. (#5161)
 add 17dd67a  GEODE-8182: change String commands to use one region (#5165)
 add a185267  Feature/geode 8144 (#5164)
 add 53d1631  GEODE-8171: javadoc for putAll need to have accurate 
exception (#5147)
 add 42c1164  GEODE-8144 another attempt to fix a failing test (#5172)
 add dd990e8  GEODE-8193: Broken link in statistics list (#5166)
 add bd2d118  GEODE-7864: Override the default implementation of 
write(byte[],int,int) (#4871)
 add 0fd56e4  GEODE-7846: Replace all uses of hardcoded / with 
Region.SEPARATOR (#5157)
 add 2d85af4  GEODE-8166: reimplement redis expiration to use new data 
model (#5174)
 add 83b40f5  The RedisData region name now starts with "__". (#5181)
 add 343e114  GEODE-8127: Reintroduces changes that account for primary 
bucket changing (#5179)
 add 973750e  ByteArrayWrapper now implementes DataSerializableFixedID 
which should save us 40 bytes each time it is serialized. (#5180)
 add 57cc3c7  GEODE-6070: Fix ShutdownCommandOverHttpDUnitTest flakiness 
(#5162)
 add 2883e97  GEODE-8205: feature flag unsupported Redis commands (#5185)
 add 0fdcd5b  GEODE-8211: fix flaky ShutdownIntegrationTest (#5193)
 add 4090cef  repackaged GlobPattern (#5190)
 add 426d7fd  GEODE-8206: CI Failure: 
ReconnectWithClusterConfigurationDUnitTest.t

[geode] 01/02: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 631f33b536ec86ca1ce77408f1393efaa80a4639
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 | 313 +---
 ci/pipelines/shared/jinja.variables.yml |  89 +---
 2 files changed, 7 insertions(+), 395 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index 720413c..27cbe19 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" or repository.branch.startswith("support/") %}
-  - 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" or repository.branch.startswith("support/") %}
-  - 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))/number
-- name: geode-passing-tokens
-  type: json-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
@@ -240,18 +164,6 @@ resource_types:
 repository: 
gcr.io/((gcp-project))/((pipeline-prefix))gcs-resource-with-json-content
 tag: latest
 jobs:
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-params: { bump: {{ semverPiece }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - 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}}
@@ -397,227 +309,6 @@ jobs:
   - name: instance-data
 

[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 78432701a0e1b58c9666f4b5ee095472cb1d83b6
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 | 207 +--
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml 
b/ci/pipelines/meta/jinja.template.yml
index 5fd8ee3..3fd622f 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -52,13 +52,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:
@@ -72,35 +66,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
@@ -188,176 +153,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))
-MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-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

[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 78432701a0e1b58c9666f4b5ee095472cb1d83b6
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 | 207 +--
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml 
b/ci/pipelines/meta/jinja.template.yml
index 5fd8ee3..3fd622f 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -52,13 +52,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:
@@ -72,35 +66,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
@@ -188,176 +153,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))
-MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-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

[geode] branch mass-test-run updated (7eaf4a5 -> 7843270)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 7eaf4a5  remove meta-* jobs that we won't use for mass-test-run
 discard 7dba154  Mass-test-run branch, no windows or publication jobs
 add ba8a552  GEODE-8132: Remove ability to set Redis region type (#5117)
 add a235c7c  GEODE-8078: log and report error at the correct place. (#5111)
 add 4fff1f9  GEODE-8094: Create HA test to ensure Spring Boot sessions 
expire correctly (#5079)
 add 32a0177  GEODE-8133: Fix task chaining for 'devBuild' (#5118)
 add e084aa4  GEODE-8130: use a single region for redis Sets and Hashes  
(#5120)
 add 0d602cc  GEODE-8035: Parallel Disk Store Recovery when Cluster 
Restarts (#5014)
 add 334e24f  GEODE-8096: Providing unique names for the JARs in the tests 
(#5119)
 add fff9853  GEODE-8069: fix release script issues (#5050)
 add 4c12d70  GEODE-8122: Update Geode Redis API docs (#5122)
 add b38ae30  GEODE-7792: configure logging for geode-membership 
integration tests (#5116)
 add 1af3be3  GEODE-8100: update cluster-management-service documentation 
(#5121)
 add 6aa2420  Introduce RedisResponse to SET executors (#5114)
 add 7e222df  GEODE-8147: change redis DELETE and EXISTS to use 
Function+Delta (#5128)
 add 47a5709  GEODE-8095: refactor operation BiFunction into a specific 
OperationPerformer interface (#5135)
 add aca029e  GEODE-8100: Update cluster management service docs - style 
edit (#5141)
 add 7538de5  GEODE-8167: bump spring security to recommended version 
(#5144)
 add 19d5f78  GEODE-7458: Adding option in gfsh command "start gateway 
sender" to control clearing of existing queues (#4387)
 add c3c226a  GEODE-8119:closing threads when offline disk store is 
executed (#5106)
 add 07bf3dd  GEODE-8150: Downgrade classgraph to 4.8.52 (#5138)
 add d08847b  GEODE-8112: Add --member option in query command. (#5102)
 add 9a0563e  GEODE-8170: change all hash and set commands to use function 
(#5125)
 add 0f8da9e  GEODE-8145: Add Redis configuration properties to 
gemfire_properties.html (#5130)
 add f2392d0  GEODE-8146: use latest winrm in tools image (#5134)
 add 358fd70  GEODE-8131: reader thread blocked attempting to issue an 
alert (#5132)
 add e0cbd78  GEODE-8127: ensure that redis function executes on primary  
(#5133)
 add d47e073  GEODE-8138: Improve semantics of the redis-port option (#5142)
 add 0a7f8ae  GEODE-8168: Redis pipelined command responses can be 
corrupted (#5145)
 add af1ea6d  GEODE-8151: Convert hash commands to return RedisResponse 
(#5140)
 add f243c4d  Revert GEODE-8127: the test is flakey (#5153)
 add a05b86d  GEODE-8175: remove unsupported redis commands (#5146)
 add 03355b9  GEODE-8175: fix compile error (#5156)
 add e5e803e  GEODE-8180: add 1.14 to management wiki (#5154)
 add 99b12ed  GEODE-8108: Remove System.out.println calls from geode-redis 
(#5149)
 add c79905f  Revert "GEODE-8119:closing threads when offline disk store is 
executed (#5106)" (#5158)
 add e432855  GEODE-7971: Gw sender deliver TX events atomically to Gw 
receivers (#4928)
 add b22df8c  GEODE-8144: endpoint identification in servers is not working 
(#5131)
 add 253d667  GEODE-8136: Move UncheckedUtils to geode-common (#5123)
 add 5e00b10  GEODE-8134: convert String commands to use Function+Delta 
(#5160)
 add bef07b3  GEODE-8174: Fix ConcurrentModificationException when using 
JTA transaction. (#5161)
 add 17dd67a  GEODE-8182: change String commands to use one region (#5165)
 add a185267  Feature/geode 8144 (#5164)
 add 53d1631  GEODE-8171: javadoc for putAll need to have accurate 
exception (#5147)
 add 42c1164  GEODE-8144 another attempt to fix a failing test (#5172)
 add dd990e8  GEODE-8193: Broken link in statistics list (#5166)
 add bd2d118  GEODE-7864: Override the default implementation of 
write(byte[],int,int) (#4871)
 add 0fd56e4  GEODE-7846: Replace all uses of hardcoded / with 
Region.SEPARATOR (#5157)
 add 2d85af4  GEODE-8166: reimplement redis expiration to use new data 
model (#5174)
 add 83b40f5  The RedisData region name now starts with "__". (#5181)
 add 343e114  GEODE-8127: Reintroduces changes that account for primary 
bucket changing (#5179)
 add 973750e  ByteArrayWrapper now implementes DataSerializableFixedID 
which should save us 40 bytes each time it is serialized. (#5180)
 add 57cc3c7  GEODE-6070: Fix ShutdownCommandOverHttpDUnitTest flakiness 
(#5162)
 add 2883e97  GEODE-8205: feature flag unsupported Redis commands (#5185)
 add 0fdcd5b  GEODE-8211: fix flaky ShutdownIntegrationTest (#5193)
 add 4090cef  repackaged GlobPattern (#5190)
 add 426d7fd  GEODE-8206: CI Failure: 
ReconnectWithClusterConfigurationDUnitTest.t

[geode] 01/02: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 631f33b536ec86ca1ce77408f1393efaa80a4639
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 | 313 +---
 ci/pipelines/shared/jinja.variables.yml |  89 +---
 2 files changed, 7 insertions(+), 395 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index 720413c..27cbe19 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" or repository.branch.startswith("support/") %}
-  - 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" or repository.branch.startswith("support/") %}
-  - 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))/number
-- name: geode-passing-tokens
-  type: json-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
@@ -240,18 +164,6 @@ resource_types:
 repository: 
gcr.io/((gcp-project))/((pipeline-prefix))gcs-resource-with-json-content
 tag: latest
 jobs:
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-params: { bump: {{ semverPiece }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - 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}}
@@ -397,227 +309,6 @@ jobs:
   - name: instance-data
 

[geode] branch feature/GEODE-7665 created (now 81102ce)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch feature/GEODE-7665
in repository https://gitbox.apache.org/repos/asf/geode.git.


  at 81102ce  GEODE-7667: Fixing test to include PR clear help text.

No new revisions were added by this update.

[geode] 01/02: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 7dba154e449a2fa7e5832cc7e8aede696a6d5c32
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 | 313 +---
 ci/pipelines/shared/jinja.variables.yml |  89 +---
 2 files changed, 7 insertions(+), 395 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index 0a10a59..43e4f97 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" or repository.branch.startswith("support/") %}
-  - 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" or repository.branch.startswith("support/") %}
-  - 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))/number
-- 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,18 +157,6 @@ 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 }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - 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}}
@@ -390,227 +302,6 @@ jobs:
   - name: instance-data
 timeout: 1h
 
-- name: UpdatePassingTokens
-  public

[geode] branch mass-test-run updated (9ed138e -> 7eaf4a5)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 9ed138e  Fixing a key.
 discard ba5a14e  removing merge issue.
 discard 1388712  remove meta-* jobs that we won't use for mass-test-run
 discard 5f659fe  Mass-test-run branch, no windows or publication jobs
 add 1292239  GEODE-8072: when region is destroyed in function, should 
throw correct exception (#5078)
 add 48d2ee5  GEODE-7702: bulkOp from accessor or NORMAL should sync with 
clear (#5012)
 add 960f33b  GEODE-7707: Tab completing '--url' on 'connect' gives two 
default values
 add 1a87e32  GEODE-7707: Align examples in doc and code
 add 15cb323  GEODE-7707: Tab completing '--url' on 'connect' gives two 
default values (#5061)
 add 8f0650e  GEODE-7864: Replace uses of hardcoded "/" with 
Region.SEPARATOR (#5049)
 add 18b1036  GEODE-8087: Fix Java binary compatibility errors reported by 
japicmp
 add 9d2ffc1  Revert "GEODE-7414_2: modify init() method argument (#5040)"
 add 7a09ede  GEODE-8087: delete debug println from japicmp (#5086)
 add 39c522e  GEODE-8016: publish with non-zero-padded build ids instead of 
SNAPSHOT (fixup) (#5087)
 add 1b4b60c  GEODE-7963: solution for faulty bucket metrics (#5000)
 add a0226d6  GEODE-8093: Declare parameter requirements for HSET and 
HSETNX (#5083)
 add 29b0b22  GEODE-8082: Refactor GeodeRedisServer (#5080)
 add 92b2bc7  GEODE-8070: rework handling of "any" in SSLUtils (#5075)
 add a5c8548  GEODE-7702: the removeAll from NORMAL should not be changed 
to use RemoteDestroyMessage like putAll (#5091)
 add 4c5788d  GEODE-8103: Renames SniSocketFactory to SniProxySocketFactory 
(#5092)
 add 79c9dd4  GEODE-8091: fix AuthenticationRequiredException when starting 
a locat… (#5071)
 add 19b900f  GEODE-8097: expects at least one callback instead of exactly 
one. (#5093)
 add 7ed7caf  GEODE-8107: Sort GCE instances by creationTimestamp for 
concourse (#5094)
 add 904a08a  GEODE-8090: implement function/delta for redis Hash ops 
(#5085)
 add 15df6a8  GEODE-8091: fix AuthenticationRequiredException when starting 
a locator (#5098)
 add 9e90aee  GEODE-8111: Fix create gw receiver --manual-start doc (#5097)
 add 5088854  GEODE-8113: change getMap to never return null (#5101)
 add 8a51ce2  GEODE-8098: Refactor CommandFunction (#5082)
 add a798009  GEODE-8120: Make GeodeRedisServer internal (#5107)
 add 5a74a33  GEODE-8124: Fix the error logging to display stacktrace 
(#5109)
 add d402351  GEODE-8114: Refactor RedisSet and RedisHash (#5100)
 add cf063bf  GEODE-8123: Allow Redis to start on a random port (#5108)
 add 2842ce0  GEODE-8126: Add ExecutionException tests to 
ExecutorServiceRuleTest (#5113)
 add f057b5c  GEODE-8125: Extract AccessibleErrorCollector from 
SharedErrorCollector (#5112)
 new 7dba154  Mass-test-run branch, no windows or publication jobs
 new 7eaf4a5  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   (9ed138e)
\
 N -- N -- N   refs/heads/mass-test-run (7eaf4a5)

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:
 build.gradle   |   2 +-
 buildSrc/build.gradle  |   4 +
 .../japicmp/AllowMajorBreakingChanges.groovy}  |  41 ++--
 .../gradle/japicmp/ParentIsExperimental.groovy |  61 ++
 ci/resource-types/gce-instances-resource/check |   3 +-
 .../ClientServerSessionCacheJUnitTest.java |   5 +-
 .../session/catalina/DeltaSessionManager.java  |   6 +-
 geode-assembly/build.gradle|  82 +---
 .../rest/ListRegionManagementDunitTest.java|  18 +-
 .../integrationTest/resources/assembly_content.txt |   6 +-
 .../cli/CreateMappingCommandDUnitTest.java |  27 +--
 ...reateMappingCommandForProxyRegionDUnitTest.java |   9 +-
 .../cli/DescribeMappingCommandDUnitTest.java   |   9 +-
 .../cli/DestroyMappingCommandDunitTest.java

[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 7eaf4a5d520a1302df57b4fa41dc21f951224891
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 | 207 +--
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml 
b/ci/pipelines/meta/jinja.template.yml
index 83eccc4..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,176 +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))
-MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-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

[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 7eaf4a5d520a1302df57b4fa41dc21f951224891
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 | 207 +--
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml 
b/ci/pipelines/meta/jinja.template.yml
index 83eccc4..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,176 +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))
-MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-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

[geode] 01/02: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 7dba154e449a2fa7e5832cc7e8aede696a6d5c32
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 | 313 +---
 ci/pipelines/shared/jinja.variables.yml |  89 +---
 2 files changed, 7 insertions(+), 395 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index 0a10a59..43e4f97 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" or repository.branch.startswith("support/") %}
-  - 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" or repository.branch.startswith("support/") %}
-  - 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))/number
-- 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,18 +157,6 @@ 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 }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - 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}}
@@ -390,227 +302,6 @@ jobs:
   - name: instance-data
 timeout: 1h
 
-- name: UpdatePassingTokens
-  public

[geode] branch mass-test-run updated (9ed138e -> 7eaf4a5)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 9ed138e  Fixing a key.
 discard ba5a14e  removing merge issue.
 discard 1388712  remove meta-* jobs that we won't use for mass-test-run
 discard 5f659fe  Mass-test-run branch, no windows or publication jobs
 add 1292239  GEODE-8072: when region is destroyed in function, should 
throw correct exception (#5078)
 add 48d2ee5  GEODE-7702: bulkOp from accessor or NORMAL should sync with 
clear (#5012)
 add 960f33b  GEODE-7707: Tab completing '--url' on 'connect' gives two 
default values
 add 1a87e32  GEODE-7707: Align examples in doc and code
 add 15cb323  GEODE-7707: Tab completing '--url' on 'connect' gives two 
default values (#5061)
 add 8f0650e  GEODE-7864: Replace uses of hardcoded "/" with 
Region.SEPARATOR (#5049)
 add 18b1036  GEODE-8087: Fix Java binary compatibility errors reported by 
japicmp
 add 9d2ffc1  Revert "GEODE-7414_2: modify init() method argument (#5040)"
 add 7a09ede  GEODE-8087: delete debug println from japicmp (#5086)
 add 39c522e  GEODE-8016: publish with non-zero-padded build ids instead of 
SNAPSHOT (fixup) (#5087)
 add 1b4b60c  GEODE-7963: solution for faulty bucket metrics (#5000)
 add a0226d6  GEODE-8093: Declare parameter requirements for HSET and 
HSETNX (#5083)
 add 29b0b22  GEODE-8082: Refactor GeodeRedisServer (#5080)
 add 92b2bc7  GEODE-8070: rework handling of "any" in SSLUtils (#5075)
 add a5c8548  GEODE-7702: the removeAll from NORMAL should not be changed 
to use RemoteDestroyMessage like putAll (#5091)
 add 4c5788d  GEODE-8103: Renames SniSocketFactory to SniProxySocketFactory 
(#5092)
 add 79c9dd4  GEODE-8091: fix AuthenticationRequiredException when starting 
a locat… (#5071)
 add 19b900f  GEODE-8097: expects at least one callback instead of exactly 
one. (#5093)
 add 7ed7caf  GEODE-8107: Sort GCE instances by creationTimestamp for 
concourse (#5094)
 add 904a08a  GEODE-8090: implement function/delta for redis Hash ops 
(#5085)
 add 15df6a8  GEODE-8091: fix AuthenticationRequiredException when starting 
a locator (#5098)
 add 9e90aee  GEODE-8111: Fix create gw receiver --manual-start doc (#5097)
 add 5088854  GEODE-8113: change getMap to never return null (#5101)
 add 8a51ce2  GEODE-8098: Refactor CommandFunction (#5082)
 add a798009  GEODE-8120: Make GeodeRedisServer internal (#5107)
 add 5a74a33  GEODE-8124: Fix the error logging to display stacktrace 
(#5109)
 add d402351  GEODE-8114: Refactor RedisSet and RedisHash (#5100)
 add cf063bf  GEODE-8123: Allow Redis to start on a random port (#5108)
 add 2842ce0  GEODE-8126: Add ExecutionException tests to 
ExecutorServiceRuleTest (#5113)
 add f057b5c  GEODE-8125: Extract AccessibleErrorCollector from 
SharedErrorCollector (#5112)
 new 7dba154  Mass-test-run branch, no windows or publication jobs
 new 7eaf4a5  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   (9ed138e)
\
 N -- N -- N   refs/heads/mass-test-run (7eaf4a5)

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:
 build.gradle   |   2 +-
 buildSrc/build.gradle  |   4 +
 .../japicmp/AllowMajorBreakingChanges.groovy}  |  41 ++--
 .../gradle/japicmp/ParentIsExperimental.groovy |  61 ++
 ci/resource-types/gce-instances-resource/check |   3 +-
 .../ClientServerSessionCacheJUnitTest.java |   5 +-
 .../session/catalina/DeltaSessionManager.java  |   6 +-
 geode-assembly/build.gradle|  82 +---
 .../rest/ListRegionManagementDunitTest.java|  18 +-
 .../integrationTest/resources/assembly_content.txt |   6 +-
 .../cli/CreateMappingCommandDUnitTest.java |  27 +--
 ...reateMappingCommandForProxyRegionDUnitTest.java |   9 +-
 .../cli/DescribeMappingCommandDUnitTest.java   |   9 +-
 .../cli/DestroyMappingCommandDunitTest.java

[geode] 02/03: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 1388712e044f0c9e81bdf086dd002649256a806d
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 | 207 +--
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml 
b/ci/pipelines/meta/jinja.template.yml
index 83eccc4..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,176 +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))
-MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-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

[geode] 01/03: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 5f659fea62ac214af6d76f379383e9e11a00cfd6
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 | 308 +---
 ci/pipelines/shared/jinja.variables.yml |  89 +---
 2 files changed, 13 insertions(+), 384 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index 06c667c..e4b65b0 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" or repository.branch.startswith("support/") %}
-  - 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" or repository.branch.startswith("support/") %}
-  - 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:
@@ -186,13 +121,8 @@ resources:
 driver: gcs
 initial_version: {{ metadata.initial_version }}
 json_key: ((!concourse-gcp-key))
-key: semvers/((pipeline-prefix))((geode-build-branch))/number
-- 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
+key: semvers/((pipeline-prefix))((geode-build-branch))/version
+
 - 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,6 +157,7 @@ resource_types:
   source:
 repository: frodenas/gcs-resource
 jobs:
+<<<<<<< HEAD
 {% for semverPiece in ['major', 'minor', 'patch'] -%}
 - name: Bump{{ semverPiece.title() }}
   serial: true
@@ -245,6 +170,10 @@ jobs:
 params:
   file: geode-build-version/number
 {% endfor %}
+===
+
+
+>>>>>>> Mass-test-run branch, no windows or publication jobs
 - name: {{build_test.name}}
   public: true
   max_in_flight: {{build_test.MAX_IN_FLIGHT}}
@@ -390,227 +319,6 @@ jobs:
   - name: instance-data
 timeout: 1

[geode] branch mass-test-run updated (d0e9b0c -> ba5a14e)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard d0e9b0c  removing merge issue.
 discard fbc7812  remove meta-* jobs that we won't use for mass-test-run
 discard a9a7ee2  Mass-test-run branch, no windows or publication jobs
 add 0e8c937  GEODE-8021: CI Failure: CloseConnectionTest. 
sharedSenderShouldRecoverFromClosedSocket (#5008)
 add dd695c4  GEODE-8032: Reclassify tests as integration tests (#5011)
 add 466a19c  GEODE-8033 - Create geode-module sub-project and 
ModuleService interface. (#5020)
 add 134ae31  GEODE-8047: Split SetsIntegrationTest into multiple files 
(#4984)
 add 694cb4c  GEODE-8044 - Renamed geode-module to geode-common-services. 
(#5024)
 add c3394e4  GEODE-8050: Ensure tests cleanup consistently to allow 
running them all within one JVM instance (#5025)
 add 560d311  GEODE-8052: DRY the 'dependentProjectNames' and 
'geodeArchives' values (#5028)
 add 3c66f2c  GEODE-8048: change redis sets to use functions and deltas 
(#5009)
 add 744b5ed  Revert "GEODE-8020: buffer corruption in SSL communications 
(#4994)" (#5027)
 add 7c2ca9e  GEODE-8051: Create multi-node concurrency (distributed) tests 
for HSET and HMSET (#5026)
 add 2a56c97  GEODE:8042- Create Integrated Distributed/HA test for Redis 
Module/Spring Session (#5022)
 add 653a1bc  GEODE-8060: Ignore flaky GemFireCacheImplCloseTest test 
(#5038)
 add af73331  GEODE-7954: restore redundancy and status redundancy gfsh 
commands
 add 4426e06  Addressing review comments
 add 5627cfd  Fix LGTM alerts
 add 0732fef  Applying review feedback
 add 84387ce  GEODE-7954: restore redundancy and status redundancy gfsh 
commands (#5004)
 add a820c59  GEODE-7955: Docs for redundancy internal API and redundancy 
commands (#5005)
 add 0e2c276  GEODE-8055: create index command should work on sub regions 
(#5034)
 add 95f0a93  GEODE-8059: replace multiple redis set functions with one 
CommandFunction (#5035)
 add 02839ea  roll develop to 1.14 now that support/1.13 has been created 
(#5044)
 add be8ac49  GEODE-8029: Delete orphaned drf files (#5037)
 add 7ee1042  GEODE-8039: update incorrect versions in LICENSE (#5018)
 add 536910a  GEODE-8072: check the null and stop the on-going query 
function when … (#5053)
 add 5f9800b  GEODE-7414_2: modify init() method argument (#5040)
 add d8e86cb  GEODE-8071: Use daemon threads in RebalanceCommand (#5054)
 add 643c617  GEODE-8073: Fix NPE after FetchKeysMessage failed. (#5055)
 add 76d5e42  Reformat README file (#5060)
 add 0ef8c5f  GEODE-8068 - Revert GEODE-8044 and GEODE-8033. (#5045)
 add 9e957f1  GEODE-8060: Fix flakiness in GemFireCacheImplCloseTest (#5041)
 add 0db6066  GEODE-8054: Refactor Sadd and Srem DUnit tests to use 
ConcurrentLoopingThreads class (#5052)
 add 3963431  [GEODE-8083] Add API Checking to Geode. (#5066)
 add 7375c59  GEODE-8020: buffer management problems (#5048)
 add da38d51  GEODE-8076: simplify redis concurrency code (#5019)
 add 639affb  GEODE-8084: Declare parameter requirements for redis commands 
(#5068)
 add be87788  GEODE-7565: Allow gateway receivers with same host and port 
(2nd try)
 add 17f9a23  Revert "GEODE-8029: Delete orphaned drf files (#5037)" (#5073)
 add 5542db5  GEODE-7998: Do not block Netty threads when publishing (#5042)
 add cf4c0ed  GEODE-8089: change redis set ops to use functions (#5058)
 add a4c8b9e  GEODE-8016: publish with non-zero-padded build ids instead of 
SNAPSHOT. (#5057)
 add 78a4fb9  GEODE-8079: Fix DistributedRegion Validations (#5070)
 add c2759ed  Revert "GEODE-8072: check the null and stop the on-going 
query function when … (#5053)" (#5077)
 add 757b1ec  GEODE-8058: Create Dunit tests for EXPIRE, PEXPIRE, EXPIREAT, 
and PEXPIREAT (#5036)
 add ed5e18b  GEODE-8088: Refactor dunit test locations (#5069)
 add a1d0c74  Geode 7812: Changes to PutAllClientServerDistributionTest 
(#5076)
 new 5f659fe  Mass-test-run branch, no windows or publication jobs
 new 1388712  remove meta-* jobs that we won't use for mass-test-run
 new ba5a14e  removing merge issue.

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   (d0e9b0c)
\
 N -- N -- N   refs/heads/mass-test-run (ba5a14e)

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 st

[geode] 03/03: removing merge issue.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit ba5a14e5c3072ca6f23444c58c48ad6d04b0bbaa
Author: Mark Hanson 
AuthorDate: Thu Apr 30 11:10:28 2020 -0700

removing merge issue.
---
 ci/pipelines/geode-build/jinja.template.yml | 17 -
 1 file changed, 17 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index e4b65b0..9ad9a08 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -157,23 +157,6 @@ resource_types:
   source:
 repository: frodenas/gcs-resource
 jobs:
-<<<<<<< HEAD
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-params: { bump: {{ semverPiece }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - put: geode-build-version
-params:
-  file: geode-build-version/number
-{% endfor %}
-===
-
-
->>>>>>> Mass-test-run branch, no windows or publication jobs
 - name: {{build_test.name}}
   public: true
   max_in_flight: {{build_test.MAX_IN_FLIGHT}}

[geode] 02/03: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 1388712e044f0c9e81bdf086dd002649256a806d
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 | 207 +--
 1 file changed, 1 insertion(+), 206 deletions(-)

diff --git a/ci/pipelines/meta/jinja.template.yml 
b/ci/pipelines/meta/jinja.template.yml
index 83eccc4..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,176 +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))
-MAVEN_SNAPSHOT_BUCKET: ((maven-snapshot-bucket))
-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

[geode] branch mass-test-run updated (d0e9b0c -> ba5a14e)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard d0e9b0c  removing merge issue.
 discard fbc7812  remove meta-* jobs that we won't use for mass-test-run
 discard a9a7ee2  Mass-test-run branch, no windows or publication jobs
 add 0e8c937  GEODE-8021: CI Failure: CloseConnectionTest. 
sharedSenderShouldRecoverFromClosedSocket (#5008)
 add dd695c4  GEODE-8032: Reclassify tests as integration tests (#5011)
 add 466a19c  GEODE-8033 - Create geode-module sub-project and 
ModuleService interface. (#5020)
 add 134ae31  GEODE-8047: Split SetsIntegrationTest into multiple files 
(#4984)
 add 694cb4c  GEODE-8044 - Renamed geode-module to geode-common-services. 
(#5024)
 add c3394e4  GEODE-8050: Ensure tests cleanup consistently to allow 
running them all within one JVM instance (#5025)
 add 560d311  GEODE-8052: DRY the 'dependentProjectNames' and 
'geodeArchives' values (#5028)
 add 3c66f2c  GEODE-8048: change redis sets to use functions and deltas 
(#5009)
 add 744b5ed  Revert "GEODE-8020: buffer corruption in SSL communications 
(#4994)" (#5027)
 add 7c2ca9e  GEODE-8051: Create multi-node concurrency (distributed) tests 
for HSET and HMSET (#5026)
 add 2a56c97  GEODE:8042- Create Integrated Distributed/HA test for Redis 
Module/Spring Session (#5022)
 add 653a1bc  GEODE-8060: Ignore flaky GemFireCacheImplCloseTest test 
(#5038)
 add af73331  GEODE-7954: restore redundancy and status redundancy gfsh 
commands
 add 4426e06  Addressing review comments
 add 5627cfd  Fix LGTM alerts
 add 0732fef  Applying review feedback
 add 84387ce  GEODE-7954: restore redundancy and status redundancy gfsh 
commands (#5004)
 add a820c59  GEODE-7955: Docs for redundancy internal API and redundancy 
commands (#5005)
 add 0e2c276  GEODE-8055: create index command should work on sub regions 
(#5034)
 add 95f0a93  GEODE-8059: replace multiple redis set functions with one 
CommandFunction (#5035)
 add 02839ea  roll develop to 1.14 now that support/1.13 has been created 
(#5044)
 add be8ac49  GEODE-8029: Delete orphaned drf files (#5037)
 add 7ee1042  GEODE-8039: update incorrect versions in LICENSE (#5018)
 add 536910a  GEODE-8072: check the null and stop the on-going query 
function when … (#5053)
 add 5f9800b  GEODE-7414_2: modify init() method argument (#5040)
 add d8e86cb  GEODE-8071: Use daemon threads in RebalanceCommand (#5054)
 add 643c617  GEODE-8073: Fix NPE after FetchKeysMessage failed. (#5055)
 add 76d5e42  Reformat README file (#5060)
 add 0ef8c5f  GEODE-8068 - Revert GEODE-8044 and GEODE-8033. (#5045)
 add 9e957f1  GEODE-8060: Fix flakiness in GemFireCacheImplCloseTest (#5041)
 add 0db6066  GEODE-8054: Refactor Sadd and Srem DUnit tests to use 
ConcurrentLoopingThreads class (#5052)
 add 3963431  [GEODE-8083] Add API Checking to Geode. (#5066)
 add 7375c59  GEODE-8020: buffer management problems (#5048)
 add da38d51  GEODE-8076: simplify redis concurrency code (#5019)
 add 639affb  GEODE-8084: Declare parameter requirements for redis commands 
(#5068)
 add be87788  GEODE-7565: Allow gateway receivers with same host and port 
(2nd try)
 add 17f9a23  Revert "GEODE-8029: Delete orphaned drf files (#5037)" (#5073)
 add 5542db5  GEODE-7998: Do not block Netty threads when publishing (#5042)
 add cf4c0ed  GEODE-8089: change redis set ops to use functions (#5058)
 add a4c8b9e  GEODE-8016: publish with non-zero-padded build ids instead of 
SNAPSHOT. (#5057)
 add 78a4fb9  GEODE-8079: Fix DistributedRegion Validations (#5070)
 add c2759ed  Revert "GEODE-8072: check the null and stop the on-going 
query function when … (#5053)" (#5077)
 add 757b1ec  GEODE-8058: Create Dunit tests for EXPIRE, PEXPIRE, EXPIREAT, 
and PEXPIREAT (#5036)
 add ed5e18b  GEODE-8088: Refactor dunit test locations (#5069)
 add a1d0c74  Geode 7812: Changes to PutAllClientServerDistributionTest 
(#5076)
 new 5f659fe  Mass-test-run branch, no windows or publication jobs
 new 1388712  remove meta-* jobs that we won't use for mass-test-run
 new ba5a14e  removing merge issue.

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   (d0e9b0c)
\
 N -- N -- N   refs/heads/mass-test-run (ba5a14e)

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 st

[geode] 03/03: removing merge issue.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit ba5a14e5c3072ca6f23444c58c48ad6d04b0bbaa
Author: Mark Hanson 
AuthorDate: Thu Apr 30 11:10:28 2020 -0700

removing merge issue.
---
 ci/pipelines/geode-build/jinja.template.yml | 17 -
 1 file changed, 17 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index e4b65b0..9ad9a08 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -157,23 +157,6 @@ resource_types:
   source:
 repository: frodenas/gcs-resource
 jobs:
-<<<<<<< HEAD
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-params: { bump: {{ semverPiece }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - put: geode-build-version
-params:
-  file: geode-build-version/number
-{% endfor %}
-===
-
-
->>>>>>> Mass-test-run branch, no windows or publication jobs
 - name: {{build_test.name}}
   public: true
   max_in_flight: {{build_test.MAX_IN_FLIGHT}}

[geode] 01/03: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 5f659fea62ac214af6d76f379383e9e11a00cfd6
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 | 308 +---
 ci/pipelines/shared/jinja.variables.yml |  89 +---
 2 files changed, 13 insertions(+), 384 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index 06c667c..e4b65b0 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" or repository.branch.startswith("support/") %}
-  - 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" or repository.branch.startswith("support/") %}
-  - 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:
@@ -186,13 +121,8 @@ resources:
 driver: gcs
 initial_version: {{ metadata.initial_version }}
 json_key: ((!concourse-gcp-key))
-key: semvers/((pipeline-prefix))((geode-build-branch))/number
-- 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
+key: semvers/((pipeline-prefix))((geode-build-branch))/version
+
 - 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,6 +157,7 @@ resource_types:
   source:
 repository: frodenas/gcs-resource
 jobs:
+<<<<<<< HEAD
 {% for semverPiece in ['major', 'minor', 'patch'] -%}
 - name: Bump{{ semverPiece.title() }}
   serial: true
@@ -245,6 +170,10 @@ jobs:
 params:
   file: geode-build-version/number
 {% endfor %}
+===
+
+
+>>>>>>> Mass-test-run branch, no windows or publication jobs
 - name: {{build_test.name}}
   public: true
   max_in_flight: {{build_test.MAX_IN_FLIGHT}}
@@ -390,227 +319,6 @@ jobs:
   - name: instance-data
 timeout: 1

[geode] branch develop updated (ed5e18b -> a1d0c74)

[mhanson]

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 ed5e18b  GEODE-8088: Refactor dunit test locations (#5069)
 add a1d0c74  Geode 7812: Changes to PutAllClientServerDistributionTest 
(#5076)

No new revisions were added by this update.

Summary of changes:
 .../client/internal/SingleHopClientExecutor.java   | 428 ++---
 .../cache/PutAllClientServerDistributedTest.java   | 342 
 2 files changed, 381 insertions(+), 389 deletions(-)

[geode] branch mass-test-run updated: removing merge issue.

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/mass-test-run by this push:
 new d0e9b0c  removing merge issue.
d0e9b0c is described below

commit d0e9b0ca8c9eb1cfba2457e48d28b4cdd7874b8c
Author: Mark Hanson 
AuthorDate: Thu Apr 30 11:10:28 2020 -0700

removing merge issue.
---
 ci/pipelines/geode-build/jinja.template.yml | 17 -
 1 file changed, 17 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index e4b65b0..9ad9a08 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -157,23 +157,6 @@ resource_types:
   source:
 repository: frodenas/gcs-resource
 jobs:
-<<<<<<< HEAD
-{% for semverPiece in ['major', 'minor', 'patch'] -%}
-- name: Bump{{ semverPiece.title() }}
-  serial: true
-  plan:
-  - get: geode-build-version
-params: { bump: {{ semverPiece }},
-  pre: ((semver-prerelease-token)),
-  pre_without_version: true }
-  - put: geode-build-version
-params:
-  file: geode-build-version/number
-{% endfor %}
-===
-
-
->>>>>>> Mass-test-run branch, no windows or publication jobs
 - name: {{build_test.name}}
   public: true
   max_in_flight: {{build_test.MAX_IN_FLIGHT}}

[geode] 02/02: remove meta-* jobs that we won't use for mass-test-run

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit fbc781251c6d3ebf9ed1495b5a12e4f9ffcd2f5c
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

[geode] 01/02: Mass-test-run branch, no windows or publication jobs

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a commit to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git

commit a9a7ee291ee3b07a3240bd21499ea4681adf9714
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 | 305 +---
 ci/pipelines/shared/jinja.variables.yml |  77 +--
 2 files changed, 13 insertions(+), 369 deletions(-)

diff --git a/ci/pipelines/geode-build/jinja.template.yml 
b/ci/pipelines/geode-build/jinja.template.yml
index 1d88496..e4b65b0 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" or repository.branch.startswith("support/") %}
-  - 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" or repository.branch.startswith("support/") %}
-  - 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:
@@ -186,13 +121,8 @@ resources:
 driver: gcs
 initial_version: {{ metadata.initial_version }}
 json_key: ((!concourse-gcp-key))
-key: semvers/((pipeline-prefix))((geode-build-branch))/number
-- 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
+key: semvers/((pipeline-prefix))((geode-build-branch))/version
+
 - 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,6 +157,7 @@ resource_types:
   source:
 repository: frodenas/gcs-resource
 jobs:
+<<<<<<< HEAD
 {% for semverPiece in ['major', 'minor', 'patch'] -%}
 - name: Bump{{ semverPiece.title() }}
   serial: true
@@ -245,6 +170,10 @@ jobs:
 params:
   file: geode-build-version/number
 {% endfor %}
+===
+
+
+>>>>>>> Mass-test-run branch, no windows or publication jobs
 - name: {{build_test.name}}
   public: true
   max_in_flight: {{build_test.MAX_IN_FLIGHT}}
@@ -390,224 +319,6 @@ jobs:
   - name: instance-data
 timeout: 1

[geode] branch mass-test-run updated (51a6897 -> fbc7812)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 51a6897  remove meta-* jobs that we won't use for mass-test-run
 discard a4d211d  Mass-test-run branch, no windows or publication jobs
 add 0a1701e  GEODE-7964: Upgrade Mockito to 3.3.3 (#4924)
 add 2999414  GEODE-7851: Pulse refreshes expired access tokens (#4977)
 add 0aae6cb  GEODE-8022: Fix windows image build via pinning. (#4993)
 add 326f228  GEODE-8023: add old version on support branch too (#4995)
 add 8e68aba  GEODE-8024: fix wan test to also work on support branches 
(#4997)
 add fad52b8  GEODE-8025: fix lucene test to not hang on support branches 
(#4999)
 add edcc077  GEODE-8026: release improvements (#5002)
 add 33ae60f  GEODE-7999: make support branches publish snapshots (#4996)
 add be81285  GEODE-8027: documentation script to attach swagger json 
(#5001)
 add ec8db54  GEODE-8020: buffer corruption in SSL communications (#4994)
 add 0f99185  GEODE-7953: Restore Redundancy Internal API (#4909)
 add ccc3f46  GEODE-7981: fix docs for redis PARTITION_REDUNDANT (#5003)
 add 9fad2c0  Revert "GEODE-7953: Restore Redundancy Internal API (#4909)" 
(#5006)
 add ee21019  GEODE-8031: Close lingering SocketCreatorFactory instances 
(#5007)
 add 6d35884  GEODE-7953: Restore Redundancy Internal API (#5010)
 add 5e0b25a  GEODE-7964: Fixup all tests touched for Mockito upgrade 
(#4986)
 add 3aa3659  GEODE 8014: delete redis sets and hashes when empty (#4989)
 add aa330f3  GEODE-8028: refactor RedisCommandType (#4998)
 add e7b0186  GEODE-6636: Create multiple buffer pools (#4234)
 add 35718a5  GEODE-8034: Create distributed tests for SREM command (#5013)
 add 1098fc2  GEODE-8038: Fix product name in docs (#5017)
 add c12e8cc  GEODE-7503: Block Cache.close() until everything is 
disconnected (#4963)
 new a9a7ee2  Mass-test-run branch, no windows or publication jobs
 new fbc7812  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   (51a6897)
\
 N -- N -- N   refs/heads/mass-test-run (fbc7812)

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|2 +-
 .../gradle/plugins/DependencyConstraints.groovy|2 +-
 ci/images/google-geode-builder/build_image.sh  |   63 -
 ci/images/google-geode-builder/packer.json |2 +-
 .../{windows-packer.json => packer.json}   |2 +-
 ci/pipelines/images/jinja.template.yml |   16 +-
 .../build_image.sh |   22 +-
 dev-tools/release/README.md|1 +
 dev-tools/release/commit_rc.sh |   11 +-
 dev-tools/release/create_support_branches.sh   |   60 +-
 dev-tools/release/deploy_rc_pipeline.sh|  129 +-
 dev-tools/release/prepare_rc.sh|   59 +-
 dev-tools/release/promote_rc.sh|   26 +-
 dev-tools/release/set_copyright.sh |   57 +
 dev-tools/release/set_versions.sh  |   98 +-
 .../integrationTest/resources/assembly_content.txt |5 +
 .../source/subnavs/geode-subnav.erb|2 +-
 .../geode/connectors/jdbc/JdbcAsyncWriterTest.java |4 +-
 .../geode/connectors/jdbc/JdbcWriterTest.java  |6 +-
 .../jdbc/internal/xml/ElementTypeTest.java |4 +-
 .../xml/JdbcConnectorServiceXmlParserTest.java |6 +-
 .../geode/ClusterCommunicationsDUnitTest.java  |   33 +-
 .../RestoreRedundancyOperationDUnitTest.java   |  347 +++
 ...butedSystemMXBeanWithAlertsDistributedTest.java |   10 +-
 .../client/internal/QueueManagerJUnitTest.java |  285 +-
 .../AvailableConnectionManagerConcurrentTest.java  |  152 +-
 .../pooling/ConnectionManagerJUnitTest.java| 1130 ---
 .../CacheDistributionAdvisorConcurrentTest.java|   63 +-
 .../cache/ha/HARegionQueueIntegrationTest.java |  460 ++-
 .../ControlFileWatchdogIn

[geode] branch mass-test-run updated (51a6897 -> fbc7812)

[mhanson]

This is an automated email from the ASF dual-hosted git repository.

mhanson pushed a change to branch mass-test-run
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 51a6897  remove meta-* jobs that we won't use for mass-test-run
 discard a4d211d  Mass-test-run branch, no windows or publication jobs
 add 0a1701e  GEODE-7964: Upgrade Mockito to 3.3.3 (#4924)
 add 2999414  GEODE-7851: Pulse refreshes expired access tokens (#4977)
 add 0aae6cb  GEODE-8022: Fix windows image build via pinning. (#4993)
 add 326f228  GEODE-8023: add old version on support branch too (#4995)
 add 8e68aba  GEODE-8024: fix wan test to also work on support branches 
(#4997)
 add fad52b8  GEODE-8025: fix lucene test to not hang on support branches 
(#4999)
 add edcc077  GEODE-8026: release improvements (#5002)
 add 33ae60f  GEODE-7999: make support branches publish snapshots (#4996)
 add be81285  GEODE-8027: documentation script to attach swagger json 
(#5001)
 add ec8db54  GEODE-8020: buffer corruption in SSL communications (#4994)
 add 0f99185  GEODE-7953: Restore Redundancy Internal API (#4909)
 add ccc3f46  GEODE-7981: fix docs for redis PARTITION_REDUNDANT (#5003)
 add 9fad2c0  Revert "GEODE-7953: Restore Redundancy Internal API (#4909)" 
(#5006)
 add ee21019  GEODE-8031: Close lingering SocketCreatorFactory instances 
(#5007)
 add 6d35884  GEODE-7953: Restore Redundancy Internal API (#5010)
 add 5e0b25a  GEODE-7964: Fixup all tests touched for Mockito upgrade 
(#4986)
 add 3aa3659  GEODE 8014: delete redis sets and hashes when empty (#4989)
 add aa330f3  GEODE-8028: refactor RedisCommandType (#4998)
 add e7b0186  GEODE-6636: Create multiple buffer pools (#4234)
 add 35718a5  GEODE-8034: Create distributed tests for SREM command (#5013)
 add 1098fc2  GEODE-8038: Fix product name in docs (#5017)
 add c12e8cc  GEODE-7503: Block Cache.close() until everything is 
disconnected (#4963)
 new a9a7ee2  Mass-test-run branch, no windows or publication jobs
 new fbc7812  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   (51a6897)
\
 N -- N -- N   refs/heads/mass-test-run (fbc7812)

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|2 +-
 .../gradle/plugins/DependencyConstraints.groovy|2 +-
 ci/images/google-geode-builder/build_image.sh  |   63 -
 ci/images/google-geode-builder/packer.json |2 +-
 .../{windows-packer.json => packer.json}   |2 +-
 ci/pipelines/images/jinja.template.yml |   16 +-
 .../build_image.sh |   22 +-
 dev-tools/release/README.md|1 +
 dev-tools/release/commit_rc.sh |   11 +-
 dev-tools/release/create_support_branches.sh   |   60 +-
 dev-tools/release/deploy_rc_pipeline.sh|  129 +-
 dev-tools/release/prepare_rc.sh|   59 +-
 dev-tools/release/promote_rc.sh|   26 +-
 dev-tools/release/set_copyright.sh |   57 +
 dev-tools/release/set_versions.sh  |   98 +-
 .../integrationTest/resources/assembly_content.txt |5 +
 .../source/subnavs/geode-subnav.erb|2 +-
 .../geode/connectors/jdbc/JdbcAsyncWriterTest.java |4 +-
 .../geode/connectors/jdbc/JdbcWriterTest.java  |6 +-
 .../jdbc/internal/xml/ElementTypeTest.java |4 +-
 .../xml/JdbcConnectorServiceXmlParserTest.java |6 +-
 .../geode/ClusterCommunicationsDUnitTest.java  |   33 +-
 .../RestoreRedundancyOperationDUnitTest.java   |  347 +++
 ...butedSystemMXBeanWithAlertsDistributedTest.java |   10 +-
 .../client/internal/QueueManagerJUnitTest.java |  285 +-
 .../AvailableConnectionManagerConcurrentTest.java  |  152 +-
 .../pooling/ConnectionManagerJUnitTest.java| 1130 ---
 .../CacheDistributionAdvisorConcurrentTest.java|   63 +-
 .../cache/ha/HARegionQueueIntegrationTest.java |  460 ++-
 .../ControlFileWatchdogIn