Merge branch 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141-2
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java
modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFinishedFutureSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8a5eb634
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8a5eb634
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8a5eb634
Branch: refs/heads/sprint-2
Commit: 8a5eb634b06df4a52ed782e5d8c6d1132a688d8c
Parents: eedab93 869b3e2
Author: Valentin Kulichenko <[email protected]>
Authored: Mon Mar 9 15:23:28 2015 -0700
Committer: Valentin Kulichenko <[email protected]>
Committed: Mon Mar 9 15:23:28 2015 -0700
----------------------------------------------------------------------
NOTICE.txt | 20 +
.../ComputeFibonacciContinuationExample.java | 12 +-
.../examples/datagrid/CacheApiExample.java | 2 +-
.../examples/ScalarContinuationExample.scala | 12 +-
.../client/suite/IgniteClientTestSuite.java | 3 +-
.../apache/ignite/IgniteSystemProperties.java | 20 -
.../org/apache/ignite/cache/CacheManager.java | 1 -
.../internal/ComputeTaskInternalFuture.java | 44 +-
.../ignite/internal/GridJobContextImpl.java | 6 +-
.../ignite/internal/GridJobSessionImpl.java | 2 +-
.../ignite/internal/GridKernalGatewayImpl.java | 26 -
.../ignite/internal/GridTaskSessionImpl.java | 2 +-
.../ignite/internal/IgniteInternalFuture.java | 79 +--
.../internal/client/GridClientFuture.java | 9 +-
.../client/impl/GridClientDataImpl.java | 2 +-
.../client/impl/GridClientFutureAdapter.java | 26 +-
.../connection/GridClientNioTcpConnection.java | 5 +-
.../impl/GridTcpRouterNioListenerAdapter.java | 2 +-
.../internal/cluster/IgniteClusterImpl.java | 9 +-
.../internal/executor/GridExecutorService.java | 2 +-
.../igfs/common/IgfsControlResponse.java | 1 -
.../managers/communication/GridIoManager.java | 35 +-
.../discovery/GridDiscoveryManager.java | 10 +-
.../eventstorage/GridEventStorageManager.java | 6 +-
.../affinity/GridAffinityAssignmentCache.java | 17 +-
.../affinity/GridAffinityProcessor.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 91 ++--
.../cache/GridCacheAffinityManager.java | 2 +-
.../cache/GridCacheDeploymentManager.java | 2 +-
.../cache/GridCacheEvictionManager.java | 27 +-
.../processors/cache/GridCacheGateway.java | 6 +
.../processors/cache/GridCacheIoManager.java | 77 +--
.../processors/cache/GridCacheMapEntry.java | 14 +-
.../processors/cache/GridCacheMessage.java | 7 -
.../cache/GridCacheMultiTxFuture.java | 54 +-
.../processors/cache/GridCacheMvcc.java | 3 +-
.../processors/cache/GridCacheMvccManager.java | 34 +-
.../GridCachePartitionExchangeManager.java | 6 +-
.../cache/GridCachePreloaderAdapter.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 2 +-
.../cache/GridCacheProjectionImpl.java | 12 +-
.../cache/GridCacheSharedContext.java | 2 +-
.../processors/cache/GridCacheUtils.java | 11 +-
.../processors/cache/IgniteCacheProxy.java | 2 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 25 +-
.../distributed/GridCacheTxFinishSync.java | 2 +-
.../GridDistributedCacheAdapter.java | 4 +-
.../GridDistributedTxRemoteAdapter.java | 6 +-
.../dht/GridDhtAssignmentFetchFuture.java | 22 +-
.../distributed/dht/GridDhtCacheAdapter.java | 9 +-
.../distributed/dht/GridDhtCacheEntry.java | 14 +-
.../distributed/dht/GridDhtEmbeddedFuture.java | 43 +-
.../distributed/dht/GridDhtFinishedFuture.java | 22 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 45 +-
.../distributed/dht/GridDhtLocalPartition.java | 4 +-
.../distributed/dht/GridDhtLockFuture.java | 35 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 35 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 38 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 4 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 16 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 48 +-
.../dht/GridPartitionedGetFuture.java | 44 +-
.../dht/atomic/GridDhtAtomicCache.java | 20 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 20 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 43 +-
.../dht/colocated/GridDhtColocatedCache.java | 30 +-
.../colocated/GridDhtColocatedLockFuture.java | 43 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 43 +-
.../preloader/GridDhtPartitionDemandPool.java | 9 +-
.../GridDhtPartitionsExchangeFuture.java | 48 +-
.../dht/preloader/GridDhtPreloader.java | 22 +-
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../distributed/near/GridNearCacheAdapter.java | 6 +-
.../distributed/near/GridNearGetFuture.java | 51 +-
.../distributed/near/GridNearLockFuture.java | 43 +-
.../near/GridNearTransactionalCache.java | 2 +-
.../near/GridNearTxFinishFuture.java | 32 +-
.../cache/distributed/near/GridNearTxLocal.java | 83 +--
.../near/GridNearTxPrepareFuture.java | 48 +-
.../processors/cache/local/GridLocalCache.java | 2 +-
.../cache/local/GridLocalLockFuture.java | 23 +-
.../local/atomic/GridLocalAtomicCache.java | 8 +-
.../GridCacheDistributedFieldsQueryFuture.java | 13 +-
.../query/GridCacheDistributedQueryFuture.java | 11 -
.../query/GridCacheDistributedQueryManager.java | 4 +-
.../query/GridCacheFieldsQueryErrorFuture.java | 53 --
.../query/GridCacheLocalFieldsQueryFuture.java | 13 +-
.../cache/query/GridCacheLocalQueryFuture.java | 15 +-
.../cache/query/GridCacheQueryErrorFuture.java | 5 +-
.../query/GridCacheQueryFutureAdapter.java | 14 +-
.../cache/query/GridCacheQueryManager.java | 11 +-
.../cache/transactions/IgniteTxAdapter.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 25 +-
.../transactions/IgniteTxLocalAdapter.java | 320 ++++++------
.../cache/transactions/IgniteTxManager.java | 18 +-
.../transactions/TransactionProxyImpl.java | 2 +-
.../closure/GridClosureProcessor.java | 38 +-
.../continuous/GridContinuousProcessor.java | 36 +-
.../dataload/GridDataLoaderFuture.java | 16 -
.../dataload/GridDataLoaderProcessor.java | 2 +-
.../dataload/IgniteDataLoaderImpl.java | 35 +-
.../GridCacheAtomicSequenceImpl.java | 4 +-
.../processors/hadoop/HadoopNoopProcessor.java | 2 +-
.../processors/igfs/IgfsDataManager.java | 36 +-
.../processors/igfs/IgfsDeleteWorker.java | 2 +-
.../internal/processors/igfs/IgfsImpl.java | 12 +-
.../processors/igfs/IgfsInputStreamImpl.java | 2 +-
.../processors/igfs/IgfsIpcHandler.java | 4 +-
.../processors/igfs/IgfsMetaManager.java | 2 +-
.../internal/processors/igfs/IgfsServer.java | 3 +-
.../processors/job/GridJobProcessor.java | 4 +-
.../processors/query/GridQueryProcessor.java | 6 +-
.../processors/resource/GridResourceUtils.java | 4 +-
.../processors/rest/GridRestProcessor.java | 14 +-
.../handlers/cache/GridCacheCommandHandler.java | 6 +-
.../cache/GridCacheQueryCommandHandler.java | 4 +-
.../DataStructuresCommandHandler.java | 4 +-
.../handlers/task/GridTaskCommandHandler.java | 6 +-
.../top/GridTopologyCommandHandler.java | 4 +-
.../version/GridVersionCommandHandler.java | 2 +-
.../tcp/GridTcpMemcachedNioListener.java | 6 +-
.../protocols/tcp/GridTcpRestNioListener.java | 6 +-
.../service/GridServiceDeploymentFuture.java | 9 +-
.../service/GridServiceProcessor.java | 10 +-
.../GridStreamerStageExecutionFuture.java | 32 +-
.../processors/streamer/IgniteStreamerImpl.java | 23 +-
.../internal/util/GridSerializableFuture.java | 28 -
.../ignite/internal/util/GridThreadLocal.java | 175 -------
.../ignite/internal/util/GridThreadLocalEx.java | 210 --------
.../ignite/internal/util/IgniteUtils.java | 8 +-
.../util/future/GridCompoundFuture.java | 52 +-
.../util/future/GridCompoundIdentityFuture.java | 18 +-
.../util/future/GridEmbeddedFuture.java | 77 +--
.../util/future/GridFinishedFuture.java | 158 ++----
.../util/future/GridFinishedFutureEx.java | 197 -------
.../internal/util/future/GridFutureAdapter.java | 365 ++++---------
.../util/future/GridFutureAdapterEx.java | 517 -------------------
.../util/future/GridFutureChainListener.java | 18 +-
.../util/future/IgniteFinishedFutureImpl.java | 27 +-
.../util/future/IgniteFinishedFutureImplEx.java | 30 --
.../internal/util/future/IgniteFutureImpl.java | 31 +-
.../internal/util/io/GridFilenameUtils.java | 2 +-
.../ignite/internal/util/lang/GridFunc.java | 90 +---
.../internal/util/lang/GridPlainFuture.java | 79 ---
.../util/lang/GridPlainFutureAdapter.java | 299 -----------
.../util/nio/GridNioEmbeddedFuture.java | 12 +-
.../util/nio/GridNioFinishedFuture.java | 77 +--
.../ignite/internal/util/nio/GridNioFuture.java | 84 +--
.../internal/util/nio/GridNioFutureImpl.java | 282 +---------
.../ignite/internal/util/nio/GridNioServer.java | 7 +-
.../util/nio/GridTcpNioCommunicationClient.java | 18 +-
.../ignite/internal/util/worker/GridWorker.java | 27 -
.../internal/util/worker/GridWorkerFuture.java | 20 -
.../visor/cache/VisorCacheClearTask.java | 2 +-
.../org/apache/ignite/lang/IgniteFuture.java | 67 +--
.../lang/IgniteFutureCancelledException.java | 3 -
.../lang/IgniteFutureTimeoutException.java | 3 -
.../communication/tcp/TcpCommunicationSpi.java | 32 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
.../internal/GridMultipleJobsSelfTest.java | 2 +-
.../GridTaskFutureImplStopGridSelfTest.java | 2 +-
.../internal/GridTaskListenerSelfTest.java | 2 +-
.../GridCacheAsyncOperationsLimitSelfTest.java | 3 +-
...dCacheAtomicUsersAffinityMapperSelfTest.java | 7 +-
.../GridCacheFinishPartitionsSelfTest.java | 6 +-
.../GridCachePartitionedLocalStoreSelfTest.java | 7 -
...chePartitionedOffHeapLocalStoreSelfTest.java | 7 -
.../cache/GridCachePutAllFailoverSelfTest.java | 6 +-
.../GridCacheReferenceCleanupSelfTest.java | 2 +-
.../GridCacheReplicatedLocalStoreSelfTest.java | 7 -
...heReplicatedUsersAffinityMapperSelfTest.java | 7 +-
...ridCacheTxPartitionedLocalStoreSelfTest.java | 7 -
.../GridCacheTxUsersAffinityMapperSelfTest.java | 7 +-
.../distributed/GridCacheEventAbstractTest.java | 17 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 26 +-
.../igfs/IgfsDualAbstractSelfTest.java | 18 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 42 +-
.../util/future/GridCompoundFutureSelfTest.java | 30 +-
.../util/future/GridEmbeddedFutureSelfTest.java | 13 +-
.../util/future/GridFinishedFutureSelfTest.java | 109 ----
.../util/future/GridFutureAdapterSelfTest.java | 115 +----
.../future/GridFutureListenPerformanceTest.java | 22 +-
.../util/future/IgniteFutureImplTest.java | 99 +---
.../util/future/nio/GridNioFutureSelfTest.java | 8 +-
.../lang/GridFutureListenPerformanceTest.java | 2 +-
.../loadtests/colocation/GridTestMain.java | 2 +-
...GridJobExecutionLoadTestClientSemaphore.java | 2 +-
...JobExecutionSingleNodeSemaphoreLoadTest.java | 2 +-
.../mergesort/GridMergeSortLoadTask.java | 2 +-
.../ignite/messaging/GridMessagingSelfTest.java | 12 +-
.../GridCacheStoreValueBytesTest.java | 4 +-
.../testsuites/IgniteLangSelfTestSuite.java | 1 -
.../processors/hadoop/igfs/HadoopIgfsEx.java | 4 +-
.../hadoop/igfs/HadoopIgfsFuture.java | 4 +-
.../hadoop/igfs/HadoopIgfsInProc.java | 9 +-
.../hadoop/igfs/HadoopIgfsInputStream.java | 6 +-
.../processors/hadoop/igfs/HadoopIgfsIo.java | 6 +-
.../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 5 +-
.../hadoop/igfs/HadoopIgfsOutProc.java | 50 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 20 +-
.../proto/HadoopProtocolJobStatusTask.java | 2 +-
.../hadoop/shuffle/HadoopShuffle.java | 4 +-
.../hadoop/shuffle/HadoopShuffleJob.java | 16 +-
.../external/HadoopExternalTaskExecutor.java | 28 +-
.../child/HadoopChildProcessRunner.java | 10 +-
.../HadoopExternalCommunication.java | 7 +-
.../HadoopTcpNioCommunicationClient.java | 12 +-
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../h2/twostep/GridReduceQueryExecutor.java | 8 +-
.../cache/jta/GridCacheXAResource.java | 9 +-
.../processors/schedule/ScheduleFutureImpl.java | 205 +-------
.../schedule/GridScheduleSelfTest.java | 4 +-
212 files changed, 1348 insertions(+), 5223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 748f9c2,2289c20..363e300
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@@ -583,8 -546,10 +571,8 @@@ public class GridIoManager extends Grid
final GridIoMessage msg,
final IgniteRunnable msgC
) {
- Runnable c = new GridWorker(ctx.gridName(), "msg-worker", log) {
- @Override protected void body() {
- workersCnt.increment();
-
+ Runnable c = new Runnable() {
+ @Override public void run() {
try {
threadProcessingMessage(true);
@@@ -631,8 -598,10 +619,8 @@@
GridIoPolicy plc,
final IgniteRunnable msgC
) {
- Runnable c = new GridWorker(ctx.gridName(), "msg-worker", log) {
- @Override protected void body() {
- workersCnt.increment();
-
+ Runnable c = new Runnable() {
+ @Override public void run() {
try {
threadProcessingMessage(true);
@@@ -823,10 -794,13 +811,10 @@@
return;
}
- // Set is not reserved and new worker should be submitted.
- workersCnt.increment();
-
final GridCommunicationMessageSet msgSet0 = set;
- Runnable c = new GridWorker(ctx.gridName(), "msg-worker", log) {
- @Override protected void body() {
+ Runnable c = new Runnable() {
+ @Override public void run() {
try {
threadProcessingMessage(true);
@@@ -1333,13 -1309,27 +1321,14 @@@
if (msgSets != null) {
final GridMessageListener lsnrs0 = lsnrs;
- boolean success = true;
-
try {
for (final GridCommunicationMessageSet msgSet : msgSets) {
- pool(msgSet.policy()).execute(new
GridWorker(ctx.gridName(), "msg-worker", log) {
- @Override protected void body() {
- unwindMessageSet(msgSet, lsnrs0);
- }
- });
- success = false;
-
- workersCnt.increment();
-
+ pool(msgSet.policy()).execute(
+ new Runnable() {
+ @Override public void run() {
- try {
- unwindMessageSet(msgSet, lsnrs0);
- }
- finally {
- workersCnt.decrement();
- }
++ unwindMessageSet(msgSet, lsnrs0);
+ }
+ });
-
- success = true;
}
}
catch (RejectedExecutionException e) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 558cade,fe95935..15d14d9
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@@ -2126,10 -2126,10 +2126,10 @@@ public abstract class GridCacheAdapter<
checkJta();
}
catch (IgniteCheckedException e) {
- return new GridFinishedFuture<>(ctx.kernalContext(), e);
+ return new GridFinishedFuture<>(e);
}
- tx = ctx.tm().threadLocalTx();
+ tx = ctx.tm().threadLocalTx(ctx.system() ? ctx : null);
}
if (tx == null || tx.implicit()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 9467bd1,791fb73..b563712
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@@ -167,9 -167,9 +167,9 @@@ public class GridDhtColocatedCache<K, V
ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(),
Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
- IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
+ IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(ctx);
if (tx != null && !tx.implicit() && !skipTx) {
return asyncOp(tx, new AsyncOp<Map<K, V>>(keys) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index c25a7a5,ff595c0..f8db71b
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@@ -109,9 -109,9 +109,9 @@@ public class GridNearTransactionalCache
ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
if (F.isEmpty(keys))
- return new GridFinishedFuture<>(ctx.kernalContext(),
Collections.<K, V>emptyMap());
+ return new GridFinishedFuture<>(Collections.<K, V>emptyMap());
- IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
+ IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(ctx);
if (tx != null && !tx.implicit() && !skipTx) {
return asyncOp(tx, new AsyncOp<Map<K, V>>(keys) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
index 287c2eb,c9d23c0..c710230
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@@ -731,9 -731,9 +731,9 @@@ public class GridClosureProcessor exten
*/
private IgniteInternalFuture<?> runLocal(@Nullable final Runnable c,
GridClosurePolicy plc) throws IgniteCheckedException {
if (c == null)
- return new GridFinishedFuture(ctx);
+ return new GridFinishedFuture();
- enterBusy();
+ busyLock.readLock();
try {
// Inject only if needed.
@@@ -742,8 -742,10 +742,8 @@@
final ClassLoader ldr =
Thread.currentThread().getContextClassLoader();
- final GridWorkerFuture fut = new GridWorkerFuture(ctx);
+ final GridWorkerFuture fut = new GridWorkerFuture();
- workersCnt.increment();
-
GridWorker w = new GridWorker(ctx.gridName(),
"closure-proc-worker", log) {
@Override protected void body() {
try {
@@@ -863,9 -868,9 +863,9 @@@
*/
private <R> IgniteInternalFuture<R> callLocal(@Nullable final Callable<R>
c, GridClosurePolicy plc) throws IgniteCheckedException {
if (c == null)
- return new GridFinishedFuture<>(ctx);
+ return new GridFinishedFuture<>();
- enterBusy();
+ busyLock.readLock();
try {
// Inject only if needed.
@@@ -874,8 -879,10 +874,8 @@@
final ClassLoader ldr =
Thread.currentThread().getContextClassLoader();
- final GridWorkerFuture<R> fut = new GridWorkerFuture<>(ctx);
+ final GridWorkerFuture<R> fut = new GridWorkerFuture<>();
- workersCnt.increment();
-
GridWorker w = new GridWorker(ctx.gridName(),
"closure-proc-worker", log) {
@Override protected void body() {
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheClearTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8a5eb634/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
