[geode] 01/01: GEODE-6724 split brain formed on concurrent locator startup
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-6724
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0f41c5f46fa731423f7b4d895cccbf8418b40da8
Author: Bruce Schuchardt
AuthorDate: Tue Apr 30 14:24:04 2019 -0700
GEODE-6724 split brain formed on concurrent locator startup
Ensure that either all locators have been contacted or a decent
number of attempts to join have occurred before allowing a member to
start its own cluster.
If all locators have been contacted we ought to have a sufficient
registration pool to choose a membership coordinator during concurrent
startup.
---
.../apache/geode/distributed/LocatorDUnitTest.java | 59 +-
.../membership/gms/membership/GMSJoinLeave.java| 13 +++--
2 files changed, 66 insertions(+), 6 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 4268596..e07f572 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.distributed;
+import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import static
org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
import static
org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
@@ -1265,11 +1266,64 @@ public class LocatorDUnitTest implements
java.io.Serializable {
}
}
+ @Test
+ public void testConcurrentLocatorStartup() throws Exception {
+List portKeepers =
+AvailablePortHelper.getRandomAvailableTCPPortKeepers(4);
+List> asyncInvocations = new
ArrayList(portKeepers.size());
+StringBuilder sb = new StringBuilder(100);
+for (int i = 0; i < portKeepers.size(); i++) {
+ AvailablePort.Keeper keeper = portKeepers.get(i);
+ sb.append("localhost[").append(keeper.getPort()).append("]");
+ if (i < portKeepers.size() - 1) {
+sb.append(',');
+ }
+}
+String locators = sb.toString();
+Properties dsProps = getClusterProperties(locators, "false");
+for (int i = 0; i < portKeepers.size(); i++) {
+ AvailablePort.Keeper keeper = portKeepers.get(i);
+ final int port = keeper.getPort();
+ DistributedTestUtils.deleteLocatorStateFile(port);
+ keeper.release();
+ AsyncInvocation startLocator = VM.getVM(i).invokeAsync("start
locator " + i, () -> {
+DUnitBlackboard blackboard = getBlackboard();
+blackboard.signalGate("" + port);
+try {
+ blackboard.waitForGate("startLocators", 5, MINUTES);
+} catch (InterruptedException e) {
+ throw new RuntimeException("test was interrupted");
+}
+startLocatorBase(dsProps, port);
+assertTrue(isSystemConnected());
+System.out.println("Locator startup completed");
+ });
+ asyncInvocations.add(startLocator);
+ getBlackboard().waitForGate("" + port, 5, MINUTES);
+}
+
+getBlackboard().signalGate("startLocators");
+int expectedCount = asyncInvocations.size() - 1;
+for (int i = 0; i < asyncInvocations.size(); i++) {
+ asyncInvocations.get(i).await();
+}
+for (int i = 0; i < asyncInvocations.size(); i++) {
+ assertTrue(VM.getVM(i).invoke("assert all in same cluster", () ->
CacheFactory
+ .getAnyInstance().getDistributedSystem().getAllOtherMembers().size()
== expectedCount));
+}
+for (int i = 0; i < asyncInvocations.size(); i++) {
+ VM.getVM(i).invoke(() -> {
+Locator.getLocator().stop();
+system = null;
+ });
+}
+ }
+
/**
- * Tests starting multiple locators in multiple VMs.
+ * Tests starting two locators and two servers in different JVMs
*/
@Test
- public void testMultipleLocators() {
+ public void testTwoLocatorsTwoServers() {
VM vm0 = VM.getVM(0);
VM vm1 = VM.getVM(1);
VM vm2 = VM.getVM(2);
@@ -1904,6 +1958,7 @@ public class LocatorDUnitTest implements
java.io.Serializable {
properties.put(MEMBER_TIMEOUT, "2000");
properties.put(LOG_LEVEL, logger.getLevel().name());
properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+properties.put(USE_CLUSTER_CONFIGURATION, "false");
properties.put(LOCATOR_WAIT_TIME, "10"); // seconds
return properties;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
b/geode-core/src/main/java/org/apache/g
[geode] branch feature/GEODE-6724 created (now 0f41c5f)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6724 in repository https://gitbox.apache.org/repos/asf/geode.git. at 0f41c5f GEODE-6724 split brain formed on concurrent locator startup This branch includes the following new commits: new 0f41c5f GEODE-6724 split brain formed on concurrent locator startup 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 feature/GEODE-6724 deleted (was bd90364)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6724 in repository https://gitbox.apache.org/repos/asf/geode.git. was bd90364 fixing unit test failures The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6583 deleted (was e25ee55)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6583 in repository https://gitbox.apache.org/repos/asf/geode.git. was e25ee55 rework failure detectors to prefill their history. Disable suspect initiation on loss of the shared/unordered TCPConduit connection The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6583 created (now e25ee55)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6583 in repository https://gitbox.apache.org/repos/asf/geode.git. at e25ee55 rework failure detectors to prefill their history. Disable suspect initiation on loss of the shared/unordered TCPConduit connection No new revisions were added by this update.
[geode] branch feature/GEODE-6583 updated (24fc6ce -> 64387f8)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6583 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 24fc6ce fix for failing unit test discard 6d4cea0 spotless discard 0d1fd84 removed sync when creating detectors & cleaned up copyright notice discard c04d8ec empty commit discard 5a03277 GEODE-6583 Integrate phi-accrual failure detection into Geode new ed8b174 GEODE-6577: performance gain by removing lazy init (#3378) new 26c2e5f Update Gradle plugins to latest versions. (#3382) new 1ff5f2e GEODE-6574: be able to list member information using cluster management service (#3380) new 3e0ac36 GEODE-6585: clarify subscription-ack-interval (#3388) new d989fc9 GEODE-6587: fix race in useFirst (#3396) new a471421 GEODE-6518: proxy region, should not add loader and writer for jdbc-mapping (#3309) new 50dfb33 GEODE-6588: Cleanup generics and other static analyzer issues. (#3391) new 7658cd2 GEODE-6580: use ConcurrentHashMap for host names new e2be8e5 GEODE-6580: Cleanup static analyzer warnings. new a610ec8 Merge pull request #3385 from balesh2/GEODE-6580 new 203aac1 GEODE-6400: Enable third-parties to consume Geode via Gradle composite build. new 579d500 GEODE-6400: Choose better var name for subprojects new 6fdaae3 Correct lingering reference to legacy configuration 'archives' new c3e8c60 Merge remote-tracking branch 'origin/develop' into geode-6400 new 40c2968 Add missing geode-redis reference to lib copySpec missed in merge. new f92c213 Merge pull request #3379 from PurelyApplied/geode-6400 new 055978d GEODE-6574: create a LocatorWebContext to ease controller testing using Spring mock context (#3393) new 91da098 GEODE-6589: Parameterize gradle project group for use in GradleBuildWithGeodeCoreAcceptanceTest (#3395) new e4bcc25 GEODE-6527 Update PartitionRegionConfig info (#3308) new 5bf288f GEODE-6534: Reduce scope of LocalRegion methods (#3398) new 5e4cca8 GEODE-6593: fix test elapsed time computation (#3401) new a4ad661 GEODE-6573: move methods from ConnectionManager to Connection (#3375) new 5a70f14 GEODE-6580: Corrects loop break. new 2e0a893 GEODE-6423 availability checks sometimes immediately initiate removal new f17d31d GEODE-6430: Add test to query PDX-based entries from gfsh (#3406) new 20bb490 GEODE-6598: Fix alertMessageIsReceivedByManager test (#3410) new e1c15bb GEODE-6534: Remove unnecessary uses of this in LocalRegion new 6487886 GEODE-6600: Remove meters on region close new abb73f8 GEODE-4267: Fix suspect string in testCrashDuringPreparePersistentId new 0d31a85 GEODE-6560 - Geode Management REST supports creating regions by group (#3400) new 5c7599c GEODE-6551: Fix Constraints Check in Alter Region (#3349) new 291a2d3 GEODE-5971: refactor various commands to use ResultModel (#3399) new a8eb419 GEODE-5971: describe member failed to display multiple cache servers (#3409) new 50c3747 GEODE-6505: move RegionShortcut and ExpirationAction back to core (#3407) new 63bd991 GEODE-6383: All subprojects should opt into configuration. (#3403) new ed43b95 GEODE-6592: Added --if-not-exists flag to CreateMappingCommand (#3402) new f1550e3 GEODE-6606: Support added MeterSubregistries in reconnect (#3418) new 2fc1d72 GEODE-6582: get max message size only once new bb7b62f remove reference to old ticket number and add relevant information to comment: new a76ea9b add comment explaining reason for static value new bb2e35a Merge pull request #3386 from balesh2/GEODE-6582 new 6eb32e2 GEODE-6584: remove unecessary synchronization (#3387) new a1d6da3 GEODE-6602: gfsh commands should be logged in locator log (#3414) new 0393473 GEODE-6518: when user explicitly specified some PartitionAttributes, … (#3427) new 0c8d3bc GEODE-6383: Correct minor lingering issues from previous PR. (#3430) new 2ad6695 GEODE-6505: add more RegionType and type validation (#3416) new d8bda91 GEODE-5971: delete InternalGfshCommand (#3421) new 9f309df GEODE-6609: Protect from MetricsPublishingService exceptions (#3429) new f7ae070 GEODE-6603: Create StoppableCountDownLatch unit tests (#3413) new 09e289f GEODE-6383: Be explicit in evaluation dependencies. * A previous commit under this ticket was too aggressive in project evaluation dependencies. Explicit > Implicit. new 397 GEODE-5142: User Guide - document thread monitoring options (#3422) new 2402cac GEODE-6612: move attributes that can not be configured in v2 api out of RegionConfig (#3425) new 232dc0f GEODE-6608: Add Swagger UI to Management REST API (#3431) new c5e52ef GEODE-6612: make group an attribute in CacheElement (#3437)
[geode] branch feature/GEODE-6583 updated: reinstated use of next-neighbors by default. added check for insufficient history to phi detectors & use timestamps if that's the case.
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-6583
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6583 by this
push:
new 77db462 reinstated use of next-neighbors by default. added check for
insufficient history to phi detectors & use timestamps if that's the case.
77db462 is described below
commit 77db4622661025099d209ca51b0621349d0af7ff
Author: Bruce Schuchardt
AuthorDate: Fri Apr 19 16:06:06 2019 -0700
reinstated use of next-neighbors by default.
added check for insufficient history to phi detectors & use timestamps
if that's the case.
---
.../gms/fd/GMSHealthMonitorJUnitTest.java | 22 +
.../gms/fd/PhiAccrualFailureDetectorTest.java | 37 +
.../membership/gms/fd/GMSHealthMonitor.java| 94 --
.../gms/fd/PhiAccrualFailureDetector.java | 13 ++-
4 files changed, 100 insertions(+), 66 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index df7acd5..a907511 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -214,27 +214,6 @@ public class GMSHealthMonitorJUnitTest {
assertEquals(mockMembers.get(myAddressIndex + 1),
gmsHealthMonitor.getNextNeighbor());
}
- @Test
- public void testHMNextNeighborAfterTimeout() throws Exception {
-System.out.println("testHMNextNeighborAfterTimeout starting");
-
-installAView();
-InternalDistributedMember initialNeighbor = mockMembers.get(myAddressIndex
+ 1);
-
-await("wait for new neighbor")
-.until(() -> gmsHealthMonitor.getNextNeighbor() != initialNeighbor);
-InternalDistributedMember neighbor = gmsHealthMonitor.getNextNeighbor();
-
-// neighbor should change. In order to not be a flaky test we don't demand
-// that it be myAddressIndex+2 but just require that the neighbor being
-// monitored has changed
-System.out.println("testHMNextNeighborAfterTimeout ending");
-Assert.assertNotNull(gmsHealthMonitor.getView());
-Assert.assertNotEquals("neighbor to not be " + neighbor + "; my ID is "
-+ mockMembers.get(myAddressIndex) + "; view=" +
gmsHealthMonitor.getView(),
-initialNeighbor, neighbor);
- }
-
/**
* it checks neighbor before member-timeout, it should be same
*/
@@ -303,6 +282,7 @@ public class GMSHealthMonitorJUnitTest {
long startTime = System.currentTimeMillis();
installAView();
InternalDistributedMember neighbor = gmsHealthMonitor.getNextNeighbor();
+assertFalse(neighbor.equals(joinLeave.getMemberID()));
await().until(() -> gmsHealthMonitor.isSuspectMember(neighbor));
long endTime = System.currentTimeMillis();
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/PhiAccrualFailureDetectorTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/PhiAccrualFailureDetectorTest.java
index a0c5061..9fcfd51 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/PhiAccrualFailureDetectorTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/PhiAccrualFailureDetectorTest.java
@@ -19,6 +19,8 @@ package
org.apache.geode.distributed.internal.membership.gms.fd;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.util.Random;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -74,4 +76,39 @@ public class PhiAccrualFailureDetectorTest {
assertTrue(failureDetector.isAvailable(timestampMillis));
}
}
+
+ @Test
+ public void isAvailableTest() throws Exception {
+double threshold = 10;
+int historySize = 200;
+double stddev = 100;
+long now = System.currentTimeMillis();
+long[] intervals =
+new long[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, -14, -15, -16,
-17, -18, -19, -20};
+int heartbeatInterval = 5000;
+int acceptableHeartbeatPauseMillis = heartbeatInterval / 2;
+Random random = new Random();
+PhiAccrualFailureDetector detector =
+new PhiAccrualFailureDetector(threshold, historySize, stddev,
+acceptableHeartbeatPauseMillis, now);
+long heartbeatTime = 0;
+for (long l = 1; l <= historySize; l++) {
+ long deviation
[geode] branch feature/GEODE-6583 updated (77db462 -> e25ee55)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6583 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 77db462 reinstated use of next-neighbors by default. added check for insufficient history to phi detectors & use timestamps if that's the case. discard 64387f8 reverting use of phi detectors for verification checks discard 74b0dc6 optimization discard 9e9fdd8 fix for failing unit test discard e8c258c spotless discard 5a73127 removed sync when creating detectors & cleaned up copyright notice discard 59e2b1a GEODE-6583 Integrate phi-accrual failure detection into Geode add 0860e38 GEODE-4958: Lowering the log level to warn. add 016cf13 GEODE-6634: Fix parallel option for repeatTest (#3443) add 8ff0939 GEODE-6557:Handling a possible null situation. add 62b8c22 GEODE-6638: do not fail with IllegalMonitorStateException during cache close (#3451) add 7fee5bf fix typo in JAVA_HOME command on OSX add 94ccba3 GEODE-6649: Static analyzer warning cleanup. add fc4e825 GEODE-6649: Add tests for effected methods. add 5d0fcf3 GEODE-6649: Remove lock contention in ClientHealthMonitor heartbeats. add 133d6af GEODE-5231: Fix PersistentReplicatedTestBase subclass flakiness add 99dae16 GEODE-5231: addIgnoredException to PersistentRVVRecoveryDUnitTest add ea0dc64 GEODE-5231: Fix timeout in PersistentRVVRecoveryDUnitTest add 2862bc7 GEODE-6639: Cleanup static analyzer warnings. add a75c5d0 GEODE-6639: Adds unit test for processing message time logic. add 55fd4a2 GEODE-6639: Use AtomicLong for processingMessageStartTime add ff703dd GEODE-6664 CI failure: org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse add 0e90b5a GEODE-6646 - CI failure in serverRestarsAfterLocatorReconnects add 447f508 GEODE-6611: geode-all-bom does not import java-library (#3474) add 064892c GEODE-6662 NioPlainEngine.ensureWrappedCapacity add 96bd60e GEODE-6640: add integration tests to do put, invalidate, then get from async JDBC mapping (#3468) add def65d4 GEODE-6579: optimize string deserialization (#3381) add 7a82437 GEODE-: Catch SocketTimeoutException (#3478) add cee84bb GEODE-6665: Avoid creating regions on Locator (#3480) add 104268a GEODE-5986 Inconsistent equals/hashCode add 6a177ec GEODE-6612: add entry count for list Region and rework filtering by groups (#3465) add f3428c6 GEODE-6611: Correct publication issues in all-bom. (#3483) add 49757e7 GEODE-6630: move allBucketsRecoveredFromDisk count down latch (#3477) add a0da3ce Fixes CI benchmark baseline selection. add 1355084 adding my PGP block as instructed in release steps add 5053c7f reduce verbosity of benchmark CI output and update version numbers due to new release add 0adb400 GEODE-6679: Use ephemeral ports in StandaloneClientManagementAPIAcceptanceTest (#3485) add c7e43c7 GEODE-5971: refactor remaining command's usage of Result (#3481) add ca36754 GEODE-6629: Add additional test assertions for disk store creation add fe0ddc5 GEODE-6656: Fix up PersistentPartitionHangsDuringRestartRegressionTest add afc311c GEODE-6607: Moving client registration queue to CacheClientNotifier add d746ec4 GEODE-6694: Use volatile access to read current state of BucketAdvisor add a6045e8 GEODE-6697: Make system property controlled variable static. add 6e17bdd GEODE-6620: Upgrading springframework library (#3472) add 88b3c51 GEODE-6693: run concurrency tests for longer (#3488) add 323cd0d GEODE-5971: Remove FileResult (#3487) add aae23e3 GEODE-6612: use java Objects for comparision instead of guava (#3493) add d3154bc GEODE-5971: have command pipeline send ResultModel json across the wire (#3495) add 96466c9 GEODE-5971: delete LegacyCommandResult and rename ModelResultModel to… (#3497) add 45c9538 Adding a couple of scripts to automate release candidates add 8181426 Updating the prepare_rc script to find the right version of openssl add 3511c67 add newly-released 1.9.0 to old versions add d684876 update the benchmarks baseline as 1.9.0 is released now add 9df7fc4 we have a deploy script; add a corresponding destroy script (#3504) add b19734d GEODE-6595: Deprecates and ignore thread local connection pool attribute. (#3394) add 8320fdc GEODE-6709: Locators should not start when ClusterConfigurationServic… (#3503) add 3282d5a GEODE-6667: Await 2 owners of bucket in testCrashWhileCreatingABucket add 0a9a097 GEODE-5971: remove unnecessary @VisibleToTest methods (#3505) add 39d8370 Fixing the minor version byte for Version.GEODE_1_10_0 add 3ea508d GEODE-6580: Cleanup static analyzer warnings. (#3432) add 59c76ee GEODE-6692: cano
[geode] branch develop updated (8536818 -> 56dcf84)
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 8536818 GEODE-6899: retried client should set last try's version tag
if found (#3743)
new 4952d3b GEODE-6883: Removing some dependencies on core from membership
new e3158e0 Removed cast to InternalDistributedMember from inside of
GMSHealthMontior
new 2312dc4 GEODE-6883: Removing no longer needed fields from Services
new 56dcf84 Merge pull request #3717 from
Bill/feature/initial-cleanup-GEODE-6883
The 8024 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:
.../internal/membership/MembershipJUnitTest.java | 62 +-
.../locator/GMSLocatorRecoveryIntegrationTest.java | 5 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 4 +-
.../gms/messenger/JGroupsMessengerJUnitTest.java | 10 +-
.../internal/ClusterDistributionManager.java | 10 +-
.../distributed/internal/ReplyProcessor21.java | 2 +-
.../internal/membership/MemberFactory.java | 9 +-
.../internal/membership/MemberServices.java| 10 +-
.../internal/membership/MembershipManager.java | 6 +-
.../{gms => adapter}/auth/GMSAuthenticator.java| 75 +++
.../internal/membership/adapter/package-info.java} | 11 +-
.../internal/membership/gms/GMSMemberFactory.java | 12 +-
.../internal/membership/gms/Services.java | 95 +++---
.../membership/gms/fd/GMSHealthMonitor.java| 125 +--
.../membership/gms/interfaces/Authenticator.java | 22 +++-
.../membership/gms/interfaces/HealthMonitor.java | 2 +-
.../membership/gms/interfaces/Manager.java | 2 +-
.../membership/gms/interfaces/MessageHandler.java | 5 +-
.../membership/gms/interfaces/Messenger.java | 2 +-
.../membership/gms/membership/GMSJoinLeave.java| 137 +
.../membership/gms/messenger/JGroupsMessenger.java | 2 +-
.../membership/gms/mgr/GMSMembershipManager.java | 12 +-
.../geode/internal/cache/DistributedRegion.java| 2 +-
.../geode/internal/cache/PartitionedRegion.java| 4 +-
.../internal/cache/tier/sockets/Handshake.java | 5 +-
.../org/apache/geode/internal/tcp/Connection.java | 4 +-
.../apache/geode/internal/tcp/ConnectionTable.java | 2 +-
.../auth/AbstractGMSAuthenticatorTestCase.java | 11 +-
.../GMSAuthenticatorWithAuthenticatorTest.java | 2 +-
.../GMSAuthenticatorWithSecurityManagerTest.java | 2 +-
.../membership/gms/MembershipManagerHelper.java| 7 +-
31 files changed, 270 insertions(+), 389 deletions(-)
rename
geode-core/src/main/java/org/apache/geode/distributed/internal/membership/{gms
=> adapter}/auth/GMSAuthenticator.java (76%)
copy
geode-core/src/main/java/org/apache/geode/{internal/offheap/MemoryUsageListener.java
=> distributed/internal/membership/adapter/package-info.java} (75%)
rename
geode-core/src/test/java/org/apache/geode/distributed/internal/membership/{gms
=> adapter}/auth/AbstractGMSAuthenticatorTestCase.java (95%)
rename
geode-core/src/test/java/org/apache/geode/distributed/internal/membership/{gms
=> adapter}/auth/GMSAuthenticatorWithAuthenticatorTest.java (99%)
rename
geode-core/src/test/java/org/apache/geode/distributed/internal/membership/{gms
=> adapter}/auth/GMSAuthenticatorWithSecurityManagerTest.java (98%)
[geode] branch develop updated: GEODE-6664 CI failure: org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new ff703dd GEODE-6664 CI failure:
org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse
ff703dd is described below
commit ff703dd4187638b2e5848c9e74f482f228d5a7cc
Author: Bruce Schuchardt
AuthorDate: Wed Apr 17 10:12:48 2019 -0700
GEODE-6664 CI failure:
org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse
Ensure that the encrypted buffer is at least as big as the
SSLSession's packet buffer size. That's required for proper decryption
of incoming packets.
---
.../java/org/apache/geode/internal/net/NioSslEngine.java | 15 +++
.../org/apache/geode/internal/net/NioSslEngineTest.java | 12 ++--
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
index f2e0e36..dd71d75 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
@@ -308,18 +308,17 @@ public class NioSslEngine implements NioFilter {
}
}
- /*
- * NioSslEngine doesn't need to ensure capacity in network buffers because
they
- * are fixed in size by the SslContext. The size recommended by the context
is
- * big enough for the SslEngine to do its work.
- */
@Override
public ByteBuffer ensureWrappedCapacity(int amount, ByteBuffer wrappedBuffer,
Buffers.BufferType bufferType, DMStats stats) {
-if (wrappedBuffer == null) {
- wrappedBuffer = Buffers.acquireBuffer(bufferType, amount, stats);
+ByteBuffer buffer = wrappedBuffer;
+int requiredSize = engine.getSession().getPacketBufferSize();
+if (buffer == null) {
+ buffer = Buffers.acquireBuffer(bufferType, requiredSize, stats);
+} else if (buffer.capacity() < requiredSize) {
+ buffer = Buffers.expandWriteBufferIfNeeded(bufferType, buffer,
requiredSize, stats);
}
-return wrappedBuffer;
+return buffer;
}
@Override
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
b/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
index 68d7936..b12df09 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
@@ -373,14 +373,22 @@ public class NioSslEngineTest {
}
@Test
- public void ensureWrappedCapacity() {
-ByteBuffer buffer = ByteBuffer.allocate(10);
+ public void ensureWrappedCapacityOfSmallMessage() {
+ByteBuffer buffer = ByteBuffer.allocate(netBufferSize);
assertThat(
nioSslEngine.ensureWrappedCapacity(10, buffer,
Buffers.BufferType.UNTRACKED, mockStats))
.isEqualTo(buffer);
}
@Test
+ public void ensureWrappedCapacityWithNoBuffer() {
+assertThat(
+nioSslEngine.ensureWrappedCapacity(10, null,
Buffers.BufferType.UNTRACKED, mockStats)
+.capacity())
+.isEqualTo(netBufferSize);
+ }
+
+ @Test
public void readAtLeast() throws Exception {
final int amountToRead = 150;
final int individualRead = 60;
[geode] branch release/1.9.0 updated: GEODE-6664 CI failure: org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch release/1.9.0
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/release/1.9.0 by this push:
new ed13a72 GEODE-6664 CI failure:
org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse
ed13a72 is described below
commit ed13a72076f9be0e13bb6988e1f957a43d8c494e
Author: Bruce Schuchardt
AuthorDate: Wed Apr 17 10:12:48 2019 -0700
GEODE-6664 CI failure:
org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse
Ensure that the encrypted buffer is at least as big as the
SSLSession's packet buffer size. That's required for proper decryption
of incoming packets.
(cherry picked from commit ff703dd4187638b2e5848c9e74f482f228d5a7cc)
---
.../java/org/apache/geode/internal/net/NioSslEngine.java | 15 +++
.../org/apache/geode/internal/net/NioSslEngineTest.java | 12 ++--
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
index f2e0e36..dd71d75 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/NioSslEngine.java
@@ -308,18 +308,17 @@ public class NioSslEngine implements NioFilter {
}
}
- /*
- * NioSslEngine doesn't need to ensure capacity in network buffers because
they
- * are fixed in size by the SslContext. The size recommended by the context
is
- * big enough for the SslEngine to do its work.
- */
@Override
public ByteBuffer ensureWrappedCapacity(int amount, ByteBuffer wrappedBuffer,
Buffers.BufferType bufferType, DMStats stats) {
-if (wrappedBuffer == null) {
- wrappedBuffer = Buffers.acquireBuffer(bufferType, amount, stats);
+ByteBuffer buffer = wrappedBuffer;
+int requiredSize = engine.getSession().getPacketBufferSize();
+if (buffer == null) {
+ buffer = Buffers.acquireBuffer(bufferType, requiredSize, stats);
+} else if (buffer.capacity() < requiredSize) {
+ buffer = Buffers.expandWriteBufferIfNeeded(bufferType, buffer,
requiredSize, stats);
}
-return wrappedBuffer;
+return buffer;
}
@Override
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
b/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
index 68d7936..b12df09 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/net/NioSslEngineTest.java
@@ -373,14 +373,22 @@ public class NioSslEngineTest {
}
@Test
- public void ensureWrappedCapacity() {
-ByteBuffer buffer = ByteBuffer.allocate(10);
+ public void ensureWrappedCapacityOfSmallMessage() {
+ByteBuffer buffer = ByteBuffer.allocate(netBufferSize);
assertThat(
nioSslEngine.ensureWrappedCapacity(10, buffer,
Buffers.BufferType.UNTRACKED, mockStats))
.isEqualTo(buffer);
}
@Test
+ public void ensureWrappedCapacityWithNoBuffer() {
+assertThat(
+nioSslEngine.ensureWrappedCapacity(10, null,
Buffers.BufferType.UNTRACKED, mockStats)
+.capacity())
+.isEqualTo(netBufferSize);
+ }
+
+ @Test
public void readAtLeast() throws Exception {
final int amountToRead = 150;
final int individualRead = 60;
[geode] branch feature/GEODE-6664 deleted (was 74ba980)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6664 in repository https://gitbox.apache.org/repos/asf/geode.git. was 74ba980 GEODE-6664 CI failure: org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-6646 deleted (was 0d3b32d)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6646 in repository https://gitbox.apache.org/repos/asf/geode.git. was 0d3b32d addressing stress-test failure The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated: GEODE-6646 - CI failure in serverRestarsAfterLocatorReconnects
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 0e90b5a GEODE-6646 - CI failure in serverRestarsAfterLocatorReconnects
0e90b5a is described below
commit 0e90b5ac2f3ada0e2813d6b518c7c70cf1986b45
Author: Bruce Schuchardt
AuthorDate: Wed Apr 17 10:29:44 2019 -0700
GEODE-6646 - CI failure in serverRestarsAfterLocatorReconnects
In this test there is a locator and there are two servers. The
locator and second servers are forced out of the cluster and
auto-reconnect. In the failure the first server becomes membership
coordinator but the other processes fail to join its cluster when
they restart. They are misconfigured to have a max-wait-time-reconnect
that is too short (5 seconds instead of 60) to allow the first server to
detect failures
before the failed server and locator start trying to reconnect.
The fix is in InternalDistributedSystem and ensures that the
waiting period before attempting to reconnect is a sufficient
multiple of the member-timeout setting.
---
.../management/JMXMBeanReconnectDUnitTest.java | 11 +++---
.../ClusterConfigLocatorRestartDUnitTest.java | 25 +++---
.../internal/InternalDistributedSystem.java| 8 +++
.../geode/test/junit/rules/MemberStarterRule.java | 4
4 files changed, 33 insertions(+), 15 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
index b7344ae..f83797f 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/management/JMXMBeanReconnectDUnitTest.java
@@ -16,6 +16,7 @@
package org.apache.geode.management;
import static java.util.stream.Collectors.toList;
+import static
org.apache.geode.distributed.ConfigurationProperties.MAX_WAIT_TIME_RECONNECT;
import static
org.apache.geode.management.ManagementService.getExistingManagementService;
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
import static
org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase.getBlackboard;
@@ -85,15 +86,18 @@ public class JMXMBeanReconnectDUnitTest {
@Before
public void before() throws Exception {
+Properties properties = new Properties();
+properties.setProperty(MAX_WAIT_TIME_RECONNECT, "5000");
+
locator1 = lsRule.startLocatorVM(LOCATOR_1_VM_INDEX, locator1Properties());
locator1.waitTilLocatorFullyStarted();
locator2 = lsRule.startLocatorVM(LOCATOR_2_VM_INDEX, locator2Properties(),
locator1.getPort());
locator2.waitTilLocatorFullyStarted();
-server1 = lsRule.startServerVM(SERVER_1_VM_INDEX, locator1.getPort());
+server1 = lsRule.startServerVM(SERVER_1_VM_INDEX, properties,
locator1.getPort());
// start an extra server to have more MBeans, but we don't need to use it
in these tests
-lsRule.startServerVM(SERVER_2_VM_INDEX, locator1.getPort());
+lsRule.startServerVM(SERVER_2_VM_INDEX, properties, locator1.getPort());
gfsh.connectAndVerify(locator1);
gfsh.executeAndAssertThat("create region --type=REPLICATE --name=" +
REGION_PATH
@@ -317,7 +321,7 @@ public class JMXMBeanReconnectDUnitTest {
Properties props = new Properties();
props.setProperty(ConfigurationProperties.JMX_MANAGER_HOSTNAME_FOR_CLIENTS,
"localhost");
props.setProperty(ConfigurationProperties.NAME, LOCATOR_1_NAME);
-props.setProperty(ConfigurationProperties.MAX_WAIT_TIME_RECONNECT, "5000");
+props.setProperty(MAX_WAIT_TIME_RECONNECT, "5000");
return props;
}
@@ -326,6 +330,7 @@ public class JMXMBeanReconnectDUnitTest {
props.setProperty(ConfigurationProperties.JMX_MANAGER_HOSTNAME_FOR_CLIENTS,
"localhost");
props.setProperty(ConfigurationProperties.NAME, LOCATOR_2_NAME);
props.setProperty(ConfigurationProperties.LOCATORS, "localhost[" +
locator1.getPort() + "]");
+props.setProperty(MAX_WAIT_TIME_RECONNECT, "5000");
return props;
}
}
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
index 0ddb364..81c3d0c 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/management/i
[geode] branch feature/GEODE-6928 deleted (was 3e066bb)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6928 in repository https://gitbox.apache.org/repos/asf/geode.git. was 3e066bb adding override notation The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated: GEODE-6928 peer-to-peer SSL stream corruption with conserve-sockets=false
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 4803096 GEODE-6928 peer-to-peer SSL stream corruption with
conserve-sockets=false
4803096 is described below
commit 48030961f82f91360d8c88f19516758ba0d6affe
Author: Bruce Schuchardt
AuthorDate: Mon Jul 1 13:00:21 2019 -0700
GEODE-6928 peer-to-peer SSL stream corruption with conserve-sockets=false
Modified the NioSslEngine to not modify the decrypted SSL buffer after
reading a direct-ack response. This allows the readFully method to
correctly see what bytes have already been consumed and correctly
compact the buffer for subsequent reads, if necessary.
The cluster communication test is modified to check for aborted
connections created (retries) during operation distribution. Without the
fix for the problem this check would fail.
---
.../org/apache/geode/ClusterCommunicationsDUnitTest.java | 14 +++---
.../org/apache/geode/distributed/internal/DMStats.java | 3 +++
.../geode/distributed/internal/DistributionStats.java | 5 +
.../distributed/internal/LonerDistributionManager.java | 5 +
.../geode/internal/cache/AbstractUpdateOperation.java | 2 +-
.../main/java/org/apache/geode/internal/net/NioFilter.java | 7 +++
.../java/org/apache/geode/internal/net/NioSslEngine.java | 7 +++
.../main/java/org/apache/geode/internal/tcp/MsgReader.java | 8 +---
8 files changed, 40 insertions(+), 11 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
index 4d7bb23..eca86ed 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
@@ -66,6 +66,7 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DirectReplyProcessor;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -143,7 +144,9 @@ public class ClusterCommunicationsDUnitTest implements
Serializable {
for (int i = 1; i <= NUM_SERVERS; i++) {
verifyCreatedEntry(getVM(i));
}
-performUpdate(getVM(1));
+for (int iteration = 1; iteration < 6; iteration++) {
+ performUpdate(getVM(1));
+}
for (int i = 1; i <= NUM_SERVERS; i++) {
verifyUpdatedEntry(getVM(i));
}
@@ -239,8 +242,13 @@ public class ClusterCommunicationsDUnitTest implements
Serializable {
}
private void performUpdate(VM memberVM) {
-memberVM.invoke("perform update", () -> cache
-.getRegion(regionName).put("testKey", "updatedTestValue"));
+memberVM.invoke("perform update", () -> {
+ DMStats stats = ((InternalDistributedSystem)
cache.getDistributedSystem())
+ .getDistributionManager().getStats();
+ int reconnectAttempts = stats.getReconnectAttempts();
+ cache.getRegion(regionName).put("testKey", "updatedTestValue");
+ assertThat(stats.getReconnectAttempts()).isEqualTo(reconnectAttempts);
+});
}
private void performCreateWithLargeValue(VM memberVM) {
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
index 410d74f..f91bf55 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
@@ -297,6 +297,9 @@ public interface DMStats {
*/
void incReconnectAttempts();
+
+ int getReconnectAttempts();
+
/**
* @since GemFire 4.1
*/
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
index f644209..9d7836c 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionStats.java
@@ -1657,6 +1657,11 @@ public class DistributionStats implements DMStats {
}
@Override
+ public int getReconnectAttempts() {
+return stats.getInt(reconnectAttemptsId);
+ }
+
+ @Override
public void incLostLease() {
stats.incInt(lostConnecti
[geode] branch feature/GEODE-6928 updated (c0a99ef -> bd76405)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6928 in repository https://gitbox.apache.org/repos/asf/geode.git. from c0a99ef cleaned up a couple of things add bd76405 removing println No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/ClusterCommunicationsDUnitTest.java| 1 - 1 file changed, 1 deletion(-)
[geode] 01/01: GEODE-6928 peer-to-peer SSL stream corruption with conserve-sockets=false
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-6928
in repository https://gitbox.apache.org/repos/asf/geode.git
commit bc1a215f24557487d43964f9722c734200911364
Author: Bruce Schuchardt
AuthorDate: Fri Jun 28 14:10:00 2019 -0700
GEODE-6928 peer-to-peer SSL stream corruption with conserve-sockets=false
Modified the NioSslEngine to not modify the decrypted SSL buffer after
reading a direct-ack response. This allows the readFully method to
correctly see what bytes have already been consumed and correctly
compact the buffer for subsequent reads, if necessary.
The cluster communication test is modified to check for aborted
connections created (retries) during operation distribution. Without the
fix for the problem this check would fail.
---
.../org/apache/geode/ClusterCommunicationsDUnitTest.java | 15 ---
.../distributed/internal/ClusterDistributionManager.java | 2 --
.../org/apache/geode/distributed/internal/DMStats.java| 3 +++
.../geode/distributed/internal/DistributionStats.java | 5 +
.../distributed/internal/LonerDistributionManager.java| 5 +
.../geode/internal/cache/AbstractUpdateOperation.java | 2 +-
.../java/org/apache/geode/internal/net/NioFilter.java | 7 +++
.../java/org/apache/geode/internal/net/NioSslEngine.java | 6 ++
.../java/org/apache/geode/internal/tcp/MsgReader.java | 12
9 files changed, 43 insertions(+), 14 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
index 4d7bb23..6fb27df 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/ClusterCommunicationsDUnitTest.java
@@ -66,6 +66,7 @@ import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.ClusterDistributionManager;
+import org.apache.geode.distributed.internal.DMStats;
import org.apache.geode.distributed.internal.DirectReplyProcessor;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -143,7 +144,10 @@ public class ClusterCommunicationsDUnitTest implements
Serializable {
for (int i = 1; i <= NUM_SERVERS; i++) {
verifyCreatedEntry(getVM(i));
}
-performUpdate(getVM(1));
+for (int iteration = 1; iteration < 6; iteration++) {
+ System.out.println("Performing update #" + iteration);
+ performUpdate(getVM(1));
+}
for (int i = 1; i <= NUM_SERVERS; i++) {
verifyUpdatedEntry(getVM(i));
}
@@ -239,8 +243,13 @@ public class ClusterCommunicationsDUnitTest implements
Serializable {
}
private void performUpdate(VM memberVM) {
-memberVM.invoke("perform update", () -> cache
-.getRegion(regionName).put("testKey", "updatedTestValue"));
+memberVM.invoke("perform update", () -> {
+ DMStats stats = ((InternalDistributedSystem)
cache.getDistributedSystem())
+ .getDistributionManager().getStats();
+ int reconnectAttempts = stats.getReconnectAttempts();
+ cache.getRegion(regionName).put("testKey", "updatedTestValue");
+ assertThat(stats.getReconnectAttempts()).isEqualTo(reconnectAttempts);
+});
}
private void performCreateWithLargeValue(VM memberVM) {
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
index 6d7490e..c13b77b 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/ClusterDistributionManager.java
@@ -790,8 +790,6 @@ public class ClusterDistributionManager implements
DistributionManager {
localAddress = membershipManager.getLocalMember();
- membershipManager.postConnect();
-
sb.append(" ms)");
logger.info("Starting DistributionManager {}. {}",
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
index 410d74f..f91bf55 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/DMStats.java
@@ -297,6 +297,9 @@ public interface DMStats {
*/
void incReconnectAttempts();
+
+ int getReconnectAttempts();
+
[geode] branch feature/GEODE-6928 created (now bc1a215)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6928 in repository https://gitbox.apache.org/repos/asf/geode.git. at bc1a215 GEODE-6928 peer-to-peer SSL stream corruption with conserve-sockets=false This branch includes the following new commits: new bc1a215 GEODE-6928 peer-to-peer SSL stream corruption with conserve-sockets=false 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-3780 suspected member is never watched again after passing final check
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-3780
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 50bcc90c779c5d74c20b75d84ebc4522dd421caa
Author: Bruce Schuchardt
AuthorDate: Tue Aug 13 09:47:52 2019 -0700
GEODE-3780 suspected member is never watched again after passing final check
After passing a "final check" a member will be subject to suspect
processing again but we weren't processing the suspect message locally.
This caused JoinLeave to never be notified of the suspect so that
removal could be initiated.
I also noticed that a method in HealthMonitor was misnamed. It claimed
to return the set of members that had failed availability checks but
instead it was returning a set of members currently under suspicion. I
renamed the method for clarity.
---
.../gms/fd/GMSHealthMonitorJUnitTest.java | 25 ++
.../gms/membership/GMSJoinLeaveJUnitTest.java | 4 ++--
.../membership/gms/fd/GMSHealthMonitor.java| 9 +---
.../membership/gms/interfaces/HealthMonitor.java | 4 ++--
.../membership/gms/membership/GMSJoinLeave.java| 2 +-
5 files changed, 36 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 264ac62..59d2c0e 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -498,6 +498,31 @@ public class GMSHealthMonitorJUnitTest {
}
}
+ @Test
+ public void testMemberIsExaminedAgainAfterPassingAvailabilityCheck() {
+// use the test health monitor's availability check for the first round of
suspect processing
+// but then turn it off so that a subsequent round is performed and fails
to get a heartbeat
+useGMSHealthMonitorTestClass = true;
+
+try {
+ GMSMembershipView v = installAView();
+
+ setFailureDetectionPorts(v);
+
+ GMSMember memberToCheck = mockMembers.get(1);
+
+ boolean retVal = gmsHealthMonitor.checkIfAvailable(memberToCheck, "Not
responding", true);
+ assertTrue("CheckIfAvailable should have return true", retVal);
+
+ // memberToCheck should be suspected again since it's not sending
heartbeats and then
+ // it should fail an availability check and cause removal of the member
+ useGMSHealthMonitorTestClass = false;
+ await().untilAsserted(() -> verify(joinLeave,
atLeastOnce()).remove(memberToCheck,
+ "Member isn't responding to heartbeat requests"));
+} finally {
+ useGMSHealthMonitorTestClass = false;
+}
+ }
@Test
public void testNeighborRemainsSameAfterSuccessfulFinalCheck() {
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 8f18895..dcefbf3 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -707,7 +707,7 @@ public class GMSJoinLeaveJUnitTest {
D = mockMembers[2],
E = mockMembers[3];
prepareAndInstallView(C, createMemberList(A, B, C, D, E));
-
when(healthMonitor.getMembersFailingAvailabilityCheck()).thenReturn(Collections.singleton(A));
+
when(healthMonitor.getSuspectedMembers()).thenReturn(Collections.singleton(A));
LeaveRequestMessage msg = new LeaveRequestMessage(B, C, "leaving for
test");
msg.setSender(C);
gmsJoinLeave.processMessage(msg);
@@ -730,7 +730,7 @@ public class GMSJoinLeaveJUnitTest {
D = mockMembers[2],
E = mockMembers[3];
prepareAndInstallView(C, createMemberList(A, B, C, D));
-
when(healthMonitor.getMembersFailingAvailabilityCheck()).thenReturn(Collections.singleton(A));
+
when(healthMonitor.getSuspectedMembers()).thenReturn(Collections.singleton(A));
E.setVmViewId(1);
gmsJoinLeave.processMessage(new JoinRequestMessage(B, E, null, 1, 1));
LeaveRequestMessage msg = new LeaveRequestMessage(B, C, "leaving for
test");
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthM
[geode] branch feature/GEODE-3780 created (now 50bcc90)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-3780 in repository https://gitbox.apache.org/repos/asf/geode.git. at 50bcc90 GEODE-3780 suspected member is never watched again after passing final check This branch includes the following new commits: new 50bcc90 GEODE-3780 suspected member is never watched again after passing final check 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 feature/GEODE-3780 updated (50bcc90 -> 085d58f)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-3780 in repository https://gitbox.apache.org/repos/asf/geode.git. from 50bcc90 GEODE-3780 suspected member is never watched again after passing final check add 085d58f empty commit No new revisions were added by this update. Summary of changes:
[geode] branch feature/GEODE-7072 updated (9f3a28c -> da7a9cf)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7072 in repository https://gitbox.apache.org/repos/asf/geode.git. from 9f3a28c GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo add da7a9cf adding another test No new revisions were added by this update. Summary of changes: .../geode/internal/cache/rollingupgrade/RollingUpgradeClients.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[geode] 01/01: GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-7072
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9f3a28cab6b6f7212f0caf0932451f850eff447d
Author: Bruce Schuchardt
AuthorDate: Mon Aug 12 09:52:40 2019 -0700
GEODE-7072 CI Failure:
WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo
A number of tests were attempting to delete old locator state files
containing membership views in order to ensure that artifacts from
previously run tests were not around to infect the current test.
Unfortunately the calls to DistributedTestUtils.deleteLocatorStateFile()
were being made from the wrong working directory. Instead of looking
for the file(s) in the directory that the test's locator would use they
were looking in the unit test VMs working directory.
---
.../org/apache/geode/cache30/ReconnectDUnitTest.java | 14 --
.../org/apache/geode/distributed/LocatorDUnitTest.java | 13 -
.../internal/cache/snapshot/GFSnapshotDUnitTest.java | 2 +-
.../rollingupgrade/RollingUpgrade2DUnitTestBase.java | 2 +-
.../RollingUpgradeConcurrentPutsReplicated.java | 3 ++-
...lingUpgradeHARegionNameOnDifferentServerVersions.java | 2 +-
...ollingUpgradeOplogMagicSeqBackwardCompactibility.java | 2 +-
.../RollingUpgradeRollLocatorWithTwoServers.java | 2 +-
.../RollingUpgradeRollLocatorsWithOldServer.java | 3 ++-
...SingleLocatorWithMultipleServersReplicatedRegion.java | 2 +-
.../rollingupgrade/RollingUpgradeVerifyXmlEntity.java| 2 +-
...ectResultAfterTwoLocatorsWithTwoServersAreRolled.java | 3 ++-
...CorrectResultsAfterClientAndServersAreRolledOver.java | 2 +-
...erClientAndServersAreRolledOverAllBucketsCreated.java | 2 +-
...ldBeSuccessfulWhenAllServersRollToCurrentVersion.java | 2 +-
...adeCreateGatewaySenderMixedSiteOneCurrentSiteTwo.java | 4 ++--
...UpgradeEventProcessingMixedSiteOneCurrentSiteTwo.java | 16 ++--
...lingUpgradeEventProcessingMixedSiteOneOldSiteTwo.java | 4 ++--
...ngUpgradeEventProcessingOldSiteOneCurrentSiteTwo.java | 4 ++--
.../wan/WANRollingUpgradeNewSenderProcessOldEvent.java | 4 ++--
...entsNotReprocessedAfterCurrentSiteMemberFailover.java | 4 ++--
...essedAfterCurrentSiteMemberFailoverWithOldClient.java | 4 ++--
...ryEventsNotReprocessedAfterOldSiteMemberFailover.java | 4 ++--
...dRemoveCacheServerProfileToMembersOlderThan1dot5.java | 2 +-
.../wan/WANRollingUpgradeVerifyGatewaySenderProfile.java | 2 +-
25 files changed, 58 insertions(+), 46 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index 87e33f1..1155abf 100755
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -320,7 +320,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
final int locPort = locatorPort;
final int secondLocPort = AvailablePortHelper.getRandomAvailableTCPPort();
-DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
final String xmlFileLoc = (new File(".")).getAbsolutePath();
@@ -473,8 +474,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
forceDisconnect(vm1);
newdm = waitForReconnect(vm1);
assertNotSame("expected a reconnect to occur in member", evenNewerdm,
newdm);
-DistributedTestUtils.deleteLocatorStateFile(locPort);
-DistributedTestUtils.deleteLocatorStateFile(secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
}
private DistributedMember getDMID(VM vm) {
@@ -553,7 +554,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
final int locPort = locatorPort;
final int secondLocPort = AvailablePortHelper.getRandomAvailableTCPPort();
-DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
final String xmlFileLoc = (new File(".")).getAbsolutePath();
@@ -638,8 +640,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
gfshThread = null;
}
});
- DistributedTestUtils.deleteLocatorStateFile(locPort);
- DistributedTestUtils.deleteLocatorStateFile(secondLocPort);
+ Invoke.invokeInEveryVM(
+ () -> DistributedTestUtils.deleteLocatorStateFile(locPort,
secondLocPort));
}
}
diff --git
a/geode-core/src/distrib
[geode] branch feature/GEODE-7072 created (now 9f3a28c)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7072 in repository https://gitbox.apache.org/repos/asf/geode.git. at 9f3a28c GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo This branch includes the following new commits: new 9f3a28c GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo 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 (6c6dc14 -> c7d414a)
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 6c6dc14 GEODE-7074: update swagger api operation names for some rest end points (#3907) new 25e591c GEODE-7036: Fix for NPE caused by ex-coordinator joining quorum new 2a466f9 GEODE-7036: Update of solution after review new aba75a7 GEODE-7036: Change TC name new c7d414a Merge pull request #3882 from Nordix/feature/GEODE-7036 The 8216 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: .../internal/RestartOfMemberDistributedTest.java | 87 ++ .../distributed/internal/InternalLocator.java | 9 ++- .../geode/test/dunit/rules/ClusterStartupRule.java | 14 +++- 3 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 geode-core/src/distributedTest/java/org/apache/geode/distributed/internal/RestartOfMemberDistributedTest.java
[geode] branch develop updated (ae72a17 -> 4aa805b)
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 ae72a17 GEODE-6897: change rebalance endpoint to 'rebalances' to conform with REST best practices add 4aa805b GEODE-7038: After auto-reconnect a server's multicat communications aren't working correctly No new revisions were added by this update. Summary of changes: .../DistributedMulticastRegionDUnitTest.java | 107 - .../internal/membership/gms/ServiceConfig.java | 8 ++ .../membership/gms/fd/GMSHealthMonitor.java| 3 +- .../membership/gms/membership/GMSJoinLeave.java| 39 ++-- .../gms/messages/JoinResponseMessage.java | 1 - .../membership/gms/messenger/JGroupsMessenger.java | 6 +- .../membership/gms/mgr/GMSMembershipManager.java | 2 +- 7 files changed, 106 insertions(+), 60 deletions(-)
[geode] branch develop updated (4aa805b -> a10af1b)
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 4aa805b GEODE-7038: After auto-reconnect a server's multicat communications aren't working correctly add a10af1b GEODE-7031 Attempts to send messages to alert listeners delays network partition detection No new revisions were added by this update. Summary of changes: .../membership/gms/fd/GMSHealthMonitor.java| 2 ++ .../org/apache/geode/internal/tcp/Connection.java | 11 +++ .../geode/internal/tcp/ConnectionJUnitTest.java| 23 ++ 3 files changed, 32 insertions(+), 4 deletions(-)
[geode] branch feature/GEODE-3780 updated (085d58f -> cba14f6)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-3780 in repository https://gitbox.apache.org/repos/asf/geode.git. from 085d58f empty commit add cba14f6 removing getSuspectMembers - it could kick out a suspect member too easily No new revisions were added by this update. Summary of changes: .../gms/membership/GMSJoinLeaveJUnitTest.java | 41 -- .../membership/gms/membership/GMSJoinLeave.java| 27 -- 2 files changed, 47 insertions(+), 21 deletions(-)
[geode] branch feature/GEODE-3780 updated (cba14f6 -> 7c08b11)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-3780 in repository https://gitbox.apache.org/repos/asf/geode.git. from cba14f6 removing getSuspectMembers - it could kick out a suspect member too easily add 7c08b11 removing unused method and commented-out code No new revisions were added by this update. Summary of changes: .../internal/membership/gms/fd/GMSHealthMonitor.java | 11 +++ .../internal/membership/gms/interfaces/HealthMonitor.java | 6 -- .../internal/membership/gms/membership/GMSJoinLeave.java | 7 --- 3 files changed, 3 insertions(+), 21 deletions(-)
[geode] branch feature/GEODE-7090 deleted (was e8b1709)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. was e8b1709 GEODE-7090: Remove dependency on DataSerializer from membership classes The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-7072 deleted (was da7a9cf)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7072 in repository https://gitbox.apache.org/repos/asf/geode.git. was da7a9cf adding another test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated: GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo (#3908)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 86fd74d GEODE-7072 CI Failure:
WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo (#3908)
86fd74d is described below
commit 86fd74db98b5dff0e92ea4985651f3955c1a3420
Author: Bruce Schuchardt
AuthorDate: Thu Aug 15 10:19:19 2019 -0700
GEODE-7072 CI Failure:
WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo (#3908)
* GEODE-7072 CI Failure:
WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo
A number of tests were attempting to delete old locator state files
containing membership views in order to ensure that artifacts from
previously run tests were not around to infect the current test.
Unfortunately the calls to DistributedTestUtils.deleteLocatorStateFile()
were being made from the wrong working directory. Instead of looking
for the file(s) in the directory that the test's locator would use they
were looking in the unit test VMs working directory.
* adding another test
---
.../org/apache/geode/cache30/ReconnectDUnitTest.java | 14 --
.../org/apache/geode/distributed/LocatorDUnitTest.java | 13 -
.../internal/cache/snapshot/GFSnapshotDUnitTest.java | 2 +-
.../rollingupgrade/RollingUpgrade2DUnitTestBase.java | 2 +-
.../cache/rollingupgrade/RollingUpgradeClients.java | 2 +-
.../RollingUpgradeConcurrentPutsReplicated.java | 3 ++-
...lingUpgradeHARegionNameOnDifferentServerVersions.java | 2 +-
...ollingUpgradeOplogMagicSeqBackwardCompactibility.java | 2 +-
.../RollingUpgradeRollLocatorWithTwoServers.java | 2 +-
.../RollingUpgradeRollLocatorsWithOldServer.java | 3 ++-
...SingleLocatorWithMultipleServersReplicatedRegion.java | 2 +-
.../rollingupgrade/RollingUpgradeVerifyXmlEntity.java| 2 +-
...ectResultAfterTwoLocatorsWithTwoServersAreRolled.java | 3 ++-
...CorrectResultsAfterClientAndServersAreRolledOver.java | 2 +-
...erClientAndServersAreRolledOverAllBucketsCreated.java | 2 +-
...ldBeSuccessfulWhenAllServersRollToCurrentVersion.java | 2 +-
...adeCreateGatewaySenderMixedSiteOneCurrentSiteTwo.java | 4 ++--
...UpgradeEventProcessingMixedSiteOneCurrentSiteTwo.java | 16 ++--
...lingUpgradeEventProcessingMixedSiteOneOldSiteTwo.java | 4 ++--
...ngUpgradeEventProcessingOldSiteOneCurrentSiteTwo.java | 4 ++--
.../wan/WANRollingUpgradeNewSenderProcessOldEvent.java | 4 ++--
...entsNotReprocessedAfterCurrentSiteMemberFailover.java | 4 ++--
...essedAfterCurrentSiteMemberFailoverWithOldClient.java | 4 ++--
...ryEventsNotReprocessedAfterOldSiteMemberFailover.java | 4 ++--
...dRemoveCacheServerProfileToMembersOlderThan1dot5.java | 2 +-
.../wan/WANRollingUpgradeVerifyGatewaySenderProfile.java | 2 +-
26 files changed, 59 insertions(+), 47 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index 87e33f1..1155abf 100755
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -320,7 +320,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
final int locPort = locatorPort;
final int secondLocPort = AvailablePortHelper.getRandomAvailableTCPPort();
-DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
final String xmlFileLoc = (new File(".")).getAbsolutePath();
@@ -473,8 +474,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
forceDisconnect(vm1);
newdm = waitForReconnect(vm1);
assertNotSame("expected a reconnect to occur in member", evenNewerdm,
newdm);
-DistributedTestUtils.deleteLocatorStateFile(locPort);
-DistributedTestUtils.deleteLocatorStateFile(secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
}
private DistributedMember getDMID(VM vm) {
@@ -553,7 +554,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
{
final int locPort = locatorPort;
final int secondLocPort = AvailablePortHelper.getRandomAvailableTCPPort();
-DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort);
+Invoke
+.invokeInEveryVM(() ->
DistributedTestUtils.deleteLocatorStateFile(locPort, secondLocPort));
final String xmlFileLoc = (new File(".")).getAbsolutePath();
@@ -638,8 +640,8 @@ public class Reconne
[geode] branch feature/GEODE-3780 updated (7c08b11 -> a19cccb)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-3780 in repository https://gitbox.apache.org/repos/asf/geode.git. from 7c08b11 removing unused method and commented-out code add a19cccb revising test No new revisions were added by this update. Summary of changes: .../membership/gms/membership/GMSJoinLeaveJUnitTest.java| 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-)
[geode] branch feature/GEODE-7090 created (now e8b1709)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. at e8b1709 GEODE-7090: Remove dependency on DataSerializer from membership classes This branch includes the following new commits: new e8b1709 GEODE-7090: Remove dependency on DataSerializer from membership classes 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 (86fd74d -> 8e9b044)
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 86fd74d GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo (#3908) add 8e9b044 GEODE-3780 suspected member is never watched again after passing final check (#3917) No new revisions were added by this update. Summary of changes: .../gms/fd/GMSHealthMonitorJUnitTest.java | 25 .../gms/membership/GMSJoinLeaveJUnitTest.java | 44 -- .../membership/gms/fd/GMSHealthMonitor.java| 8 ++-- .../membership/gms/interfaces/HealthMonitor.java | 6 --- .../membership/gms/membership/GMSJoinLeave.java| 20 +- 5 files changed, 70 insertions(+), 33 deletions(-)
[geode] branch feature/GEODE-3780 deleted (was a19cccb)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-3780 in repository https://gitbox.apache.org/repos/asf/geode.git. was a19cccb revising test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] 01/01: GEODE-3780 suspected member is never watched again after passing final check (#3917)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/merge_geode_3780
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9975d1e10a905b040edeefa0ecb2210d1a1c1525
Author: Bruce Schuchardt
AuthorDate: Thu Aug 15 13:55:46 2019 -0700
GEODE-3780 suspected member is never watched again after passing final
check (#3917)
* GEODE-3780 suspected member is never watched again after passing final
check
After passing a "final check" a member will be subject to suspect
processing again but we weren't processing the suspect message locally.
This caused JoinLeave to never be notified of the suspect so that
removal could be initiated.
I also noticed that a method in HealthMonitor was misnamed. It claimed
to return the set of members that had failed availability checks but
instead it was returning a set of members currently under suspicion. I
renamed the method for clarity.
* empty commit
* removing getSuspectMembers - it could kick out a suspect member too easily
* removing unused method and commented-out code
* revising test
(cherry picked from commit 8e9b04470264983d0aa1c7900f6e9be2374549d9)
---
.../gms/fd/GMSHealthMonitorJUnitTest.java | 25
.../gms/membership/GMSJoinLeaveJUnitTest.java | 44 --
.../membership/gms/fd/GMSHealthMonitor.java| 8 ++--
.../membership/gms/interfaces/HealthMonitor.java | 6 ---
.../membership/gms/membership/GMSJoinLeave.java| 20 +-
5 files changed, 70 insertions(+), 33 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 2fb067f..a750fa9 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -500,6 +500,31 @@ public class GMSHealthMonitorJUnitTest {
}
}
+ @Test
+ public void testMemberIsExaminedAgainAfterPassingAvailabilityCheck() {
+// use the test health monitor's availability check for the first round of
suspect processing
+// but then turn it off so that a subsequent round is performed and fails
to get a heartbeat
+useGMSHealthMonitorTestClass = true;
+
+try {
+ NetView v = installAView();
+
+ setFailureDetectionPorts(v);
+
+ InternalDistributedMember memberToCheck = mockMembers.get(1);
+
+ boolean retVal = gmsHealthMonitor.checkIfAvailable(memberToCheck, "Not
responding", true);
+ assertTrue("CheckIfAvailable should have return true", retVal);
+
+ // memberToCheck should be suspected again since it's not sending
heartbeats and then
+ // it should fail an availability check and cause removal of the member
+ useGMSHealthMonitorTestClass = false;
+ await().untilAsserted(() -> verify(joinLeave,
atLeastOnce()).remove(memberToCheck,
+ "Member isn't responding to heartbeat requests"));
+} finally {
+ useGMSHealthMonitorTestClass = false;
+}
+ }
@Test
public void testNeighborRemainsSameAfterSuccessfulFinalCheck() {
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index cb605ea..2fe1a3e 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -716,12 +716,13 @@ public class GMSJoinLeaveJUnitTest {
D = mockMembers[2],
E = mockMembers[3];
prepareAndInstallView(C, createMemberList(A, B, C, D, E));
-
when(healthMonitor.getMembersFailingAvailabilityCheck()).thenReturn(Collections.singleton(A));
LeaveRequestMessage msg = new LeaveRequestMessage(B, C, "leaving for
test");
msg.setSender(C);
gmsJoinLeave.processMessage(msg);
+RemoveMemberMessage removeMemberMessage = new RemoveMemberMessage(B, A,
"removing for test");
+removeMemberMessage.setSender(B);
+gmsJoinLeave.processMessage(removeMemberMessage);
assertTrue("Expected becomeCoordinator to be invoked",
gmsJoinLeave.isCoordinator());
-await().until(() -> gmsJoinLeave.getView().size() == 1);
}
/**
@@ -738,18 +739,39 @@ public class GMSJoinLeaveJUnitTest {
[geode] branch feature/GEODE-7103 created (now d935f76)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7103 in repository https://gitbox.apache.org/repos/asf/geode.git. at d935f76 GEODE-7103:CI Failure: org.apache.geode.internal.cache.PartitionedRegionCreationJUnitTest This branch includes the following new commits: new d935f76 GEODE-7103:CI Failure: org.apache.geode.internal.cache.PartitionedRegionCreationJUnitTest 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-7103:CI Failure: org.apache.geode.internal.cache.PartitionedRegionCreationJUnitTest
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-7103
in repository https://gitbox.apache.org/repos/asf/geode.git
commit d935f7667548f65d271c1114865e081d669669f1
Author: Bruce Schuchardt
AuthorDate: Mon Aug 19 12:02:32 2019 -0700
GEODE-7103:CI Failure:
org.apache.geode.internal.cache.PartitionedRegionCreationJUnitTest
replaced while-loops with await() or with a timeout
replaced static variables with instance variables
added tearDown to close the static cache held in
PartitionedRegionTestHelper and shut down region-creation threads
removed requirement to run tests in alphabetical order
---
.../cache/PartitionedRegionCreationJUnitTest.java | 195 +++--
1 file changed, 59 insertions(+), 136 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
index 1b4f969..3a26b40 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
@@ -22,12 +22,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.junit.After;
import org.junit.Before;
-import org.junit.FixMethodOrder;
import org.junit.Test;
-import org.junit.runners.MethodSorters;
-import org.apache.geode.LogWriter;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -36,66 +34,59 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.Scope;
+import org.apache.geode.test.awaitility.GeodeAwaitility;
-/**
- * This is a test for creation of Partition region(PR).
- *
- * Following tests are included in PartitionedRegionCreationJUnitTest :
- *
- *
- * 1) testpartionedRegionCreate - Tests the PR creation.
- *
- *
- * 2) testpartionedRegionInitialization - Tests the PR initialization
- *
- *
- * 3) testpartionedRegionRegistration - Tests the PR registration
- *
- *
- * 4) testpartionedRegionBucketToNodeCreate - Tests the PR's BUCKET_2_NODE
region creation
- *
- *
- *
- */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class PartitionedRegionCreationJUnitTest {
- static volatile int PRNumber = 0;
+ private volatile int PRNumber = 0;
- static Region root = null;
+ private volatile boolean incrementFlag = false;
- static volatile boolean increamentFlag = false;
+ private final int TOTAL_THREADS = 10;
- static final int TOTAL_THREADS = 10;
+ private volatile int TOTAL_PR_CREATED = 0;
- static volatile int TOTAL_PR_CREATED = 0;
+ private volatile int TOTAL_RETURNS = 0;
- static volatile int TOTAL_RETURNS = 0;
+ private volatile int TOTAL_PR_CREATION_FAIL = 0;
- static volatile int TOTAL_PR_CREATION_FAIL = 0;
+ private final Object PR_CREATE = new Object();
- static final Object PR_CREATE = new Object();
+ private final Object PR_CREATE_FAIL = new Object();
- static final Object PR_CREATE_FAIL = new Object();
+ private final Object PR_INCREMENT = new Object();
- static final Object PR_INCREMENT = new Object();
+ private final Object PR_TOTAL_RETURNS = new Object();
- static final Object PR_TOTAL_RETURNS = new Object();
+ private boolean PRCreateDone = false;
- public boolean PRCreateDone = false;
-
- List PRRegionList = new ArrayList();
-
- LogWriter logger = null;
+ private List PRRegionList = new ArrayList();
private Object CREATE_COMPLETE_LOCK = new Object();
private volatile boolean createComplete = false;
+ private List regionCreationThreads = new ArrayList<>(20);
+
@Before
public void setUp() throws Exception {
TOTAL_RETURNS = 0;
-if (logger == null)
- logger = PartitionedRegionTestHelper.getLogger();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+PartitionedRegionTestHelper.closeCache();
+long numThreads = regionCreationThreads.size();
+int numAlive = 0;
+for (Thread thread : regionCreationThreads) {
+ thread.interrupt();
+ thread.join(GeodeAwaitility.getTimeout().getValueInMS() / numThreads);
+ if (thread.isAlive()) {
+numAlive++;
+ }
+}
+if (numAlive > 0) {
+ throw new IllegalStateException("Test is leaving behind " + numAlive + "
live threads");
+}
}
/*
@@ -105,13 +96,9 @@ public class PartitionedRegionCreationJUnitTest {
* 5) Test for localMaxMemory < 0
*/
@Test
- public void test000PartitionedRegionCreate() {
+ public void testPartitionedRegionCreate() {
createMultiplePartitionedReg
[geode] branch feature/merge_geode_3780 created (now 9975d1e)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/merge_geode_3780 in repository https://gitbox.apache.org/repos/asf/geode.git. at 9975d1e GEODE-3780 suspected member is never watched again after passing final check (#3917) This branch includes the following new commits: new 9975d1e GEODE-3780 suspected member is never watched again after passing final check (#3917) 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 feature/GEODE-7103 deleted (was d935f76)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7103 in repository https://gitbox.apache.org/repos/asf/geode.git. was d935f76 GEODE-7103:CI Failure: org.apache.geode.internal.cache.PartitionedRegionCreationJUnitTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (87b3110 -> 5c800d5)
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 87b3110 GEODE-7071: Add CA to CertStores so that all certificates can be signed (#3905) add 5c800d5 GEODE-7103:CI Failure: org.apache.geode.internal.cache.PartitionedRegionCreationJUnitTest No new revisions were added by this update. Summary of changes: .../cache/PartitionedRegionCreationJUnitTest.java | 195 +++-- 1 file changed, 59 insertions(+), 136 deletions(-)
[geode] branch feature/GEODE-7072 created (now b1c1b44)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7072 in repository https://gitbox.apache.org/repos/asf/geode.git. at b1c1b44 GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo This branch includes the following new commits: new b1c1b44 GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo 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 dsfid_separation_wip updated (f09c93c -> ab7af10)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch dsfid_separation_wip in repository https://gitbox.apache.org/repos/asf/geode.git. discard f09c93c implemented new SerializationContext for DataSerializableFixedID toData/fromData discard 34db26b introduction of SerializationVersion, a superclass of Version discard c5e5b8d redoing lost work discard 2e9adb3 Proof of concept: Isolation of DataSerializableFixedID for use in membership add c5121fb GEODE-7105: Changed Function execution HA docs add babf35d Minor language edit add 222bbe6 Merge pull request #3950 from nabarunnag/feature/GEODE-7105 add f17931b GEODE-7085: Ensure bitset is flushed in all code paths add 7d6e08a GEODE-6945: expand the type to related xml attributes (#3936) add 5d0153a GEODE-7089: Each client registration thread uses its own queue add b5c0395 GEODE-7087: Reset flag after unlock bucket primary lock. (#3926) add 5a6c1f8 GEODE-7099: Clean up MeterSubregistryReconnectDistributedTest (#3942) add 9368e09 GEODE-6915: Improve CompiledGroupBySelect Tests (#3954) add 174af1d GEODE-7088: Using ConcurrentSets for interested clients add 5bb753a GEODE-7088: Fixing test build issue add 7aeb882 GEODE-7104: Ensure compatibility with Spring 5.x (#3948) add 7efc2cd GEODE-130: Cleanup internal API warnings. (#3872) add c94b6e1 GEODE-7091: Add Micrometer binders to meter registry (#3952) add a4dad30 GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCu… (#3966) add 785c6a3 GEODE-7112: add wait until user transaction is timed out. (#3961) add 2ad5d3e GEODE-7083: Cleanup static analyzer warnings. add b8c5a0b GEODE-7083: Adds statistics to PeerTypeRegistration add 4ab4a28 Format fix for a nested list add d8a1dde fix geode-examples in ci to use repo branch instead of hardcoding develop add 2381aa7 Add 1.9.1 to Version list add a4e84ad Add 1.9.1 to Version list add 0c16b1b GEODE-7066: Modified batch conflation to use event id instead of shadow key add 083f1ba GEODE-6910: Add Aggregate Function Documentation (#3962) add feb7567 GEODE-7107: Introduce HttpService interface (#3963) add 6549e25 GEODE-7120: Adjust pipeline values for RAM and timeouts new d26ae43 Proof of concept: Isolation of DataSerializableFixedID for use in membership new 4c4e727 redoing lost work new 26e6aab introduction of SerializationVersion, a superclass of Version new 7155367 implemented new SerializationContext for DataSerializableFixedID toData/fromData new ab7af10 fixed rebase conflict compilation error 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 (f09c93c) \ N -- N -- N refs/heads/dsfid_separation_wip (ab7af10) 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 5 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| 6 + .../dockerizedtest/DockerizedExecHandle.java | 36 +-- ci/pipelines/examples/jinja.template.yml | 2 +- ci/pipelines/geode-build/jinja.template.yml| 2 +- ci/pipelines/shared/jinja.variables.yml| 4 +- .../apache/geode/metrics/MicrometerBinderTest.java | 195 +++ .../management/internal/AgentUtilJUnitTest.java| 13 +- .../integrationTest/resources/assembly_content.txt | 1 + .../resources/dependency_classpath.txt | 1 + .../source/subnavs/geode-subnav.erb| 3 - geode-core/build.gradle| 3 +- .../internal/jta/dunit/TxnTimeOutDUnitTest.java| 17 +- .../MeterSubregistryReconnectDistributedTest.java | 127 .../internal/TypeRegistrationDistributedTest.java | 175 ++ .../CompiledGroupBySelectIntegrationTest.java | 253 +++ .../internal/CompiledGroupBySelectJUnitTest.java | 152 - .../gms/fd/GMSHealthMonitorJUnitTest.java | 27 ++ .../cache/ha/HARegionQueueIntegrationTest.java | 4 +- .../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 234 ++ .../codeAnalysis/sanctionedDataSerial
[geode] 01/05: Proof of concept: Isolation of DataSerializableFixedID for use in membership
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git
commit d26ae437fb7273dc71e63e254b3d051101693713
Author: Bruce Schuchardt
AuthorDate: Tue Aug 20 08:58:38 2019 -0700
Proof of concept: Isolation of DataSerializableFixedID for use in
membership
InternalDataSerializer holds a DSFIDFactory instance and a
DSFIDSerializer instance (which is also a DSFIDFactory).
InternalDataSerializer registers Geode DSFID classes with the factory.
InternalDataSerializer defers DSFID serialization/deserialization to
DSFIDSerializer.
Need to move registration of membership DSFID classes to that package
and change GMS initialization to create a DSFIDSerializer if one isn't
provided. How do we pass in Geode's DSFIDSerializer?
Just started figuring out how to provide a writeObject() method to the
toData methods in DSFID classes and elsewhere.
Need to enhance DSFID toData/fromData to provide serialization context.
Exceptions still not isolated.
Version still references classes outside of the serialization package.
---
.../org/apache/geode/internal/DSFIDFactory.java| 1054 +---
.../geode/internal/HeapDataOutputStream.java |5 +-
.../BufferDataOutputStream.java} | 15 +-
.../{ => serialization}/ByteBufferWriter.java |0
.../geode/internal/{ => serialization}/DSCODE.java |1 +
.../DSFIDNotFoundException.java|0
.../internal/serialization/DSFIDSerializer.java| 363 +++
.../DataSerializableFixedID.java |0
.../{util => serialization}/DscodeHelper.java |2 +-
.../ObjectSerializer.java} | 15 +-
.../{ => serialization}/SerializationVersions.java |2 +
.../internal/{ => serialization}/Version.java |0
.../VersionedDataInputStream.java |2 +
.../VersionedDataOutputStream.java |2 +
.../{ => serialization}/VersionedDataStream.java |2 +
.../{ => serialization}/VersionedObjectInput.java |2 +
.../{ => serialization}/VersionedObjectOutput.java |2 +
.../internal/HeapDataOutputStreamJUnitTest.java|4 +-
.../geode/internal/HeapDataOutputStreamTest.java |4 +-
.../internal/{ => serialization}/DSCODETest.java |1 +
.../{ => serialization}/VersionJUnitTest.java |1 +
21 files changed, 427 insertions(+), 1050 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
index 1f0b447..2cb5ea1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
@@ -12,454 +12,34 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireError;
-import org.apache.geode.admin.internal.SystemMemberCacheEventProcessor;
-import org.apache.geode.admin.jmx.internal.StatAlertNotification;
import org.apache.geode.annotations.Immutable;
-import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.client.internal.CacheServerLoadMessage;
-import org.apache.geode.cache.client.internal.locator.ClientConnectionRequest;
-import org.apache.geode.cache.client.internal.locator.ClientConnectionResponse;
-import org.apache.geode.cache.client.internal.locator.ClientReplacementRequest;
-import org.apache.geode.cache.client.internal.locator.GetAllServersRequest;
-import org.apache.geode.cache.client.internal.locator.GetAllServersResponse;
-import org.apache.geode.cache.client.internal.locator.LocatorListRequest;
-import org.apache.geode.cache.client.internal.locator.LocatorListResponse;
-import org.apache.geode.cache.client.internal.locator.LocatorStatusRequest;
-import org.apache.geode.cache.client.internal.locator.LocatorStatusResponse;
-import org.apache.geode.cache.client.internal.locator.QueueConnectionRequest;
-import org.apache.geode.cache.client.internal.locator.QueueConnectionResponse;
-import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.internal.CqEntry;
-import org.apache.geode.cache.query.internal.CumulativeNonDistinctResults;
-import org.apache.geode.cache.query.internal.LinkedResultSet;
-import org.apache.geode.cache.query.int
[geode] 05/05: fixed rebase conflict compilation error
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ab7af10f63d691a90694f4cac308230d4653061d
Author: Bruce Schuchardt
AuthorDate: Mon Aug 26 16:03:03 2019 -0700
fixed rebase conflict compilation error
---
.../org/apache/geode/internal/serialization/SerializationVersion.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
index e066458..9b3addb 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/serialization/SerializationVersion.java
@@ -26,7 +26,7 @@ public class SerializationVersion implements
Comparable {
// We need access to them in GMS for backward-compatibility
public static final byte GFE_90_ORDINAL = 45; // this is also GEODE
1.0.0-incubating
public static final byte GEODE_1_2_0_ORDINAL = 65;
- public static final byte GEODE_1_3_0_ORDINAL = 70;
+ public static final byte GEODE_1_4_0_ORDINAL = 75;
public static final byte GEODE_1_10_0_ORDINAL = 105;
/**
[geode] 03/05: introduction of SerializationVersion, a superclass of Version
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 26e6aabf9729de216d726f135f707d4dfdce94c9
Author: Bruce Schuchardt
AuthorDate: Fri Aug 23 15:50:31 2019 -0700
introduction of SerializationVersion, a superclass of Version
---
...ackwardCompatibilitySerializationDUnitTest.java | 11 +-
.../cache/client/ClientCacheFactoryJUnitTest.java | 4 +-
.../internal/InternalDataSerializerBenchmark.java | 2 +-
.../client/internal/ClientSideHandshakeImpl.java | 16 +--
.../membership/InternalDistributedMember.java | 13 +-
.../internal/membership/gms/GMSMember.java | 15 ++-
.../membership/gms/messenger/JGroupsMessenger.java | 7 +-
.../distributed/internal/tcpserver/TcpClient.java | 17 ++-
.../distributed/internal/tcpserver/TcpServer.java | 4 +-
.../geode/internal/HeapDataOutputStream.java | 4 +-
.../geode/internal/InternalDataSerializer.java | 35 +++---
.../java/org/apache/geode/internal/Version.java| 130 ++-
.../geode/internal/VersionedObjectInput.java | 8 +-
.../geode/internal/VersionedObjectOutput.java | 8 +-
.../apache/geode/internal/cache/DiskInitFile.java | 3 +-
.../org/apache/geode/internal/cache/EventID.java | 2 +-
.../geode/internal/cache/FilterRoutingInfo.java| 2 +-
.../org/apache/geode/internal/cache/Oplog.java | 10 +-
.../cache/persistence/DiskInitFileParser.java | 3 +-
.../tier/sockets/ClientRegistrationMetadata.java | 7 +-
.../tier/sockets/ServerSideHandshakeFactory.java | 3 +-
.../tier/sockets/ServerSideHandshakeImpl.java | 19 +--
.../internal/cache/wan/GatewaySenderEventImpl.java | 2 +-
.../serialization/BufferDataOutputStream.java | 11 +-
.../internal/serialization/ByteArrayDataInput.java | 17 +--
.../internal/serialization/DSFIDSerializer.java| 15 ++-
.../serialization/SerializationVersion.java| 140 +
.../serialization/SerializationVersions.java | 4 +-
.../serialization/VersionedDataInputStream.java| 6 +-
.../serialization/VersionedDataOutputStream.java | 6 +-
.../serialization/VersionedDataStream.java | 4 +-
.../org/apache/geode/internal/tcp/Connection.java | 4 +-
.../apache/geode/internal/tcp/MsgDestreamer.java | 2 +-
.../tcp/VersionedByteBufferInputStream.java| 8 +-
.../geode/internal/tcp/VersionedMsgStreamer.java | 8 +-
.../org/apache/geode/internal/util/BlobHelper.java | 2 +-
.../java/org/apache/geode/DataSerializerTest.java | 4 +-
.../cache/execute/FunctionAdapterJUnitTest.java| 2 +-
.../membership/gms/GMSMemberJUnitTest.java | 2 +-
.../geode/internal/ByteArrayDataInputTest.java | 2 +-
.../geode/internal/DataSerializableJUnitTest.java | 4 +-
.../geode/internal/cache/FilterInfoTest.java | 2 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 4 +-
.../internal/results/PageEntryJUnitTest.java | 2 +-
.../apache/geode/OldClientSupportDUnitTest.java| 10 +-
.../gemstone/gemfire/OldClientSupportProvider.java | 3 +-
46 files changed, 319 insertions(+), 268 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 7a0396c..b6a774c 100755
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -35,6 +35,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import
org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationVersion;
import org.apache.geode.internal.serialization.SerializationVersions;
import org.apache.geode.internal.serialization.VersionedDataInputStream;
import org.apache.geode.internal.serialization.VersionedDataOutputStream;
@@ -93,7 +94,7 @@ public class BackwardCompatibilitySerializationDUnitTest
extends JUnit4CacheTest
@Test
public void testToDataFromHigherVersionToLower() throws Exception {
DataOutputStream dos =
-new VersionedDataOutputStream(new DataOutputStream(baos),
Version.GFE_56.ordinal());
+new VersionedDataOutputStream(new DataOutputStream(baos),
Version.GFE_56);
InternalDataSerializer.writeDSFID(msg, dos);
assertTrue(toDataPre66Called);
assertFalse(toDataCalled);
@@ -107,7 +108,7 @@ public class BackwardCompatibilitySerializationDUnitTest
extends JUnit4CacheTest
@Test
public void
[geode] branch dsfid_separation_wip updated (2e39399 -> 35066fb)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch dsfid_separation_wip in repository https://gitbox.apache.org/repos/asf/geode.git. from 2e39399 addressing unit test failures add 35066fb more unit test failure fixes No new revisions were added by this update. Summary of changes: .../gms/fd/GMSHealthMonitorJUnitTest.java | 5 .../gms/locator/GMSLocatorIntegrationTest.java | 24 +++ .../internal/membership/gms/GMSMember.java | 4 +-- .../membership/gms/locator/GMSLocator.java | 3 +- .../org/apache/geode/internal/DSFIDFactory.java| 34 ++ .../geode/internal/InternalDataSerializer.java | 2 ++ .../serialization/SerializationVersion.java| 4 +-- 7 files changed, 70 insertions(+), 6 deletions(-)
[geode] branch dsfid_separation_wip updated (6d06211 -> 7dd5dad)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 6d06211 including build.gradle for the new sub-project
add 7dd5dad hoping to make dependency checks happy
No new revisions were added by this update.
Summary of changes:
.../src/test/resources/expected-pom.xml| 24 +-
1 file changed, 10 insertions(+), 14 deletions(-)
copy {geode-protobuf =>
geode-serialization}/src/test/resources/expected-pom.xml (84%)
[geode] branch feature/GEODE-7090 created (now b7b0873)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. at b7b0873 incorporating review comments and fixing tomcat test classpath This branch includes the following new commits: new 10e0885 GEODE-7090 Remove dependency on DataSerializer from membership classes new b7b0873 incorporating review comments and fixing tomcat test classpath 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-7090 updated (b7b0873 -> f226923)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch feature/GEODE-7090
in repository https://gitbox.apache.org/repos/asf/geode.git.
from b7b0873 incorporating review comments and fixing tomcat test classpath
add f226923 splitting ObjectSerializer into a serializer and a
deserializer
No new revisions were added by this update.
Summary of changes:
...ackwardCompatibilitySerializationDUnitTest.java | 2 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 12 ++---
.../internal/membership/gms/GMSUtil.java | 2 +-
.../gms/locator/FindCoordinatorResponse.java | 2 +-
.../membership/gms/locator/GetViewResponse.java| 2 +-
.../gms/messages/InstallViewMessage.java | 4 +-
.../gms/messages/JoinRequestMessage.java | 2 +-
.../gms/messages/JoinResponseMessage.java | 2 +-
.../membership/gms/messages/ViewAckMessage.java| 2 +-
.../membership/gms/messenger/JGroupsMessenger.java | 2 +-
.../geode/internal/InternalDataSerializer.java | 21
.../cache/InvalidatePartitionedRegionMessage.java | 4 +-
geode-serialization/build.gradle | 7 +--
.../internal/serialization/DSFIDSerializer.java| 40 --
.../serialization/DSFIDSerializerFactory.java | 16 +-
.../serialization/DSFIDSerializerImpl.java | 63 --
.../serialization/DeserializationContext.java | 2 +-
.../serialization/DeserializationContextImpl.java | 4 +-
...jectSerializer.java => ObjectDeserializer.java} | 19 ++-
.../internal/serialization/ObjectSerializer.java | 14 ++---
.../serialization/StaticSerialization.java | 4 +-
21 files changed, 127 insertions(+), 99 deletions(-)
copy
geode-serialization/src/main/java/org/apache/geode/internal/serialization/{ObjectSerializer.java
=> ObjectDeserializer.java} (69%)
[geode] branch feature/GEODE-7090 updated (f226923 -> ab7b074)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. discard f226923 splitting ObjectSerializer into a serializer and a deserializer discard b7b0873 incorporating review comments and fixing tomcat test classpath discard 10e0885 GEODE-7090 Remove dependency on DataSerializer from membership classes add f0d0183 GEODE 6872: Add Non-Sticky configuration information to Tomcat Session module documentation (#3932) add b31d9f3 GEODE-6867: Updating Tomcat Session State Module docs (#3886) add 49db9da auto-stage to nexus and output next steps and script to commit the RC add fc213dc don't try to run brew command on linux just to find cmake add 4cd3f3b GEODE-7090 Remove dependency on DataSerializer from membership classes add 39d0371 incorporating review comments and fixing tomcat test classpath add 11601a0 splitting ObjectSerializer into a serializer and a deserializer add ab7b074 rebased on origin & fixed deserialization 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 (f226923) \ N -- N -- N refs/heads/feature/GEODE-7090 (ab7b074) 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. No new revisions were added by this update. Summary of changes: dev-tools/release/commit_rc.sh | 101 + dev-tools/release/prepare_rc.sh| 41 +++-- .../apache/geode/session/tests/TomcatInstall.java | 6 ++ .../integrationTest/resources/assembly_content.txt | 1 + .../Tomcat8ClientServerRollingUpgradeTest.java | 71 ++- geode-book/README.md | 8 +- .../source/subnavs/geode-subnav.erb| 3 + .../http_session_mgmt/chapter_overview.html.md.erb | 4 + .../configuring_non_sticky_sessions.html.md.erb| 57 .../tc_setting_up_the_module.html.md.erb | 18 .../tomcat_installing_the_module.html.md.erb | 3 + .../tomcat_setting_up_the_module.html.md.erb | 17 ++-- .../weblogic_setting_up_the_module.html.md.erb | 22 ++--- .../apache/geode/test/version/VersionManager.java | 21 + .../serialization/DSFIDSerializerImpl.java | 2 +- 15 files changed, 316 insertions(+), 59 deletions(-) create mode 100755 dev-tools/release/commit_rc.sh create mode 100644 geode-docs/tools_modules/http_session_mgmt/configuring_non_sticky_sessions.html.md.erb
[geode] branch feature/GEODE-7090 updated (ab7b074 -> 9d2b6dd)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. from ab7b074 rebased on origin & fixed deserialization issue add 9d2b6dd fixing Jetty classpath to include geode-serialization jar No new revisions were added by this update. Summary of changes: extensions/geode-modules-assembly/release/session/bin/modify_war | 1 + .../src/main/java/org/apache/geode/session/tests/TomcatInstall.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)
[geode] branch dsfid_separation_wip updated (35066fb -> 13e72d2)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 35066fb more unit test failure fixes
add 13e72d2 introduce DSFIDSerializer interface
No new revisions were added by this update.
Summary of changes:
...lusterDistributionManagerForAdminDUnitTest.java | 9 +-
...ackwardCompatibilitySerializationDUnitTest.java | 7 +-
.../cache/TransactionsWithDeltaDUnitTest.java | 88 +++---
.../control/RebalanceOperationDistributedTest.java | 6 +-
.../gms/locator/GMSLocatorIntegrationTest.java | 3 +-
.../gms/messenger/JGroupsMessengerJUnitTest.java | 3 +-
.../membership/gms/messenger/JGroupsMessenger.java | 5 +-
.../org/apache/geode/internal/DSFIDFactory.java| 3 +-
.../geode/internal/InternalDataSerializer.java | 5 +-
.../internal/serialization/DSFIDSerializer.java| 347 +
...FIDSerializer.java => DSFIDSerializerImpl.java} | 15 +-
.../serialization/SerializationVersion.java| 19 +-
.../geode/internal/offheap/DataTypeJUnitTest.java | 9 +-
13 files changed, 108 insertions(+), 411 deletions(-)
copy
geode-core/src/main/java/org/apache/geode/internal/serialization/{DSFIDSerializer.java
=> DSFIDSerializerImpl.java} (97%)
[geode] 01/01: GEODE-7119 Version ordinal constants are byte but should be short
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-7119
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9694909b4c51bd7a8a79b2af43cbe1b137ae0271
Author: Bruce Schuchardt
AuthorDate: Thu Aug 29 08:57:43 2019 -0700
GEODE-7119 Version ordinal constants are byte but should be short
Changed all Version ordinal declarations to be of type 'short' instead of
type 'byte'. Changed the constructor to take a 'short' instead of a
'byte'.
While we could change Version to use ints instead of shorts I don't see
a compelling reason to do that at this time.
---
.../java/org/apache/geode/internal/Version.java| 72 +++---
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java
b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index 74da825..acdf8dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -57,7 +57,7 @@ public class Version implements Comparable {
/** byte used as ordinal to represent this Version */
private final short ordinal;
- public static final int HIGHEST_VERSION = 107;
+ public static final int HIGHEST_VERSION = 110;
@Immutable
private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
@@ -72,91 +72,91 @@ public class Version implements Comparable {
public static final Version TOKEN =
new Version("", "TOKEN", (byte) -1, (byte) 0, (byte) 0, (byte) 0,
TOKEN_ORDINAL);
- private static final byte GFE_56_ORDINAL = 0;
+ private static final short GFE_56_ORDINAL = 0;
@Immutable
public static final Version GFE_56 =
new Version("GFE", "5.6", (byte) 5, (byte) 6, (byte) 0, (byte) 0,
GFE_56_ORDINAL);
- private static final byte GFE_57_ORDINAL = 1;
+ private static final short GFE_57_ORDINAL = 1;
@Immutable
public static final Version GFE_57 =
new Version("GFE", "5.7", (byte) 5, (byte) 7, (byte) 0, (byte) 0,
GFE_57_ORDINAL);
- private static final byte GFE_58_ORDINAL = 3;
+ private static final short GFE_58_ORDINAL = 3;
@Immutable
public static final Version GFE_58 =
new Version("GFE", "5.8", (byte) 5, (byte) 8, (byte) 0, (byte) 0,
GFE_58_ORDINAL);
- private static final byte GFE_603_ORDINAL = 4;
+ private static final short GFE_603_ORDINAL = 4;
@Immutable
public static final Version GFE_603 =
new Version("GFE", "6.0.3", (byte) 6, (byte) 0, (byte) 3, (byte) 0,
GFE_603_ORDINAL);
- private static final byte GFE_61_ORDINAL = 5;
+ private static final short GFE_61_ORDINAL = 5;
@Immutable
public static final Version GFE_61 =
new Version("GFE", "6.1", (byte) 6, (byte) 1, (byte) 0, (byte) 0,
GFE_61_ORDINAL);
- private static final byte GFE_65_ORDINAL = 6;
+ private static final short GFE_65_ORDINAL = 6;
@Immutable
public static final Version GFE_65 =
new Version("GFE", "6.5", (byte) 6, (byte) 5, (byte) 0, (byte) 0,
GFE_65_ORDINAL);
- private static final byte GFE_651_ORDINAL = 7;
+ private static final short GFE_651_ORDINAL = 7;
@Immutable
public static final Version GFE_651 =
new Version("GFE", "6.5.1", (byte) 6, (byte) 5, (byte) 1, (byte) 0,
GFE_651_ORDINAL);
- private static final byte GFE_6516_ORDINAL = 12;
+ private static final short GFE_6516_ORDINAL = 12;
@Immutable
public static final Version GFE_6516 =
new Version("GFE", "6.5.1.6", (byte) 6, (byte) 5, (byte) 1, (byte) 6,
GFE_6516_ORDINAL);
- private static final byte GFE_66_ORDINAL = 16;
+ private static final short GFE_66_ORDINAL = 16;
@Immutable
public static final Version GFE_66 =
new Version("GFE", "6.6", (byte) 6, (byte) 6, (byte) 0, (byte) 0,
GFE_66_ORDINAL);
- private static final byte GFE_662_ORDINAL = 17;
+ private static final short GFE_662_ORDINAL = 17;
@Immutable
public static final Version GFE_662 =
new Version("GFE", "6.6.2", (byte) 6, (byte) 6, (byte) 2, (byte) 0,
GFE_662_ORDINAL);
- private static final byte GFE_6622_ORDINAL = 18;
+ private static final short GFE_6622_ORDINAL = 18;
@Immutable
public static final Version GFE_6622 =
new Version("GFE", "6.6.2.2", (byte) 6, (byte) 6, (byte) 2, (byte) 2,
GFE_6622_ORDINAL);
- private static final byte GFE_70_ORDINAL = 19;
+ private static final short GFE_70_ORDINAL = 19;
@Immutable
public static final Version GFE_70 =
new Version("GFE", "7.0", (byte) 7, (byte) 0, (byte) 0, (byte) 0,
GFE_70_ORDINAL);
- private static final byte GFE_701_ORDI
[geode] branch feature/GEODE-7119 created (now 9694909)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7119 in repository https://gitbox.apache.org/repos/asf/geode.git. at 9694909 GEODE-7119 Version ordinal constants are byte but should be short This branch includes the following new commits: new 9694909 GEODE-7119 Version ordinal constants are byte but should be short 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 dsfid_separation_wip updated (f17109d -> 6d06211)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git.
from f17109d moving DataSerializableFixedID serialization to a new
sub-project
add 6d06211 including build.gradle for the new sub-project
No new revisions were added by this update.
Summary of changes:
geode-assembly/build.gradle| 2 +
.../build.gradle | 71 --
2 files changed, 42 insertions(+), 31 deletions(-)
copy {extensions/geode-modules => geode-serialization}/build.gradle (52%)
mode change 100644 => 100755
[geode] branch dsfid_separation_wip updated (137d328 -> f17109d)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 137d328 fix serializables
add f17109d moving DataSerializableFixedID serialization to a new
sub-project
No new revisions were added by this update.
Summary of changes:
.../src/test/resources/expected-pom.xml| 8 +++-
geode-core/build.gradle| 2 +
.../security/ClientAuthenticationTestCase.java | 3 +-
.../MembershipDependenciesJUnitTest.java | 5 ---
.../tier/sockets/CommandInitializerJUnitTest.java} | 19 +
geode-core/src/test/resources/expected-pom.xml | 5 +++
.../internal/cache/TxCommitMessageBCTestBase.java | 5 +--
.../apache/geode/test/dunit/internal/ChildVM.java | 2 +-
.../apache/geode/test/version/VersionManager.java | 7 ++--
.../AbstractSerializationContext.java | 0
.../serialization/BufferDataOutputStream.java | 0
.../internal/serialization/ByteArrayDataInput.java | 0
.../geode/internal/serialization/DSCODE.java | 7 +---
.../serialization/DSFIDNotFoundException.java | 0
.../internal/serialization/DSFIDSerializer.java| 0
.../serialization/DSFIDSerializerImpl.java | 3 +-
.../serialization/DataSerializableFixedID.java | 0
.../serialization/DeserializationContextImpl.java | 0
.../geode/internal/serialization/DscodeHelper.java | 0
.../serialization/SerializationContext.java| 0
.../serialization/SerializationContextImpl.java| 0
.../serialization/SerializationVersions.java | 0
.../internal/serialization/SerializerPlugin.java | 0
.../serialization/StaticSerialization.java | 0
.../serialization/ThreadLocalByteArrayCache.java | 0
.../UnsupportedSerializationVersionException.java | 0
.../geode/internal/serialization/Version.java | 0
.../serialization/VersionedDataInputStream.java| 0
.../serialization/VersionedDataOutputStream.java | 0
.../serialization/VersionedDataStream.java | 10 ++---
.../BufferDataOutputStreamJUnitTest.java | 49 +++---
.../serialization}/ByteArrayDataInputTest.java | 13 +++---
.../geode/internal/serialization/DSCODETest.java | 4 +-
.../SerializationDependenciesJUnitTest.java| 0
.../internal/serialization/VersionJUnitTest.java | 22 --
geode-unsafe/src/test/resources/expected-pom.xml | 4 +-
settings.gradle| 1 +
37 files changed, 62 insertions(+), 107 deletions(-)
copy
geode-core/src/{main/java/org/apache/geode/cache/client/internal/locator/ServerLocationResponse.java
=>
test/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializerJUnitTest.java}
(67%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/AbstractSerializationContext.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/BufferDataOutputStream.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/ByteArrayDataInput.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/DSCODE.java
(98%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/DSFIDNotFoundException.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializer.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/DSFIDSerializerImpl.java
(98%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/DataSerializableFixedID.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/DeserializationContextImpl.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/DscodeHelper.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/SerializationContext.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/SerializationContextImpl.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/SerializationVersions.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/SerializerPlugin.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/StaticSerialization.java
(100%)
rename {geode-core =>
geode-serialization}/src/main/java/org/apache/geode/internal/serialization/ThreadL
[geode] branch feature/GEODE-7119 updated (9694909 -> 468699b)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7119 in repository https://gitbox.apache.org/repos/asf/geode.git. from 9694909 GEODE-7119 Version ordinal constants are byte but should be short add bf00bf1 GEODE-7078: rename config to configuration (#3981) add 46debcf Revert "GEODE-6805: Allow shorthand ~ to represent user home in jar deployment. (#3927)" add b6e7b07 GEODE-6941: move xml configuration objects to core (#3978) add ffe0fc6 GEODE-7140: Rename the meters for entries add c306d01 GEODE-7139: Cleanup the common tags on the meters add 577f0b2 GEODE:7141 Rename meter 'cache.gatewayreceiver.events.received' add 576e33b GEODE-6941: clean out xml traces in geode-management (#3987) add ec74aee Revert "Add 1.9.1 to Version list" add 12f11c9 Revert "Add 1.9.1 to Version list" add 468699b Merge branch 'develop' into feature/GEODE-7119 No new revisions were added by this update. Summary of changes: .../geode/test/junit/rules/HttpResponseAssert.java | 6 ++-- .../geode/metrics/GatewayReceiverMetricsTest.java | 2 +- .../geode/metrics/RegionEntriesGaugeTest.java | 4 +-- .../resources/ManagementClientCreateRegion.java| 2 +- ...ateRegionWithDiskstoreAndSecurityDUnitTest.java | 2 +- .../rest/ClientClusterManagementSSLTest.java | 6 ++-- .../ClientClusterManagementServiceDunitTest.java | 8 ++--- ...ClusterManagementLocatorReconnectDunitTest.java | 6 ++-- .../rest/ClusterManagementServiceOnServerTest.java | 2 +- .../rest/GatewayReceiverManagementDUnitTest.java | 4 +-- .../rest/ListIndexManagementDUnitTest.java | 2 +- .../rest/ListRegionManagementDunitTest.java| 25 ++--- .../rest/ManagementRequestLoggingDUnitTest.java| 2 +- .../rest/RebalanceManagementDunitTest.java | 2 +- .../internal/rest/RegionManagementDunitTest.java | 6 ++-- .../internal/rest/ServerRestartTest.java | 2 +- .../integrationTest/resources/assembly_content.txt | 5 +-- .../java/org/apache/geode/lang/Identifiable.java | 12 +++ .../jdbc/internal/cli/CreateDataSourceCommand.java | 5 +-- .../internal/cli/DestroyDataSourceCommand.java | 7 ++-- .../internal/CacheConfigDAODUnitTest.java | 2 +- .../internal/api/RegionAPIDUnitTest.java | 6 ++-- .../cli/commands/AlterRegionCommandDUnitTest.java | 6 ++-- .../cli/commands/CreateRegionCommandDUnitTest.java | 16 - ...egionCommandPersistsConfigurationDUnitTest.java | 34 +- .../RegionConfigMutatorIntegrationTest.java| 6 ++-- .../RegionConfigRealizerIntegrationTest.java | 2 +- .../geode/cache/configuration/CacheConfig.java | 28 +++ .../geode/cache/configuration/CacheElement.java| 23 +++- .../configuration/CacheTransactionManagerType.java | 20 +-- .../geode/cache/configuration/ClassNameType.java | 20 +-- .../geode/cache/configuration/DeclarableType.java | 24 ++--- .../geode/cache/configuration/DiskDirType.java | 20 +-- .../geode/cache/configuration/DiskDirsType.java| 20 +-- .../geode/cache/configuration/DiskStoreType.java | 21 +-- .../configuration/DynamicRegionFactoryType.java| 20 +-- .../configuration/EnumActionDestroyOverflow.java | 20 +-- .../cache/configuration/EnumReadableWritable.java | 20 +-- .../cache/configuration/FunctionServiceType.java | 20 +-- .../cache/configuration/GatewayReceiverConfig.java | 0 .../cache/configuration/JndiBindingsType.java | 20 +-- .../geode/cache/configuration/ObjectType.java | 20 +-- .../geode/cache/configuration/ParameterType.java | 20 +-- .../apache/geode/cache/configuration/PdxType.java | 20 +-- .../apache/geode/cache/configuration/PoolType.java | 20 +-- .../configuration/RegionAttributesDataPolicy.java | 20 +-- .../RegionAttributesIndexUpdateType.java | 20 +-- .../configuration/RegionAttributesMirrorType.java | 20 +-- .../cache/configuration/RegionAttributesScope.java | 20 +-- .../cache/configuration/RegionAttributesType.java | 32 - .../geode/cache/configuration/RegionConfig.java| 27 ++ .../cache/configuration/ResourceManagerType.java | 20 +-- .../SerializationRegistrationType.java | 20 +-- .../geode/cache/configuration/ServerType.java | 20 +-- .../geode/cache/configuration/XSDRootElement.java | 29 ++- .../geode/cache/configuration/package-info.java| 28 --- .../java/org/apache/geode/internal/Version.java| 7 +--- .../geode/internal/cache/RegionPerfStats.java | 4 +-- .../cache/tier/sockets/CommandInitializer.java | 1 - .../internal/cache/wan/Ga
[geode] branch develop updated (00a8fbe -> 50df321)
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 00a8fbe GEODE-7138: remove setting transaction timeout in the test if not necessary. (#3986) add 50df321 GEODE-7119 Version ordinal constants are byte but should be short (#3988) No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/internal/Version.java| 69 +++--- 1 file changed, 35 insertions(+), 34 deletions(-)
[geode] branch feature/GEODE-7119 deleted (was 468699b)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7119 in repository https://gitbox.apache.org/repos/asf/geode.git. was 468699b Merge branch 'develop' into feature/GEODE-7119 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch dsfid_separation_wip updated (13e72d2 -> 137d328)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch dsfid_separation_wip in repository https://gitbox.apache.org/repos/asf/geode.git. from 13e72d2 introduce DSFIDSerializer interface add af45737 Removing SerializationVersion and including Version add 99684da removing obsolete dependencies from membership test add 137d328 fix serializables No new revisions were added by this update. Summary of changes: geode-core/build.gradle| 1 + .../distributed/DistributedMemberDUnitTest.java| 3 +- .../geode/distributed/internal/DateMessage.java| 2 +- .../TcpServerBackwardCompatDUnitTest.java | 9 +- ...ackwardCompatibilitySerializationDUnitTest.java | 4 +- .../geode/internal/cache/GIIDeltaDUnitTest.java| 2 +- .../PersistentRVVRecoveryDUnitTest.java| 5 +- .../PersistentRecoveryOrderDUnitTest.java | 3 +- .../geode/pdx/PDXAsyncEventQueueDUnitTest.java | 2 +- .../geode/pdx/PdxAttributesDistributedTest.java| 2 +- .../apache/geode/pdx/PdxClientServerDUnitTest.java | 2 +- .../security/ClientAuthenticationTestCase.java | 2 +- .../cache/client/ClientCacheFactoryJUnitTest.java | 2 +- .../gms/fd/GMSHealthMonitorJUnitTest.java | 2 +- .../gms/locator/GMSLocatorIntegrationTest.java | 4 +- .../locator/GMSLocatorRecoveryIntegrationTest.java | 2 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 2 +- .../gms/messenger/JGroupsMessengerJUnitTest.java | 35 ++-- .../cache/CompactOfflineDiskStoreJUnitTest.java| 2 +- .../cache/FilterProfileConcurrencyTest.java| 2 +- ...FOEvictionAlgoMemoryEnabledRegionJUnitTest.java | 2 +- .../cache/ha/HARegionQueueIntegrationTest.java | 2 +- .../cache/tier/sockets/CacheClientProxyTest.java | 2 +- .../sockets/ServerConnectionIntegrationTest.java | 2 +- .../offheap/OffHeapValidationJUnitTest.java| 2 +- .../geode/pdx/AutoSerializableJUnitTest.java | 2 +- .../org/apache/geode/pdx/ByteSourceJUnitTest.java | 2 +- .../geode/pdx/PdxInstanceFactoryJUnitTest.java | 2 +- .../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 2 +- .../apache/geode/pdx/PdxSerializableJUnitTest.java | 2 +- .../codeAnalysis/sanctionedDataSerializables.txt | 34 ++-- .../internal/InternalDataSerializerBenchmark.java | 1 + .../src/main/java/org/apache/geode/CopyHelper.java | 2 +- .../main/java/org/apache/geode/DataSerializer.java | 2 +- .../admin/jmx/internal/StatAlertNotification.java | 2 +- .../geode/cache/client/internal/AbstractOp.java| 2 +- .../cache/client/internal/AuthenticateUserOp.java | 2 +- .../client/internal/ClientSideHandshakeImpl.java | 9 +- .../client/internal/ExecuteFunctionNoAckOp.java| 2 +- .../cache/client/internal/ExecuteFunctionOp.java | 2 +- .../internal/ExecuteRegionFunctionNoAckOp.java | 2 +- .../client/internal/ExecuteRegionFunctionOp.java | 2 +- .../internal/ExecuteRegionFunctionSingleHopOp.java | 2 +- .../geode/cache/client/internal/GetAllOp.java | 2 +- .../geode/cache/client/internal/KeySetOp.java | 2 +- .../cache/client/internal/ProxyCacheCloseOp.java | 2 +- .../geode/cache/client/internal/PutAllOp.java | 2 +- .../geode/cache/client/internal/QueryOp.java | 2 +- .../cache/client/internal/RegisterInterestOp.java | 2 +- .../geode/cache/client/internal/RemoveAllOp.java | 2 +- .../internal/locator/ServerLocationRequest.java| 2 +- .../internal/locator/ServerLocationResponse.java | 2 +- .../apache/geode/cache/query/internal/CqEntry.java | 2 +- .../internal/CumulativeNonDistinctResults.java | 2 +- .../cache/query/internal/LinkedResultSet.java | 2 +- .../cache/query/internal/LinkedStructSet.java | 2 +- .../cache/query/internal/NWayMergeResults.java | 2 +- .../geode/cache/query/internal/NullToken.java | 2 +- .../cache/query/internal/PRQueryTraceInfo.java | 2 +- .../geode/cache/query/internal/ResultsBag.java | 2 +- .../query/internal/ResultsCollectionWrapper.java | 2 +- .../geode/cache/query/internal/ResultsSet.java | 2 +- .../cache/query/internal/SortedResultSet.java | 2 +- .../cache/query/internal/SortedStructSet.java | 2 +- .../geode/cache/query/internal/StructImpl.java | 2 +- .../geode/cache/query/internal/StructSet.java | 2 +- .../geode/cache/query/internal/Undefined.java | 2 +- .../query/internal/index/IndexCreationData.java| 2 +- .../cache/query/internal/types/ObjectTypeImpl.java | 2 +- .../internal/ClusterDistributionManager.java | 2 +- .../distributed/internal/DistributionAdvisor.java | 2 +- .../distributed/internal/DistributionManager.java | 2 +- .../distributed/internal/DistributionMessage.java | 2 +- .../internal/LonerDistributionManager.java
[geode] branch dsfid_separation_wip created (now c5e5b8d)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch dsfid_separation_wip in repository https://gitbox.apache.org/repos/asf/geode.git. at c5e5b8d redoing lost work This branch includes the following new commits: new 2e9adb3 Proof of concept: Isolation of DataSerializableFixedID for use in membership new c5e5b8d redoing lost work 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/02: Proof of concept: Isolation of DataSerializableFixedID for use in membership
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2e9adb3ed71a5441b21062e3c3cd5d03fe4a841e
Author: Bruce Schuchardt
AuthorDate: Tue Aug 20 08:58:38 2019 -0700
Proof of concept: Isolation of DataSerializableFixedID for use in
membership
InternalDataSerializer holds a DSFIDFactory instance and a
DSFIDSerializer instance (which is also a DSFIDFactory).
InternalDataSerializer registers Geode DSFID classes with the factory.
InternalDataSerializer defers DSFID serialization/deserialization to
DSFIDSerializer.
Need to move registration of membership DSFID classes to that package
and change GMS initialization to create a DSFIDSerializer if one isn't
provided. How do we pass in Geode's DSFIDSerializer?
Just started figuring out how to provide a writeObject() method to the
toData methods in DSFID classes and elsewhere.
Need to enhance DSFID toData/fromData to provide serialization context.
Exceptions still not isolated.
Version still references classes outside of the serialization package.
---
.../org/apache/geode/internal/DSFIDFactory.java| 1054 +---
.../geode/internal/HeapDataOutputStream.java |5 +-
.../BufferDataOutputStream.java} | 15 +-
.../{ => serialization}/ByteBufferWriter.java |0
.../geode/internal/{ => serialization}/DSCODE.java |1 +
.../DSFIDNotFoundException.java|0
.../internal/serialization/DSFIDSerializer.java| 363 +++
.../DataSerializableFixedID.java |0
.../{util => serialization}/DscodeHelper.java |2 +-
.../ObjectSerializer.java} | 15 +-
.../{ => serialization}/SerializationVersions.java |2 +
.../internal/{ => serialization}/Version.java |0
.../VersionedDataInputStream.java |2 +
.../VersionedDataOutputStream.java |2 +
.../{ => serialization}/VersionedDataStream.java |2 +
.../{ => serialization}/VersionedObjectInput.java |2 +
.../{ => serialization}/VersionedObjectOutput.java |2 +
.../internal/HeapDataOutputStreamJUnitTest.java|4 +-
.../geode/internal/HeapDataOutputStreamTest.java |4 +-
.../internal/{ => serialization}/DSCODETest.java |1 +
.../{ => serialization}/VersionJUnitTest.java |1 +
21 files changed, 427 insertions(+), 1050 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
index 1f0b447..2cb5ea1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
@@ -12,454 +12,34 @@
* or implied. See the License for the specific language governing permissions
and limitations under
* the License.
*/
-package org.apache.geode.internal;
+package org.apache.geode.internal.serialization;
import java.io.DataInput;
-import java.io.DataOutput;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import org.apache.geode.DataSerializer;
import org.apache.geode.InternalGemFireError;
-import org.apache.geode.admin.internal.SystemMemberCacheEventProcessor;
-import org.apache.geode.admin.jmx.internal.StatAlertNotification;
import org.apache.geode.annotations.Immutable;
-import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.client.internal.CacheServerLoadMessage;
-import org.apache.geode.cache.client.internal.locator.ClientConnectionRequest;
-import org.apache.geode.cache.client.internal.locator.ClientConnectionResponse;
-import org.apache.geode.cache.client.internal.locator.ClientReplacementRequest;
-import org.apache.geode.cache.client.internal.locator.GetAllServersRequest;
-import org.apache.geode.cache.client.internal.locator.GetAllServersResponse;
-import org.apache.geode.cache.client.internal.locator.LocatorListRequest;
-import org.apache.geode.cache.client.internal.locator.LocatorListResponse;
-import org.apache.geode.cache.client.internal.locator.LocatorStatusRequest;
-import org.apache.geode.cache.client.internal.locator.LocatorStatusResponse;
-import org.apache.geode.cache.client.internal.locator.QueueConnectionRequest;
-import org.apache.geode.cache.client.internal.locator.QueueConnectionResponse;
-import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.cache.query.internal.CqEntry;
-import org.apache.geode.cache.query.internal.CumulativeNonDistinctResults;
-import org.apache.geode.cache.query.internal.LinkedResultSet;
-import org.apache.geode.cache.query.int
[geode] branch feature/GEODE-7072 updated (b1c1b44 -> 8a6a28f)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7072 in repository https://gitbox.apache.org/repos/asf/geode.git. from b1c1b44 GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCurrentSiteTwo add 8a6a28f empty commit No new revisions were added by this update. Summary of changes:
[geode] branch dsfid_separation_wip updated: introduction of SerializationVersion, a superclass of Version
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch dsfid_separation_wip
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/dsfid_separation_wip by this
push:
new 34db26b introduction of SerializationVersion, a superclass of Version
34db26b is described below
commit 34db26b11e9ffaf7be2d1f73f85dd0558917dc13
Author: Bruce Schuchardt
AuthorDate: Fri Aug 23 15:50:31 2019 -0700
introduction of SerializationVersion, a superclass of Version
---
...ackwardCompatibilitySerializationDUnitTest.java | 11 +-
.../cache/client/ClientCacheFactoryJUnitTest.java | 4 +-
.../internal/InternalDataSerializerBenchmark.java | 2 +-
.../client/internal/ClientSideHandshakeImpl.java | 16 +--
.../membership/InternalDistributedMember.java | 13 +-
.../internal/membership/gms/GMSMember.java | 15 ++-
.../membership/gms/messenger/JGroupsMessenger.java | 7 +-
.../distributed/internal/tcpserver/TcpClient.java | 17 ++-
.../distributed/internal/tcpserver/TcpServer.java | 4 +-
.../geode/internal/HeapDataOutputStream.java | 4 +-
.../geode/internal/InternalDataSerializer.java | 35 +++---
.../java/org/apache/geode/internal/Version.java| 130 ++-
.../geode/internal/VersionedObjectInput.java | 8 +-
.../geode/internal/VersionedObjectOutput.java | 8 +-
.../apache/geode/internal/cache/DiskInitFile.java | 3 +-
.../org/apache/geode/internal/cache/EventID.java | 2 +-
.../geode/internal/cache/FilterRoutingInfo.java| 2 +-
.../org/apache/geode/internal/cache/Oplog.java | 10 +-
.../cache/persistence/DiskInitFileParser.java | 3 +-
.../tier/sockets/ClientRegistrationMetadata.java | 7 +-
.../tier/sockets/ServerSideHandshakeFactory.java | 3 +-
.../tier/sockets/ServerSideHandshakeImpl.java | 19 +--
.../internal/cache/wan/GatewaySenderEventImpl.java | 2 +-
.../serialization/BufferDataOutputStream.java | 11 +-
.../internal/serialization/ByteArrayDataInput.java | 17 +--
.../internal/serialization/DSFIDSerializer.java| 15 ++-
.../serialization/SerializationVersion.java| 140 +
.../serialization/SerializationVersions.java | 4 +-
.../serialization/VersionedDataInputStream.java| 6 +-
.../serialization/VersionedDataOutputStream.java | 6 +-
.../serialization/VersionedDataStream.java | 4 +-
.../org/apache/geode/internal/tcp/Connection.java | 4 +-
.../apache/geode/internal/tcp/MsgDestreamer.java | 2 +-
.../tcp/VersionedByteBufferInputStream.java| 8 +-
.../geode/internal/tcp/VersionedMsgStreamer.java | 8 +-
.../org/apache/geode/internal/util/BlobHelper.java | 2 +-
.../java/org/apache/geode/DataSerializerTest.java | 4 +-
.../cache/execute/FunctionAdapterJUnitTest.java| 2 +-
.../membership/gms/GMSMemberJUnitTest.java | 2 +-
.../geode/internal/ByteArrayDataInputTest.java | 2 +-
.../geode/internal/DataSerializableJUnitTest.java | 4 +-
.../geode/internal/cache/FilterInfoTest.java | 2 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 4 +-
.../internal/results/PageEntryJUnitTest.java | 2 +-
.../apache/geode/OldClientSupportDUnitTest.java| 10 +-
.../gemstone/gemfire/OldClientSupportProvider.java | 3 +-
46 files changed, 319 insertions(+), 268 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 7a0396c..b6a774c 100755
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -35,6 +35,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import
org.apache.geode.internal.cache.DistributedPutAllOperation.EntryVersionsList;
import org.apache.geode.internal.serialization.DataSerializableFixedID;
+import org.apache.geode.internal.serialization.SerializationVersion;
import org.apache.geode.internal.serialization.SerializationVersions;
import org.apache.geode.internal.serialization.VersionedDataInputStream;
import org.apache.geode.internal.serialization.VersionedDataOutputStream;
@@ -93,7 +94,7 @@ public class BackwardCompatibilitySerializationDUnitTest
extends JUnit4CacheTest
@Test
public void testToDataFromHigherVersionToLower() throws Exception {
DataOutputStream dos =
-new VersionedDataOutputStream(new DataOutputStream(baos),
Version.GFE_56.ordinal());
+new VersionedDataOutputStream(new DataOutputStream(baos),
Version.GFE_56);
InternalDataSerializer.writeDSFID(msg, dos);
assertTrue
[geode] branch dsfid_separation_wip updated (ab7af10 -> 2e39399)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch dsfid_separation_wip in repository https://gitbox.apache.org/repos/asf/geode.git. from ab7af10 fixed rebase conflict compilation error add 2e39399 addressing unit test failures No new revisions were added by this update. Summary of changes: .../locator/GMSLocatorRecoveryIntegrationTest.java | 18 +- .../gms/messenger/JGroupsMessengerJUnitTest.java | 90 +- .../apache/geode/codeAnalysis/excludedClasses.txt |2 +- .../codeAnalysis/sanctionedDataSerializables.txt | 1514 ++-- .../org/apache/geode/cache/AttributesFactory.java |5 +- .../org/apache/geode/cache/EvictionAttributes.java |3 +- .../internal/membership/gms/Services.java | 57 + .../membership/gms/fd/GMSHealthMonitor.java|2 +- .../membership/gms/locator/GMSLocator.java |9 +- .../org/apache/geode/internal/DSFIDFactory.java| 34 - .../geode/internal/InternalDataSerializer.java |4 +- .../internal/cache/EvictionAttributesImpl.java |3 +- .../tier/sockets/ClientProxyMembershipID.java |1 + .../internal/serialization/DSFIDSerializer.java|2 + .../serialization/SerializationVersion.java|8 +- .../sanctioned-geode-core-serializables.txt| 10 +- .../MembershipDependenciesJUnitTest.java | 13 +- .../codeAnalysis/sanctionedDataSerializables.txt | 22 +- .../codeAnalysis/sanctionedDataSerializables.txt |4 +- 19 files changed, 948 insertions(+), 853 deletions(-)
[geode] branch develop updated (c94b6e1 -> a4dad30)
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 c94b6e1 GEODE-7091: Add Micrometer binders to meter registry (#3952) add a4dad30 GEODE-7072 CI Failure: WANRollingUpgradeEventProcessingMixedSiteOneCu… (#3966) No new revisions were added by this update. Summary of changes: .../gms/fd/GMSHealthMonitorJUnitTest.java | 27 ++ .../membership/gms/fd/GMSHealthMonitor.java| 2 +- 2 files changed, 28 insertions(+), 1 deletion(-)
[geode] branch feature/GEODE-7072 deleted (was 8a6a28f)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7072 in repository https://gitbox.apache.org/repos/asf/geode.git. was 8a6a28f empty commit The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-7090 updated (2bb5a68 -> 81ec9b9)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. from 2bb5a68 addressing suspect string in ClusterConfigLocatorRestartDUnitTest add 81ec9b9 addressing Ryan's PR comments No new revisions were added by this update. Summary of changes: .../gms/messenger/JGroupsMessengerJUnitTest.java | 69 +++--- .../org/apache/geode/cache/AttributesFactory.java | 1 - .../client/internal/ClientSideHandshakeImpl.java | 3 +- .../membership/InternalDistributedMember.java | 3 +- .../membership/gms/messenger/JGroupsMessenger.java | 6 +- .../tier/sockets/ServerSideHandshakeImpl.java | 6 +- 6 files changed, 42 insertions(+), 46 deletions(-)
[geode] branch feature/GEODE-7090 updated (32bc462 -> 2bb5a68)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 32bc462 addressing suspect string in ClusterConfigLocatorRestartDUnitTest discard 9d2b6dd fixing Jetty classpath to include geode-serialization jar discard ab7b074 rebased on origin & fixed deserialization issue discard 11601a0 splitting ObjectSerializer into a serializer and a deserializer discard 39d0371 incorporating review comments and fixing tomcat test classpath discard 4cd3f3b GEODE-7090 Remove dependency on DataSerializer from membership classes add 7cde6cc2 GEODE-7118: Cleanup RestartOfMemberDistributedTest add dafa5f0 Add standalone LogWriterLogger to geode-dunit add c79cd1d GEODE-7114: fix flaky tests by using GeodeAwaitility. (#3979) add 7f2b986 GEODE-7039: Improve read performance during server recovery (#3955) add 78cef46 GEODE-7136: remove "groups" in management configuration (#3997) add 245f285 GEODE-6916: Add Aggregate Functions Tests (#3953) add 57f1cc7 GEODE-7158: Adding singleton cleanup before and after tests add 5ef067d GEODE-7090 Remove dependency on DataSerializer from membership classes add 8020751 incorporating review comments and fixing tomcat test classpath add 480f9ba splitting ObjectSerializer into a serializer and a deserializer add b284361 rebased on origin & fixed deserialization issue add 9b3584b fixing Jetty classpath to include geode-serialization jar add 2bb5a68 addressing suspect string in ClusterConfigLocatorRestartDUnitTest 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 (32bc462) \ N -- N -- N refs/heads/feature/GEODE-7090 (2bb5a68) 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. No new revisions were added by this update. Summary of changes: .../rest/ListRegionManagementDunitTest.java| 24 +- .../geode/cache/query/dunit/GroupByDUnitImpl.java | 334 .../dunit/GroupByPartitionedQueryDUnitTest.java| 93 - .../cache/query/dunit/GroupByQueryDUnitTest.java | 189 -- .../dunit/PdxGroupByPartitionedQueryDUnitTest.java | 92 - .../AggregateFunctionsQueryDUnitTest.java | 1857 ...lusterDistributionManagerForAdminDUnitTest.java |6 +- .../internal/RestartOfMemberDistributedTest.java | 81 +- ...ntPartitionedRegionWithRedundancyDUnitTest.java | 318 .../jta/dunit/TransactionTimeOutDUnitTest.java | 188 +- .../cli/commands/CreateIndexCommandDUnitTest.java | 13 +- .../cache/query/functional/CountStarJUnitTest.java | 674 --- .../functional/GroupByPartitionedJUnitTest.java| 43 - .../functional/GroupByReplicatedJUnitTest.java | 32 - .../functional/PdxGroupByPartitionedJUnitTest.java | 38 - .../functional/PdxGroupByReplicatedJUnitTest.java | 35 - .../AggregateFunctionQueryBaseIntegrationTest.java | 86 + .../internal/aggregate/AvgIntegrationTest.java | 337 .../internal/aggregate/CountIntegrationTest.java | 340 .../internal/aggregate/MaxIntegrationTest.java | 334 .../internal/aggregate/MinIntegrationTest.java | 334 .../internal/aggregate/SumIntegrationTest.java | 328 .../ConfigurationPersistenceService.java |3 +- .../apache/geode/internal/cache/BucketAdvisor.java | 32 +- .../api/LocatorClusterManagementService.java | 79 +- .../internal/cli/commands/CreateIndexCommand.java | 43 +- ...ator.java => CommonConfigurationValidator.java} |8 +- .../configuration/validators/MemberValidator.java | 15 +- .../sanctioned-geode-management-serializables.txt |2 +- .../tier/sockets/CacheClientNotifierTest.java | 20 + .../api/LocatorClusterManagementServiceTest.java | 66 +- .../cli/commands/CreateIndexCommandTest.java | 99 +- java => CommonConfigurationValidatorTest.java} | 17 +- .../validators/MemberValidatorTest.java| 48 +- .../apache/geode/test/dunit/LogWriterUtils.java| 51 +- .../geode/test/dunit}/log4j/LogWriterLogger.java | 516 +- .../geode/test/dunit/rules/ClusterStartupRule.java |1 + .../apache/geode/test/junit/rules/VMProvider.java | 15 +- .../cache/query/functional/GroupByTestImpl.java| 1031 --- .../query/functional/GroupByTestInterface.j
[geode] branch feature/GEODE-7168 updated (96b5c06 -> 1fc6309)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. from 96b5c06 updated docs to mention geode-serialization jar add 1fc6309 addressing review comments No new revisions were added by this update. Summary of changes: .../internal/cli/commands/ConnectCommandAcceptanceTest.java| 3 +-- .../java/org/apache/geode/test/junit/rules/GfshRuleTest.java | 3 +-- .../java/org/apache/geode/test/version/VersionManager.java | 10 +- ...gUpgradeMultipleReceiversDefinedInClusterConfiguration.java | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-)
[geode] branch feature/GEODE-7175 updated (d0b342c -> ebe30fc)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7175 in repository https://gitbox.apache.org/repos/asf/geode.git. from d0b342c correcting expected toData/fromData info add ebe30fc fixing goofy serialization code in DistTxEntryEvent No new revisions were added by this update. Summary of changes: .../apache/geode/internal/cache/DistributedRemoveAllOperation.java | 4 ++-- .../apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java | 2 +- .../java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java| 2 +- .../org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage.java | 2 +- .../apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTestBase.java | 5 ++--- 5 files changed, 7 insertions(+), 8 deletions(-)
[geode] branch develop updated (0e90631 -> a0f7a0f)
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 0e90631 GEODE-7035 - adding a new enumInfo will check from local map only, same as adding a new pdxtype (#4044) add a0f7a0f GEODE-7168 tomcat rolling upgrade test failure No new revisions were added by this update. Summary of changes: .../apache/geode/session/tests/TomcatInstall.java | 6 ++ .../cli/commands/ConnectCommandAcceptanceTest.java | 3 +- .../geode/test/junit/rules/GfshRuleTest.java | 3 +- .../Tomcat8ClientServerRollingUpgradeTest.java | 74 -- ...omcatSessionBackwardsCompatibilityTestBase.java | 2 +- ...overWithMixedVersionServersDistributedTest.java | 2 +- .../apache/geode/security/ClientAuthDUnitTest.java | 3 +- ...aAuthorizationUsingLegacySecurityDUnitTest.java | 8 +-- ...onUsingLegacySecurityWithFailoverDUnitTest.java | 8 +-- .../tomcat_installing_the_module.html.md.erb | 3 + .../tomcat_setting_up_the_module.html.md.erb | 17 +++-- .../weblogic_setting_up_the_module.html.md.erb | 8 +++ ...tartupRuleCanSpecifyOlderVersionsDUnitTest.java | 6 ++ .../security/ClientAuthorizationTestCase.java | 1 + .../geode/test/dunit/internal/ProcessManager.java | 16 + .../apache/geode/test/version/VersionManager.java | 61 -- .../LuceneSearchWithRollingUpgradeDUnit.java | 2 +- geode-old-versions/build.gradle| 4 +- ...ipleReceiversDefinedInClusterConfiguration.java | 2 +- 19 files changed, 159 insertions(+), 70 deletions(-)
[geode] branch feature/GEODE-7168 deleted (was 1fc6309)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. was 1fc6309 addressing review comments The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-7090 updated (81ec9b9 -> b11e9c1)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. from 81ec9b9 addressing Ryan's PR comments add b11e9c1 addressing Bill's comments No new revisions were added by this update. Summary of changes: .../gms/messenger/JGroupsMessengerJUnitTest.java | 4 +-- .../cache/query/internal/types/ObjectTypeImpl.java | 4 +-- .../org/apache/geode/internal/DSFIDFactory.java| 10 +++--- .../apache/geode/internal/ExternalizableDSFID.java | 4 +-- .../geode/internal/InternalDataSerializer.java | 38 +++--- .../cache/DestroyPartitionedRegionMessage.java | 4 +-- .../geode/internal/cache/DistTXCommitMessage.java | 3 +- .../internal/cache/DistTXPrecommitMessage.java | 3 +- .../internal/cache/DistTXRollbackMessage.java | 3 +- .../internal/cache/DistributedPutAllOperation.java | 4 +-- .../internal/cache/InitialImageOperation.java | 8 ++--- .../cache/MemberFunctionStreamingMessage.java | 3 +- .../java/org/apache/geode/internal/cache/Node.java | 2 +- .../cache/PreferBytesCachedDeserializable.java | 3 +- .../cache/StoreAllCachedDeserializable.java| 3 +- .../internal/cache/TXRemoteCommitMessage.java | 3 +- .../internal/cache/VMCachedDeserializable.java | 3 +- .../CompressedCachedDeserializable.java| 3 +- .../geode/internal/cache/locks/TXLockIdImpl.java | 7 ++-- .../partitioned/BecomePrimaryBucketMessage.java| 5 +-- .../cache/partitioned/CreateBucketMessage.java | 4 +-- .../partitioned/DeposePrimaryBucketMessage.java| 5 +-- .../partitioned/EndBucketCreationMessage.java | 2 +- .../cache/partitioned/FetchEntryMessage.java | 4 +-- .../partitioned/FetchPartitionDetailsMessage.java | 4 +-- .../partitioned/ManageBackupBucketMessage.java | 4 +-- .../cache/partitioned/ManageBucketMessage.java | 5 +-- .../cache/partitioned/MoveBucketMessage.java | 5 +-- .../PartitionedRegionFunctionStreamingMessage.java | 3 +- .../cache/partitioned/RemoveBucketMessage.java | 5 +-- .../tier/sockets/ClientInterestMessageImpl.java| 5 +-- .../cache/tier/sockets/VersionedObjectList.java| 4 +-- .../geode/internal/cache/tx/RemoteSizeMessage.java | 5 +-- .../locator/LocatorStatusResponseJUnitTest.java| 9 +++-- .../ResultsBagLimitBehaviourJUnitTest.java | 7 ++-- .../membership/gms/GMSMemberJUnitTest.java | 2 +- .../cache/ha/EventIdOptimizationJUnitTest.java | 7 ++-- .../partitioned/PutPutReplyMessageJUnitTest.java | 9 +++-- .../partitioned/RemotePutMessageJUnitTest.java | 4 ++- .../internal/cache/tx/RemotePutAllMessageTest.java | 1 + .../cache/tx/RemotePutReplyMessageJUnitTest.java | 9 +++-- .../cache/tx/RemoteRemoveAllMessageTest.java | 1 + .../org/apache/geode/pdx/internal/EnumIdTest.java | 7 ++-- .../apache/geode/pdx/internal/EnumInfoTest.java| 8 +++-- .../AbstractSerializationContext.java | 20 +--- 45 files changed, 153 insertions(+), 103 deletions(-)
[geode] branch feature/GEODE-7168 updated (43dbca6 -> f4d53b4)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 43dbca6 GEODE-7168: CI failure in Tomcat8 rolling upgrade test add c826d63 During CI, copy attach_sha_to_branch to tmpdir before execution add c058bb2 Revert "GEODE-6867: Updating Tomcat Session State Module docs (#3886)" add aaa1378 GEODE-7169 Fix building from source archive add f4d53b4 GEODE-7168: CI failure in Tomcat8 rolling upgrade test 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 (43dbca6) \ N -- N -- N refs/heads/feature/GEODE-7168 (f4d53b4) 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. No new revisions were added by this update. Summary of changes: build.gradle| 2 +- ci/scripts/execute_build.sh | 3 ++- ci/scripts/execute_publish.sh | 3 ++- ci/scripts/execute_tests.sh | 4 +++- .../org/apache/geode/session/tests/TomcatInstall.java | 6 -- .../tests/Tomcat8ClientServerRollingUpgradeTest.java| 8 +--- .../tomcat_installing_the_module.html.md.erb| 3 --- .../tomcat_setting_up_the_module.html.md.erb| 17 + .../weblogic_setting_up_the_module.html.md.erb | 7 --- 9 files changed, 22 insertions(+), 31 deletions(-)
[geode] 01/01: GEODE-7168: CI failure in Tomcat8 rolling upgrade test
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-7168
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 43dbca6886800d703f9900fe9523fab68b5c3d3a
Author: Bruce Schuchardt
AuthorDate: Fri Sep 6 14:07:31 2019 -0700
GEODE-7168: CI failure in Tomcat8 rolling upgrade test
The test infrastructure wasn't providing the actual version strings with
period-separators so our tomcat tests were having to do some hard work
to find those strings. This PR alters the geode-old-versions sub-project
and VersionManager to preserve the original version strings.
---
.../Tomcat8ClientServerRollingUpgradeTest.java | 17 +++--
...loverWithMixedVersionServersDistributedTest.java | 2 +-
.../apache/geode/security/ClientAuthDUnitTest.java | 3 ++-
.../apache/geode/test/version/VersionManager.java | 21 +++--
geode-old-versions/build.gradle | 4 ++--
5 files changed, 19 insertions(+), 28 deletions(-)
diff --git
a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
index 943bb89..94aa265 100644
---
a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
+++
b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
@@ -20,9 +20,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.commons.lang3.JavaVersion;
import org.apache.commons.lang3.SystemUtils;
@@ -60,20 +58,13 @@ public class Tomcat8ClientServerRollingUpgradeTest {
private String locatorDir;
private String server1Dir;
private String server2Dir;
- private static Map versionMap = new HashMap<>();
@Parameterized.Parameters(name = "{0}")
public static Collection data() {
List result =
VersionManager.getInstance().getVersionsWithoutCurrent();
-int minimumVersion = SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)
? 180 : 170;
-result.removeIf(s -> Integer.parseInt(s) < minimumVersion);
-Version.getAllVersions().forEach(v -> {
- result.forEach(r -> {
-if (r.equals(v.getName().replace(".", ""))) {
- versionMap.put(r, v);
-}
- });
-});
+String minimumVersion =
+SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9) ? "1.8.0" :
"1.7.0";
+result.removeIf(s -> s.compareTo(minimumVersion) < 0);
return result;
}
@@ -309,8 +300,6 @@ public class Tomcat8ClientServerRollingUpgradeTest {
* @return Paths to required jars
*/
private String getClassPathTomcat8AndOldModules() {
-String oldVersion = versionMap.get(this.oldVersion).getName();
-
final String[] requiredClasspathJars = {
"/lib/geode-modules-" + oldVersion + ".jar",
"/lib/geode-modules-tomcat8-" + oldVersion + ".jar",
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
index 7cda8c3..8b28d4c 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
@@ -96,7 +96,7 @@ public class
ClientServerTransactionFailoverWithMixedVersionServersDistributedTe
@Before
public void setup() throws Exception {
host = Host.getHost(0);
-String startingVersion = "160";
+String startingVersion = "1.6.0";
server1 = host.getVM(startingVersion, 0);
server2 = host.getVM(startingVersion, 1);
server3 = host.getVM(startingVersion, 2);
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
index a36ed0c..ac268b6 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
@@ -86,7 +86,8 @@ public class ClientAuthDUnitTest {
// for older version of client when we did not implement lazy
initialization of the pool, the
// authentication error will happen at this step.
-i
[geode] branch feature/GEODE-7168 created (now 43dbca6)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. at 43dbca6 GEODE-7168: CI failure in Tomcat8 rolling upgrade test This branch includes the following new commits: new 43dbca6 GEODE-7168: CI failure in Tomcat8 rolling upgrade test 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 "Revert "GEODE-6867: Updating Tomcat Session State Module docs (#3886)""
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-7168
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2e93d32ccdabff1f353f00d7481f2ff11e6c0004
Author: Bruce Schuchardt
AuthorDate: Fri Sep 6 14:59:21 2019 -0700
Revert "Revert "GEODE-6867: Updating Tomcat Session State Module docs
(#3886)""
This reverts commit c058bb2b02e037ebc747b5a2909a31afb0ef153c.
---
.../apache/geode/session/tests/TomcatInstall.java | 6 ++
.../Tomcat8ClientServerRollingUpgradeTest.java | 81 --
.../tomcat_installing_the_module.html.md.erb | 3 +
.../tomcat_setting_up_the_module.html.md.erb | 17 +++--
.../weblogic_setting_up_the_module.html.md.erb | 7 ++
5 files changed, 100 insertions(+), 14 deletions(-)
diff --git
a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
index dabf7df..e1aa0bf 100644
---
a/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
+++
b/geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
@@ -89,6 +89,12 @@ public class TomcatInstall extends ContainerInstall {
}
}
+ /**
+ * If you update this list method to return different dependencies, please
also update
+ * the Tomcat module documentation!
+ * The documentation can be found here:
+ *
geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
+ */
private static final String[] tomcatRequiredJars =
{"antlr", "commons-io", "commons-lang", "commons-validator", "fastutil",
"geode-common",
"geode-core", "geode-management", "javax.transaction-api",
"jgroups", "log4j-api",
diff --git
a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
index e00d4cc..943bb89 100644
---
a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
+++
b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
@@ -20,7 +20,9 @@ import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.commons.lang3.JavaVersion;
import org.apache.commons.lang3.SystemUtils;
@@ -36,6 +38,7 @@ import org.junit.runners.Parameterized;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.UniquePortSupplier;
+import org.apache.geode.internal.Version;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
@@ -57,12 +60,20 @@ public class Tomcat8ClientServerRollingUpgradeTest {
private String locatorDir;
private String server1Dir;
private String server2Dir;
+ private static Map versionMap = new HashMap<>();
@Parameterized.Parameters(name = "{0}")
public static Collection data() {
List result =
VersionManager.getInstance().getVersionsWithoutCurrent();
int minimumVersion = SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)
? 180 : 170;
result.removeIf(s -> Integer.parseInt(s) < minimumVersion);
+Version.getAllVersions().forEach(v -> {
+ result.forEach(r -> {
+if (r.equals(v.getName().replace(".", ""))) {
+ versionMap.put(r, v);
+}
+ });
+});
return result;
}
@@ -140,12 +151,9 @@ public class Tomcat8ClientServerRollingUpgradeTest {
ContainerInstall.ConnectionType.CLIENT_SERVER,
portSupplier::getAvailablePort);
-classPathTomcat8AndOldModules = tomcat8AndOldModules.getHome() + "/lib/*"
+ File.pathSeparator
-+ tomcat8AndOldModules.getHome() + "/bin/*";
+classPathTomcat8AndOldModules = getClassPathTomcat8AndOldModules();
-classPathTomcat8AndCurrentModules =
-tomcat8AndCurrentModules.getHome() + "/lib/*" + File.pathSeparator
-+ tomcat8AndCurrentModules.getHome() + "/bin/*";
+classPathTomcat8AndCurrentModules = getClassPathTomcat8AndCurrentModules();
// Get available port for the locator
locatorPort = portSupplier.getAvailablePort();
@@ -290,4 +298,67 @@ public class Tomcat8ClientServerRollingUpgradeTest {
}
}
+ /**
+ * If this test break
[geode] branch feature/GEODE-7168 updated: GEODE-7168 tomcat rolling upgrade test failure
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-7168
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-7168 by this
push:
new 3cc6edd GEODE-7168 tomcat rolling upgrade test failure
3cc6edd is described below
commit 3cc6eddaf5c2e7ddbb43c0f5ab6880e8507c052a
Author: Bruce Schuchardt
AuthorDate: Fri Sep 6 15:16:40 2019 -0700
GEODE-7168 tomcat rolling upgrade test failure
This PR reinstates the changes to this test and modifies the
geode-old-versions subproject to preserve the full version string (with
periods) for older versions. This lets the tomcat test build a
classpath without requiring the target version to have representation in
Version.java.
---
.../Tomcat8ClientServerRollingUpgradeTest.java | 17 +++--
...loverWithMixedVersionServersDistributedTest.java | 2 +-
.../apache/geode/security/ClientAuthDUnitTest.java | 3 ++-
.../apache/geode/test/version/VersionManager.java | 21 +++--
geode-old-versions/build.gradle | 4 ++--
5 files changed, 19 insertions(+), 28 deletions(-)
diff --git
a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
index 943bb89..94aa265 100644
---
a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
+++
b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
@@ -20,9 +20,7 @@ import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.commons.lang3.JavaVersion;
import org.apache.commons.lang3.SystemUtils;
@@ -60,20 +58,13 @@ public class Tomcat8ClientServerRollingUpgradeTest {
private String locatorDir;
private String server1Dir;
private String server2Dir;
- private static Map versionMap = new HashMap<>();
@Parameterized.Parameters(name = "{0}")
public static Collection data() {
List result =
VersionManager.getInstance().getVersionsWithoutCurrent();
-int minimumVersion = SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)
? 180 : 170;
-result.removeIf(s -> Integer.parseInt(s) < minimumVersion);
-Version.getAllVersions().forEach(v -> {
- result.forEach(r -> {
-if (r.equals(v.getName().replace(".", ""))) {
- versionMap.put(r, v);
-}
- });
-});
+String minimumVersion =
+SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9) ? "1.8.0" :
"1.7.0";
+result.removeIf(s -> s.compareTo(minimumVersion) < 0);
return result;
}
@@ -309,8 +300,6 @@ public class Tomcat8ClientServerRollingUpgradeTest {
* @return Paths to required jars
*/
private String getClassPathTomcat8AndOldModules() {
-String oldVersion = versionMap.get(this.oldVersion).getName();
-
final String[] requiredClasspathJars = {
"/lib/geode-modules-" + oldVersion + ".jar",
"/lib/geode-modules-tomcat8-" + oldVersion + ".jar",
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
index 7cda8c3..8b28d4c 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/ClientServerTransactionFailoverWithMixedVersionServersDistributedTest.java
@@ -96,7 +96,7 @@ public class
ClientServerTransactionFailoverWithMixedVersionServersDistributedTe
@Before
public void setup() throws Exception {
host = Host.getHost(0);
-String startingVersion = "160";
+String startingVersion = "1.6.0";
server1 = host.getVM(startingVersion, 0);
server2 = host.getVM(startingVersion, 1);
server3 = host.getVM(startingVersion, 2);
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
index a36ed0c..ac268b6 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthDUnitTest.java
@@ -86,7 +86,8 @@ public class ClientAuthDU
[geode] branch feature/GEODE-7168 deleted (was f4d53b4)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. was f4d53b4 GEODE-7168: CI failure in Tomcat8 rolling upgrade test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-7196 updated (ca27333 -> da4f5e3)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7196 in repository https://gitbox.apache.org/repos/asf/geode.git. from ca27333 remove membership collections from ClusterDistributionManager add da4f5e3 fixed constructor problem No new revisions were added by this update. Summary of changes: .../geode/distributed/internal/ClusterDistributionManager.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
[geode] branch feature/GEODE-7196 updated (da4f5e3 -> e13b530)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7196 in repository https://gitbox.apache.org/repos/asf/geode.git. discard da4f5e3 fixed constructor problem discard ca27333 remove membership collections from ClusterDistributionManager discard 8e5130a GEODE-7196 Simplify ClusterDistributionManage add 5979d81 GEODE-7077: fix bug for creating pdx type at the 2nd time with no ser… (#4043) add 21ae51e GEODE-7193: add entry-idle-time and entry-time-to-live to region attributes add 91176d6 GEODE-7178: Check operation if instance of Byte and Destroy for older… (#4041) add d91bf15 GEODE-7179: alter async queue command to change state of event processor during creation. add 6ccf66e Replaced junit.Assert usage with assertj add 80976b6 Replace magic numbers with references to fields add 3c2a906 Merge pull request #4046 from BenjaminPerryRoss/feature/GEODE-7179 add 575c6ba GEODE-7128: APIs and GFSH commands to resume AEQ processing add 688b308 Renamed resume AEQ command to be more specific add 374bb53 Spotless add 922ecfb Fixed Unit and Integration Test issues add 7ca5cc1 Spotless add 0903ec7 Removed ConverterHint from resume AEQ command add f019dd9 Added test logic for unpaused AEQ to DUnit test add d611072 Trigger pre-checkin add 240dfe7 Spotless add fd828f1 Trigger Pre-checkin add b0f2407 Merge pull request #4034 from BenjaminPerryRoss/feature/GEODE-7128 add c00e92b GEODE-7195: Add OQL before aggregations callback (#4048) add 343a7d2 GEODE-7194: simplify CMS 'get' return type (#4047) add fbb2106 GEODE-7150: Use Long in OQL COUNT and AVG (#3994) add a414ac9 GEODE-7196 Simplify ClusterDistributionManage add 9fe3ea0 remove membership collections from ClusterDistributionManager add 4c168e0 fixed constructor problem add e13b530 fixing unit test failures 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 (da4f5e3) \ N -- N -- N refs/heads/feature/GEODE-7196 (e13b530) 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. No new revisions were added by this update. Summary of changes: .../rest/GatewayReceiverManagementDUnitTest.java | 36 +- .../rest/ListIndexManagementDUnitTest.java | 13 +- .../rest/MemberManagementServiceDunitTest.java | 48 ++- .../internal/rest/RegionManagementDunitTest.java | 69 +++- .../integrationTest/resources/assembly_content.txt | 6 +- .../AlterAsyncEventQueueCommandDUnitTest.java | 147 +++- .../ResumeAsyncEventQueueDispatcherDUnitTest.java | 91 + .../internal/QueryObserverCallbackJUnitTest.java | 386 - .../query/internal/QueryObserverCallbacksTest.java | 243 + .../query/internal/CompiledGroupBySelect.java | 5 +- .../geode/cache/query/internal/QueryObserver.java | 12 + .../internal/aggregate/AbstractAggregator.java | 19 +- .../geode/cache/query/internal/aggregate/Avg.java | 4 +- .../query/internal/aggregate/AvgBucketNode.java| 4 +- .../query/internal/aggregate/AvgPRQueryNode.java | 6 +- .../cache/query/internal/aggregate/Count.java | 8 +- .../query/internal/aggregate/CountPRQueryNode.java | 10 +- .../internal/ClusterDistributionManager.java | 7 +- .../internal/cache/tier/sockets/BaseCommand.java | 23 -- .../cache/tier/sockets/command/Destroy65.java | 27 +- .../internal/cache/tier/sockets/command/Put65.java | 21 +- .../api/LocatorClusterManagementService.java | 23 +- .../cli/commands/AlterAsyncEventQueueCommand.java | 12 +- .../cli/commands/CommandAvailabilityIndicator.java | 3 +- ...=> ResumeAsyncEventQueueDispatcherCommand.java} | 52 +-- .../cli/functions/CacheRealizationFunction.java| 6 +- .../ResumeAsyncEventQueueDispatcherFunction.java | 54 +++ .../management/internal/cli/i18n/CliStrings.java | 11 + .../configuration/converters/RegionConverter.java | 84 + ...mberConfigRealizer.java => MemberRealizer.java} | 14 +- .../configuration/validators/MemberValidator.java | 6 + .../validators/RegionConfigValidator.java | 36 ++ .../geode/pdx/internal/PeerTypeRegistration.java | 3 + .../sanctioned-geode-core-serializables.txt| 1 + .../sanctioned-geode-management-serializables.txt | 9
[geode] branch feature/GEODE-7196 created (now ca27333)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7196 in repository https://gitbox.apache.org/repos/asf/geode.git. at ca27333 remove membership collections from ClusterDistributionManager This branch includes the following new commits: new 8e5130a GEODE-7196 Simplify ClusterDistributionManage new ca27333 remove membership collections from ClusterDistributionManager 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-7168 updated (390956f -> 96b5c06)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. from 390956f removed unused method, fixed test failing with 1.0.0-incubating add 96b5c06 updated docs to mention geode-serialization jar No new revisions were added by this update. Summary of changes: .../http_session_mgmt/weblogic_setting_up_the_module.html.md.erb | 1 + 1 file changed, 1 insertion(+)
[geode] branch feature/GEODE-7168 updated (5c96812 -> 390956f)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. from 5c96812 v1.4.0 backward-compat fixes and intellij classpath cleanup add 390956f removed unused method, fixed test failing with 1.0.0-incubating No new revisions were added by this update. Summary of changes: .../apache/geode/security/ClientAuthDUnitTest.java | 2 +- .../apache/geode/test/version/VersionManager.java | 21 - 2 files changed, 1 insertion(+), 22 deletions(-)
[geode] 01/01: GEODE-7175 Convert toData/fromData in other modules to use new serializers
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch feature/GEODE-7175 in repository https://gitbox.apache.org/repos/asf/geode.git commit 7e16e9400a6d2dfbfa674a1df29286456677c3d1 Author: Bruce Schuchardt AuthorDate: Tue Sep 10 14:57:10 2019 -0700 GEODE-7175 Convert toData/fromData in other modules to use new serializers use the serialization context's readObject/writeObject methods instead of the static methods in DataSerializer. --- .../internal/locator/QueueConnectionRequest.java | 2 +- .../apache/geode/cache/query/internal/CqEntry.java | 9 +++ .../internal/CumulativeNonDistinctResults.java | 8 +++--- .../cache/query/internal/LinkedResultSet.java | 9 +++ .../cache/query/internal/LinkedStructSet.java | 9 +++ .../cache/query/internal/NWayMergeResults.java | 8 +++--- .../geode/cache/query/internal/ResultsBag.java | 9 +++ .../query/internal/ResultsCollectionWrapper.java | 9 +++ .../geode/cache/query/internal/ResultsSet.java | 5 ++-- .../cache/query/internal/SortedResultSet.java | 9 +++ .../cache/query/internal/SortedStructSet.java | 6 ++--- .../geode/cache/query/internal/StructImpl.java | 4 +-- .../geode/cache/query/internal/StructSet.java | 9 +++ .../distributed/internal/DistributionMessage.java | 6 +++-- .../geode/distributed/internal/StartupMessage.java | 4 +-- .../internal/locks/DLockRemoteToken.java | 6 ++--- .../geode/internal/InternalDataSerializer.java | 2 +- .../statalerts/GaugeThresholdDecoratorImpl.java| 9 +++ .../statalerts/NumberThresholdDecoratorImpl.java | 4 +-- .../internal/cache/DistTXPrecommitMessage.java | 4 +-- .../internal/cache/DistributedPutAllOperation.java | 28 ++-- .../cache/DistributedRemoveAllOperation.java | 26 ++- .../geode/internal/cache/EntryEventImpl.java | 30 +++--- .../apache/geode/internal/cache/FilterProfile.java | 4 +-- .../internal/cache/InitialImageOperation.java | 28 ++-- .../cache/InvalidatePartitionedRegionMessage.java | 3 +-- .../geode/internal/cache/RegionEventImpl.java | 4 +-- .../geode/internal/cache/TXCommitMessage.java | 15 ++- .../apache/geode/internal/cache/TXEntryState.java | 13 ++ .../geode/internal/cache/locks/TXLockIdImpl.java | 5 ++-- .../cache/partitioned/FetchEntryMessage.java | 5 ++-- .../internal/cache/partitioned/GetMessage.java | 5 ++-- .../partitioned/PRUpdateEntryVersionMessage.java | 13 +- .../cache/partitioned/PartitionMessage.java| 10 .../PartitionMessageWithDirectReply.java | 6 +++-- .../cache/partitioned/PutAllPRMessage.java | 9 --- .../internal/cache/partitioned/PutMessage.java | 5 ++-- .../cache/partitioned/RemoveAllPRMessage.java | 9 --- .../internal/cache/partitioned/SizeMessage.java| 5 ++-- .../internal/cache/snapshot/SnapshotPacket.java| 4 +-- .../tier/sockets/ClientDataSerializerMessage.java | 6 ++--- .../tier/sockets/ClientInstantiatorMessage.java| 6 ++--- .../tier/sockets/ClientInterestMessageImpl.java| 8 +++--- .../cache/tier/sockets/HAEventWrapper.java | 8 +++--- .../cache/tier/sockets/ObjectPartList.java | 8 +++--- .../cache/tier/sockets/ObjectPartList651.java | 8 +++--- .../tier/sockets/SerializedObjectPartList.java | 4 +-- .../cache/tier/sockets/VersionedObjectList.java| 25 ++ .../geode/internal/cache/tx/DistTxEntryEvent.java | 28 +++- .../internal/cache/tx/RemoteDestroyMessage.java| 5 ++-- .../internal/cache/tx/RemoteOperationMessage.java | 9 --- .../internal/cache/tx/RemotePutAllMessage.java | 4 +-- .../geode/internal/cache/tx/RemotePutMessage.java | 5 ++-- .../internal/cache/tx/RemoteRemoveAllMessage.java | 5 ++-- .../internal/cache/wan/GatewaySenderEventImpl.java | 23 + ...aySenderQueueEntrySynchronizationOperation.java | 8 +++--- .../internal/JmxManagerLocatorResponse.java| 4 +-- .../internal/cli/functions/CliFunctionResult.java | 12 - .../ResultsBagLimitBehaviourJUnitTest.java | 4 +-- .../lucene/internal/LuceneResultStructImpl.java| 9 +++ .../lucene/internal/distributed/EntryScore.java| 5 ++-- .../distributed/LuceneFunctionContext.java | 8 +++--- .../lucene/internal/distributed/TopEntries.java| 5 ++-- .../internal/distributed/TopEntriesCollector.java | 4 +-- .../serialization/DSFIDSerializerImpl.java | 4 +-- .../internal/serialization/ObjectDeserializer.java | 2 +- .../internal/locator/wan/LocatorJoinMessage.java | 9 +++ .../locator/wan/RemoteLocatorJoinRequest.java | 5 ++-- .../locator/wan/RemoteLocatorResponse.java | 5 ++-- 69 files changed, 304
[geode] branch feature/GEODE-7175 created (now 7e16e94)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7175 in repository https://gitbox.apache.org/repos/asf/geode.git. at 7e16e94 GEODE-7175 Convert toData/fromData in other modules to use new serializers This branch includes the following new commits: new 7e16e94 GEODE-7175 Convert toData/fromData in other modules to use new serializers 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 feature/GEODE-7168 updated (7bf60a5 -> 9514558)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 7bf60a5 fixing tests that parsed the old version numbers discard 3cc6edd GEODE-7168 tomcat rolling upgrade test failure discard 2e93d32 Revert "Revert "GEODE-6867: Updating Tomcat Session State Module docs (#3886)"" add 815e1fb no need to trigger full pipeline on release script or readme edits add 97282da no need to trigger full pipeline on release script or readme edits add f0107ad move brew and docker release steps earlier since they no longer depend on all mirrors being ready add 957cd9a validate that archive.apache.org is ready before doing brew or docker; improve script output add f6e1108 GEODE-7124: Added new API to create AEQ with paused event processing add 615d339 GEODE-7126: Added new API to resume AEQ event processing add 1440a95 GEODE-7129: Adding XML config for creating AEQ with paused event processing. add 42e07dc GEODE-7126: Refactoring API names to be more consistent. add e1f200e GEODE-7126: Added new CacheConfig to sanctioned serializable list add 6ee6d96 GEODE-7090 Remove dependency on DataSerializer from membership classes add d853adf GEODE-7107: Make jetty-server optional in geode-core pom (#3968) add 383bc54 fix for NPE in JGroupsMessengerJUnitTest add 5f70160 GEODE-7127: Added gfsh arguments for starting AEQ with paused event processing. add 06da924 add a script to deploy a pipeline to validate release candidate artifacts add 0645446 GEODE-7127: Fixing the list AEQ command. add 00d81d9 Revert "Revert "GEODE-6867: Updating Tomcat Session State Module docs (#3886)"" add 71dfd78 GEODE-7168 tomcat rolling upgrade test failure add ed26011 fixing tests that parsed the old version numbers add 9514558 rebase on develop 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 (7bf60a5) \ N -- N -- N refs/heads/feature/GEODE-7168 (9514558) 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. No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml|8 +- ci/pipelines/geode-build/jinja.template.yml|2 + dev-tools/release/commit_rc.sh | 14 + dev-tools/release/deploy_rc_pipeline.sh| 387 + dev-tools/release/finalize_release.sh | 108 +- dev-tools/release/prepare_rc.sh| 32 +- dev-tools/release/promote_rc.sh| 131 +- .../release/session/bin/modify_war |1 + geode-assembly/build.gradle|2 + .../apache/geode/session/tests/TomcatInstall.java |3 +- .../integrationTest/resources/assembly_content.txt |1 + .../resources/dependency_classpath.txt | 121 +- .../Tomcat8ClientServerRollingUpgradeTest.java |2 +- geode-core/build.gradle|9 +- .../geode/ClusterCommunicationsDUnitTest.java | 24 +- .../distributed/DistributedMemberDUnitTest.java|3 +- ...lusterDistributionManagerForAdminDUnitTest.java |9 +- .../geode/distributed/internal/DateMessage.java| 14 +- .../TcpServerBackwardCompatDUnitTest.java |9 +- ...ackwardCompatibilitySerializationDUnitTest.java | 76 +- .../geode/internal/cache/GIIDeltaDUnitTest.java|2 +- .../cache/TransactionsWithDeltaDUnitTest.java | 88 +- .../control/RebalanceOperationDistributedTest.java |6 +- .../PersistentRVVRecoveryDUnitTest.java|5 +- .../PersistentRecoveryOrderDUnitTest.java |3 +- .../asyncqueue/AsyncEventQueuePausedDUnitTest.java | 242 .../CreateAsyncEventQueueCommandDUnitTest.java | 38 +- .../ListAsyncEventQueuesCommandDUnitTest.java | 17 + .../geode/pdx/PDXAsyncEventQueueDUnitTest.java |2 +- .../geode/pdx/PdxAttributesDistributedTest.java|2 +- .../apache/geode/pdx/PdxClientServerDUnitTest.java |2 +- .../security/ClientAuthenticationTestCase.java |3 +- .../cache/client/ClientCacheFactoryJUnitTest.java | 10 +- .../ResultsDataSerializabilityJUnitTest.java |2 +- .../gms/fd/GMSHealthMonitorJUnitTest.java |7 +
[geode] branch feature/GEODE-7168 updated (9514558 -> 5c96812)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. from 9514558 rebase on develop add 5c96812 v1.4.0 backward-compat fixes and intellij classpath cleanup No new revisions were added by this update. Summary of changes: ...aAuthorizationUsingLegacySecurityDUnitTest.java | 2 +- ...onUsingLegacySecurityWithFailoverDUnitTest.java | 2 +- ...tartupRuleCanSpecifyOlderVersionsDUnitTest.java | 3 +++ .../security/ClientAuthorizationTestCase.java | 1 + .../geode/test/dunit/internal/ProcessManager.java | 16 .../apache/geode/test/version/VersionManager.java | 29 ++ 6 files changed, 40 insertions(+), 13 deletions(-)
[geode] branch develop updated (ec247ec -> 0ed6343)
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 ec247ec GEODE-7204: Add changes to AEQ documentation for 'pause-event-processing' functionality (#4053) add 0ed6343 GEODE-7175: fixing goofy serialization code in DistTxEntryEvent No new revisions were added by this update. Summary of changes: .../apache/geode/internal/cache/DistributedRemoveAllOperation.java| 4 ++-- .../apache/geode/internal/cache/partitioned/RemoveAllPRMessage.java | 2 +- .../java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java | 2 +- .../org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage.java| 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
[geode] branch feature/GEODE-7090 updated (f04f9ad -> 6dbc0fb)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch feature/GEODE-7090
in repository https://gitbox.apache.org/repos/asf/geode.git.
from f04f9ad altered DSFID classes to use serialization context for
read/writeObject ops
add 4022b8c Revert "GEODE-7087: Reset flag after unlock bucket primary
lock. (#3926)"
add 507be1b GEODE-7054: Add SSL benchmarks to CI (#3931)
add 723153f Revert "GEODE-7054: Add SSL benchmarks to CI (#3931)"
add ced3e45 automation of more steps of the release process
add 2e030f6 GEODE-7156: add token based authentication support in
management rest… (#4005)
add e8afa56 add 1.9.1 to old versions
add 6fe62ab add 1.9.1 to old versions
add 4ed44e1 fixes to release scripts
add 83b6565 GEODE-7164: Fix issue with IntelliJ Gradle import (#4012)
add c826d63 During CI, copy attach_sha_to_branch to tmpdir before
execution
add c058bb2 Revert "GEODE-6867: Updating Tomcat Session State Module docs
(#3886)"
add aaa1378 GEODE-7169 Fix building from source archive
add 815e1fb no need to trigger full pipeline on release script or readme
edits
add 97282da no need to trigger full pipeline on release script or readme
edits
add f0107ad move brew and docker release steps earlier since they no
longer depend on all mirrors being ready
add 957cd9a validate that archive.apache.org is ready before doing brew
or docker; improve script output
add 6dbc0fb rebase on develop
No new revisions were added by this update.
Summary of changes:
build.gradle | 2 +-
ci/pipelines/geode-build/jinja.template.yml| 2 +
ci/scripts/execute_build.sh| 3 +-
ci/scripts/execute_publish.sh | 3 +-
ci/scripts/execute_tests.sh| 4 +-
dev-tools/release/README.md| 7 +-
dev-tools/release/commit_rc.sh | 74 ---
dev-tools/release/finalize_release.sh | 185 ++
dev-tools/release/prepare_rc.sh| 159 ++-
dev-tools/release/print_rc_email.sh| 3 +-
dev-tools/release/promote_rc.sh| 214 +
.../ManagementRestAuthTokenIntegrationTest.java| 70 +++
.../integrationTest/resources/assembly_content.txt | 1 +
.../Tomcat8ClientServerRollingUpgradeTest.java | 7 +-
.../InternalDistributedSystemJUnitTest.java| 25 +++
.../geode/distributed/ConfigurationProperties.java | 21 ++
.../internal/AbstractDistributionConfig.java | 11 +-
.../distributed/internal/DistributionConfig.java | 25 +++
.../internal/DistributionConfigImpl.java | 27 ++-
.../distributed/internal/InternalLocator.java | 8 +
.../geode/examples/SimpleSecurityManager.java | 15 +-
.../org/apache/geode/internal/AbstractConfig.java | 9 +-
.../geode/internal/cache/InternalHttpService.java | 1 +
.../org/apache/geode/internal/cache/TXState.java | 68 +++
.../internal/security/ResourceConstants.java | 3 +-
.../security/AuthTokenEnabledComponents.java} | 23 ++-
.../org/apache/geode/security/SecurityManager.java | 20 +-
.../sanctioned-geode-core-serializables.txt| 1 +
.../internal/DistributionConfigJUnitTest.java | 22 ++-
.../apache/geode/internal/AbstractConfigTest.java | 9 +-
.../apache/geode/internal/cache/TXStateTest.java | 90 -
.../tomcat_installing_the_module.html.md.erb | 3 -
.../tomcat_setting_up_the_module.html.md.erb | 17 +-
.../weblogic_setting_up_the_module.html.md.erb | 7 -
.../internal/rest/BaseLocatorContextLoader.java| 2 +
.../management/internal/rest/GeodeComponent.java | 4 +
.../internal/rest/LocatorWebContext.java | 9 -
.../internal/rest/SecuredLocatorContextLoader.java | 1 -
...dLocatorWithAuthTokenEnabledContextLoader.java} | 5 +-
...tionTest.java => RequestWithAuthTokenTest.java} | 30 ++-
.../rest/security/GeodeAuthenticationProvider.java | 24 ++-
.../rest/security/JwtAuthenticationFilter.java | 77
.../rest/security/RestSecurityConfiguration.java | 48 +++--
.../rest/security/JwtAuthenticationFilterTest.java | 69 +++
.../security/LogNoPasswordDistributedTest.java | 2 +-
gradle/ide.gradle | 1 +
settings.gradle| 3 +-
47 files changed, 1106 insertions(+), 308 deletions(-)
create mode 100755 dev-tools/release/finalize_release.sh
create mode 100755 dev-tools/release/promote_rc.sh
create mode 100644
geode-assembly/src/integrationTest/java/org/apache/geode/rest/internal/web/ManagementRestAuthTokenIntegrationTest.java
copy
geode-core/src/{distributedTest/java/org/apache/geode/security/NoShowValue1PostProces
[geode] branch feature/GEODE-7090 updated (b11e9c1 -> f04f9ad)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. from b11e9c1 addressing Bill's comments add f04f9ad altered DSFID classes to use serialization context for read/writeObject ops No new revisions were added by this update. Summary of changes: .../internal/locator/QueueConnectionRequest.java | 2 +- .../apache/geode/cache/query/internal/CqEntry.java | 9 +++ .../internal/CumulativeNonDistinctResults.java | 8 +++--- .../cache/query/internal/LinkedResultSet.java | 9 +++ .../cache/query/internal/LinkedStructSet.java | 9 +++ .../cache/query/internal/NWayMergeResults.java | 8 +++--- .../geode/cache/query/internal/ResultsBag.java | 9 +++ .../query/internal/ResultsCollectionWrapper.java | 9 +++ .../geode/cache/query/internal/ResultsSet.java | 5 ++-- .../cache/query/internal/SortedResultSet.java | 9 +++ .../cache/query/internal/SortedStructSet.java | 6 ++--- .../geode/cache/query/internal/StructImpl.java | 4 +-- .../geode/cache/query/internal/StructSet.java | 9 +++ .../distributed/internal/DistributionMessage.java | 6 +++-- .../geode/distributed/internal/StartupMessage.java | 4 +-- .../internal/locks/DLockRemoteToken.java | 6 ++--- .../geode/internal/InternalDataSerializer.java | 2 +- .../statalerts/GaugeThresholdDecoratorImpl.java| 9 +++ .../statalerts/NumberThresholdDecoratorImpl.java | 4 +-- .../internal/cache/DistTXPrecommitMessage.java | 4 +-- .../internal/cache/DistributedPutAllOperation.java | 28 ++-- .../cache/DistributedRemoveAllOperation.java | 26 ++- .../geode/internal/cache/EntryEventImpl.java | 30 +++--- .../apache/geode/internal/cache/FilterProfile.java | 4 +-- .../internal/cache/InitialImageOperation.java | 28 ++-- .../cache/InvalidatePartitionedRegionMessage.java | 3 +-- .../geode/internal/cache/RegionEventImpl.java | 4 +-- .../geode/internal/cache/TXCommitMessage.java | 15 ++- .../apache/geode/internal/cache/TXEntryState.java | 13 ++ .../geode/internal/cache/locks/TXLockIdImpl.java | 5 ++-- .../cache/partitioned/FetchEntryMessage.java | 5 ++-- .../internal/cache/partitioned/GetMessage.java | 5 ++-- .../partitioned/PRUpdateEntryVersionMessage.java | 13 +- .../cache/partitioned/PartitionMessage.java| 10 .../PartitionMessageWithDirectReply.java | 6 +++-- .../cache/partitioned/PutAllPRMessage.java | 9 --- .../internal/cache/partitioned/PutMessage.java | 5 ++-- .../cache/partitioned/RemoveAllPRMessage.java | 9 --- .../internal/cache/partitioned/SizeMessage.java| 5 ++-- .../internal/cache/snapshot/SnapshotPacket.java| 4 +-- .../tier/sockets/ClientDataSerializerMessage.java | 6 ++--- .../tier/sockets/ClientInstantiatorMessage.java| 6 ++--- .../tier/sockets/ClientInterestMessageImpl.java| 8 +++--- .../cache/tier/sockets/HAEventWrapper.java | 8 +++--- .../cache/tier/sockets/ObjectPartList.java | 8 +++--- .../cache/tier/sockets/ObjectPartList651.java | 8 +++--- .../tier/sockets/SerializedObjectPartList.java | 4 +-- .../cache/tier/sockets/VersionedObjectList.java| 25 ++ .../geode/internal/cache/tx/DistTxEntryEvent.java | 28 +++- .../internal/cache/tx/RemoteDestroyMessage.java| 5 ++-- .../internal/cache/tx/RemoteOperationMessage.java | 9 --- .../internal/cache/tx/RemotePutAllMessage.java | 4 +-- .../geode/internal/cache/tx/RemotePutMessage.java | 5 ++-- .../internal/cache/tx/RemoteRemoveAllMessage.java | 5 ++-- .../internal/cache/wan/GatewaySenderEventImpl.java | 23 + ...aySenderQueueEntrySynchronizationOperation.java | 8 +++--- .../internal/JmxManagerLocatorResponse.java| 4 +-- .../internal/cli/functions/CliFunctionResult.java | 12 - .../ResultsBagLimitBehaviourJUnitTest.java | 4 +-- .../lucene/internal/LuceneResultStructImpl.java| 9 +++ .../lucene/internal/distributed/EntryScore.java| 5 ++-- .../distributed/LuceneFunctionContext.java | 8 +++--- .../lucene/internal/distributed/TopEntries.java| 5 ++-- .../internal/distributed/TopEntriesCollector.java | 4 +-- .../serialization/DSFIDSerializerImpl.java | 4 +-- .../internal/serialization/ObjectDeserializer.java | 2 +- .../internal/locator/wan/LocatorJoinMessage.java | 9 +++ .../locator/wan/RemoteLocatorJoinRequest.java | 5 ++-- .../locator/wan/RemoteLocatorResponse.java | 5 ++-- 69 files changed, 304 insertions(+), 290 deletions(-)
[geode] branch develop updated (d853adf -> 383bc54)
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 d853adf GEODE-7107: Make jetty-server optional in geode-core pom (#3968) add 383bc54 fix for NPE in JGroupsMessengerJUnitTest No new revisions were added by this update. Summary of changes: .../internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java | 1 + 1 file changed, 1 insertion(+)
[geode] branch feature/GEODE-7168 updated (3cc6edd -> 7bf60a5)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7168 in repository https://gitbox.apache.org/repos/asf/geode.git. from 3cc6edd GEODE-7168 tomcat rolling upgrade test failure add 7bf60a5 fixing tests that parsed the old version numbers No new revisions were added by this update. Summary of changes: .../tests/TomcatSessionBackwardsCompatibilityTestBase.java | 2 +- .../ClientDataAuthorizationUsingLegacySecurityDUnitTest.java | 6 +++--- ...uthorizationUsingLegacySecurityWithFailoverDUnitTest.java | 6 +++--- .../ClusterStartupRuleCanSpecifyOlderVersionsDUnitTest.java | 3 +++ .../java/org/apache/geode/test/version/VersionManager.java | 12 .../cache/lucene/LuceneSearchWithRollingUpgradeDUnit.java| 2 +- 6 files changed, 23 insertions(+), 8 deletions(-)
[geode] branch develop updated (e1f200e -> 6ee6d96)
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 e1f200e GEODE-7126: Added new CacheConfig to sanctioned serializable list add 6ee6d96 GEODE-7090 Remove dependency on DataSerializer from membership classes No new revisions were added by this update. Summary of changes: .../src/test/resources/expected-pom.xml|8 +- .../release/session/bin/modify_war |1 + geode-assembly/build.gradle|2 + .../apache/geode/session/tests/TomcatInstall.java |3 +- .../integrationTest/resources/assembly_content.txt |1 + .../resources/dependency_classpath.txt | 121 +- geode-core/build.gradle|3 + .../geode/ClusterCommunicationsDUnitTest.java | 24 +- .../distributed/DistributedMemberDUnitTest.java|3 +- ...lusterDistributionManagerForAdminDUnitTest.java |9 +- .../geode/distributed/internal/DateMessage.java| 14 +- .../TcpServerBackwardCompatDUnitTest.java |9 +- ...ackwardCompatibilitySerializationDUnitTest.java | 76 +- .../geode/internal/cache/GIIDeltaDUnitTest.java|2 +- .../cache/TransactionsWithDeltaDUnitTest.java | 88 +- .../control/RebalanceOperationDistributedTest.java |6 +- .../PersistentRVVRecoveryDUnitTest.java|5 +- .../PersistentRecoveryOrderDUnitTest.java |3 +- .../geode/pdx/PDXAsyncEventQueueDUnitTest.java |2 +- .../geode/pdx/PdxAttributesDistributedTest.java|2 +- .../apache/geode/pdx/PdxClientServerDUnitTest.java |2 +- .../security/ClientAuthenticationTestCase.java |3 +- .../cache/client/ClientCacheFactoryJUnitTest.java | 10 +- .../ResultsDataSerializabilityJUnitTest.java |2 +- .../gms/fd/GMSHealthMonitorJUnitTest.java |7 +- .../gms/locator/GMSLocatorIntegrationTest.java | 25 + .../locator/GMSLocatorRecoveryIntegrationTest.java | 20 +- .../gms/membership/GMSJoinLeaveJUnitTest.java |2 +- .../gms/messenger/JGroupsMessengerJUnitTest.java | 102 +- .../cache/CompactOfflineDiskStoreJUnitTest.java|2 +- .../cache/FilterProfileConcurrencyTest.java|2 +- ...FOEvictionAlgoMemoryEnabledRegionJUnitTest.java |4 +- .../cache/ha/HARegionQueueIntegrationTest.java |2 +- .../cache/tier/sockets/CacheClientProxyTest.java |2 +- .../sockets/ServerConnectionIntegrationTest.java |2 +- .../offheap/OffHeapValidationJUnitTest.java|2 +- .../geode/pdx/AutoSerializableJUnitTest.java |2 +- .../org/apache/geode/pdx/ByteSourceJUnitTest.java |2 +- .../geode/pdx/PdxInstanceFactoryJUnitTest.java |2 +- .../org/apache/geode/pdx/PdxInstanceJUnitTest.java |2 +- .../apache/geode/pdx/PdxSerializableJUnitTest.java |4 +- .../apache/geode/codeAnalysis/excludedClasses.txt |2 +- .../codeAnalysis/sanctionedDataSerializables.txt | 1516 ++-- .../internal/InternalDataSerializerBenchmark.java |3 + .../src/main/java/org/apache/geode/CopyHelper.java |2 +- .../main/java/org/apache/geode/DataSerializer.java | 186 +-- .../internal/SystemMemberCacheEventProcessor.java | 12 +- .../admin/jmx/internal/StatAlertNotification.java | 15 +- .../org/apache/geode/cache/AttributesFactory.java |4 +- .../org/apache/geode/cache/EvictionAttributes.java |3 +- .../geode/cache/client/internal/AbstractOp.java|4 +- .../cache/client/internal/AuthenticateUserOp.java |4 +- .../client/internal/CacheServerLoadMessage.java| 12 +- .../client/internal/ClientSideHandshakeImpl.java |8 +- .../client/internal/ExecuteFunctionNoAckOp.java|2 +- .../cache/client/internal/ExecuteFunctionOp.java |2 +- .../internal/ExecuteRegionFunctionNoAckOp.java |2 +- .../client/internal/ExecuteRegionFunctionOp.java |2 +- .../internal/ExecuteRegionFunctionSingleHopOp.java |2 +- .../geode/cache/client/internal/GetAllOp.java |2 +- .../geode/cache/client/internal/KeySetOp.java |2 +- .../cache/client/internal/ProxyCacheCloseOp.java |2 +- .../geode/cache/client/internal/PutAllOp.java |2 +- .../apache/geode/cache/client/internal/PutOp.java |2 +- .../geode/cache/client/internal/QueryOp.java |2 +- .../cache/client/internal/RegisterInterestOp.java |2 +- .../geode/cache/client/internal/RemoveAllOp.java |2 +- .../internal/locator/ClientConnectionRequest.java | 14 +- .../internal/locator/ClientConnectionResponse.java | 10 +- .../internal/locator/ClientReplacementRequest.java | 14 +- .../internal/locator/GetAllServersRequest.java | 14 +- .../internal/locator/GetAllServersResponse.java| 10 +- .../internal/locator/LocatorListRequest.java |2 +- .../internal/locator
[geode] branch feature/GEODE-7090 deleted (was 6dbc0fb)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7090 in repository https://gitbox.apache.org/repos/asf/geode.git. was 6dbc0fb rebase on develop The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-7196 updated (66c1e35 -> fb12a33)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-7196 in repository https://gitbox.apache.org/repos/asf/geode.git. from 66c1e35 rebasing on develop add fb12a33 fixing unit test failures No new revisions were added by this update. Summary of changes: .../cache/BucketCreationCrashRegressionTest.java | 2 ++ ...PersistentPartitionedRegionDistributedTest.java | 2 +- ...niversalMembershipListenerAdapterDUnitTest.java | 2 +- .../internal/ClusterDistributionManager.java | 36 ++ .../internal/ClusterOperationExecutors.java| 1 - .../distributed/internal/ReplyProcessor21.java | 1 - .../internal/membership/MembershipManager.java | 9 ++ .../membership/adapter/GMSMembershipManager.java | 15 ++--- .../internal/membership/gms/GMSMember.java | 16 ++ 9 files changed, 36 insertions(+), 48 deletions(-)
