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

2021-03-02 Thread udo
This is an automated email from the ASF dual-hosted git repository.

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


from dcb1096  GEODE-8886 fix (#6059)
 add f2636e0  Revert "GEODE-8905: Introduce JarDeploymentService (#5989)" 
(#6078)

No new revisions were added by this update.

Summary of changes:
 .../src/test/resources/expected-pom.xml|  38 +-
 .../gradle/plugins/DependencyConstraints.groovy|   5 +-
 extensions/geode-modules-session/build.gradle  |   2 -
 extensions/geode-modules/build.gradle  |   3 +-
 .../src/test/resources/expected-pom.xml|  11 +-
 extensions/session-testing-war/build.gradle|   1 -
 .../apache/geode/session/tests/TomcatInstall.java  |  10 +-
 .../geode/modules/DeployJarAcceptanceTest.java | 261 
 .../example/test/function/ExampleFunction.java |  37 --
 .../example/test/function/PojoFunction.java|  40 --
 .../resources/example/test/pojo/ExamplePojo.java   |  50 ---
 .../internal/rest/DeployToMultiGroupDUnitTest.java |   9 +-
 .../rest/DeploymentManagementDUnitTest.java|  22 +-
 .../rest/DeploymentManagementRedployDUnitTest.java |   7 +-
 .../DeploymentSemanticVersionJarDUnitTest.java |  13 +-
 .../integrationTest/resources/assembly_content.txt |  22 +-
 .../resources/dependency_classpath.txt |   5 +-
 .../cli/CreateDataSourceCommandDUnitTest.java  |   1 +
 .../CreateMappingPreconditionCheckFunction.java|   2 +-
 .../internal/cli/DeregisterDriverFunction.java |   8 +-
 .../cli/FunctionContextArgumentProvider.java   |   4 +-
 .../jdbc/internal/cli/ListDriversFunction.java |   6 +-
 .../jdbc/internal/cli/RegisterDriverFunction.java  |   8 +-
 .../ConnectorsDistributedSystemService.java|   1 -
 .../cli/ConnectionsCommandManagerTest.java |   2 +-
 .../internal/cli/DeregisterDriverFunctionTest.java |   6 +-
 .../jdbc/internal/cli/ListDriversFunctionTest.java |   6 +-
 .../internal/cli/RegisterDriverFunctionTest.java   |   6 +-
 geode-core/build.gradle|   2 -
 .../mock/AlterMockCacheExtensionFunction.java  |   4 +-
 .../mock/AlterMockRegionExtensionFunction.java |   4 +-
 .../mock/CreateMockCacheExtensionFunction.java |   4 +-
 .../mock/CreateMockRegionExtensionFunction.java|   4 +-
 .../mock/DestroyMockCacheExtensionFunction.java|   4 +-
 .../mock/DestroyMockRegionExtensionFunction.java   |   4 +-
 .../ClusterConfigDeployJarDUnitTest.java   |  48 +--
 ...rConfigServerRestartWithJarDeployDUnitTest.java |   2 +-
 .../FunctionToFileTrackerIntegrationTest.java  | 150 ---
 .../ClassPathLoaderDeployTest.java |  18 +-
 .../ClassPathLoaderIntegrationTest.java|  83 ++--
 .../ClassPathLoaderJUnitTest.java  | 167 +++-
 .../apache/geode/internal}/DeployedJarTest.java|   2 +-
 .../geode/internal}/JarDeployerDeadlockTest.java   |  24 +-
 .../geode/internal}/JarDeployerFileTest.java   | 110 +++--
 .../internal}/JarDeployerIntegrationTest.java  |  95 ++---
 .../backup/BackupFileCopierIntegrationTest.java|  61 +--
 .../backup/IncrementalBackupIntegrationTest.java   |  22 +-
 .../apache/geode/codeAnalysis/excludedClasses.txt  |   4 +-
 .../admin/internal/ManagedEntityConfigXml.java |   2 +-
 .../internal/ManagedEntityControllerFactory.java   |   2 +-
 .../internal/AdminDistributedSystemJmxImpl.java|  10 +-
 .../geode/admin/jmx/internal/AgentConfigImpl.java  |   2 +-
 .../apache/geode/admin/jmx/internal/AgentImpl.java |  20 +-
 .../admin/jmx/internal/CacheServerJmxImpl.java |  18 +-
 .../internal/ConfigurationParameterJmxImpl.java|   6 +-
 .../DistributedSystemHealthConfigJmxImpl.java  |   5 +-
 .../jmx/internal/DistributionLocatorJmxImpl.java   |   4 +-
 .../jmx/internal/GemFireHealthConfigJmxImpl.java   |   7 +-
 .../admin/jmx/internal/GemFireHealthJmxImpl.java   |  10 +-
 .../admin/jmx/internal/GenerateMBeanHTML.java  |   2 +-
 .../internal/{MBeanUtils.java => MBeanUtil.java}   |  26 +-
 .../jmx/internal/MemberInfoWithStatsMBean.java |   4 +-
 .../jmx/internal/StatisticResourceJmxImpl.java |  12 +-
 .../internal/SystemMemberBridgeServerJmxImpl.java  |   6 +-
 .../jmx/internal/SystemMemberCacheJmxImpl.java |  28 +-
 .../geode/admin/jmx/internal/SystemMemberJmx.java  |   4 +-
 .../admin/jmx/internal/SystemMemberJmxImpl.java|  18 +-
 .../jmx/internal/SystemMemberRegionJmxImpl.java|   8 +-
 .../apache/geode/admin/jmx/internal/package.html   |  16 +-
 .../client/internal/ClientPartitionAdvisor.java|   2 +-
 .../internal/execute/FunctionToFileTracker.java| 233 ---
 .../internal/QueryConfigurationServiceImpl.java|   2 +-
 .../deployment/internal/JarDeploymentService.java  | 109 -
 .../internal/JarDeploymentServiceFactory.java  |  84 
 .../geode/distributed/DistributedSystem.java   |   2 +-
 .../InternalConfig

