[geode] branch develop updated (c79a5bc -> f521117)
This is an automated email from the ASF dual-hosted git repository. mivanac pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from c79a5bc Revert "Fix test-container and internal docker image. (#5319)" (#5326) add f521117 GEODE-8172: flaky test (#5148) No new revisions were added by this update. Summary of changes: ...PersistenceEnabledGatewaySenderOffHeapDUnitTest.java | 1 + ...llelWANPersistenceEnabledGatewaySenderDUnitTest.java | 17 + 2 files changed, 14 insertions(+), 4 deletions(-)
[geode] branch feature/GEODE-8259 updated (7955138 -> 362fd5e)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-8259 in repository https://gitbox.apache.org/repos/asf/geode.git. from 7955138 remove unnecessary logger add 362fd5e fix the test case based on bruce's comments No new revisions were added by this update. Summary of changes: .../geode/cache/client/internal/GetAllOpJUnitTest.java| 15 --- 1 file changed, 12 insertions(+), 3 deletions(-)
[geode] branch feature/GEODE-8259 updated (b25d759 -> 7955138)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-8259 in repository https://gitbox.apache.org/repos/asf/geode.git. from b25d759 GEODE-8259: add junit test for GetAllOp add 7955138 remove unnecessary logger No new revisions were added by this update. Summary of changes: .../org/apache/geode/cache/client/internal/GetAllOpJUnitTest.java | 4 1 file changed, 4 deletions(-)
[geode] branch develop updated (4ff9955 -> bfe1ca1)
This is an automated email from the ASF dual-hosted git repository.
burcham pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 4ff9955 GEODE-8319: fix NPE when cluster configuration folder does
not exist … (#5325)
add bfe1ca1 GEODE-8240: Member Identifier Future Versions
No new revisions were added by this update.
Summary of changes:
.../cache/client/ClientCacheFactoryJUnitTest.java | 6 +-
.../cache/ha/HARegionQueueIntegrationTest.java | 2 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 93 ++
.../internal/ClusterDistributionManager.java | 4 +-
.../internal/LonerDistributionManager.java | 4 +-
.../membership/InternalDistributedMember.java | 16 ++-
.../internal/cache/AbstractUpdateOperation.java| 2 +-
.../internal/cache/DistributedPutAllOperation.java | 5 +-
.../cache/DistributedRemoveAllOperation.java | 10 +-
...xpireDisconnectedClientTransactionsMessage.java | 4 +-
.../geode/internal/cache/GemFireCacheImpl.java | 3 +-
.../internal/cache/InitialImageOperation.java | 16 +--
.../org/apache/geode/internal/cache/Oplog.java | 3 +-
.../geode/internal/cache/PartitionedRegion.java| 4 +-
.../cache/PartitionedRegionQueryEvaluator.java | 2 +-
.../geode/internal/cache/ServerPingMessage.java| 2 +-
.../cache/partitioned/IndexCreationMsg.java| 2 +-
.../cache/partitioned/PutAllPRMessage.java | 7 +-
.../internal/cache/partitioned/QueryMessage.java | 4 +-
.../cache/partitioned/RemoveAllPRMessage.java | 8 +-
.../geode/internal/cache/tx/DistTxEntryEvent.java | 4 +-
.../internal/cache/tx/RemotePutAllMessage.java | 2 +-
.../internal/cache/tx/RemoteRemoveAllMessage.java | 2 +-
.../configuration/domain/Configuration.java| 4 +-
.../operation/RestoreRedundancyPerformer.java | 2 +-
.../management/internal/util/ManagementUtils.java | 3 +-
...eDisconnectedClientTransactionsMessageTest.java | 2 +-
.../operation/RestoreRedundancyPerformerTest.java | 8 +-
.../RollingUpgrade2DUnitTestBase.java | 3 +-
.../rollingupgrade/RollingUpgradeDUnitTest.java| 23 +++-
.../cli/commands/CreateGatewaySenderCommand.java | 3 +-
.../internal/cli/commands/RedundancyCommand.java | 2 +-
.../commands/CreateGatewaySenderCommandTest.java | 4 +-
.../org/apache/geode/test/version/TestVersion.java | 11 --
.../apache/geode/test/version/VersionManager.java | 4 +-
.../cache/lucene/internal/LuceneServiceImpl.java | 9 +-
.../internal/distributed/LuceneQueryFunction.java | 2 +-
.../gms/GMSMemberDataVersionJUnitTest.java | 99 +++
.../gms/membership/GMSJoinLeaveJUnitTest.java | 30 +
.../internal/membership/api/MemberData.java| 4 +-
.../internal/membership/api/MemberIdentifier.java | 3 +-
.../internal/membership/gms/GMSMemberData.java | 46 +++
.../internal/membership/gms/GMSMembership.java | 9 +-
.../internal/membership/gms/GMSMembershipView.java | 19 +++
.../membership/gms/MemberIdentifierImpl.java | 12 +-
.../membership/gms/membership/GMSJoinLeave.java| 2 +
geode-old-versions/README.md | 55 +
.../geode/internal/serialization/Version.java | 123 +--
.../internal/serialization/VersionOrdinal.java | 83 +
.../internal/serialization/VersionOrdinalImpl.java | 136 +
.../serialization/VersionedDataStream.java | 13 +-
...zationVersionException.java => Versioning.java} | 26 ++--
.../internal/DSFIDSerializerImpl.java | 19 +--
.../internal/serialization/VersionJUnitTest.java | 15 +++
.../serialization/VersionOrdinalImplJUnitTest.java | 127 +++
.../TcpServerProductVersionDUnitTest.java | 11 +-
56 files changed, 750 insertions(+), 367 deletions(-)
create mode 100644
geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberDataVersionJUnitTest.java
create mode 100644 geode-old-versions/README.md
create mode 100644
geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersionOrdinal.java
create mode 100644
geode-serialization/src/main/java/org/apache/geode/internal/serialization/VersionOrdinalImpl.java
copy
geode-serialization/src/main/java/org/apache/geode/internal/serialization/{UnsupportedSerializationVersionException.java
=> Versioning.java} (56%)
create mode 100644
geode-serialization/src/test/java/org/apache/geode/internal/serialization/VersionOrdinalImplJUnitTest.java
[geode] branch develop updated (f521117 -> 4ff9955)
This is an automated email from the ASF dual-hosted git repository. jinmeiliao pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f521117 GEODE-8172: flaky test (#5148) add 4ff9955 GEODE-8319: fix NPE when cluster configuration folder does not exist … (#5325) No new revisions were added by this update. Summary of changes: ...igurationPersistenceServiceIntegrationTest.java | 48 ++ .../InternalConfigurationPersistenceService.java | 35 +- ...nternalConfigurationPersistenceServiceTest.java | 74 -- 3 files changed, 122 insertions(+), 35 deletions(-) create mode 100644 geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/InternalConfigurationPersistenceServiceIntegrationTest.java
[geode] branch support/1.13 updated: GEODE-8095: Changes to make GEODE Respond to Restore Redundancy REST Command (#5300) (#5327)
This is an automated email from the ASF dual-hosted git repository.
mhanson pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 9255163 GEODE-8095: Changes to make GEODE Respond to Restore
Redundancy REST Command (#5300) (#5327)
9255163 is described below
commit 9255163a026d5571a89ba6aad950b75539261414
Author: mhansonp
AuthorDate: Tue Jun 30 10:35:55 2020 -0700
GEODE-8095: Changes to make GEODE Respond to Restore Redundancy REST
Command (#5300) (#5327)
* GEODE-8095: Changes to make GEODE Respond to Restore Redundancy
(cherry picked from commit f5c5e2cc7860c132074a16351ca4db847f64d6f7)
Co-authored-by: Jinmei Liao
---
.../rest/RestoreRedundancyManagementDUnitTest.java | 345 +
.../internal/operation/OperationManager.java | 2 +
...rializableRestoreRedundancyResultsImplTest.java | 5 +-
...RedundancyRequestControllerIntegrationTest.java | 174 +++
.../RestoreRedundancyOperationController.java | 74 +
5 files changed, 596 insertions(+), 4 deletions(-)
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
new file mode 100644
index 000..3464fe7
--- /dev/null
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
@@ -0,0 +1,345 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ *
+ */
+
+package org.apache.geode.management.internal.rest;
+
+import static
org.apache.geode.cache.PartitionAttributesFactory.GLOBAL_MAX_BUCKETS_DEFAULT;
+import static org.apache.geode.cache.Region.SEPARATOR;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.IntStream;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.PartitionAttributesImpl;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.management.api.ClusterManagementOperationResult;
+import org.apache.geode.management.api.ClusterManagementService;
+import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.operation.RestoreRedundancyRequest;
+import org.apache.geode.management.runtime.RegionRedundancyStatus;
+import org.apache.geode.management.runtime.RestoreRedundancyResults;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.rules.MemberStarterRule;
+
+/**
+ * This class borrows very heavily from the RestoreRedundancyCommandDUnitTest
+ *
+ */
+
+public class RestoreRedundancyManagementDUnitTest {
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule();
+
+ private MemberVM locator;
+ private List servers;
+ private static final int SERVERS_TO_START = 3;
+ private static final String HIGH_REDUNDANCY_REGION_NAME = "highRedundancy";
+ private static final int HIGH_REDUNDANCY_COPIES = SERVERS_TO_START - 1;
+ private static final String LOW_REDUNDANCY_REGION_NAME = "lowRedundancy";
+ private static final String PARENT_REGION_NAME = "colocatedParent";
+ private static final String CHILD_REGION_NAME = "colocatedChild";
+ private static final int SINGLE_REDUNDANT_COPY = 1;
+ private static final String NO_CONFIGURED_REDUNDANCY_REGION_NAME =
"noConfiguredRedundancy";
+
+ private
[geode] branch support/1.13 updated: GEODE-8095: Changes to make GEODE Respond to Restore Redundancy REST Command (#5300) (#5327)
This is an automated email from the ASF dual-hosted git repository.
mhanson pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 9255163 GEODE-8095: Changes to make GEODE Respond to Restore
Redundancy REST Command (#5300) (#5327)
9255163 is described below
commit 9255163a026d5571a89ba6aad950b75539261414
Author: mhansonp
AuthorDate: Tue Jun 30 10:35:55 2020 -0700
GEODE-8095: Changes to make GEODE Respond to Restore Redundancy REST
Command (#5300) (#5327)
* GEODE-8095: Changes to make GEODE Respond to Restore Redundancy
(cherry picked from commit f5c5e2cc7860c132074a16351ca4db847f64d6f7)
Co-authored-by: Jinmei Liao
---
.../rest/RestoreRedundancyManagementDUnitTest.java | 345 +
.../internal/operation/OperationManager.java | 2 +
...rializableRestoreRedundancyResultsImplTest.java | 5 +-
...RedundancyRequestControllerIntegrationTest.java | 174 +++
.../RestoreRedundancyOperationController.java | 74 +
5 files changed, 596 insertions(+), 4 deletions(-)
diff --git
a/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
new file mode 100644
index 000..3464fe7
--- /dev/null
+++
b/geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/RestoreRedundancyManagementDUnitTest.java
@@ -0,0 +1,345 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ *
+ */
+
+package org.apache.geode.management.internal.rest;
+
+import static
org.apache.geode.cache.PartitionAttributesFactory.GLOBAL_MAX_BUCKETS_DEFAULT;
+import static org.apache.geode.cache.Region.SEPARATOR;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.IntStream;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.PartitionAttributesImpl;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.management.api.ClusterManagementOperationResult;
+import org.apache.geode.management.api.ClusterManagementService;
+import org.apache.geode.management.client.ClusterManagementServiceBuilder;
+import org.apache.geode.management.operation.RestoreRedundancyRequest;
+import org.apache.geode.management.runtime.RegionRedundancyStatus;
+import org.apache.geode.management.runtime.RestoreRedundancyResults;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.rules.MemberStarterRule;
+
+/**
+ * This class borrows very heavily from the RestoreRedundancyCommandDUnitTest
+ *
+ */
+
+public class RestoreRedundancyManagementDUnitTest {
+
+ @Rule
+ public ClusterStartupRule cluster = new ClusterStartupRule();
+
+ private MemberVM locator;
+ private List servers;
+ private static final int SERVERS_TO_START = 3;
+ private static final String HIGH_REDUNDANCY_REGION_NAME = "highRedundancy";
+ private static final int HIGH_REDUNDANCY_COPIES = SERVERS_TO_START - 1;
+ private static final String LOW_REDUNDANCY_REGION_NAME = "lowRedundancy";
+ private static final String PARENT_REGION_NAME = "colocatedParent";
+ private static final String CHILD_REGION_NAME = "colocatedChild";
+ private static final int SINGLE_REDUNDANT_COPY = 1;
+ private static final String NO_CONFIGURED_REDUNDANCY_REGION_NAME =
"noConfiguredRedundancy";
+
+ private
[geode] branch support/1.13 updated: GEODE-8315: update Shiro from 1.5.2 to 1.5.3 (#5321)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 4f2d66d GEODE-8315: update Shiro from 1.5.2 to 1.5.3 (#5321)
4f2d66d is described below
commit 4f2d66d2b0e90f9dbe2c946a79341e7b34d0e40f
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Sat Jun 27 22:04:57 2020 -0700
GEODE-8315: update Shiro from 1.5.2 to 1.5.3 (#5321)
(cherry picked from commit 84fc86d0527c47f92691ac2b1472301d40e239fc)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +-
.../integrationTest/resources/dependency_classpath.txt | 18 +-
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 185ca9a..cbdfb1a 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -406,7 +406,7 @@
org.apache.shiro
shiro-core
-1.5.2
+1.5.3
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 9e2727e..9b8c591 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin {
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.13.1")
deps.put("micrometer.version", "1.4.1")
-deps.put("shiro.version", "1.5.2")
+deps.put("shiro.version", "1.5.3")
deps.put("slf4j-api.version", "1.7.30")
// These version numbers are used in testing various versions of tomcat
and are consumed explicitly
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 9dc7648..e762126 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1055,15 +1055,15 @@ lib/netty-all-4.1.48.Final.jar
lib/protobuf-java-3.11.4.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.5.2.jar
-lib/shiro-config-core-1.5.2.jar
-lib/shiro-config-ogdl-1.5.2.jar
-lib/shiro-core-1.5.2.jar
-lib/shiro-crypto-cipher-1.5.2.jar
-lib/shiro-crypto-core-1.5.2.jar
-lib/shiro-crypto-hash-1.5.2.jar
-lib/shiro-event-1.5.2.jar
-lib/shiro-lang-1.5.2.jar
+lib/shiro-cache-1.5.3.jar
+lib/shiro-config-core-1.5.3.jar
+lib/shiro-config-ogdl-1.5.3.jar
+lib/shiro-core-1.5.3.jar
+lib/shiro-crypto-cipher-1.5.3.jar
+lib/shiro-crypto-core-1.5.3.jar
+lib/shiro-crypto-hash-1.5.3.jar
+lib/shiro-event-1.5.3.jar
+lib/shiro-lang-1.5.3.jar
lib/slf4j-api-1.7.30.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.5.RELEASE.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index df1bad5..a12a84b 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -36,8 +36,8 @@ javax.activation-1.2.0.jar
istack-commons-runtime-3.0.11.jar
jaxb-impl-2.3.2.jar
commons-validator-1.6.jar
-shiro-core-1.5.2.jar
-shiro-config-ogdl-1.5.2.jar
+shiro-core-1.5.3.jar
+shiro-config-ogdl-1.5.3.jar
commons-beanutils-1.9.4.jar
commons-codec-1.14.jar
commons-collections-3.2.2.jar
@@ -58,13 +58,13 @@ jna-5.5.0.jar
jopt-simple-5.0.4.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.5.2.jar
-shiro-crypto-hash-1.5.2.jar
-shiro-crypto-cipher-1.5.2.jar
-shiro-config-core-1.5.2.jar
-shiro-event-1.5.2.jar
-shiro-crypto-core-1.5.2.jar
-shiro-lang-1.5.2.jar
+shiro-cache-1.5.3.jar
+shiro-crypto-hash-1.5.3.jar
+shiro-crypto-cipher-1.5.3.jar
+shiro-config-core-1.5.3.jar
+shiro-event-1.5.3.jar
+shiro-crypto-core-1.5.3.jar
+shiro-lang-1.5.3.jar
slf4j-api-1.7.30.jar
spring-core-5.2.5.RELEASE.jar
javax.activation-api-1.2.0.jar
[geode] branch support/1.12 updated: GEODE-8315: update Shiro from 1.5.2 to 1.5.3 (#5321)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 7b1bbd4 GEODE-8315: update Shiro from 1.5.2 to 1.5.3 (#5321)
7b1bbd4 is described below
commit 7b1bbd4e168ab6a6da0fbfdc43bfde2e350bd832
Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com>
AuthorDate: Sat Jun 27 22:04:57 2020 -0700
GEODE-8315: update Shiro from 1.5.2 to 1.5.3 (#5321)
(cherry picked from commit 84fc86d0527c47f92691ac2b1472301d40e239fc)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 2 +-
.../geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 18 +-
.../integrationTest/resources/dependency_classpath.txt | 18 +-
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml
b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 0ab3c3b..81f8200 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -340,7 +340,7 @@
org.apache.shiro
shiro-core
-1.5.2
+1.5.3
compile
diff --git
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 3a791ba..ffa477e 100644
---
a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++
b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -42,7 +42,7 @@ class DependencyConstraints implements Plugin {
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.12.1")
deps.put("micrometer.version", "1.2.1")
-deps.put("shiro.version", "1.5.2")
+deps.put("shiro.version", "1.5.3")
deps.put("slf4j-api.version", "1.7.28")
// These version numbers are used in testing various versions of tomcat
and are consumed explicitly
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt
b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 2d2ad1d..e2721b9 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1044,15 +1044,15 @@ lib/netty-all-4.1.48.Final.jar
lib/protobuf-java-3.10.0.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
-lib/shiro-cache-1.5.2.jar
-lib/shiro-config-core-1.5.2.jar
-lib/shiro-config-ogdl-1.5.2.jar
-lib/shiro-core-1.5.2.jar
-lib/shiro-crypto-cipher-1.5.2.jar
-lib/shiro-crypto-core-1.5.2.jar
-lib/shiro-crypto-hash-1.5.2.jar
-lib/shiro-event-1.5.2.jar
-lib/shiro-lang-1.5.2.jar
+lib/shiro-cache-1.5.3.jar
+lib/shiro-config-core-1.5.3.jar
+lib/shiro-config-ogdl-1.5.3.jar
+lib/shiro-core-1.5.3.jar
+lib/shiro-crypto-cipher-1.5.3.jar
+lib/shiro-crypto-core-1.5.3.jar
+lib/shiro-crypto-hash-1.5.3.jar
+lib/shiro-event-1.5.3.jar
+lib/shiro-lang-1.5.3.jar
lib/slf4j-api-1.7.28.jar
lib/snappy-0.4.jar
lib/spring-beans-5.2.5.RELEASE.jar
diff --git
a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index caf499f..366ee24 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -34,8 +34,8 @@ antlr-2.7.7.jar
javax.activation-1.2.0.jar
istack-commons-runtime-3.0.9.jar
commons-validator-1.6.jar
-shiro-core-1.5.2.jar
-shiro-config-ogdl-1.5.2.jar
+shiro-core-1.5.3.jar
+shiro-config-ogdl-1.5.3.jar
commons-beanutils-1.9.4.jar
commons-collections-3.2.2.jar
commons-io-2.6.jar
@@ -56,13 +56,13 @@ jopt-simple-5.0.4.jar
httpcore-4.4.12.jar
snappy-0.4.jar
jgroups-3.6.14.Final.jar
-shiro-cache-1.5.2.jar
-shiro-crypto-hash-1.5.2.jar
-shiro-crypto-cipher-1.5.2.jar
-shiro-config-core-1.5.2.jar
-shiro-event-1.5.2.jar
-shiro-crypto-core-1.5.2.jar
-shiro-lang-1.5.2.jar
+shiro-cache-1.5.3.jar
+shiro-crypto-hash-1.5.3.jar
+shiro-crypto-cipher-1.5.3.jar
+shiro-config-core-1.5.3.jar
+shiro-event-1.5.3.jar
+shiro-crypto-core-1.5.3.jar
+shiro-lang-1.5.3.jar
slf4j-api-1.7.28.jar
swagger-annotations-1.5.23.jar
spring-core-5.2.5.RELEASE.jar
[geode] branch feature/GEODE-8259 updated (79fab08 -> b25d759)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-8259 in repository https://gitbox.apache.org/repos/asf/geode.git. from 79fab08 refix to only change getAllOp add b25d759 GEODE-8259: add junit test for GetAllOp No new revisions were added by this update. Summary of changes: .../cache/client/internal/GetAllOpJUnitTest.java | 96 ++ 1 file changed, 96 insertions(+) create mode 100644 geode-core/src/test/java/org/apache/geode/cache/client/internal/GetAllOpJUnitTest.java
[geode] branch develop updated (bfe1ca1 -> 5d6fcf1)
This is an automated email from the ASF dual-hosted git repository. donalevans pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from bfe1ca1 GEODE-8240: Member Identifier Future Versions add 5d6fcf1 GEODE-7864: Fix array index out of bounds alerts (#5330) No new revisions were added by this update. Summary of changes: geode-core/src/main/java/org/apache/geode/internal/AvailablePort.java | 2 +- .../geode/internal/cache/partitioned/PartitionMemberInfoImpl.java | 4 ++-- .../geode/internal/cache/persistence/query/mock/ByteComparator.java | 2 +- .../apache/geode/internal/cache/tier/sockets/BaseCommandQuery.java| 2 +- .../internal/cache/tier/sockets/ClientDataSerializerMessage.java | 2 +- .../geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java | 2 +- .../apache/geode/management/internal/cli/commands/DeployCommand.java | 2 +- .../management/internal/cli/commands/ListJndiBindingCommand.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-)
[geode] branch feature/GEODE-8324 created (now 514b17a)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-8324 in repository https://gitbox.apache.org/repos/asf/geode.git. at 514b17a GEODE-8324: Don't add a remote ds id to recipients unless it is running This branch includes the following new commits: new 514b17a GEODE-8324: Don't add a remote ds id to recipients unless it is running 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-8324: Don't add a remote ds id to recipients unless it is running
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-8324
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 514b17a5a43093c2301c5305ea356bc48924fe90
Author: Barry Oglesby
AuthorDate: Tue Jun 30 14:44:36 2020 -0700
GEODE-8324: Don't add a remote ds id to recipients unless it is running
---
.../org/apache/geode/internal/cache/AbstractRegion.java | 16 +---
.../geode/internal/cache/wan/AbstractGatewaySender.java | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index 0364e17..e8c73e5 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -738,15 +738,17 @@ public abstract class AbstractRegion implements
InternalRegion, AttributesMutato
if ((sz > 0 || isPdxTypesRegion) && !allGatewaySenders.isEmpty()) {
List allRemoteDSIds = new ArrayList<>(sz);
for (GatewaySender sender : allGatewaySenders) {
-// This is for all regions except pdx Region
-if (!isPdxTypesRegion) {
- // Make sure we are distributing to only those senders whose id
- // is available on this region
- if (allGatewaySenderIds.contains(sender.getId())) {
+if (sender.isRunning()) {
+ // This is for all regions except pdx Region
+ if (!isPdxTypesRegion) {
+// Make sure we are distributing to only those senders whose id
+// is available on this region
+if (allGatewaySenderIds.contains(sender.getId())) {
+ allRemoteDSIds.add(sender.getRemoteDSId());
+}
+ } else { // this else is for PDX region
allRemoteDSIds.add(sender.getRemoteDSId());
}
-} else { // this else is for PDX region
- allRemoteDSIds.add(sender.getRemoteDSId());
}
}
return allRemoteDSIds;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 396edca..6e4a4f3 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -1036,7 +1036,7 @@ public abstract class AbstractGatewaySender implements
InternalGatewaySender, Di
if (this.isPrimary()) {
tmpDroppedEvents.add(clonedEvent);
if (isDebugEnabled) {
-logger.debug("add to tmpDroppedEvents for evnet {}", clonedEvent);
+logger.debug("add to tmpDroppedEvents for event {}", clonedEvent);
}
}
if (isDebugEnabled) {
[geode] branch support/1.22 created (now ee9a4b0)
This is an automated email from the ASF dual-hosted git repository. burcham pushed a change to branch support/1.22 in repository https://gitbox.apache.org/repos/asf/geode.git. at ee9a4b0 GEODE-8259: when client singlehop getAll encountered SerializationException, it should retry (#5253) No new revisions were added by this update.
[geode] branch develop updated (5d6fcf1 -> ee9a4b0)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 5d6fcf1 GEODE-7864: Fix array index out of bounds alerts (#5330) add ee9a4b0 GEODE-8259: when client singlehop getAll encountered SerializationException, it should retry (#5253) No new revisions were added by this update. Summary of changes: .../geode/cache/client/internal/GetAllOp.java | 38 +--- .../cache/client/internal/GetAllOpJUnitTest.java | 101 + 2 files changed, 125 insertions(+), 14 deletions(-) create mode 100644 geode-core/src/test/java/org/apache/geode/cache/client/internal/GetAllOpJUnitTest.java
[geode] branch support/1.12 updated: GEODE-8259: when client singlehop getAll encountered SerializationException, it should retry (#5253)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 16f2093 GEODE-8259: when client singlehop getAll encountered
SerializationException, it should retry (#5253)
16f2093 is described below
commit 16f2093fa59b9f0f3b7600cc365d922d78d6e8dd
Author: Xiaojian Zhou
AuthorDate: Tue Jun 30 15:19:39 2020 -0700
GEODE-8259: when client singlehop getAll encountered
SerializationException, it should retry (#5253)
Co-authored-by: Xiaojian Zhou
Co-authored-by: Anil
(cherry picked from commit ee9a4b05277ff531d0d89d5d0fb65f63063557e3)
---
.../geode/cache/client/internal/GetAllOp.java | 38 +---
.../cache/client/internal/GetAllOpJUnitTest.java | 100 +
2 files changed, 124 insertions(+), 14 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
index 89c2251..c8c35a4 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/GetAllOp.java
@@ -22,6 +22,7 @@ import java.util.Set;
import org.apache.logging.log4j.Logger;
+import org.apache.geode.SerializationException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ServerConnectivityException;
import org.apache.geode.cache.client.ServerOperationException;
@@ -74,23 +75,32 @@ public class GetAllOp {
VersionedObjectList result = null;
ServerConnectivityException se = null;
List retryList = new ArrayList();
- List callableTasks =
- constructGetAllTasks(region.getFullPath(), serverToFilterMap,
(PoolImpl) pool, callback);
- Map results =
- SingleHopClientExecutor.submitGetAll(serverToFilterMap,
- callableTasks, cms, (LocalRegion) region);
- for (ServerLocation server : results.keySet()) {
-Object serverResult = results.get(server);
-if (serverResult instanceof ServerConnectivityException) {
- se = (ServerConnectivityException) serverResult;
- retryList.addAll(serverToFilterMap.get(server));
-} else {
- if (result == null) {
-result = (VersionedObjectList) serverResult;
+ try {
+List callableTasks =
+constructGetAllTasks(region.getFullPath(), serverToFilterMap,
(PoolImpl) pool,
+callback);
+Map results =
+SingleHopClientExecutor.submitGetAll(serverToFilterMap,
+callableTasks, cms, (LocalRegion) region);
+for (ServerLocation server : results.keySet()) {
+ Object serverResult = results.get(server);
+ if (serverResult instanceof ServerConnectivityException) {
+se = (ServerConnectivityException) serverResult;
+retryList.addAll(serverToFilterMap.get(server));
} else {
-result.addAll((VersionedObjectList) serverResult);
+if (result == null) {
+ result = (VersionedObjectList) serverResult;
+} else {
+ result.addAll((VersionedObjectList) serverResult);
+}
}
}
+ } catch (ServerOperationException serverOperationException) {
+if (!(serverOperationException.getCause() instanceof
SerializationException)) {
+ throw serverOperationException;
+}
+se = serverOperationException;
+retryList = keys;
}
if (se != null) {
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/client/internal/GetAllOpJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/GetAllOpJUnitTest.java
new file mode 100644
index 000..f905225
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/GetAllOpJUnitTest.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.cache.client.internal;
+
+import static
