You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2020/04/10 15:30:20 UTC
[geode] branch feature/GEODE-7852query updated (ae87dd4 -> 4d593a7)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch feature/GEODE-7852query
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard ae87dd4 removed useless test of toString method
discard e4820c0 GEODE-7852: Add client side configuration option to support a SNI proxy
add e9993c1 GEODE-7765: Update dependencies for v1.13
add 93e460b GEODE-7838: getNumOfServers while rebalance is executed (#4815)
add 7763ce5 GEODE-7779: Concourse BumpXYZ does not include {prerelease} (#4684)
add b93cc01 Revert "GEODE-7852: test SNI client against a geode (2-node) cluster (#4925)" (#4940)
add 51477e9 GEODE-7943 add synchronization to Subscriptions class (#4913)
add 2ffc874 GEODE-7949: Geode Redis - Get/Set commands for RedisString datatype to cover new parameters (#4907)
add f49151a GEODE-7852: Add client side configuration option to support a SNI proxy
add a32d211 removed useless test of toString method
add 4d593a7 rebasing on develop after Bill's revert
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 (ae87dd4)
\
N -- N -- N refs/heads/feature/GEODE-7852query (4d593a7)
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 | 96 +++---
.../gradle/plugins/DependencyConstraints.groovy | 62 ++--
ci/pipelines/geode-build/jinja.template.yml | 6 +-
ci/pipelines/shared/jinja.variables.yml | 2 +-
.../apache/geode/session/tests/TomcatInstall.java | 4 +-
.../MissingDiskStoreAcceptanceTest.java | 2 +-
...tanceTest.java => ClientSNIAcceptanceTest.java} | 26 +-
.../client/sni/DualServerSNIAcceptanceTest.java | 169 ----------
...tandaloneClientManagementAPIAcceptanceTest.java | 2 +-
.../client/sni/geode-config/locator-keystore.jks | Bin 0 -> 2028 bytes
.../sni/geode-config/locator-maeve-keystore.jks | Bin 2048 -> 0 bytes
.../geode-config/server-clementine-keystore.jks | Bin 2059 -> 0 bytes
.../sni/geode-config/server-dolores-keystore.jks | Bin 2050 -> 0 bytes
.../client/sni/geode-config/server-keystore.jks | Bin 0 -> 2025 bytes
.../geode/client/sni/geode-config/truststore.jks | Bin 8095 -> 6023 bytes
.../org/apache/geode/client/sni/haproxy.cfg | 14 +-
.../geode/client/sni/scripts/geode-starter-2.gfsh | 23 --
.../geode/client/sni/scripts/geode-starter.gfsh | 4 +-
.../integrationTest/resources/assembly_content.txt | 42 ++-
.../resources/dependency_classpath.txt | 54 ++--
.../integrationTest/resources/expected_jars.txt | 22 +-
.../geode/ClusterCommunicationsDUnitTest.java | 2 +-
.../api/AlertingServiceDistributedTest.java | 2 +-
.../ResourceManagerWithQueryMonitorDUnitTest.java | 2 +-
.../apache/geode/cache30/ReconnectDUnitTest.java | 4 +-
...ReconnectWithClusterConfigurationDUnitTest.java | 2 +-
.../apache/geode/distributed/LocatorDUnitTest.java | 2 +-
.../internal/DistributionAdvisorDUnitTest.java | 2 +-
...rverReadConflictTransactionDistributedTest.java | 2 +-
...ntServerTransactionFailoverDistributedTest.java | 2 +-
.../internal/cache/DeltaPropagationDUnitTest.java | 4 +-
.../cache/PartitionedRegionSingleHopDUnitTest.java | 4 +-
.../control/RebalanceOperationDistributedTest.java | 3 +-
...istributedRegionFunctionExecutionDUnitTest.java | 6 +-
...tColocatedPartitionedRegionDistributedTest.java | 2 +-
...tPartitionHangsDuringRestartRegressionTest.java | 2 +-
...PersistentPartitionedRegionDistributedTest.java | 2 +-
.../PersistentRVVRecoveryDUnitTest.java | 2 +-
.../PersistentRecoveryOrderDUnitTest.java | 2 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 2 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 2 +-
.../MeterSubregistryReconnectDistributedTest.java | 2 +-
.../LoggingWithReconnectDistributedTest.java | 2 +-
...butedSystemMXBeanWithAlertsDistributedTest.java | 2 +-
...stemMXBeanWithNotificationsDistributedTest.java | 2 +-
.../management/JMXMBeanReconnectDUnitTest.java | 2 +-
.../DeprecatedAgentLauncherIntegrationTest.java | 2 +-
.../AlertingServiceWithClusterIntegrationTest.java | 2 +-
.../distributed/LauncherIntegrationTestCase.java | 2 +-
.../ServerLauncherRemoteIntegrationTestCase.java | 2 +-
.../cache/PartitionedRegionCreationJUnitTest.java | 4 +-
.../cache/TXDetectReadConflictJUnitTest.java | 8 +-
.../backup/IncrementalBackupIntegrationTest.java | 2 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 7 +-
.../logging/MergeLogFilesIntegrationTest.java | 2 +-
.../DistributedSystemMXBeanIntegrationTest.java | 2 +-
.../geode/cache/control/RebalanceResults.java | 7 +
.../cache/partition/PartitionRebalanceInfo.java | 7 +
.../control/PartitionRebalanceDetailsImpl.java | 6 +
.../cache/control/RebalanceResultsImpl.java | 9 +
.../internal/functions/RebalanceFunction.java | 2 +-
.../geode/management/internal/i18n/CliStrings.java | 2 +
.../operation/RebalanceOperationPerformer.java | 4 +-
.../sanctioned-geode-core-serializables.txt | 4 +-
.../cache/control/InternalResourceManagerTest.java | 2 +-
.../SingleThreadColocationLoggerTest.java | 2 +-
.../executor/AbstractExecutorGroupJUnitTest.java | 2 +-
.../concurrent/StoppableCountDownLatchTest.java | 4 +-
.../operation/RebalanceOperationPerformerTest.java | 2 +-
.../cache/PutAllClientServerDistributedTest.java | 2 +-
.../cache/tier/sockets/DurableClientTestBase.java | 16 +-
.../gfsh/command-pages/rebalance.html.md.erb | 28 +-
.../tests/DistributedExecutorServiceRuleTest.java | 2 +-
.../MemberStarterRuleAwaitIntegrationTest.java | 2 +-
.../tests/SharedCountersRuleDistributedTest.java | 2 +-
.../AsyncInvocationTimeoutDistributedTest.java | 2 +-
.../dunit/tests/StackTraceDistributedTest.java | 2 +-
.../dunit/tests/VMDumpThreadsDistributedTest.java | 2 +-
.../RebalanceCommandDistributedTestBase.java | 65 +++-
.../apache/geode/test/dunit/AsyncInvocation.java | 2 +-
.../test/dunit/internal/VMEventNotifierTest.java | 2 +-
.../cli/util/LogExporterFileIntegrationTest.java | 4 +-
.../internal/cli/commands/RebalanceCommand.java | 12 +-
.../web/http/support/HttpRequesterTest.java | 3 +-
.../geode/test/awaitility/GeodeAwaitility.java | 26 +-
.../apache/geode/test/process/ProcessWrapper.java | 2 +-
.../geode/test/awaitility/GeodeAwaitilityTest.java | 23 +-
.../rules/ExecutorServiceRuleGetThreadsTest.java | 2 +-
.../test/junit/rules/ExpectedTimeoutRuleTest.java | 2 +-
.../operation/RebalanceRegionResultImpl.java | 11 +
.../management/runtime/RebalanceRegionResult.java | 5 +
.../sanctioned-geode-management-serializables.txt | 2 +-
.../management/operation/RebalanceResultTest.java | 4 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 2 +-
.../org/apache/geode/redis/RedisDistDUnitTest.java | 2 +-
.../apache/geode/redis/HashesIntegrationTest.java | 10 +
.../apache/geode/redis/StringsIntegrationTest.java | 343 ++++++++++++++++++++-
.../redis/general/ExpireAtIntegrationTest.java | 17 +-
.../geode/redis/internal/DummySubscription.java | 28 +-
.../internal/SubscriptionsIntegrationTest.java | 194 ++++++++++++
.../org/apache/geode/redis/internal/GeoCoder.java | 8 +-
.../apache/geode/redis/internal/KeyRegistrar.java | 13 +-
.../geode/redis/internal/RedisConstants.java | 2 +
.../apache/geode/redis/internal/Subscriptions.java | 19 +-
.../internal/executor/string/GetExecutor.java | 2 +-
.../internal/executor/string/SetExecutor.java | 241 ++++++++++-----
...itTest.java => StringGetExecutorJUnitTest.java} | 78 +++--
.../string/StringSetExecutorJUnitTest.java | 190 +++++++++++-
geode-wan/build.gradle | 2 +-
109 files changed, 1383 insertions(+), 666 deletions(-)
rename geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/{SingleServerSNIAcceptanceTest.java => ClientSNIAcceptanceTest.java} (87%)
delete mode 100644 geode-assembly/src/acceptanceTest/java/org/apache/geode/client/sni/DualServerSNIAcceptanceTest.java
create mode 100644 geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/locator-keystore.jks
delete mode 100644 geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/locator-maeve-keystore.jks
delete mode 100644 geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/server-clementine-keystore.jks
delete mode 100644 geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/server-dolores-keystore.jks
create mode 100644 geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/geode-config/server-keystore.jks
delete mode 100644 geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter-2.gfsh
copy geode-experimental-driver/src/main/java/org/apache/geode/experimental/driver/NoOpSerializer.java => geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/DummySubscription.java (64%)
create mode 100644 geode-redis/src/integrationTest/java/org/apache/geode/redis/internal/SubscriptionsIntegrationTest.java
copy geode-redis/src/test/java/org/apache/geode/redis/internal/executor/string/{IncrExecutorJUnitTest.java => StringGetExecutorJUnitTest.java} (62%)