[geode] branch feature/GEODE-10279 created (now b617db87a9)

2022-05-04 Thread zhouxj
This is an automated email from the ASF dual-hosted git repository.

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


  at b617db87a9 GEODE-10279: Need to lock RVV and flush before backup

This branch includes the following new commits:

 new b617db87a9 GEODE-10279: Need to lock RVV and flush before backup

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




[geode] 01/01: GEODE-10279: Need to lock RVV and flush before backup

2022-05-04 Thread zhouxj
This is an automated email from the ASF dual-hosted git repository.

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

commit b617db87a97516972508504ffa5b662a83bd78a8
Author: zhouxh 
AuthorDate: Wed May 4 17:03:49 2022 -0700

GEODE-10279: Need to lock RVV and flush before backup
---
 .../apache/geode/internal/cache/DiskStoreImpl.java | 52 ++
 .../geode/internal/cache/backup/BackupTask.java| 13 --
 .../geode/internal/cache/backup/FlushToDisk.java   |  4 ++
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index 9dee1c1c77..44be93e885 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -87,6 +87,7 @@ import org.apache.geode.cache.DiskStoreFactory;
 import org.apache.geode.cache.RegionDestroyedException;
 import org.apache.geode.cache.persistence.PersistentID;
 import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.backup.BackupService;
@@ -1509,6 +1510,57 @@ public class DiskStoreImpl implements DiskStore {
 return cache;
   }
 
+  HashMap lockedRVVs = new HashMap<>();
+
+  public void unlockRVVForAllDiskRegions() {
+InternalDistributedMember myId = 
cache.getInternalDistributedSystem().getDistributedMember();
+Iterator> iterator =
+lockedRVVs.entrySet().iterator();
+boolean unlocked = false;
+while (iterator.hasNext()) {
+  Map.Entry entry = iterator.next();
+  LocalRegion lr = entry.getKey();
+  RegionVersionVector rvv = entry.getValue();
+  rvv.unlockForClear(myId);
+  iterator.remove();
+  if (logger.isDebugEnabled()) {
+logger.debug("Unlocked " + lr.getFullPath() + "'s RVV:" + rvv);
+  }
+  unlocked = true;
+}
+if (unlocked && logger.isDebugEnabled()) {
+  logger.debug("Unlocked RVVs for all disk regions of diskstore " + 
getName());
+}
+  }
+
+  public void lockRVVForAllDiskRegions() {
+Collection diskRegions = getDiskRegions();
+DistributionManager dm = cache.getDistributionManager();
+InternalDistributedMember myId = 
cache.getInternalDistributedSystem().getDistributedMember();
+boolean locked = false;
+try {
+  for (DiskRegion dr : diskRegions) {
+LocalRegion region = (LocalRegion) getCache().getRegion(dr.getName());
+if (region != null && region.getVersionVector() != null) {
+  RegionVersionVector rvv = region.getVersionVector();
+  lockedRVVs.put(region, rvv);
+  rvv.lockForClear(dr.getName(), dm, myId);
+  if (logger.isDebugEnabled()) {
+logger.debug("Locked " + dr.getName() + "'s RegionVersionVector");
+  }
+  locked = true;
+}
+  }
+  if (locked && logger.isDebugEnabled()) {
+logger.info("Locked RVVs for all disk regions of " + this.getName());
+  }
+} catch (Exception e) {
+  unlockRVVForAllDiskRegions();
+  logger.info("lockRVVForAllDiskRegionsAndFlush failed due to ", e);
+  throw e;
+}
+  }
+
   @Override
   public void flush() {
 forceFlush();
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/backup/BackupTask.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/backup/BackupTask.java
index 8124dee40d..0a42625cfb 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/backup/BackupTask.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/backup/BackupTask.java
@@ -104,8 +104,8 @@ class BackupTask {
   return new HashSet<>();
 }
 
+Collection diskStores = 
cache.listDiskStoresIncludingRegionOwned();
 try {
-  Collection diskStores = 
cache.listDiskStoresIncludingRegionOwned();
   temporaryFiles = TemporaryBackupFiles.create();
   fileCopier = new BackupFileCopier(cache,
   ClassPathLoader.getLatest().getJarDeploymentService(), 
temporaryFiles);
@@ -124,6 +124,9 @@ class BackupTask {
   }
   return persistentIds;
 } finally {
+  for (DiskStore ds : diskStores) {
+((DiskStoreImpl) ds).unlockRVVForAllDiskRegions();
+  }
   cleanup();
 }
   }
