Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39F3C18E5D for ; Wed, 29 Apr 2015 13:35:58 +0000 (UTC) Received: (qmail 51747 invoked by uid 500); 29 Apr 2015 13:35:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 51720 invoked by uid 500); 29 Apr 2015 13:35:58 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 51707 invoked by uid 99); 29 Apr 2015 13:35:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 13:35:58 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of root@apache.org designates 54.76.25.247 as permitted sender) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 13:35:32 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 7D0622AB36 for ; Wed, 29 Apr 2015 13:35:09 +0000 (UTC) Received: (qmail 50199 invoked by uid 99); 29 Apr 2015 13:35:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 13:35:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1ACADE09B2; Wed, 29 Apr 2015 13:35:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 29 Apr 2015 13:35:25 -0000 Message-Id: <2af2e99054194f9bab820f5614b58192@git.apache.org> In-Reply-To: <40ce8f5d7f81426d8b4f2e114300bf93@git.apache.org> References: <40ce8f5d7f81426d8b4f2e114300bf93@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/24] incubator-ignite git commit: Merge branches 'ignite-757' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-757' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36192bdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36192bdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36192bdd Branch: refs/heads/ignite-sprint-4 Commit: 36192bdd2339d9c2794462ee5b5a40e2ac014752 Parents: 2587900 acc731c Author: S.Vladykin Authored: Wed Apr 29 09:27:14 2015 +0300 Committer: S.Vladykin Committed: Wed Apr 29 09:27:14 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 13 + .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../java/org/apache/ignite/IgniteLogger.java | 8 +- .../java/org/apache/ignite/IgniteServices.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 2 +- .../eviction/sorted/SortedEvictionPolicy.java | 2 +- .../configuration/ConnectorConfiguration.java | 2 +- .../configuration/IgniteConfiguration.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 16 + .../managers/communication/GridIoManager.java | 6 +- .../deployment/GridDeploymentManager.java | 2 +- .../GridDeploymentPerVersionStore.java | 3 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../cache/GridCacheSharedContext.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 59 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtTxFinishFuture.java | 102 +++- .../cache/distributed/dht/GridDhtTxLocal.java | 6 + .../distributed/dht/GridDhtTxLocalAdapter.java | 23 + .../cache/distributed/dht/GridDhtTxRemote.java | 7 + .../dht/preloader/GridDhtPreloader.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 6 + .../cache/transactions/IgniteInternalTx.java | 5 + .../cache/transactions/IgniteTxAdapter.java | 10 + .../cache/transactions/IgniteTxHandler.java | 57 +- .../cache/transactions/IgniteTxManager.java | 117 +++- .../util/tostring/GridToStringBuilder.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 7 - .../visor/cache/VisorCacheNodesTask.java | 74 +++ .../cache/VisorCacheStoreConfiguration.java | 35 -- .../cache/VisorCacheTypeFieldMetadata.java | 36 +- .../visor/cache/VisorCacheTypeMetadata.java | 99 +--- .../internal/visor/igfs/VisorIgfsMetrics.java | 128 +---- .../node/VisorNodeEventsCollectorTask.java | 58 +- .../internal/visor/query/VisorQueryArg.java | 19 +- .../internal/visor/query/VisorQueryCursor.java | 1 - .../internal/visor/query/VisorQueryJob.java | 9 +- .../internal/visor/query/VisorQueryTask.java | 41 -- .../internal/visor/util/VisorEventMapper.java | 13 + .../internal/visor/util/VisorTaskUtils.java | 2 +- .../apache/ignite/logger/java/JavaLogger.java | 12 +- .../apache/ignite/marshaller/Marshaller.java | 14 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 10 +- .../optimized/OptimizedMarshaller.java | 8 +- .../apache/ignite/resources/LoggerResource.java | 2 +- .../apache/ignite/resources/SpringResource.java | 2 +- .../org/apache/ignite/services/Service.java | 2 +- .../ignite/services/ServiceConfiguration.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 4 +- .../fifoqueue/FifoQueueCollisionSpi.java | 10 +- .../jobstealing/JobStealingCollisionSpi.java | 14 +- .../PriorityQueueCollisionSpi.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 10 +- .../memory/MemoryEventStorageSpi.java | 10 +- .../spi/failover/always/AlwaysFailoverSpi.java | 10 +- .../jobstealing/JobStealingFailoverSpi.java | 6 +- .../spi/failover/never/NeverFailoverSpi.java | 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 4 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 12 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 10 +- .../WeightedRandomLoadBalancingSpi.java | 10 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +- .../src/test/config/load/merge-sort-base.xml | 2 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 147 +++++ .../cache/IgniteCachePutAllRestartTest.java | 203 +++++++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 29 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 7 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 2 - .../near/IgniteCacheNearTxRollbackTest.java | 133 +++++ .../logger/java/IgniteJavaLoggerTest.java | 65 --- .../ignite/logger/java/JavaLoggerTest.java | 65 +++ .../junits/logger/GridTestLog4jLogger.java | 10 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheFailoverTestSuite.java | 8 +- .../testsuites/IgniteCacheRestartTestSuite.java | 3 +- .../testsuites/IgniteLoggingSelfTestSuite.java | 2 +- .../processors/hadoop/HadoopProcessor.java | 2 +- .../ignite/logger/jcl/IgniteJclLogger.java | 167 ------ .../org/apache/ignite/logger/jcl/JclLogger.java | 167 ++++++ .../ignite/logger/jcl/IgniteJclLoggerTest.java | 48 -- .../apache/ignite/logger/jcl/JclLoggerTest.java | 48 ++ .../ignite/testsuites/IgniteJclTestSuite.java | 2 +- .../apache/ignite/logger/log4j/Log4JLogger.java | 8 +- .../ignite/logger/slf4j/GridSlf4jLogger.java | 138 ----- .../apache/ignite/logger/slf4j/Slf4jLogger.java | 138 +++++ .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 314 ++++++----- .../visor/commands/VisorConsoleCommand.scala | 77 --- .../ignite/visor/commands/VisorTextTable.scala | 539 ------------------ .../visor/commands/ack/VisorAckCommand.scala | 42 +- .../commands/alert/VisorAlertCommand.scala | 35 +- .../commands/cache/VisorCacheClearCommand.scala | 51 +- .../commands/cache/VisorCacheCommand.scala | 34 +- .../commands/cache/VisorCacheScanCommand.scala | 60 +- .../commands/cache/VisorCacheStopCommand.scala | 30 +- .../commands/cache/VisorCacheSwapCommand.scala | 66 +-- .../commands/common/VisorConsoleCommand.scala | 90 +++ .../visor/commands/common/VisorTextTable.scala | 543 +++++++++++++++++++ .../config/VisorConfigurationCommand.scala | 439 +++++++-------- .../commands/deploy/VisorDeployCommand.scala | 47 +- .../commands/disco/VisorDiscoveryCommand.scala | 58 +- .../commands/events/VisorEventsCommand.scala | 338 +++++------- .../visor/commands/gc/VisorGcCommand.scala | 130 ++--- .../visor/commands/kill/VisorKillCommand.scala | 53 +- .../visor/commands/node/VisorNodeCommand.scala | 47 +- .../visor/commands/ping/VisorPingCommand.scala | 41 +- .../commands/start/VisorStartCommand.scala | 34 +- .../commands/tasks/VisorTasksCommand.scala | 76 +-- .../commands/top/VisorTopologyCommand.scala | 36 +- .../visor/commands/vvm/VisorVvmCommand.scala | 32 +- .../scala/org/apache/ignite/visor/visor.scala | 275 +++++++--- .../ignite/visor/VisorTextTableSpec.scala | 3 +- 120 files changed, 3286 insertions(+), 2814 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/36192bdd/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ----------------------------------------------------------------------