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 A827617427 for ; Fri, 10 Apr 2015 12:44:26 +0000 (UTC) Received: (qmail 55719 invoked by uid 500); 10 Apr 2015 12:44:26 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 55683 invoked by uid 500); 10 Apr 2015 12:44:26 -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 55668 invoked by uid 99); 10 Apr 2015 12:44:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 12:44:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Apr 2015 12:44:24 +0000 Received: (qmail 53175 invoked by uid 99); 10 Apr 2015 12:43:59 -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, 10 Apr 2015 12:43:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7ABE4E0414; Fri, 10 Apr 2015 12:43:59 +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, 10 Apr 2015 12:44:30 -0000 Message-Id: <31cb826d05da4193b75c76e78000d267@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [33/50] incubator-ignite git commit: Merge branches 'ignite-715' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-715 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-715' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-715 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28ba25ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28ba25ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28ba25ec Branch: refs/heads/ignite-683-2 Commit: 28ba25ec7f0df10abade74e4a71e4f292fc1a128 Parents: 021ddf8 217883c Author: Andrey Novikov Authored: Fri Apr 10 17:27:41 2015 +0700 Committer: Andrey Novikov Committed: Fri Apr 10 17:27:41 2015 +0700 ---------------------------------------------------------------------- .../examples/MessagingExamplesSelfTest.java | 2 +- .../java8/examples/BasicExamplesSelfTest.java | 3 + .../java8/examples/CacheExamplesSelfTest.java | 4 + .../examples/CheckpointExamplesSelfTest.java | 3 + .../examples/ClusterGroupExampleSelfTest.java | 3 +- .../examples/ContinuationExamplesSelfTest.java | 3 + .../ContinuousMapperExamplesSelfTest.java | 4 +- .../DeploymentExamplesMultiNodeSelfTest.java | 2 + .../examples/DeploymentExamplesSelfTest.java | 2 + .../HibernateL2CacheExampleSelfTest.java | 3 + .../java8/examples/IgfsExamplesSelfTest.java | 3 + .../examples/LifecycleExamplesSelfTest.java | 3 + .../MemcacheRestExamplesMultiNodeSelfTest.java | 2 + .../examples/MemcacheRestExamplesSelfTest.java | 2 + .../examples/MessagingExamplesSelfTest.java | 4 +- .../examples/MonteCarloExamplesSelfTest.java | 3 + .../examples/SpringBeanExamplesSelfTest.java | 3 + .../java8/examples/TaskExamplesSelfTest.java | 2 + .../client/ClientReconnectionSelfTest.java | 67 +++--- .../java/org/apache/ignite/IgniteCache.java | 9 + .../configuration/CacheConfiguration.java | 69 +++--- .../internal/cluster/ClusterGroupAdapter.java | 150 ++++++++++-- .../discovery/GridDiscoveryManager.java | 26 +- .../processors/cache/CacheMetricsImpl.java | 7 +- .../processors/cache/CacheMetricsSnapshot.java | 223 +++++++++++++++++- .../processors/cache/GridCacheProcessor.java | 52 ++-- .../processors/cache/IgniteCacheProxy.java | 26 ++ .../cache/VisorCacheQueryConfiguration.java | 9 - .../spi/discovery/DiscoveryMetricsProvider.java | 10 + .../discovery/tcp/TcpClientDiscoverySpi.java | 35 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 45 +++- .../tcp/internal/TcpDiscoveryNode.java | 76 +++++- .../messages/TcpDiscoveryHeartbeatMessage.java | 65 +++++ .../ignite/internal/GridProjectionSelfTest.java | 82 +++++++ .../ignite/internal/GridStartStopSelfTest.java | 8 +- .../CacheMetricsForClusterGroupSelfTest.java | 236 +++++++++++++++++++ ...CacheOffHeapMultiThreadedUpdateSelfTest.java | 42 ++-- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- .../cache/GridCacheReloadSelfTest.java | 3 +- .../GridCacheReturnValueTransferSelfTest.java | 15 +- .../IgniteTxMultiThreadedAbstractTest.java | 5 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +- .../GridCacheSetAbstractSelfTest.java | 10 +- .../GridCacheSetFailoverAbstractSelfTest.java | 6 +- .../distributed/GridCacheEventAbstractTest.java | 16 +- .../GridCacheNodeFailureAbstractTest.java | 15 +- ...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../continuous/GridEventConsumeSelfTest.java | 7 +- .../processors/igfs/IgfsAbstractSelfTest.java | 8 +- .../tostring/GridToStringBuilderSelfTest.java | 5 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +- .../tcp/TcpClientDiscoverySelfTest.java | 5 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../junits/spi/GridSpiAbstractTest.java | 6 + .../IgniteCacheMetricsSelfTestSuite.java | 4 + .../IgniteSpiDiscoverySelfTestSuite.java | 2 + ...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 10 +- .../processors/cache/GridCacheSwapSelfTest.java | 5 +- .../IgniteCacheReplicatedQuerySelfTest.java | 11 +- .../processors/cache/GridCacheJtaSelfTest.java | 6 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +- 62 files changed, 1232 insertions(+), 222 deletions(-) ----------------------------------------------------------------------