# Merge remote-tracking branch 'remotes/origin/master' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e73e496f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e73e496f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e73e496f Branch: refs/heads/ignite-901 Commit: e73e496f98603a04ef1b6409af8873c48959826e Parents: 15ef9b9 c134dcf Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 9 09:48:32 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 9 09:48:32 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 ++ .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/CacheConfiguration.java | 4 + .../configuration/TransactionConfiguration.java | 23 +++ .../apache/ignite/internal/IgniteKernal.java | 32 +-- .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../processors/cache/GridCacheProcessor.java | 121 ++++------- .../cache/GridCacheSharedContext.java | 15 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../datastructures/DataStructuresProcessor.java | 39 +++- .../GridCacheCountDownLatchImpl.java | 15 +- .../visor/cache/VisorCacheConfiguration.java | 11 - .../ignite/spi/discovery/tcp/ServerImpl.java | 20 ++ .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- ...cheStoreSessionListenerAbstractSelfTest.java | 1 - .../cache/CacheFutureExceptionSelfTest.java | 161 +++++++-------- .../IgniteCacheConfigurationTemplateTest.java | 26 +-- .../cache/IgniteDynamicCacheStartSelfTest.java | 16 +- .../IgniteDynamicClientCacheStartSelfTest.java | 5 +- .../IgniteClientDataStructuresAbstractTest.java | 109 +++++++--- .../IgniteCountDownLatchAbstractSelfTest.java | 12 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 8 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++++ .../IgniteSpiDiscoverySelfTestSuite.java | 3 + .../HibernateTransactionalDataRegion.java | 12 +- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 - .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 ++++++- .../cache/jta/GridCacheXAResource.java | 16 +- .../processors/cache/GridCacheJtaSelfTest.java | 52 +++-- .../GridTmLookupLifecycleAwareSelfTest.java | 29 ++- modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++ modules/kafka/pom.xml | 11 - .../commands/cache/VisorCacheCommand.scala | 2 - .../config/benchmark-put-indexed-val.properties | 64 ++++++ modules/yardstick/config/ignite-base-config.xml | 23 +++ .../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++ .../ignite/yardstick/cache/model/Person1.java | 55 +++++ .../ignite/yardstick/cache/model/Person2.java | 67 ++++++ .../ignite/yardstick/cache/model/Person8.java | 109 ++++++++++ 51 files changed, 1220 insertions(+), 378 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73e496f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73e496f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73e496f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73e496f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index 3c8cb47,7f4daff..715d514 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@@ -95,61 -98,10 +99,62 @@@ public class GridCacheSharedContext<K, GridCacheDeploymentManager<K, V> depMgr, GridCachePartitionExchangeManager<K, V> exchMgr, GridCacheIoManager ioMgr, - Collection<CacheStoreSessionListener> storeSesLsnrs + Collection<CacheStoreSessionListener> storeSesLsnrs, + CacheJtaManagerAdapter jtaMgr ) { this.kernalCtx = kernalCtx; + + setManagers(txMgr, verMgr, mvccMgr, depMgr, exchMgr, ioMgr); + + this.storeSesLsnrs = storeSesLsnrs; + + txMetrics = new TransactionMetricsAdapter(); + + ctxMap = new ConcurrentHashMap<>(); + } + + /** + * @throws IgniteCheckedException If failed. + */ + void onDisconnected(IgniteFuture<?> reconnectFut) throws IgniteCheckedException { + for (ListIterator<? extends GridCacheSharedManager<?, ?>> it = mgrs.listIterator(mgrs.size()); + it.hasPrevious();) { + GridCacheSharedManager<?, ?> mgr = it.previous(); + + mgr.onDisconnected(reconnectFut); + + if (mgr.restartOnDisconnect()) + mgr.onKernalStop(true); + } + + for (ListIterator<? extends GridCacheSharedManager<?, ?>> it = mgrs.listIterator(mgrs.size()); it.hasPrevious();) { + GridCacheSharedManager<?, ?> mgr = it.previous(); + + if (mgr.restartOnDisconnect()) + mgr.stop(true); + } + + mgrs = new LinkedList<>(); + + setManagers(txMgr, + verMgr, + mvccMgr, + new GridCacheDeploymentManager<K, V>(), + new GridCachePartitionExchangeManager<K, V>(), + ioMgr); + + for (GridCacheSharedManager<K, V> mgr : mgrs) { + if (mgr.restartOnDisconnect()) + mgr.start(this); + } + } + + private void setManagers(IgniteTxManager txMgr, + GridCacheVersionManager verMgr, + GridCacheMvccManager mvccMgr, + GridCacheDeploymentManager<K, V> depMgr, + GridCachePartitionExchangeManager<K, V> exchMgr, + GridCacheIoManager ioMgr) { this.mvccMgr = add(mvccMgr); this.verMgr = add(verMgr); this.txMgr = add(txMgr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73e496f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73e496f/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73e496f/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e73e496f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java ----------------------------------------------------------------------
