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 04E4217AFD for ; Fri, 17 Jul 2015 09:46:13 +0000 (UTC) Received: (qmail 82580 invoked by uid 500); 17 Jul 2015 09:46:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 82548 invoked by uid 500); 17 Jul 2015 09:46:12 -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 82539 invoked by uid 99); 17 Jul 2015 09:46:12 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2015 09:46:12 +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 838A3D5594 for ; Fri, 17 Jul 2015 09:46:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.555 X-Spam-Level: X-Spam-Status: No, score=0.555 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.226, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id CmsbhoiWvjLE for ; Fri, 17 Jul 2015 09:46:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 0F9CB43E3E for ; Fri, 17 Jul 2015 09:46:05 +0000 (UTC) Received: (qmail 82452 invoked by uid 99); 17 Jul 2015 09:46:05 -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; Fri, 17 Jul 2015 09:46:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47C5FDFB02; Fri, 17 Jul 2015 09:46:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 17 Jul 2015 09:46:06 -0000 Message-Id: In-Reply-To: <77349a14297346e4b68ed3ec487242c3@git.apache.org> References: <77349a14297346e4b68ed3ec487242c3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-961 Merge remote-tracking branch 'remotes/origin/master' into ignite-961 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c7e7c469 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c7e7c469 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c7e7c469 Branch: refs/heads/ignite-961 Commit: c7e7c4696a00ae33992672cd5fab03d2ce95b6ed Parents: 18a3e05 f0d24f6 Author: sboikov Authored: Fri Jul 17 12:45:36 2015 +0300 Committer: sboikov Committed: Fri Jul 17 12:45:36 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 12 ++ .../processors/cache/GridCacheContext.java | 45 +++-- .../processors/cache/GridCacheMvccManager.java | 6 +- .../GridCachePartitionExchangeManager.java | 53 ++++++ .../distributed/dht/GridDhtTopologyFuture.java | 14 -- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 11 +- .../GridDhtPartitionsExchangeFuture.java | 31 +--- .../cache/transactions/IgniteTxManager.java | 4 +- .../distributed/IgniteCache150ClientsTest.java | 1 + .../IgniteCacheClientReconnectTest.java | 175 +++++++++++++++++++ .../IgniteCacheServerNodeConcurrentStart.java | 96 ++++++++++ .../testframework/junits/GridAbstractTest.java | 5 + .../testsuites/IgniteCacheTestSuite2.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 - .../testsuites/IgniteClientNodesTestSuite.java | 42 +++++ 16 files changed, 439 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c7e7c469/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------