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 d7572ac703be8a32e58fa8d0103058349c07ecd7 Merge: 8ef9bcf8ee1 6fb76dbe3d6 Author: Maksim Timonin <[email protected]> AuthorDate: Fri Oct 4 10:26:08 2024 +0300 Merge branch 'master' into IGNITE-22662__snapshot_refactoring .github/workflows/commit-check.yml | 3 +- .github/workflows/publish-snapshot.yml | 2 +- bin/control.bat | 8 +- bin/ignite.bat | 8 +- bin/include/functions.sh | 6 +- bin/include/jvmdefaults.bat | 19 - bin/include/jvmdefaults.sh | 19 +- bin/index-reader.bat | 8 +- deliveries/docker/apache-ignite-net/Dockerfile | 2 +- deliveries/docker/apache-ignite/arm64/Dockerfile | 4 +- deliveries/docker/apache-ignite/run.sh | 19 +- deliveries/docker/apache-ignite/x86_64/Dockerfile | 4 +- docs/README.adoc | 2 +- docs/_docs/SQL/distributed-joins.adoc | 21 + docs/_docs/SQL/sql-calcite.adoc | 2 +- docs/_docs/data-modeling/binary-marshaller.adoc | 47 + docs/_docs/data-rebalancing.adoc | 7 +- .../change-data-capture-extensions.adoc | 75 +- docs/_docs/includes/cpp-prerequisites.adoc | 2 +- docs/_docs/includes/dotnet-prerequisites.adoc | 2 +- docs/_docs/includes/prereqs.adoc | 2 +- .../monitoring-metrics/new-metrics-system.adoc | 2 +- docs/_docs/monitoring-metrics/new-metrics.adoc | 3 + docs/_docs/monitoring-metrics/system-views.adoc | 3 +- .../net-specific/net-cross-platform-support.adoc | 6 +- docs/_docs/net-specific/net-troubleshooting.adoc | 3 +- .../perf-and-troubleshooting/memory-tuning.adoc | 2 +- docs/_docs/quick-start/java.adoc | 8 +- docs/_docs/restapi.adoc | 8 +- docs/_docs/security/sandbox.adoc | 2 +- docs/_docs/security/tde.adoc | 10 +- docs/_docs/sql-reference/ddl.adoc | 60 + docs/_docs/tools/control-script.adoc | 12 +- docs/_docs/tools/informatica.adoc | 2 +- examples/README.md | 4 +- examples/pom-standalone-lgpl.xml | 4 +- examples/pom-standalone.xml | 4 +- modules/calcite/pom.xml | 4 +- modules/calcite/src/main/codegen/config.fmpp | 12 +- .../src/main/codegen/includes/parserImpls.ftl | 38 + .../query/calcite/CalciteQueryProcessor.java | 1 + .../processors/query/calcite/RootQuery.java | 13 +- .../query/calcite/exec/ExecutionServiceImpl.java | 8 +- .../query/calcite/exec/LogicalRelImplementor.java | 38 +- .../query/calcite/exec/exp/ExpressionFactory.java | 4 +- .../calcite/exec/exp/ExpressionFactoryImpl.java | 5 +- .../query/calcite/exec/exp/RexImpTable.java | 363 +- .../query/calcite/exec/exp/RexToLixTranslator.java | 55 + .../query/calcite/exec/exp/agg/Accumulators.java | 46 + .../query/calcite/externalize/RelJson.java | 1 + .../query/calcite/externalize/RelJsonReader.java | 14 +- .../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 +- .../query/calcite/prepare/IgniteTypeCoercion.java | 38 + .../query/calcite/prepare/PlannerPhase.java | 3 + .../prepare/ddl/SqlToNativeCommandConverter.java | 34 +- .../query/calcite/rel/IgniteIndexCount.java | 25 +- .../processors/query/calcite/rel/IgniteLimit.java | 14 +- .../processors/query/calcite/rel/IgniteSort.java | 10 +- .../query/calcite/rule/IndexCountRule.java | 6 +- .../query/calcite/schema/CacheIndexImpl.java | 103 +- .../query/calcite/schema/IgniteSchema.java | 34 +- .../query/calcite/schema/SchemaHolderImpl.java | 29 +- .../query/calcite/schema/ViewTableImpl.java | 52 + .../query/calcite/schema/ViewTableMacroImpl.java | 105 + .../query/calcite/sql/IgniteSqlConformance.java | 10 + .../calcite/sql/fun/IgniteStdSqlOperatorTable.java | 12 + .../calcite/sql/generated/IgniteSqlParserImpl.java | 22140 ++++++++++--------- .../generated/IgniteSqlParserImplConstants.java | 1418 +- .../generated/IgniteSqlParserImplTokenManager.java | 22123 +++++++++--------- .../processors/query/calcite/trait/TraitUtils.java | 5 + .../query/calcite/type/IgniteTypeFactory.java | 13 +- .../query/calcite/util/IgniteResource.java | 4 + .../processors/query/calcite/util/TypeUtils.java | 45 +- .../calcite/exec/LogicalRelImplementorTest.java | 23 +- .../calcite/exec/NumericTypesPrecisionsTest.java | 202 + .../calcite/exec/rel/AbstractExecutionTest.java | 2 + .../exec/rel/HashAggregateExecutionTest.java | 1 + .../integration/AbstractBasicIntegrationTest.java | 19 +- .../integration/AggregatesIntegrationTest.java | 27 + .../integration/AuthorizationIntegrationTest.java | 87 +- .../query/calcite/integration/DataTypesTest.java | 102 + .../integration/IndexRebuildIntegrationTest.java | 8 +- .../query/calcite/integration/IntervalTest.java | 5 +- .../integration/JoinRehashIntegrationTest.java | 60 +- .../integration/LimitOffsetIntegrationTest.java | 10 + .../calcite/integration/StdSqlOperatorsTest.java | 10 +- .../calcite/integration/ViewsIntegrationTest.java | 433 + .../query/calcite/jdbc/JdbcCrossEngineTest.java | 37 + .../query/calcite/planner/AbstractPlannerTest.java | 22 +- .../calcite/planner/AggregatePlannerTest.java | 33 + .../calcite/planner/LimitOffsetPlannerTest.java | 12 + .../query/calcite/planner/PlannerTest.java | 193 +- .../calcite/planner/SerializationPlannerTest.java | 93 + .../calcite/planner/SortAggregatePlannerTest.java | 2 +- .../planner/UserDefinedViewsPlannerTest.java | 108 + .../query/calcite/sql/SqlCustomParserTest.java | 92 + .../ignite/testsuites/IgniteCalciteTestSuite.java | 3 + .../ignite/testsuites/IntegrationTestSuite.java | 2 + .../apache/ignite/testsuites/PlannerTestSuite.java | 6 +- .../test/sql/aggregate/group/test_group_by.test | 34 +- .../sql/aggregate/group/test_group_by.test_ignore | 182 - .../sql/aggregate/group/test_group_by_alias.test | 17 + .../group/test_group_by_alias.test_ignore | 1 - .../calcite/src/test/sql/order/test_order_by.test | 20 + .../src/test/sql/order/test_order_by.test_ignore | 9 - modules/checkstyle/pom.xml | 4 +- .../ignite/common/NodeSslConnectionMetricTest.java | 24 +- .../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 26 +- .../jdbc2/JdbcAbstractUpdateStatementSelfTest.java | 8 +- .../apache/ignite/internal/jdbc2/JdbcBlobTest.java | 3 + .../apache/ignite/internal/jdbc2/JdbcClobTest.java | 452 + .../jdbc2/JdbcInsertStatementSelfTest.java | 59 +- .../internal/jdbc2/JdbcMergeStatementSelfTest.java | 48 +- .../jdbc2/JdbcPreparedStatementSelfTest.java | 54 +- .../internal/jdbc2/JdbcResultSetSelfTest.java | 51 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 2 + .../thin/JdbcThinAbstractDmlStatementSelfTest.java | 72 +- .../JdbcThinAbstractUpdateStatementSelfTest.java | 8 +- .../jdbc/thin/JdbcThinConnectionSSLTest.java | 8 +- .../jdbc/thin/JdbcThinConnectionSelfTest.java | 68 +- .../jdbc/thin/JdbcThinInsertStatementSelfTest.java | 41 +- .../jdbc/thin/JdbcThinMergeStatementSelfTest.java | 25 +- .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 3 +- .../thin/JdbcThinPreparedStatementSelfTest.java | 82 +- .../jdbc/thin/JdbcThinResultSetSelfTest.java | 76 +- .../PersistenceBasicCompatibilityTest.java | 2 +- .../testframework/util/MavenUtils.java | 53 +- .../SecurityCommandHandlerPermissionsTest.java | 8 +- .../util/GridCommandHandlerClusterByClassTest.java | 26 +- .../util/GridCommandHandlerConsistencyTest.java | 98 +- .../apache/ignite/util/SystemViewCommandTest.java | 2 +- .../cache-create-correct-skip-existing-check.xml | 36 + .../main/java/org/apache/ignite/IgniteCache.java | 14 +- .../main/java/org/apache/ignite/IgniteCluster.java | 8 +- .../apache/ignite/IgniteJdbcThinDataSource.java | 4 +- .../org/apache/ignite/IgniteSystemProperties.java | 2 +- .../java/org/apache/ignite/cache/CacheEntry.java | 16 +- .../java/org/apache/ignite/cache/QueryEntity.java | 2 +- .../apache/ignite/cache/query/ContinuousQuery.java | 6 +- .../cache/store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../java/org/apache/ignite/client/ClientCache.java | 2 +- .../org/apache/ignite/cluster/ClusterNode.java | 12 +- .../compute/ComputeJobContinuationAdapter.java | 2 +- .../apache/ignite/compute/ComputeLoadBalancer.java | 12 +- .../compute/ComputeTaskContinuousMapper.java | 4 +- .../apache/ignite/compute/ComputeTaskSession.java | 4 +- .../ignite/configuration/DeploymentMode.java | 2 +- .../ignite/configuration/SqlConfiguration.java | 8 +- .../sorted/inline/InlineTreeFilterClosure.java | 2 +- .../internal/client/thin/ReliableChannel.java | 29 +- .../internal/client/thin/TcpClientChannel.java | 17 +- .../GridNioClientConnectionMultiplexer.java | 2 +- .../cluster/DistributedBaselineConfiguration.java | 16 +- .../cache/distribution/CacheDistributionTask.java | 11 +- .../internal/jdbc/thin/ConnectionProperties.java | 10 - .../jdbc/thin/ConnectionPropertiesImpl.java | 37 +- .../internal/jdbc/thin/JdbcThinConnection.java | 6 +- .../jdbc/thin/JdbcThinPreparedStatement.java | 8 +- .../internal/jdbc/thin/JdbcThinResultSet.java | 18 +- .../ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 3 +- .../org/apache/ignite/internal/jdbc2/JdbcBlob.java | 2 +- .../org/apache/ignite/internal/jdbc2/JdbcClob.java | 326 + .../ignite/internal/jdbc2/JdbcConnection.java | 2 +- .../internal/jdbc2/JdbcPreparedStatement.java | 4 +- .../ignite/internal/jdbc2/JdbcResultSet.java | 8 +- .../management/cache/CacheCreateCommand.java | 7 + .../management/cache/CacheCreateCommandArg.java | 16 + .../internal/management/cache/CacheCreateTask.java | 12 +- .../consistency/ConsistencyRepairTask.java | 4 +- .../deployment/GridDeploymentCommunication.java | 15 +- .../deployment/GridDeploymentLocalStore.java | 17 + .../managers/encryption/GridEncryptionManager.java | 2 + .../systemview/walker/SqlViewViewWalker.java | 16 +- .../internal/pagemem/wal/record/WALRecord.java | 5 +- .../internal/plugin/IgniteLogInfoProviderImpl.java | 2 +- .../processors/cache/CacheMetricsImpl.java | 50 +- .../processors/cache/GridCacheContext.java | 10 + .../processors/cache/GridCacheEntryEx.java | 4 - .../processors/cache/GridCacheMapEntry.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 | 5 +- .../distributed/GridDistributedUnlockRequest.java | 11 +- .../cache/distributed/dht/GridDhtLockFuture.java | 3 +- .../cache/distributed/dht/GridDhtLockRequest.java | 90 +- .../cache/distributed/dht/GridDhtLockResponse.java | 63 +- .../dht/GridDhtTransactionalCacheAdapter.java | 47 +- .../distributed/dht/GridDhtTxFinishFuture.java | 11 - .../distributed/dht/GridDhtTxFinishRequest.java | 204 +- .../distributed/dht/GridDhtTxFinishResponse.java | 8 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 1 - .../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 | 127 +- .../dht/colocated/GridDhtColocatedLockFuture.java | 32 +- .../preloader/GridDhtPartitionsExchangeFuture.java | 8 +- .../cache/distributed/near/GridNearGetRequest.java | 8 +- .../distributed/near/GridNearGetResponse.java | 10 +- .../cache/distributed/near/GridNearLockFuture.java | 50 +- .../distributed/near/GridNearLockRequest.java | 99 +- .../distributed/near/GridNearSingleGetRequest.java | 8 +- .../near/GridNearSingleGetResponse.java | 12 +- .../near/GridNearTransactionalCache.java | 173 +- .../distributed/near/GridNearTxFinishFuture.java | 2 - .../distributed/near/GridNearTxFinishResponse.java | 7 +- .../cache/distributed/near/GridNearTxLocal.java | 29 +- .../distributed/near/GridNearTxPrepareRequest.java | 2 +- .../near/GridNearTxPrepareResponse.java | 22 +- .../cache/distributed/near/GridNearTxRemote.java | 94 +- .../snapshot/IgniteSnapshotManager.java | 94 +- .../snapshot/SnapshotMetadataVerificationTask.java | 13 +- .../snapshot/SnapshotRestoreProcess.java | 2 +- .../cache/query/IgniteQueryErrorCode.java | 6 + .../processors/cache/query/SqlFieldsQueryEx.java | 21 - .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/TxLocksRequest.java | 9 +- .../cache/transactions/TxLocksResponse.java | 11 +- .../cluster/GridClusterStateProcessor.java | 10 +- .../datastructures/DataStructuresProcessor.java | 2 + .../persistence/DistributedMetaStorageImpl.java | 3 + .../odbc/jdbc/JdbcConnectionContext.java | 19 +- .../processors/odbc/jdbc/JdbcRequestHandler.java | 7 - .../odbc/odbc/OdbcConnectionContext.java | 15 +- .../processors/odbc/odbc/OdbcRequestHandler.java | 8 - .../platform/memory/PlatformMemoryPool.java | 7 +- .../processors/query/GridQueryProcessor.java | 19 +- .../internal/processors/query/NestedTxMode.java | 60 - .../internal/processors/query/QueryUtils.java | 15 + .../query/schema/AbstractSchemaChangeListener.java | 10 + .../query/schema/SchemaChangeListener.java | 19 +- .../query/schema/SchemaOperationException.java | 18 + .../query/schema/SchemaSqlViewManager.java | 222 + .../query/schema/management/SchemaDescriptor.java | 34 + .../query/schema/management/SchemaManager.java | 100 +- .../query/schema/management/ViewDescriptor.java} | 48 +- .../stat/IgniteStatisticsConfigurationManager.java | 36 +- .../query/stat/IgniteStatisticsManagerImpl.java | 8 +- .../GridInternalSubscriptionProcessor.java | 16 +- .../processors/task/GridTaskProcessor.java | 4 +- .../ignite/internal/sql/SqlCommandProcessor.java | 20 +- .../org/apache/ignite/internal/sql/SqlKeyword.java | 15 + .../org/apache/ignite/internal/sql/SqlParser.java | 30 +- .../internal/sql/command/SqlCreateViewCommand.java | 129 + .../internal/sql/command/SqlDropViewCommand.java | 98 + .../suggestions/JvmConfigurationSuggestions.java | 9 - .../ignite/internal/util/FeatureChecker.java | 8 +- .../apache/ignite/internal/util/GridCleaner.java | 99 - .../apache/ignite/internal/util/GridUnsafe.java | 8 +- .../apache/ignite/internal/util/IgniteUtils.java | 8 +- .../apache/ignite/lang/IgniteAsyncCallback.java | 4 +- .../ignite/marshaller/MarshallerContext.java | 4 +- .../main/java/org/apache/ignite/package-info.java | 2 +- .../ignite/plugin/security/SecurityPermission.java | 8 +- .../security/SecurityPermissionSetBuilder.java | 2 +- .../ignite/services/ServiceCallInterceptor.java | 4 +- .../spi/IgniteSpiOperationTimeoutHelper.java | 13 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 54 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../loadbalancing/adaptive/AdaptiveLoadProbe.java | 2 +- .../spi/systemview/view/sql/SqlViewView.java | 46 +- .../apache/ignite/transactions/Transaction.java | 2 +- .../main/resources/META-INF/classnames.properties | 1 - .../org/apache/ignite/client/ReliabilityTest.java | 12 +- .../IgniteClientReconnectDeploymentTest.java | 81 + .../RemoveEntryProcessorTransactionTest.java | 53 + .../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 + .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../processors/cache/GridCacheTestEntryEx.java | 2 - .../cache/consistency/ReadRepairDataGenerator.java | 2 - .../IgniteSnapshotRestoreFromRemoteTest.java | 55 + .../snapshot/IncrementalSnapshotTest.java | 37 + .../ignite/internal/sql/SqlParserViewSelfTest.java | 129 + .../JvmConfigurationSuggestionsTest.java | 86 - .../ignite/internal/util/nio/GridNioSelfTest.java | 10 +- .../security/SecurityPermissionSetBuilderTest.java | 6 +- .../tcp/TcpDiscoveryNetworkIssuesTest.java | 123 +- .../testframework/wal/record/RecordUtils.java | 49 +- .../ignite/testsuites/IgniteBasicTestSuite2.java | 5 - .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../ignite/testsuites/IgniteCacheTestSuite13.java | 2 + .../testsuites/IgniteClientReconnectTestSuite.java | 4 +- ...mandHandlerClusterByClassTest_cache_help.output | 3 +- ...dlerClusterByClassWithSSLTest_cache_help.output | 3 +- modules/ducktests/README.md | 92 +- .../dns_failure_test/BlockingNameService.java | 20 +- .../tests/jdbc/JdbcThinSelfTestApplication.java | 124 + .../ducktest/utils/IgniteAwareApplication.java | 4 + .../utils/IgniteAwareApplicationService.java | 12 +- .../tests/checks/utils/check_ignite_spec.py | 22 +- modules/ducktests/tests/docker/Dockerfile | 2 +- modules/ducktests/tests/docker/ducker-ignite | 2 +- modules/ducktests/tests/docker/run_tests.sh | 4 +- .../tests/ignitetest/services/utils/__init__.py | 1 + .../ignitetest/services/utils/config_template.py | 9 + .../ignitetest/services/utils/ignite_aware.py | 3 +- .../utils/ignite_configuration/__init__.py | 32 + .../tests/ignitetest/services/utils/ignite_spec.py | 23 +- .../tests/ignitetest/services/utils/jvm_utils.py | 2 +- .../tests/ignitetest/services/utils/path.py | 9 + .../utils/templates/thin_jdbc_config.xml.j2 | 46 + .../tests/ignitetest/tests/jdbc_thin_test.py | 66 + .../tests/ignitetest/utils/ignite_test.py | 1 + .../processors/query/h2/H2SchemaManager.java | 24 + .../processors/query/h2/IgniteH2Indexing.java | 5 +- .../processors/query/h2/QueryParameters.java | 26 +- .../internal/processors/query/h2/QueryParser.java | 9 +- .../query/h2/sql/GridSqlQueryParser.java | 2 +- .../cache/metric/SqlViewExporterSpiTest.java | 2 +- .../db/LongDestroyDurableBackgroundTaskTest.java | 4 +- .../query/h2/sql/SqlUnsupportedSelfTest.java | 3 - .../IgniteBinaryCacheQueryTestSuite.java | 2 + modules/kubernetes/config/Dockerfile | 2 +- .../apache/ignite/logger/log4j2/Log4J2Logger.java | 4 +- modules/numa-allocator/README.md | 4 +- modules/platforms/cpp/odbc-test/CMakeLists.txt | 1 - modules/platforms/cpp/odbc/CMakeLists.txt | 1 - .../include/ignite/odbc/config/configuration.h | 32 - .../ignite/odbc/config/connection_string_parser.h | 3 - .../cpp/odbc/include/ignite/odbc/message.h | 11 + .../cpp/odbc/include/ignite/odbc/nested_tx_mode.h | 81 - .../odbc/system/ui/dsn_configuration_window.h | 12 +- .../win/src/system/ui/dsn_configuration_window.cpp | 36 - .../cpp/odbc/src/config/configuration.cpp | 27 - .../odbc/src/config/connection_string_parser.cpp | 19 - modules/platforms/cpp/odbc/src/dsn_config.cpp | 5 - modules/platforms/cpp/odbc/src/message.cpp | 2 +- modules/platforms/cpp/odbc/src/nested_tx_mode.cpp | 80 - .../Impl/Unmanaged/Jni/JvmDll.cs | 6 +- modules/platforms/dotnet/examples/README.md | 2 +- modules/tools/pom.xml | 15 +- .../tools/ant/beautifier/GridJavadocAntTask.java | 40 +- .../ignite/tools/javadoc/IgniteLinkTaglet.java | 164 - modules/urideploy/pom.xml | 2 +- packaging/deb/control | 2 +- packaging/rpm/apache-ignite.spec | 4 +- parent/pom.xml | 16 +- pom.xml | 1 + 367 files changed, 30483 insertions(+), 25655 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()) diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataVerificationTask.java index 398239d6b3c,370e922c7a4..f3250b63b76 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataVerificationTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotMetadataVerificationTask.java @@@ -45,9 -49,10 +46,11 @@@ import org.apache.ignite.internal.util. import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import static java.lang.String.valueOf; import static org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager.incrementalSnapshotWalsDir; + import static org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager.snapshotMetaFileName; /** Snapshot task to verify snapshot metadata on the baseline nodes for given snapshot name. */ @GridInternal