[geode] branch support/1.14 updated: GEODE-8097: expects at least one callback (#6049)

2021-03-02 Thread onichols
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/support/1.14 by this push:
 new 8a0dc1a  GEODE-8097: expects at least one callback (#6049)
8a0dc1a is described below

commit 8a0dc1aae8636a44c4fa4d5d30dcbc0efafb4430
Author: Jinmei Liao 
AuthorDate: Wed Feb 24 09:55:02 2021 -0800

GEODE-8097: expects at least one callback (#6049)

(cherry picked from commit e08cad4d7198f9bd82614ca9b7e631df36b38757)
---
 .../geode/management/internal/ClientClusterManagementServiceTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/geode-management/src/test/java/org/apache/geode/management/internal/ClientClusterManagementServiceTest.java
 
b/geode-management/src/test/java/org/apache/geode/management/internal/ClientClusterManagementServiceTest.java
index ed9a9b3..ab7c216 100644
--- 
a/geode-management/src/test/java/org/apache/geode/management/internal/ClientClusterManagementServiceTest.java
+++ 
b/geode-management/src/test/java/org/apache/geode/management/internal/ClientClusterManagementServiceTest.java
@@ -186,7 +186,8 @@ public class ClientClusterManagementServiceTest {
 service.getFuture(opType, opId);
 
 await().untilAsserted(
-() -> 
verify(serviceTransport).submitMessageForGetOperation(same(opType), 
same(opId)));
+() -> verify(serviceTransport, 
atLeastOnce()).submitMessageForGetOperation(same(opType),
+same(opId)));
 assertThat(future.isDone()).isFalse();
 
 when(successOperationResult.getOperationEnd()).thenReturn(new Date());



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

2021-03-02 Thread 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-native] branch develop updated: GEODE-8949: Versioning improvements (#754)

2021-03-02 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 38fa9ee  GEODE-8949: Versioning improvements (#754)
38fa9ee is described below

commit 38fa9eef45da2a0743410d24c5852e8dd3a69494
Author: Jacob Barrett 
AuthorDate: Tue Mar 2 11:29:50 2021 -0800

GEODE-8949: Versioning improvements (#754)

* Download latest Geode.
* Don't bake Geode into images.
* Trigger packer images.
* Configurable version for semver and geode resource.
* Adds version bump.
* Uses geode latest in source checks.
---
 ci/README.md   |  1 +
 ci/base/base.yml   |  2 ++
 ci/base/pipeline.yml   | 14 ---
 ci/lib/functions.lib.yml   | 10 
 ci/lib/templates.lib.txt   | 45 +-
 ci/lib/templates.lib.yml   | 34 ++---
 ci/release/pipeline.yml| 17 -
 ci/set-pipeline.sh | 15 
 packer/build-rhel-7.json   |  3 +--
 packer/build-rhel-8.json   |  3 +--
 packer/build-ubuntu-16-04.json |  1 -
 packer/build-ubuntu-18-04.json |  1 -
 packer/build-ubuntu-20-04.json |  1 -
 packer/build-windows-2016-vs-2017.json |  6 -
 packer/build-windows-2019-vs-2017.json |  6 -
 packer/build-windows-2019-vs-2019.json |  6 -
 packer/linux/install-geode.sh  | 26 
 packer/windows/install-geode.ps1   | 31 ---
 18 files changed, 126 insertions(+), 96 deletions(-)

diff --git a/ci/README.md b/ci/README.md
index e419a70..1d5d9aa 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -98,6 +98,7 @@ This Concourse pipeline YAML is rendered using `ytt`. Depends 
on output from `gi
 * [Concourse](https://concourse-ci.org) v6.5.0+
 * [`ytt`](https://get-ytt.io) v0.28.0+
 * [`git`](https://git-scm.com) v2.25.2+
+* [`yq`](https://github.com/mikefarah/yq) v4.6.0+ (optional for set-pipeline 
script)
 * [`gcloud`](https://cloud.google.com/sdk/docs/install) SDK
 
 ## Layout
diff --git a/ci/base/base.yml b/ci/base/base.yml
index edd1d37..60ba0d5 100644
--- a/ci/base/base.yml
+++ b/ci/base/base.yml
@@ -36,6 +36,8 @@ packages:
 ---
 pipeline:
   name: develop
+  version: 1.15.0
+  pre: build
 
 github:
   owner: apache
diff --git a/ci/base/pipeline.yml b/ci/base/pipeline.yml
index ae687ac..a69b93d 100644
--- a/ci/base/pipeline.yml
+++ b/ci/base/pipeline.yml
@@ -21,13 +21,19 @@
 #@  "registry_image_resource",
 #@  "semver_resource",
 #@  "apache_directory_index_resource",
+#@  "maven_resource",
 #@  "build_resources",
 #@  "build_jobs",
 #@  "build_job_name",
 #@  "check_source_job",
 #@  "check_source_job_name",
 #@  "update_pipeline_job",
-#@  "update_pipeline_job_name")
+#@  "update_pipeline_job_name",
+#@ )
+#@ load("functions.lib.yml",
+#@  "initial_version",
+#@  "version_pattern",
+#@ )
 #@ load("@ytt:data", "data")
 #@ load("@ytt:template", "template")
 
@@ -36,9 +42,10 @@ resource_types:
   - #@ resource_type("gci-resource", "smgoller/gci-resource")
   - #@ resource_type("gcs-resource", "frodenas/gcs-resource")
   - #@ resource_type("apache-directory-index-resource", 
"jakepivotal/apache-directory-index-resource")
+  - #@ resource_type("maven-resource", "jakepivotal/maven-resource")
 
 resources:
-  - #@ semver_resource("version", "1.14.0-build.0")
+  - #@ semver_resource("version", initial_version())
   - #@ gcr_image_resource("gcloud-image", "google.com/cloudsdktool/cloud-sdk", 
"alpine")
   - #@ project_gcr_image_resource("task-image", "geode-native-task")
   - #@ project_gcr_image_resource("clang-tools-image", 
"geode-native-clang-tools")
@@ -46,7 +53,8 @@ resources:
   - #@ template.replace(build_resources(data.values.builds, 
data.values.configs))
   - #@ registry_image_resource("ytt-image", "gerritk/ytt")
   - #@ github_resource("ci-source", data.values.github.owner, 
data.values.github.repository, data.values.repository.branch, ["ci/*"])
-  - #@ apache_directory_index_resource("geode", 
"https://archive.apache.org/dist/geode/";, "$VERSION", 
"apache-geode-$VERSION.tgz")
+  - #@ maven_resource("geode-latest", 
"https://maven.apachegeode-ci.info/snapshots";, 
"org.apache.geode:apache-geode:tgz", version_pattern())
+  #! - #@ apache_directory_index_resource("geode", 
"https://archive.apache.org/dist/geode/";, "$VERSION", 
"apache-geode-$VERSION.tgz")
 
 jobs:
   - #@ template.replace(build_jobs(data.values.builds, data.values.configs))
diff --git a/ci/lib/functions.lib.yml b/ci/lib/functions.lib.yml
index 0e34a80..f5702a7 100644
--- a/ci/lib/functions.lib.yml
+++ b/ci/lib/functions.lib.yml
@@ -33,3 +33,13 @@
 #@ def image_family_name(family):
 #@ return (data.values.pipe

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

2021-03-02 Thread jbarrett
This is an automated email from the ASF dual-hosted git repository.

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


from dc3ed8c  GEODE-8963: separate client/server compatibility from 
server/server version compatibility (#6050)
 add a9b25a14 GEODE-8975: Deprecate old format. (#6058)

No new revisions were added by this update.

Summary of changes:
 .../cache/snapshot/ParallelSnapshotDUnitTest.java  |  6 ++--
 .../cache/snapshot/SnapshotByteArrayDUnitTest.java |  4 +--
 .../geode/cache/snapshot/SnapshotDUnitTest.java| 14 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java |  4 +--
 .../cache/snapshot/GFSnapshotDUnitTest.java|  2 +-
 .../cache/snapshot/CacheSnapshotJUnitTest.java |  8 +++---
 .../cache/snapshot/RegionSnapshotJUnitTest.java| 32 +++---
 .../geode/cache/snapshot/WanSnapshotJUnitTest.java |  4 +--
 .../geode/cache/snapshot/SnapshotOptions.java  | 13 +++--
 .../cache/snapshot/ClientSnapshotDUnitTest.java| 14 +-
 .../internal/cli/functions/ExportDataFunction.java |  4 +--
 .../internal/cli/functions/ImportDataFunction.java |  2 +-
 .../cache/lucene/LuceneIndexDestroyDUnitTest.java  |  4 +--
 13 files changed, 60 insertions(+), 51 deletions(-)



[geode-native] branch develop updated: Updates README.md, CONTRIBUTING.md and BUILDING.md (#755)

2021-03-02 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 6c1cf0c  Updates README.md, CONTRIBUTING.md and BUILDING.md (#755)
6c1cf0c is described below

commit 6c1cf0c9c5de4bad6733d2e0e9fa850a56d33393
Author: Jacob Barrett 
AuthorDate: Tue Mar 2 10:41:18 2021 -0800

Updates README.md, CONTRIBUTING.md and BUILDING.md (#755)

* Updates README.md with established versioning rules.
* Updates CONTRIBUTING.md and BUILDING.md.
* Updates OS versions
* updates tooling
* Moves contributing details from BUILDING.md to CONTRIBUTING.md
---
 BUILDING.md | 113 -
 CONTRIBUTING.md | 376 ++--
 README.md   |  52 +---
 3 files changed, 294 insertions(+), 247 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index 63aabd3..6536b41 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -2,7 +2,7 @@
 
 ## Prerequisites (All Platforms)
 
-* [CMake 3.12](https://cmake.org/) or newer
+* [CMake 3.18](https://cmake.org/) or newer
 * C++11 compiler *(see platform specific requirements)*
 * [Doxygen 1.8.11 or greater](https://sourceforge.net/projects/doxygen/) *(for 
building source documentation)*
 * [OpenSSL](https://www.openssl.org) *(for building source documentation)*
@@ -72,7 +72,7 @@ Install XCode from the App Store
 Install the required dependencies through homebrew. If you use another package 
manager for your mac feel free to use
 that.
 
-```bash
+```console
 $ brew install geode
 $ brew install openssl
 $ brew install doxygen
@@ -82,7 +82,7 @@ $ brew install cmake
 You will need to provide the path to the brew installed OpenSSL headers since 
macOS already has a system installed
 version but without the required headers.
 
-```bash
+```console
 $ cmake .. -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
 ```
 
@@ -130,73 +130,6 @@ IPv6 support can be enabled by adding `-DWITH_IPV6=ON` to 
the CMake [Generator](
 $ cmake … -DWITH_IPV6=ON …
 ```
 
- Code Coverage
-
-If building with GCC or Clang you can enable C++ code coverage by adding 
`-DUSE_CPP_COVERAGE=ON` to the
-CMake [Generator](#generator) command.
-
-```console
-$ cmake … -DUSE_CPP_COVERAGE=ON …
-```
-
-You can then generate a C++ code coverage report by downloading 
[lcov](http://ltp.sourceforge.net/coverage/lcov.php).
-After acquiring lcov, finish the [Steps to build](#Steps-to-build) section 
above. Then, run the tests as described in
-the [CONTRIBUTING.md](CONTRIBUTING.md). Finally, run the following commands 
from the `build` directory:
-
-```console
-$ lcov --capture --directory . --output-file coverage.info
-$ genhtml coverage.info --output-directory coverage_report
-```
-
-You can then open the `index.html` file in the `coverage_report` directory 
using any browser.
-
- Clang-Tidy
-
-To enable `clang-tidy`:
-
-```console
-$ cmake … -DCMAKE_CXX_CLANG_TIDY=clang-tidy …
-```
-
-To use specific `clang-tidy`:
-
-```console
-$ cmake … -DCMAKE_CXX_CLANG_TIDY=/path/to/clang-tidy …
-```
-
-By default `clang-tidy` uses the configuration found in `.clang-tidy`
-To override `clang-tidy` options:
-
-```console
-$ cmake … -DCMAKE_CXX_CLANG_TIDY=clang-tidy; …
-```
-
- Clang-format
-
-Individual targets in the build tree have their own dependency of the form 
`<>-clangformat`, which uses
-the `clang-format` executable, wherever it is found, to format and modified 
files according to the rules specfied in the
-.clang-format file. This is helpful when submitting changes to geode-native, 
because an improperly formatted file will
-fail Travis-CI and have to be fixed prior to merging any pull request. If 
clang-format is not installed on your system,
-clangformat targets will not be added to your project files, and geode-native 
should build normally. Under some
-circumstances, however, it may become necessary to disable `clang-format` on a 
system where it _is_ installed.
-
-To disable `clang-format` in the build:
-
-```
-$ cmake … -DClangFormat_EXECUTABLE='' …
-```
-
-On the other hand, it may also be desirable to run clang-format on the entire 
source tree. This is also easily done via
-the `all-clangformat` _in a build with clang-format enabled_. If clang-format 
has been disabled in the cmake
-configuration step, as above, the `all-clangformat` target will not exist, and 
the cmake configuration step will have to
-be re-run with clang-format enabled.
-
-To run clang-format on the entire source tree:
-
-```
-$ cmake --build . --target all-clangformat
-```
-
 ## Installing
 
 By default a system-specific location is used by CMake as the destination of 
the `install` target, e.g., `/usr/local` on
@@ -218,27 +151,27 @@ $ cmake --build . --target install
 
 # Platform-Specific Prerequisites
 
-## Windows
+## Windows
 
-* Windows 8.1 64-bit
 * Windows 10 64-bit
-* Windows Se

[geode] branch develop updated (57666f6 -> dc3ed8c)

2021-03-02 Thread bschuchardt
This is an automated email from the ASF dual-hosted git repository.

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


from 57666f6  GEODE-8986: bump benchmark baseline version (#6072)
 add dc3ed8c  GEODE-8963: separate client/server compatibility from 
server/server version compatibility (#6050)

No new revisions were added by this update.

Summary of changes:
 .../client/internal/ClientSideHandshakeImpl.java   |  5 +-
 .../geode/internal/cache/tier/ConnectionProxy.java | 11 +--
 .../cache/tier/sockets/CommandInitializer.java |  4 +-
 .../cache/tier/sockets/ServerConnection.java   |  8 ++-
 .../tier/sockets/ServerSideHandshakeFactory.java   | 31 
 .../cache/tier/sockets/CommandInitializerTest.java | 17 +++--
 .../tier/sockets/ClientServerMiscBCDUnitTest.java  | 47 +++-
 .../geode/internal/serialization/KnownVersion.java | 84 ++
 .../serialization/KnownVersionJUnitTest.java   | 27 +++
 9 files changed, 164 insertions(+), 70 deletions(-)



[geode] branch support/1.14 updated: GEODE-8920: Modify debug logging to make it easier to trace a message (#6041) (#6071)

2021-03-02 Thread burcham
This is an automated email from the ASF dual-hosted git repository.

burcham 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 bce7a19  GEODE-8920: Modify debug logging to make it easier to trace a 
message (#6041) (#6071)
bce7a19 is described below

commit bce7a19b55b51a8809e71c9a2c776eba31a4e92c
Author: Kamilla Aslami 
AuthorDate: Tue Mar 2 11:58:09 2021 -0600

GEODE-8920: Modify debug logging to make it easier to trace a message 
(#6041) (#6071)

(cherry picked from commit fc2fc9f890c5673bd6d0954048efb525b0098126)
---
 .../geode/distributed/internal/direct/DirectChannel.java   | 10 +-
 .../main/java/org/apache/geode/internal/tcp/Connection.java|  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
index fc8800f..8f65c2d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
@@ -211,7 +211,7 @@ public class DirectChannel {
   InternalDistributedMember[] p_destinations,
   final DistributionMessage msg, long ackWaitThreshold, long 
ackSAThreshold)
   throws ConnectExceptions, NotSerializableException {
-InternalDistributedMember destinations[] = p_destinations;
+InternalDistributedMember[] destinations = p_destinations;
 
 // Collects connect exceptions that happened during previous attempts to 
send.
 // These represent members we are not able to distribute to.
@@ -276,7 +276,7 @@ public class DirectChannel {
   retryInfo = null;
   retry = true;
 }
-final List cons = new ArrayList(destinations.length);
+final List cons = new ArrayList<>(destinations.length);
 ConnectExceptions ce = getConnections(mgr, msg, destinations, 
orderedMsg, retry, ackTimeout,
 ackSDTimeout, cons);
 
@@ -299,9 +299,9 @@ public class DirectChannel {
   return bytesWritten;
 }
 
-if (retry && logger.isDebugEnabled()) {
-  logger.debug("Retrying send ({}{}) to {} peers ({}) via tcp/ip",
-  msg, cons.size(), cons);
+if (logger.isDebugEnabled()) {
+  logger.debug("{} on these {} connections: {}",
+  (retry ? "Retrying send" : "Sending"), cons.size(), cons);
 }
 DMStats stats = getDMStats();
 List sentCons; // used for cons we sent to this time
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java 
b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
index 6d4c675..60c418e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/Connection.java
@@ -3224,7 +3224,7 @@ public class Connection implements Runnable {
   private void setThreadName(int dominoNumber) {
 Thread.currentThread().setName(THREAD_KIND_IDENTIFIER + " for " + 
remoteAddr + " "
 + (sharedResource ? "" : "un") + "shared" + " " + (preserveOrder ? "" 
: "un")
-+ "ordered" + " uid=" + uniqueId + (dominoNumber > 0 ? " dom #" + 
dominoNumber : "")
++ "ordered sender uid=" + uniqueId + (dominoNumber > 0 ? " dom #" + 
dominoNumber : "")
 + " local port=" + socket.getLocalPort() + " remote port=" + 
socket.getPort());
   }
 



[geode] branch develop updated (0da3718 -> 57666f6)

2021-03-02 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 0da3718  GEODE-8980: bump dependencies (#6062)
 add 57666f6  GEODE-8986: bump benchmark baseline version (#6072)

No new revisions were added by this update.

Summary of changes:
 ci/pipelines/shared/jinja.variables.yml | 2 +-
 dev-tools/release/promote_rc.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



[geode] branch develop updated (477ffba -> 0da3718)

2021-03-02 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 477ffba  GEODE-7245: Remove most uses of latestViewReadLock in 
GMSMembership (#6037)
 add 0da3718  GEODE-8980: bump dependencies (#6062)

No new revisions were added by this update.

Summary of changes:
 .../src/test/resources/expected-pom.xml| 60 +++---
 build.gradle   |  2 +-
 buildSrc/build.gradle  |  2 +-
 .../gradle/plugins/DependencyConstraints.groovy| 27 +-
 dev-tools/dependencies/bump.sh |  2 +-
 .../session/tests/GenericAppServerInstall.java |  2 +-
 .../integrationTest/resources/assembly_content.txt | 36 ++---
 .../resources/dependency_classpath.txt | 30 +--
 geode-redis/build.gradle   |  4 +-
 9 files changed, 84 insertions(+), 81 deletions(-)



[geode] branch develop updated (77e6a04 -> 477ffba)

2021-03-02 Thread burcham
This is an automated email from the ASF dual-hosted git repository.

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


from 77e6a04  GEODE-8964: Prevent writing incorrect data to cache for 
transactional create with null value (#6069)
 add 477ffba  GEODE-7245: Remove most uses of latestViewReadLock in 
GMSMembership (#6037)

No new revisions were added by this update.

Summary of changes:
 .../internal/membership/api/MembershipView.java| 147 +++---
 .../internal/membership/gms/GMSMembership.java | 313 -
 2 files changed, 164 insertions(+), 296 deletions(-)



[geode] branch support/1.14 updated: GEODE-8919: undid polymorphic naming for processMessage methods. (#6055) (#6070)

2021-03-02 Thread echobravo
This is an automated email from the ASF dual-hosted git repository.

echobravo 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 f6e3f13  GEODE-8919: undid polymorphic naming for processMessage 
methods. (#6055) (#6070)
f6e3f13 is described below

commit f6e3f13aa65036d890fd1faa7e2ca403f87c9fc0
Author: Ernie Burghardt 
AuthorDate: Tue Mar 2 09:33:15 2021 -0800

GEODE-8919: undid polymorphic naming for processMessage methods. (#6055) 
(#6070)

(cherry picked from commit 6edf69546b784f67ed125bc4b1d592496ee1f5ee)
---
 .../gms/membership/GMSJoinLeaveJUnitTest.java  | 131 +++--
 .../membership/gms/membership/GMSJoinLeave.java|  52 
 2 files changed, 95 insertions(+), 88 deletions(-)

diff --git 
a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
 
b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index d6bef41..e8912f3 100644
--- 
a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ 
b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -267,7 +267,7 @@ public class GMSJoinLeaveJUnitTest {
 // simulate a response being received
 MemberIdentifier sender = mockMembers[2];
 FindCoordinatorResponse resp = new FindCoordinatorResponse(coordinator, 
sender, null, 0);
-gmsJoinLeave.processMessage(resp);
+gmsJoinLeave.processFindCoordinatorResponseMessage(resp);
 // tell GMSJoinLeave that a unit test is running so it won't clear the
 // responses collection
 gmsJoinLeave.unitTesting.add("findCoordinatorFromView");
@@ -283,7 +283,8 @@ public class GMSJoinLeaveJUnitTest {
   public void testProcessJoinMessageRejectOldMemberVersion() throws Exception {
 initMocks();
 
-gmsJoinLeave.processMessage(new JoinRequestMessage(mockOldMember, 
mockOldMember, null, -1, 0));
+gmsJoinLeave.processJoinRequestMessage(
+new JoinRequestMessage(mockOldMember, mockOldMember, null, -1, 0));
 assertTrue("JoinRequest should not have been added to view request",
 gmsJoinLeave.getViewRequests().size() == 0);
 verify(messenger).send(isA(JoinResponseMessage.class));
@@ -296,7 +297,7 @@ public class GMSJoinLeaveJUnitTest {
 List members = Arrays.asList(mockMembers);
 GMSMembershipView v = new GMSMembershipView(mockMembers[0], 2, members);
 InstallViewMessage message = getInstallViewMessage(v, null, false);
-gmsJoinLeave.processMessage(message);
+gmsJoinLeave.processInstallViewMessage(message);
 verify(manager).forceDisconnect(isA(String.class));
   }
 
@@ -308,7 +309,8 @@ public class GMSJoinLeaveJUnitTest {
 .thenThrow(new SecurityException("we want to fail auth here"));
 
 gmsJoinLeave
-.processMessage(new JoinRequestMessage(mockMembers[0], mockMembers[0], 
credentials, -1, 0));
+.processJoinRequestMessage(
+new JoinRequestMessage(mockMembers[0], mockMembers[0], 
credentials, -1, 0));
 assertTrue("JoinRequest should not have been added to view request",
 gmsJoinLeave.getViewRequests().size() == 0);
 verify(messenger).send(isA(JoinResponseMessage.class));
@@ -321,7 +323,8 @@ public class GMSJoinLeaveJUnitTest {
 .thenThrow(new SecurityException("we want to fail auth here"));
 
 gmsJoinLeave
-.processMessage(new JoinRequestMessage(mockMembers[0], mockMembers[0], 
null, -1, 0));
+.processJoinRequestMessage(
+new JoinRequestMessage(mockMembers[0], mockMembers[0], null, -1, 
0));
 assertTrue("JoinRequest should not have been added to view request",
 gmsJoinLeave.getViewRequests().size() == 0);
 verify(messenger).send(isA(JoinResponseMessage.class));
@@ -337,12 +340,12 @@ public class GMSJoinLeaveJUnitTest {
 JoinResponseMessage[] joinResponse = gmsJoinLeave.getJoinResponseMessage();
 
 JoinResponseMessage jrm = new JoinResponseMessage(mockMembers[0], new 
byte[9], 233);
-gmsJoinLeave.processMessage(jrm);
+gmsJoinLeave.processJoinResponseMessage(jrm);
 // this should NOT logs, this is just to inform member succesful joining
 Assert.assertEquals(null, joinResponse[0]);
 
 jrm = new JoinResponseMessage("rejected...", 0);
-gmsJoinLeave.processMessage(jrm);
+gmsJoinLeave.processJoinResponseMessage(jrm);
 // this should log..
 Assert.assertEquals(jrm, joinResponse[0]);
   }
@@ -362,12 +365,12 @@ public class GMSJoinLeaveJUnitTest {
   netView.setPublicKey(member, member.toString());
 }
 InstallViewMessage installViewMessage = getInstallViewMessage(netView, 
credentials, true);
-gmsJoinLeav