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 B9CCA1763E for ; Wed, 10 Jun 2015 13:50:29 +0000 (UTC) Received: (qmail 62570 invoked by uid 500); 10 Jun 2015 13:50:17 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 62504 invoked by uid 500); 10 Jun 2015 13:50:17 -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 62485 invoked by uid 99); 10 Jun 2015 13:50:17 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jun 2015 13:50:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id BEAABCD092 for ; Wed, 10 Jun 2015 13:50:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id BcBsCytlXZ3v for ; Wed, 10 Jun 2015 13:50:01 +0000 (UTC) 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 0367921240 for ; Wed, 10 Jun 2015 13:49:57 +0000 (UTC) Received: (qmail 56842 invoked by uid 99); 10 Jun 2015 13:49:55 -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, 10 Jun 2015 13:49:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A7B49E045E; Wed, 10 Jun 2015 13:49:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 10 Jun 2015 13:50:09 -0000 Message-Id: <5db4915d3cee410990850f24dd6b4028@git.apache.org> In-Reply-To: <7349e673f9514d9b92afa00be1b17d9c@git.apache.org> References: <7349e673f9514d9b92afa00be1b17d9c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-883_1' into ignite-sprint-5 Merge remote-tracking branch 'remotes/origin/ignite-883_1' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/015afdbf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/015afdbf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/015afdbf Branch: refs/heads/ignite-695 Commit: 015afdbf1921e6ae5e8cd2f92efc8b4a695f05ca Parents: 8467a3c c7bc598 Author: sboikov Authored: Mon Jun 8 13:38:48 2015 +0300 Committer: sboikov Committed: Mon Jun 8 13:38:48 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 26 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../internal/managers/GridManagerAdapter.java | 9 + .../checkpoint/GridCheckpointManager.java | 52 +- .../discovery/GridDiscoveryManager.java | 28 +- .../processors/cache/GridCacheAdapter.java | 4 + .../GridCachePartitionExchangeManager.java | 26 +- .../processors/cache/GridCacheTtlManager.java | 9 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../GridDhtPartitionsExchangeFuture.java | 50 +- .../cache/transactions/IgniteTxManager.java | 3 - .../datastructures/DataStructuresProcessor.java | 107 +++- .../service/GridServiceProcessor.java | 4 +- .../timeout/GridSpiTimeoutObject.java | 73 +++ .../timeout/GridTimeoutProcessor.java | 105 +++- .../util/nio/GridCommunicationClient.java | 30 +- .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../util/nio/GridTcpCommunicationClient.java | 554 ------------------- .../util/nio/GridTcpNioCommunicationClient.java | 8 - .../org/apache/ignite/spi/IgniteSpiAdapter.java | 27 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 10 + .../ignite/spi/IgniteSpiTimeoutObject.java | 44 ++ .../spi/checkpoint/noop/NoopCheckpointSpi.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 438 ++++----------- .../tcp/TcpCommunicationSpiMBean.java | 2 - .../ignite/spi/discovery/tcp/ClientImpl.java | 3 - .../ignite/spi/discovery/tcp/ServerImpl.java | 10 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 156 +----- .../IgniteCountDownLatchAbstractSelfTest.java | 102 ++++ .../IgniteCacheClientNearCacheExpiryTest.java | 103 ++++ .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../internal/util/nio/GridNioSelfTest.java | 2 +- .../GridTcpCommunicationSpiAbstractTest.java | 4 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 2 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 2 - ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java | 13 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 25 + .../testframework/GridSpiTestContext.java | 10 + 39 files changed, 886 insertions(+), 1201 deletions(-) ----------------------------------------------------------------------