You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ti...@apache.org on 2024/08/22 13:52:07 UTC
(ignite) 01/01: Merge branch 'master' into IGNITE-22662__snapshot_refactoring
This is an automated email from the ASF dual-hosted git repository.
timoninmaxim pushed a commit to branch IGNITE-22662__snapshot_refactoring
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit dd338c844f75344eccbb5217827096be76425616
Merge: 8ef9bcf8ee1 add61eb5887
Author: Maksim Timonin <ti...@gmail.com>
AuthorDate: Thu Aug 22 16:51:45 2024 +0300
Merge branch 'master' into IGNITE-22662__snapshot_refactoring
docs/_docs/SQL/distributed-joins.adoc | 21 +++
.../change-data-capture-extensions.adoc | 13 --
docs/_docs/monitoring-metrics/new-metrics.adoc | 3 +
docs/_docs/tools/control-script.adoc | 8 +-
.../query/calcite/CalciteQueryProcessor.java | 1 +
.../processors/query/calcite/RootQuery.java | 13 +-
.../query/calcite/exec/ExecutionServiceImpl.java | 8 +-
.../query/calcite/exec/LogicalRelImplementor.java | 21 +++
.../query/calcite/message/ErrorMessage.java | 10 +-
.../query/calcite/message/GenericValueMessage.java | 13 +-
.../query/calcite/message/MarshalableMessage.java | 9 +-
.../query/calcite/message/MarshallingContext.java | 58 -------
.../query/calcite/message/MessageServiceImpl.java | 61 ++------
.../query/calcite/message/QueryBatchMessage.java | 5 +-
.../query/calcite/message/QueryStartRequest.java | 10 +-
.../query/calcite/message/QueryStartResponse.java | 10 +-
.../query/calcite/message/ValueMessage.java | 5 +-
.../query/calcite/metadata/ColocationGroup.java | 6 +-
.../calcite/metadata/FragmentDescription.java | 6 +-
.../query/calcite/metadata/FragmentMapping.java | 6 +-
.../query/calcite/prepare/BaseQueryContext.java | 29 +++-
.../processors/query/calcite/rel/IgniteLimit.java | 14 +-
.../processors/query/calcite/rel/IgniteSort.java | 10 +-
.../calcite/exec/LogicalRelImplementorTest.java | 8 +-
.../calcite/exec/rel/AbstractExecutionTest.java | 2 +
.../integration/JoinRehashIntegrationTest.java | 60 +++++--
.../integration/LimitOffsetIntegrationTest.java | 10 ++
.../query/calcite/planner/AbstractPlannerTest.java | 20 +--
.../calcite/planner/LimitOffsetPlannerTest.java | 12 ++
.../query/calcite/planner/PlannerTest.java | 134 ++++------------
.../ignite/common/NodeSslConnectionMetricTest.java | 24 ++-
.../SecurityCommandHandlerPermissionsTest.java | 8 +-
.../util/GridCommandHandlerClusterByClassTest.java | 9 +-
.../util/GridCommandHandlerConsistencyTest.java | 98 +++++++++---
.../cache-create-correct-skip-existing-check.xml | 36 +++++
.../sorted/inline/InlineTreeFilterClosure.java | 2 +-
.../internal/client/thin/ReliableChannel.java | 29 +++-
.../internal/client/thin/TcpClientChannel.java | 17 +-
.../GridNioClientConnectionMultiplexer.java | 2 +-
.../cluster/DistributedBaselineConfiguration.java | 16 +-
.../management/cache/CacheCreateCommand.java | 7 +
.../management/cache/CacheCreateCommandArg.java | 16 ++
.../internal/management/cache/CacheCreateTask.java | 12 +-
.../consistency/ConsistencyRepairTask.java | 4 +-
.../deployment/GridDeploymentCommunication.java | 15 +-
.../managers/encryption/GridEncryptionManager.java | 2 +
.../processors/cache/CacheMetricsImpl.java | 50 +++++-
.../processors/cache/GridCacheContext.java | 10 ++
.../processors/cache/GridCacheMessage.java | 11 +-
.../internal/processors/cache/GridCacheUtils.java | 14 +-
.../distributed/GridCacheTxRecoveryRequest.java | 2 +-
.../distributed/GridCacheTxRecoveryResponse.java | 2 +-
.../distributed/GridDistributedLockRequest.java | 20 +--
.../distributed/GridDistributedLockResponse.java | 6 +-
.../GridDistributedTxFinishRequest.java | 2 +-
.../GridDistributedTxFinishResponse.java | 2 +-
.../distributed/GridDistributedTxMapping.java | 12 +-
.../GridDistributedTxPrepareRequest.java | 31 ++--
.../GridDistributedTxPrepareResponse.java | 6 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/GridDistributedUnlockRequest.java | 11 +-
.../cache/distributed/dht/GridDhtLockFuture.java | 3 +-
.../cache/distributed/dht/GridDhtLockRequest.java | 90 ++---------
.../cache/distributed/dht/GridDhtLockResponse.java | 17 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 43 ++----
.../distributed/dht/GridDhtTxFinishResponse.java | 8 +-
.../cache/distributed/dht/GridDhtTxMapping.java | 2 +-
.../distributed/dht/GridDhtTxPrepareRequest.java | 8 +-
.../distributed/dht/GridDhtTxPrepareResponse.java | 16 +-
.../distributed/dht/GridDhtUnlockRequest.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 119 +++++++-------
.../dht/colocated/GridDhtColocatedLockFuture.java | 5 +-
.../preloader/GridDhtPartitionsExchangeFuture.java | 8 +-
.../cache/distributed/near/GridNearGetRequest.java | 8 +-
.../distributed/near/GridNearGetResponse.java | 10 +-
.../cache/distributed/near/GridNearLockFuture.java | 7 +-
.../distributed/near/GridNearLockRequest.java | 24 +--
.../distributed/near/GridNearSingleGetRequest.java | 8 +-
.../near/GridNearSingleGetResponse.java | 12 +-
.../near/GridNearTransactionalCache.java | 172 +--------------------
.../distributed/near/GridNearTxFinishResponse.java | 7 +-
.../distributed/near/GridNearTxPrepareRequest.java | 2 +-
.../near/GridNearTxPrepareResponse.java | 22 ++-
.../cache/distributed/near/GridNearTxRemote.java | 94 +----------
.../snapshot/IgniteSnapshotManager.java | 94 +++++------
.../snapshot/SnapshotRestoreProcess.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 2 +-
.../cache/transactions/IgniteTxLocalAdapter.java | 2 +-
.../cache/transactions/TxLocksRequest.java | 9 +-
.../cache/transactions/TxLocksResponse.java | 11 +-
.../cluster/GridClusterStateProcessor.java | 10 +-
.../datastructures/DataStructuresProcessor.java | 2 +
.../persistence/DistributedMetaStorageImpl.java | 3 +
.../GridInternalSubscriptionProcessor.java | 16 +-
.../processors/task/GridTaskProcessor.java | 4 +-
.../apache/ignite/internal/util/IgniteUtils.java | 8 +-
.../org/apache/ignite/client/ReliabilityTest.java | 12 +-
.../internal/client/thin/ComputeTaskTest.java | 4 +-
.../internal/client/thin/FunctionalTest.java | 3 +
.../ThinClientAbstractPartitionAwarenessTest.java | 56 ++++++-
.../thin/ThinClientEnpointsDiscoveryTest.java | 45 ++++++
...ientPartitionAwarenessUnstableTopologyTest.java | 4 +-
.../metric/CacheMetricsConflictResolverTest.java | 146 +++++++++++++++++
.../IgniteSnapshotRestoreFromRemoteTest.java | 55 +++++++
.../ignite/testsuites/IgniteCacheTestSuite13.java | 2 +
...mandHandlerClusterByClassTest_cache_help.output | 3 +-
...dlerClusterByClassWithSSLTest_cache_help.output | 3 +-
.../db/LongDestroyDurableBackgroundTaskTest.java | 4 +-
.../apache/ignite/logger/log4j2/Log4J2Logger.java | 2 +-
109 files changed, 1172 insertions(+), 1083 deletions(-)
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
index d2643d5e8ed,dc893677f01..bb78b31bbde
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
@@@ -725,11 -720,10 +724,13 @@@ public class IgniteSnapshotManager exte
@Override protected void stop0(boolean cancel) {
busyLock.block();
+ IgniteCheckedException stopErr = new NodeStoppingException("Node is stopping.");
+
try {
+ snpRmtMgr.stop();
+
- restoreCacheGrpProc.interrupt(new NodeStoppingException("Node is stopping."));
+ restoreCacheGrpProc.interrupt(stopErr);
+ checkSnpProc.interrupt(stopErr);
// Try stop all snapshot processing if not yet.
for (AbstractSnapshotFutureTask<?> sctx : locSnpTasks.values())