Merge remote-tracking branch 'remotes/origin/master' into ignite-5578 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3cf893c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3cf893c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3cf893c Branch: refs/heads/ignite-5578 Commit: b3cf893c5c2aecf5bfc14a443ca3cd71c2bec30b Parents: bc9a416 b8b8064 Author: sboikov <[email protected]> Authored: Mon Aug 21 11:39:56 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Aug 21 11:39:56 2017 +0300 ---------------------------------------------------------------------- .../example-persistent-store.xml | 23 - .../datagrid/CacheClientBinaryQueryExample.java | 3 + .../persistentstore/PersistentStoreExample.java | 29 +- modules/clients/src/test/config/jdbc-config.xml | 1 + .../jdbc2/JdbcConnectionReopenTest.java | 51 + .../jdbc2/JdbcDeleteStatementSelfTest.java | 22 + .../jdbc2/JdbcInsertStatementSelfTest.java | 159 ++ .../jdbc2/JdbcMergeStatementSelfTest.java | 41 + .../jdbc2/JdbcStatementBatchingSelfTest.java | 133 ++ .../jdbc2/JdbcUpdateStatementSelfTest.java | 24 + .../tcp/redis/RedisProtocolStringSelfTest.java | 44 + .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 7 + .../ignite/jdbc/thin/JdbcThinBatchSelfTest.java | 333 ++++ .../jdbc/thin/JdbcThinMetadataSelfTest.java | 337 +++- .../java/org/apache/ignite/IgniteCache.java | 1 - .../org/apache/ignite/IgniteDataStreamer.java | 26 +- .../apache/ignite/IgniteSystemProperties.java | 8 + .../org/apache/ignite/cache/CacheMetrics.java | 10 + .../org/apache/ignite/cache/QueryEntity.java | 236 +++ .../org/apache/ignite/cache/QueryIndex.java | 5 +- .../ignite/cache/query/SqlFieldsQuery.java | 38 +- .../query/annotations/QueryGroupIndex.java | 20 + .../cache/query/annotations/QuerySqlField.java | 23 + .../configuration/CacheConfiguration.java | 615 +------ .../configuration/CheckpointWriteOrder.java | 33 + .../PersistentStoreConfiguration.java | 26 + .../ignite/internal/GridKernalContext.java | 2 +- .../ignite/internal/GridKernalContextImpl.java | 6 +- .../apache/ignite/internal/IgniteKernal.java | 17 +- .../ignite/internal/IgniteNodeAttributes.java | 6 + .../org/apache/ignite/internal/IgnitionEx.java | 23 +- .../internal/jdbc/thin/JdbcThinConnection.java | 20 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java | 1587 ++++++++++++++++++ .../jdbc/thin/JdbcThinParameterMetadata.java | 115 ++ .../jdbc/thin/JdbcThinPreparedStatement.java | 43 +- .../internal/jdbc/thin/JdbcThinResultSet.java | 47 +- .../internal/jdbc/thin/JdbcThinStatement.java | 50 +- .../internal/jdbc/thin/JdbcThinTcpIo.java | 131 +- .../internal/jdbc2/JdbcBatchUpdateTask.java | 215 +++ .../ignite/internal/jdbc2/JdbcConnection.java | 43 +- .../internal/jdbc2/JdbcDatabaseMetadata.java | 2 +- .../internal/jdbc2/JdbcPreparedStatement.java | 25 +- .../ignite/internal/jdbc2/JdbcStatement.java | 59 +- .../managers/communication/GridIoManager.java | 6 + .../managers/communication/GridIoMessage.java | 3 + .../discovery/GridDiscoveryManager.java | 39 +- .../ignite/internal/pagemem/PageUtils.java | 26 + .../internal/pagemem/store/PageStore.java | 5 + .../cache/CacheAffinitySharedManager.java | 56 +- .../cache/CacheClusterMetricsMXBeanImpl.java | 10 + .../cache/CacheLocalMetricsMXBeanImpl.java | 10 + .../processors/cache/CacheMetricsImpl.java | 36 +- .../processors/cache/CacheMetricsSnapshot.java | 18 + .../processors/cache/GridCacheProcessor.java | 113 +- .../processors/cache/GridCacheUtils.java | 97 ++ .../binary/CacheObjectBinaryProcessor.java | 20 +- .../binary/CacheObjectBinaryProcessorImpl.java | 17 +- .../distributed/dht/GridDhtLocalPartition.java | 38 +- .../dht/GridDhtPartitionTopologyImpl.java | 16 + .../dht/atomic/GridDhtAtomicCache.java | 32 +- .../dht/preloader/GridDhtPartitionDemander.java | 22 +- .../dht/preloader/GridDhtPreloader.java | 6 +- .../GridCacheDatabaseSharedManager.java | 120 +- .../cache/persistence/MetadataStorage.java | 19 +- .../cache/persistence/file/FilePageStore.java | 56 +- .../persistence/file/FilePageStoreFactory.java | 35 + .../persistence/file/FilePageStoreManager.java | 18 +- .../cache/persistence/file/FilePageStoreV2.java | 53 + .../file/FileVersionCheckingFactory.java | 116 ++ .../cache/persistence/freelist/PagesList.java | 67 +- .../persistence/pagemem/PageMemoryImpl.java | 80 +- .../tree/io/PagePartitionCountersIO.java | 2 +- .../wal/AbstractWalRecordsIterator.java | 11 +- .../persistence/wal/ByteBufferExpander.java | 27 +- .../wal/FileWriteAheadLogManager.java | 79 +- .../wal/reader/StandaloneGridKernalContext.java | 2 +- .../reader/StandaloneWalRecordsIterator.java | 9 +- .../cache/query/QueryEntityClassProperty.java | 116 ++ .../cache/query/QueryEntityIndexDescriptor.java | 121 ++ .../cache/query/QueryEntityTypeDescriptor.java | 212 +++ .../cache/store/CacheStoreManager.java | 4 +- .../store/GridCacheStoreManagerAdapter.java | 20 +- .../cache/transactions/IgniteTxAdapter.java | 9 +- .../IgniteTxImplicitSingleStateImpl.java | 5 +- .../cluster/GridClusterStateProcessor.java | 64 +- .../datastreamer/DataStreamerImpl.java | 281 ++-- .../datastreamer/DataStreamerRequest.java | 59 +- .../processors/odbc/SqlListenerNioListener.java | 9 +- .../odbc/SqlListenerRequestHandler.java | 9 + .../odbc/jdbc/JdbcBatchExecuteRequest.java | 109 ++ .../odbc/jdbc/JdbcBatchExecuteResult.java | 102 ++ .../processors/odbc/jdbc/JdbcColumnMeta.java | 75 +- .../processors/odbc/jdbc/JdbcIndexMeta.java | 192 +++ .../odbc/jdbc/JdbcMetaColumnsRequest.java | 102 ++ .../odbc/jdbc/JdbcMetaColumnsResult.java | 99 ++ .../odbc/jdbc/JdbcMetaIndexesRequest.java | 88 + .../odbc/jdbc/JdbcMetaIndexesResult.java | 98 ++ .../odbc/jdbc/JdbcMetaParamsRequest.java | 87 + .../odbc/jdbc/JdbcMetaParamsResult.java | 97 ++ .../odbc/jdbc/JdbcMetaPrimaryKeysRequest.java | 88 + .../odbc/jdbc/JdbcMetaPrimaryKeysResult.java | 99 ++ .../odbc/jdbc/JdbcMetaSchemasRequest.java | 73 + .../odbc/jdbc/JdbcMetaSchemasResult.java | 73 + .../odbc/jdbc/JdbcMetaTablesRequest.java | 87 + .../odbc/jdbc/JdbcMetaTablesResult.java | 97 ++ .../processors/odbc/jdbc/JdbcParameterMeta.java | 163 ++ .../odbc/jdbc/JdbcPrimaryKeyMeta.java | 131 ++ .../processors/odbc/jdbc/JdbcQuery.java | 95 ++ .../odbc/jdbc/JdbcQueryCloseRequest.java | 4 +- .../odbc/jdbc/JdbcQueryExecuteRequest.java | 8 +- .../odbc/jdbc/JdbcQueryExecuteResult.java | 12 +- .../odbc/jdbc/JdbcQueryFetchRequest.java | 4 +- .../odbc/jdbc/JdbcQueryFetchResult.java | 12 +- .../odbc/jdbc/JdbcQueryMetadataRequest.java | 18 +- .../odbc/jdbc/JdbcQueryMetadataResult.java | 14 +- .../processors/odbc/jdbc/JdbcRequest.java | 75 +- .../odbc/jdbc/JdbcRequestHandler.java | 337 +++- .../processors/odbc/jdbc/JdbcResult.java | 69 +- .../processors/odbc/jdbc/JdbcTableMeta.java | 82 + .../processors/odbc/jdbc/JdbcUtils.java | 37 +- .../odbc/odbc/OdbcRequestHandler.java | 6 + .../processors/query/GridQueryProcessor.java | 17 +- .../query/GridQueryTypeDescriptor.java | 7 + .../query/QueryTypeDescriptorImpl.java | 15 + .../internal/processors/query/QueryUtils.java | 7 +- .../messages/GridQueryNextPageResponse.java | 36 +- .../schema/SchemaIndexCacheVisitorImpl.java | 7 + .../processors/rest/GridRestCommand.java | 3 + .../handlers/cache/GridCacheCommandHandler.java | 75 +- .../key/GridRedisExpireCommandHandler.java | 101 ++ .../protocols/tcp/redis/GridRedisCommand.java | 4 + .../tcp/redis/GridRedisNioListener.java | 2 + .../apache/ignite/internal/util/GridUnsafe.java | 14 + .../ignite/internal/util/StripedExecutor.java | 89 +- .../ignite/internal/util/lang/GridFunc.java | 2 +- .../visor/cache/VisorCacheStopTask.java | 22 +- .../visor/cache/VisorCacheStopTaskArg.java | 27 + .../communication/tcp/TcpCommunicationSpi.java | 60 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 20 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 + .../org/apache/ignite/thread/IgniteThread.java | 10 + .../ignite/internal/GridDiscoverySelfTest.java | 30 - .../cache/CacheGroupsMetricsRebalanceTest.java | 118 ++ .../GridCacheAbstractLocalStoreSelfTest.java | 7 + ...ridCacheQuerySqlFieldInlineSizeSelfTest.java | 160 ++ ...dMemoryConfigurationConsistencySelfTest.java | 79 + .../IgniteOptimisticTxSuspendResumeTest.java | 11 +- .../IgnitePdsCacheRebalancingAbstractTest.java | 53 +- .../persistence/IgnitePdsDynamicCacheTest.java | 43 + ...gnitePdsRecoveryAfterFileCorruptionTest.java | 2 +- ...nitePersistenceSequentialCheckpointTest.java | 44 + .../IgnitePersistentStoreCacheGroupsTest.java | 31 +- .../db/wal/IgniteWalRecoveryTest.java | 2 + .../db/wal/crc/IgniteDataIntegrityTests.java | 66 +- .../IgniteStandByClusterTest.java | 48 +- .../DataStreamProcessorSelfTest.java | 14 +- .../datastreamer/DataStreamerImplSelfTest.java | 3 +- .../platform/PlatformCacheWriteMetricsTask.java | 10 + .../discovery/tcp/IgniteClientConnectTest.java | 163 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../IgniteSpiDiscoverySelfTestSuite.java | 6 + .../query/h2/opt/GridH2SpatialIndex.java | 7 - .../query/h2/DmlStatementsProcessor.java | 274 +-- .../processors/query/h2/H2RowDescriptor.java | 11 - .../processors/query/h2/H2TableEngine.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 57 +- .../query/h2/database/H2PkHashIndex.java | 7 - .../query/h2/database/H2TreeIndex.java | 32 +- .../query/h2/database/InlineIndexHelper.java | 414 ++++- .../query/h2/opt/GridH2IndexBase.java | 93 +- .../query/h2/opt/GridH2QueryContext.java | 59 - .../query/h2/opt/GridH2RowDescriptor.java | 5 - .../processors/query/h2/opt/GridH2Table.java | 186 +- .../query/h2/opt/GridH2TreeIndex.java | 602 ------- .../query/h2/opt/GridLuceneDirectory.java | 64 +- .../processors/query/h2/opt/GridLuceneFile.java | 91 +- .../query/h2/opt/GridLuceneIndex.java | 3 +- .../query/h2/opt/GridLuceneInputStream.java | 42 +- .../query/h2/opt/GridLuceneOutputStream.java | 18 +- .../query/h2/twostep/GridMapQueryExecutor.java | 729 +++----- .../query/h2/twostep/GridMergeIndex.java | 7 +- .../h2/twostep/GridMergeIndexIterator.java | 165 ++ .../h2/twostep/GridReduceQueryExecutor.java | 68 +- .../query/h2/twostep/MapNodeResults.java | 121 ++ .../query/h2/twostep/MapQueryLazyWorker.java | 176 ++ .../query/h2/twostep/MapQueryLazyWorkerKey.java | 97 ++ .../query/h2/twostep/MapQueryResult.java | 288 ++++ .../query/h2/twostep/MapQueryResults.java | 175 ++ .../h2/twostep/MapReplicatedReservation.java | 38 + .../query/h2/twostep/MapRequestKey.java | 80 + .../query/h2/twostep/MapReservationKey.java | 73 + .../h2/twostep/msg/GridH2QueryRequest.java | 9 + ...teCacheFullTextQueryNodeJoiningSelfTest.java | 3 +- .../DynamicIndexAbstractConcurrentSelfTest.java | 126 +- .../cache/index/LongIndexNameTest.java | 212 +++ .../processors/query/LazyQuerySelfTest.java | 389 +++++ .../h2/GridIndexingSpiAbstractSelfTest.java | 18 +- .../h2/database/InlineIndexHelperTest.java | 252 ++- .../query/h2/opt/GridH2TableSelfTest.java | 172 -- .../h2/sql/AbstractH2CompareQueryTest.java | 4 +- .../IgniteCacheQuerySelfTestSuite.java | 9 + .../IgniteCacheWithIndexingTestSuite.java | 3 + .../java/org/apache/ignite/ml/math/Blas.java | 159 +- .../java/org/apache/ignite/ml/math/Matrix.java | 16 + .../ml/math/impls/matrix/AbstractMatrix.java | 28 +- .../storage/vector/MatrixVectorStorage.java | 11 + .../vector/SparseLocalOnHeapVectorStorage.java | 9 + .../impls/matrix/MatrixImplementationsTest.java | 22 +- .../RandomAccessSparseVectorStorageTest.java | 4 +- .../impl/cache/query/query_fields_row_impl.h | 2 +- modules/platforms/cpp/odbc-test/Makefile.am | 1 + .../cpp/odbc-test/include/complex_type.h | 53 +- .../cpp/odbc-test/include/test_utils.h | 9 + .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 1 + .../project/vs/odbc-test.vcxproj.filters | 3 + .../cpp/odbc-test/src/meta_queries_test.cpp | 353 ++++ .../platforms/cpp/odbc-test/src/test_utils.cpp | 13 + .../ignite/odbc/query/column_metadata_query.h | 3 + .../ignite/odbc/query/table_metadata_query.h | 3 + .../include/ignite/odbc/query/type_info_query.h | 3 + .../cpp/odbc/src/config/connection_info.cpp | 19 +- .../platforms/cpp/odbc/src/meta/column_meta.cpp | 6 + modules/platforms/cpp/odbc/src/odbc.cpp | 2 +- .../cpp/odbc/src/query/batch_query.cpp | 7 +- .../odbc/src/query/column_metadata_query.cpp | 16 +- .../platforms/cpp/odbc/src/query/data_query.cpp | 7 +- .../cpp/odbc/src/query/table_metadata_query.cpp | 16 +- .../cpp/odbc/src/query/type_info_query.cpp | 18 +- modules/platforms/cpp/odbc/src/statement.cpp | 2 +- .../Apache.Ignite.Core.Tests.csproj | 1 + .../Serializable/AdvancedSerializationTest.cs | 31 + .../BasicSerializableObjectsTest.cs | 7 +- .../Impl/Binary/SerializableSerializer.cs | 18 +- .../http/jetty/GridJettyRestHandler.java | 31 +- .../ignite/visor/commands/VisorConsole.scala | 12 +- .../commands/top/VisorTopologyCommand.scala | 111 +- .../ignite/visor/VisorRuntimeBaseSpec.scala | 9 +- .../top/VisorActivationCommandSpec.scala | 67 + .../testsuites/VisorConsoleSelfTestSuite.scala | 3 +- modules/web-console/backend/app/mongo.js | 1 + .../web-console-footer-links/component.js | 23 + .../web-console-footer-links/style.scss | 31 + .../web-console-footer-links/template.pug | 17 + .../app/components/web-console-footer/index.js | 4 +- .../components/web-console-footer/style.scss | 8 +- .../components/web-console-footer/template.pug | 1 + .../components/web-console-header/style.scss | 17 - .../components/web-console-header/template.pug | 9 - .../frontend/app/data/getting-started.json | 13 + .../hide-on-state-change.directive.js | 8 +- .../ui-ace-java/ui-ace-java.controller.js | 13 + .../ui-ace-spring/ui-ace-spring.controller.js | 13 + .../generator/AbstractTransformer.js | 2 +- .../generator/ConfigurationGenerator.js | 3 +- .../states/configuration/caches/memory.pug | 2 +- .../states/configuration/caches/store.pug | 2 +- .../states/configuration/clusters/connector.pug | 2 +- .../states/configuration/clusters/memory.pug | 2 +- .../states/configuration/clusters/swap.pug | 2 +- .../states/configuration/domains/general.pug | 2 +- .../states/configuration/domains/query.pug | 7 + .../states/configuration/domains/store.pug | 2 +- .../app/services/LegacyTable.service.js | 6 +- .../frontend/controllers/domains-controller.js | 24 +- modules/web-console/frontend/package.json | 2 +- .../frontend/public/images/multicluster.png | Bin 0 -> 21921 bytes .../views/configuration/domains-import.tpl.pug | 6 + modules/web-console/frontend/views/index.pug | 8 + .../web-console/frontend/views/signin.tpl.pug | 6 + .../console/agent/handlers/ClusterListener.java | 13 +- .../ignite/console/agent/rest/RestExecutor.java | 201 ++- 271 files changed, 13804 insertions(+), 3770 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index 72ab8c8,0eff7fa..d1e4fa9 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@@ -783,19 -750,24 +792,26 @@@ public class GridDhtPartitionTopologyIm boolean belongs = partitionLocalNode(p, topVer); if (loc != null && state == EVICTED) { + try { + loc.rent(false).get(); + } + catch (IgniteCheckedException ex) { + throw new IgniteException(ex); + } + locParts.set(p, loc = null); - if (!belongs) + if (!belongs) { throw new GridDhtInvalidPartitionException(p, "Adding entry to evicted partition " + "(often may be caused by inconsistent 'key.hashCode()' implementation) " + - "[part=" + p + ", topVer=" + topVer + ", this.topVer=" + this.topVer + ']'); + "[part=" + p + ", topVer=" + topVer + ", this.topVer=" + this.readyTopVer + ']'); + } } - else if (loc != null && state == RENTING && !showRenting) + else if (loc != null && state == RENTING && !showRenting) { throw new GridDhtInvalidPartitionException(p, "Adding entry to partition that is concurrently " + "evicted [part=" + p + ", shouldBeMoving=" + loc.reload() + ", belongs=" + belongs + - ", topVer=" + topVer + ", curTopVer=" + this.topVer + "]"); + ", topVer=" + topVer + ", curTopVer=" + this.readyTopVer + "]"); + } if (loc == null) { if (!belongs) http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 0178bb6,3ef9e61..e32ecc6 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@@ -1548,9 -1549,15 +1549,16 @@@ public class GridCacheDatabaseSharedMan if (storeMgr.pages(grpId, i) <= 1) continue; + GridDhtLocalPartition part = grp.topology().forceCreatePartition(i); + + assert part != null; + + // TODO: https://issues.apache.org/jira/browse/IGNITE-6097 + grp.offheap().onPartitionInitialCounterUpdated(i, 0); + long partMetaId = pageMem.partitionMetaPageId(grpId, i); long partMetaPage = pageMem.acquirePage(grpId, partMetaId); + try { long pageAddr = pageMem.writeLock(grpId, partMetaId, partMetaPage); @@@ -1619,10 -1622,14 +1623,15 @@@ /** * @param cacheCtx Cache context to apply an update. * @param dataEntry Data entry to apply. + * @throws IgniteCheckedException If failed to restore. */ private void applyUpdate(GridCacheContext cacheCtx, DataEntry dataEntry) throws IgniteCheckedException { - GridDhtLocalPartition locPart = cacheCtx.topology().forceCreatePartition(dataEntry.partitionId()); + int partId = dataEntry.partitionId(); + + if (partId == -1) + partId = cacheCtx.affinity().partition(dataEntry.key()); + + GridDhtLocalPartition locPart = cacheCtx.topology().forceCreatePartition(partId); switch (dataEntry.op()) { case CREATE: http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index ecf75a1,13a889c..3ad75cc --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@@ -499,10 -501,12 +501,12 @@@ public class GridClusterStateProcessor log.info("Sending " + prettyStr(activate) + " request from node [id=" + ctx.localNodeId() + ", topVer=" + topVer + ", client=" + ctx.clientNode() + - ", daemon" + ctx.isDaemon() + "]"); + ", daemon=" + ctx.isDaemon() + "]"); } - IgniteFuture<Void> fut = comp.runAsync(new ClientChangeGlobalStateComputeRequest(activate)); + IgniteCompute comp = ((ClusterGroupAdapter)ctx.cluster().get().forServers()).compute(); + + IgniteFuture<Void> fut = comp.runAsync(new ChangeGlobalStateComputeRequest(activate)); fut.listen(new CI1<IgniteFuture>() { @Override public void apply(IgniteFuture fut) { http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3cf893c/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java ----------------------------------------------------------------------