@@ -272,8 +275,12 @@ class BackupTask {
   backup = new DiskStoreBackup(allOplogs);
   backupByDiskStore.put(diskStore, backup);
 
-  fileCopier.copyDiskInitFile(diskStore);
-  diskStore.getPersistentOplogSet().forceRoll(null);
+  try {
+fileCopier.copyDiskInitFile(diskStore);
+

[geode] branch develop updated (b27d6a4e47 -> 8dabaab77e)

2022-05-04 Thread jinmeiliao
This is an automated email from the ASF dual-hosted git repository.

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


from b27d6a4e47 GEODE-10046: Bump 3rd-party dependency versions (#7650)
 add 8dabaab77e GEODE-9390: Guarding membership addition code paths to omit 
membership duplicates (#7639)

No new revisions were added by this update.

Summary of changes:
 .../MissingDiskStoreAcceptanceTest.java|  11 +-
 .../DistributionStatsNodesDistributedTest.java | 120 
 .../internal/ClusterDistributionManager.java   | 158 +++--
 3 files changed, 212 insertions(+), 77 deletions(-)
 create mode 100644 
geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/DistributionStatsNodesDistributedTest.java



[geode] branch develop updated (a81c884b85 -> b27d6a4e47)

2022-05-04 Thread onichols
This is an automated email from the ASF dual-hosted git repository.

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


from a81c884b85 GEODE-10275: Bump spring from 5.3.18 to 5.3.19 (#7647)
 add b27d6a4e47 GEODE-10046: Bump 3rd-party dependency versions (#7650)

No new revisions were added by this update.

Summary of changes:
 .../src/test/resources/expected-pom.xml| 36 +++---
 .../gradle/plugins/DependencyConstraints.groovy| 14 -
 .../integrationTest/resources/assembly_content.txt |  4 +--
 .../resources/gfsh_dependency_classpath.txt|  4 +--
 .../resources/dependency_classpath.txt |  4 +--
 5 files changed, 31 insertions(+), 31 deletions(-)



[geode] branch develop updated: GEODE-10275: Bump spring from 5.3.18 to 5.3.19 (#7647)

2022-05-04 Thread onichols
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/develop by this push:
 new a81c884b85 GEODE-10275: Bump spring from 5.3.18 to 5.3.19 (#7647)
a81c884b85 is described below

commit a81c884b85961878a631ebedebb0ab98dcbf5875
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Wed May 4 12:44:51 2022 -0700

GEODE-10275: Bump spring from 5.3.18 to 5.3.19 (#7647)

Geode endeavors to update to the latest version of 3rd-party
dependencies on develop wherever possible.
---
 .../src/test/resources/expected-pom.xml  | 20 ++--
 .../gradle/plugins/DependencyConstraints.groovy  |  2 +-
 .../integrationTest/resources/assembly_content.txt   | 10 +-
 .../resources/gfsh_dependency_classpath.txt  | 10 +-
 .../resources/dependency_classpath.txt   | 10 +-
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml 
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 5cd4e69d32..bc1c10e11f 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -685,52 +685,52 @@
   
 org.springframework
 spring-aspects
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-beans
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-context
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-core
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-expression
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-oxm
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-test
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-tx
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-web
-5.3.18
+5.3.19
   
   
 org.springframework
 spring-webmvc
-5.3.18
+5.3.19
   
   
 org.springframework.boot
diff --git 
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
 
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index a2f9bf747d..3634d43006 100644
--- 
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ 
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -48,7 +48,7 @@ class DependencyConstraints implements Plugin {
 deps.put("jackson.version", "2.13.2")
 deps.put("jackson.databind.version", "2.13.2.2")
 deps.put("springshell.version", "1.2.0.RELEASE")
-deps.put("springframework.version", "5.3.18")
+deps.put("springframework.version", "5.3.19")
 
 // These version numbers are used in testing various versions of tomcat 
and are consumed explicitly
 // in will be called explicitly in the relevant extensions module, and 
respective configurations
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt 
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 7e224c0bd2..0888195ad0 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1054,12 +1054,12 @@ lib/shiro-event-1.9.0.jar
 lib/shiro-lang-1.9.0.jar
 lib/slf4j-api-1.7.32.jar
 lib/snappy-0.4.jar
-lib/spring-beans-5.3.18.jar
-lib/spring-context-5.3.18.jar
-lib/spring-core-5.3.18.jar
-lib/spring-jcl-5.3.18.jar
+lib/spring-beans-5.3.19.jar
+lib/spring-context-5.3.19.jar
+lib/spring-core-5.3.19.jar
+lib/spring-jcl-5.3.19.jar
 lib/spring-shell-1.2.0.RELEASE.jar
-lib/spring-web-5.3.18.jar
+lib/spring-web-5.3.19.jar
 lib/swagger-annotations-1.6.6.jar
 tools/Extensions/geode-web-0.0.0.war
 tools/Extensions/geode-web-api-0.0.0.war
diff --git 
a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt 
b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
index 05ca42cfb4..73e0769a95 100644
--- a/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/gfsh_dependency_classpath.txt
@@ -18,7 +18,7 @@ geode-common-0.0.0.jar
 geode-unsafe-0.0.0.jar
 geode-deployment-legacy-0.0.0.jar
 spring-shell-1.2.0.RELEASE.jar
-spring-web-5.3.18.jar
+spring-web-5.3.19.jar
 commons-lang3-3.12.0.jar
 rmiio-2.1.2.jar
 jackson-annotations-2.13.2.jar
@@ -31,8 +31,8 @@ log4j-core-2.17.2.jar
 log4j-jcl-2.17.2.jar
 log4j-jul-2.17.2.jar
 log4j-api-2.17.2.jar

[geode] branch revert-7381-newfeature1/GEODE-9484 created (now 758ef27045)

2022-05-04 Thread mivanac
This is an automated email from the ASF dual-hosted git repository.

mivanac pushed a change to branch revert-7381-newfeature1/GEODE-9484
in repository https://gitbox.apache.org/repos/asf/geode.git


  at 758ef27045 Revert "GEODE-9484: Improve sending message to multy 
destinations (#7381)"

This branch includes the following new commits:

 new 758ef27045 Revert "GEODE-9484: Improve sending message to multy 
destinations (#7381)"

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




[geode] 01/01: Revert "GEODE-9484: Improve sending message to multy destinations (#7381)"

2022-05-04 Thread mivanac
This is an automated email from the ASF dual-hosted git repository.

mivanac pushed a commit to branch revert-7381-newfeature1/GEODE-9484
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 758ef27045019cbe5654aed42b52898cc41ceaa8
Author: Mario Ivanac <48509724+miva...@users.noreply.github.com>
AuthorDate: Wed May 4 21:02:16 2022 +0200

Revert "GEODE-9484: Improve sending message to multy destinations (#7381)"

This reverts commit 62cd12c7f0bbb3d092011555e714e57ce041791a.
---
 ...edTest.java => UpdatePropagationDUnitTest.java} | 109 +++
 ...Test.java => UpdatePropagationPRDUnitTest.java} |   2 +-
 .../geode/internal/tcp/CloseConnectionTest.java|   2 +-
 .../geode/internal/tcp/TCPConduitDUnitTest.java|   2 +-
 .../distributed/internal/direct/DirectChannel.java |  44 +++-
 .../org/apache/geode/internal/tcp/Connection.java  |   6 +-
 .../apache/geode/internal/tcp/ConnectionTable.java |  30 ++
 .../org/apache/geode/internal/tcp/TCPConduit.java  | 117 +++--
 .../internal/tcp/ConnectionTransmissionTest.java   |   2 +-
 .../apache/geode/internal/tcp/TCPConduitTest.java  |  74 +++--
 10 files changed, 68 insertions(+), 320 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
similarity index 78%
rename from 
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDistributedTest.java
rename to 
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index 58de5b4762..0b99a144e5 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDistributedTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -20,7 +20,6 @@ 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.apache.geode.test.awaitility.GeodeAwaitility.await;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -51,8 +50,6 @@ import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.cache.util.CacheListenerAdapter;
 import org.apache.geode.cache30.CacheSerializableRunnable;
 import org.apache.geode.distributed.internal.ServerLocationAndMemberId;
-import 
org.apache.geode.distributed.internal.membership.api.MembershipManagerHelper;
-import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.dunit.NetworkUtils;
@@ -71,76 +68,45 @@ import org.apache.geode.util.internal.GeodeGlossary;
  * the same across servers
  */
 @Category({ClientSubscriptionTest.class})
-public class UpdatePropagationDistributedTest extends JUnit4CacheTestCase {
+public class UpdatePropagationDUnitTest extends JUnit4CacheTestCase {
 
   private static final String REGION_NAME = 
"UpdatePropagationDUnitTest_region";
 
   private VM server1 = null;
   private VM server2 = null;
-  private VM server3 = null;
   private VM client1 = null;
   private VM client2 = null;
 
   private int PORT1;
   private int PORT2;
-  private int PORT3;
-
-  private final int minNumEntries = 2;
-
-  private String hostnameServer1;
-  private String hostnameServer3;
 
   @Override
   public final void postSetUp() throws Exception {
 disconnectAllFromDS();
 
 final Host host = Host.getHost(0);
-
+// Server1 VM
 server1 = host.getVM(0);
 
+// Server2 VM
 server2 = host.getVM(1);
 
-server3 = host.getVM(2);
-
-client1 = host.getVM(3);
-
-client2 = host.getVM(4);
+// Client 1 VM
+client1 = host.getVM(2);
 
-PORT1 = server1.invoke(() -> createServerCache());
-PORT2 = server2.invoke(() -> createServerCache());
-PORT3 = server3.invoke(() -> createServerCache());
+// client 2 VM
+client2 = host.getVM(3);
 
-hostnameServer1 = NetworkUtils.getServerHostName(server1.getHost());
-hostnameServer3 = NetworkUtils.getServerHostName(server3.getHost());
-
-IgnoredException.addIgnoredException("java.net.SocketException");
-IgnoredException.addIgnoredException("Unexpected IOException");
-  }
+PORT1 = server1.invoke(this::createServerCache);
+PORT2 = server2.invoke(this::createServerCache);
 
-
-
-  @Test
-  public void updatesArePropagatedToAllMembersWhenOneKilled() throws Exception 
{
 client1.invoke(
-() -> createClientCache(hostnameServer1, PORT1));
+() -> 

[geode-native] branch develop updated: GEMNC-509: Rename .NET client to .NET Framework (#965)

2022-05-04 Thread bbender
This is an automated email from the ASF dual-hosted git repository.

bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
 new 4d0578a82 GEMNC-509: Rename .NET client to .NET Framework (#965)
4d0578a82 is described below

commit 4d0578a829ee4d967ec4358133e4a8c3563f1310
Author: Blake Bender 
AuthorDate: Wed May 4 08:04:08 2022 -0700

GEMNC-509: Rename .NET client to .NET Framework (#965)

Co-authored-by: Max Hufnagel 
---
 docs/geode-native-docs-cpp/about-client-users-guide.html.md.erb | 4 ++--
 docs/geode-native-docs-cpp/client-cache-ref.html.md.erb | 2 +-
 docs/geode-native-docs-cpp/continuous-queries.html.md.erb   | 6 +++---
 docs/geode-native-docs-cpp/function-execution.html.md.erb   | 2 +-
 .../cpp-serialization/pdxserializable-interface.html.md.erb | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/geode-native-docs-cpp/about-client-users-guide.html.md.erb 
b/docs/geode-native-docs-cpp/about-client-users-guide.html.md.erb
index b7876abf9..6f9511f27 100644
--- a/docs/geode-native-docs-cpp/about-client-users-guide.html.md.erb
+++ b/docs/geode-native-docs-cpp/about-client-users-guide.html.md.erb
@@ -21,12 +21,12 @@ This documentation describes the Apache Geode Native Client 
version <%=vars.prod
 Source files are available from the [Apache Geode-Native Github 
repository](https://github.com/apache/geode-native) 
 and instructions on how to build this documentation are available in the 
project README file found at that location.
 
-The Apache Geode Native Client is a library that provides access for C++ and 
Microsoft® .NET™ clients to an Apache Geode cluster.
+The Apache Geode Native Client is a library that provides access for C++ and 
Microsoft® .NET™ Framework clients to an Apache Geode cluster.
 
 See the API docs for API details:
 
   - [C++ API docs](/<%=vars.cppapiref_version%>/hierarchy.html)
-  - [.NET API docs](/<%=vars.dotnetapiref_version%>/hierarchy.html)
+  - [.NET Framework API docs](/<%=vars.dotnetapiref_version%>/hierarchy.html)
 
 See the [_<%=vars.product_name_long%> User 
Guide_](<%=vars.serverman%>/about_<%=vars.product_name.downcase%>.html) for 
information regarding the server.
 
diff --git a/docs/geode-native-docs-cpp/client-cache-ref.html.md.erb 
b/docs/geode-native-docs-cpp/client-cache-ref.html.md.erb
index 250caad4e..aebd70dcd 100644
--- a/docs/geode-native-docs-cpp/client-cache-ref.html.md.erb
+++ b/docs/geode-native-docs-cpp/client-cache-ref.html.md.erb
@@ -41,7 +41,7 @@ specified in the XML file.
 
 The declarative XML file is used to externalize the configuration of the 
client cache.
 The contents of the XML file correspond to APIs found in 
the`apache::geode::client` package for C++ applications,
-and the `Apache::Geode::Client` package for .NET applications.
+and the `Apache::Geode::Client` package for .NET Framework applications.
 
 Elements are defined in the Client Cache XSD file, named `cpp-cache-1.0.xsd`, 
which you can find in
 your native client distribution in the `xsds` directory, and online at
diff --git a/docs/geode-native-docs-cpp/continuous-queries.html.md.erb 
b/docs/geode-native-docs-cpp/continuous-queries.html.md.erb
index 6d01d8db6..8b7549d60 100644
--- a/docs/geode-native-docs-cpp/continuous-queries.html.md.erb
+++ b/docs/geode-native-docs-cpp/continuous-queries.html.md.erb
@@ -19,9 +19,9 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 
-The C++ and .NET clients can initiate queries that run on the 
<%=vars.product_name%> cache server
-and notify the client when the query results have changed.  For details on the 
server-side setup for
-continuous queries, see [How Continuous Querying 
Works](<%=vars.serverman%>/developing/continuous_querying/how_continuous_querying_works.html)
 
+The C++ and .NET Framework clients can initiate queries that run on the 
<%=vars.product_name%>
+cache server and notify the client when the query results have changed.  For 
details on the
+server-side setup for continuous queries, see [How Continuous Querying 
Works](<%=vars.serverman%>/developing/continuous_querying/how_continuous_querying_works.html)
 in the *<%=vars.product_name%> User Guide*.
 
 ## Continuous Query Basics
diff --git a/docs/geode-native-docs-cpp/function-execution.html.md.erb 
b/docs/geode-native-docs-cpp/function-execution.html.md.erb
index bf01b17d8..acf3fb82c 100644
--- a/docs/geode-native-docs-cpp/function-execution.html.md.erb
+++ b/docs/geode-native-docs-cpp/function-execution.html.md.erb
@@ -97,7 +97,7 @@ The client:
 - invokes the object's execute method to invoke the server-side function
 
 If the client expects results, it must create a result object.
-The .NET example uses a built-in result collector 
(`IResultCollector.getResults()`) to retrieve the function results.
+The 

[geode] branch develop updated: GEODE-10215: Document warning for parallel gws (#7623)

2022-05-04 Thread dbarnes
This is an automated email from the ASF dual-hosted git repository.

dbarnes 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 ff9b3be5e3 GEODE-10215: Document warning for parallel gws (#7623)
ff9b3be5e3 is described below

commit ff9b3be5e3a11ac227856065f1a602b2c72a5229
Author: Jakov Varenina <62134331+jvaren...@users.noreply.github.com>
AuthorDate: Wed May 4 16:58:46 2022 +0200

GEODE-10215: Document warning for parallel gws (#7623)
---
 geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb 
b/geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb
index 194581c4e0..882b65a59e 100644
--- a/geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/command-pages/destroy.html.md.erb
@@ -200,6 +200,8 @@ similar to:
 ``` pre
 gfsh>alter region --name=regionA --gateway-sender-id=""
 ```
+**Note:** Do not reuse the removed parallel gateway-sender in the new region 
unless that region
+is colocated with the previously attached region, as that will lead to data 
replication issues.
 
 **Availability:** Online. You must be connected in `gfsh` to a JMX Manager 
member to use this command.