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 2A3381772E for ; Mon, 1 Jun 2015 09:18:28 +0000 (UTC) Received: (qmail 35566 invoked by uid 500); 1 Jun 2015 09:18:28 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 35533 invoked by uid 500); 1 Jun 2015 09:18:28 -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 35524 invoked by uid 99); 1 Jun 2015 09:18:28 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 09:18:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 9D4A0181A34 for ; Mon, 1 Jun 2015 09:18:27 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 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, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id BWU0GKGpUy2o for ; Mon, 1 Jun 2015 09:18:22 +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 B89D447C07 for ; Mon, 1 Jun 2015 09:18:21 +0000 (UTC) Received: (qmail 35373 invoked by uid 99); 1 Jun 2015 09:18:21 -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; Mon, 01 Jun 2015 09:18:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E76D7DFC15; Mon, 1 Jun 2015 09:18:20 +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: Mon, 01 Jun 2015 09:18:21 -0000 Message-Id: <61ba4b3a28054d6498d80fda0f07141d@git.apache.org> In-Reply-To: <02cdd93454c34360bb812f1a1edc93f1@git.apache.org> References: <02cdd93454c34360bb812f1a1edc93f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-ignite git commit: Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5 Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite 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/00848cce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00848cce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00848cce Branch: refs/heads/ignite-sprint-5 Commit: 00848ccedd6ad1490461069d5039cf7306626377 Parents: 52d64bb 31fcc3e Author: ashutak Authored: Mon Jun 1 12:16:44 2015 +0300 Committer: ashutak Committed: Mon Jun 1 12:16:44 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheMetrics.java | 187 +++++++-- .../configuration/IgniteConfiguration.java | 6 + .../org/apache/ignite/igfs/IgfsUserContext.java | 119 ++++++ .../igfs/secondary/IgfsSecondaryFileSystem.java | 7 + .../internal/igfs/common/IgfsMarshaller.java | 35 +- .../igfs/common/IgfsPathControlRequest.java | 22 + .../internal/managers/GridManagerAdapter.java | 59 +-- .../processors/cache/CacheMetricsImpl.java | 367 ++++++++++++++++- .../cache/CacheMetricsMXBeanImpl.java | 100 +++++ .../processors/cache/CacheMetricsSnapshot.java | 380 +++++++++++++---- .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheSwapManager.java | 118 ++++-- .../internal/processors/hadoop/HadoopJob.java | 2 +- .../ignite/internal/processors/igfs/IgfsEx.java | 8 +- .../internal/processors/igfs/IgfsImpl.java | 8 +- .../processors/igfs/IgfsIpcHandler.java | 184 +++++---- .../igfs/IgfsSecondaryFileSystemImpl.java | 9 +- .../internal/processors/igfs/IgfsServer.java | 4 +- .../internal/processors/igfs/IgfsUtils.java | 16 + .../ignite/internal/util/GridJavaProcess.java | 30 +- .../ignite/mxbean/CacheMetricsMXBean.java | 80 ++++ .../apache/ignite/plugin/PluginProvider.java | 26 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 35 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 47 --- .../spi/swapspace/file/FileSwapSpaceSpi.java | 8 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 412 +++++++++++++++++++ .../testframework/GridSpiTestContext.java | 25 +- .../IgniteCacheMetricsSelfTestSuite.java | 1 + .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 165 +++++--- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 107 +++-- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 32 +- .../internal/processors/hadoop/HadoopUtils.java | 10 +- .../hadoop/SecondaryFileSystemProvider.java | 53 ++- .../hadoop/fs/HadoopDistributedFileSystem.java | 91 ---- .../hadoop/fs/HadoopFileSystemsUtils.java | 17 - .../hadoop/fs/HadoopLazyConcurrentMap.java | 204 +++++++++ .../processors/hadoop/igfs/HadoopIgfsEx.java | 6 + .../hadoop/igfs/HadoopIgfsInProc.java | 170 ++++++-- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 33 +- .../hadoop/igfs/HadoopIgfsWrapper.java | 19 +- .../hadoop/v2/HadoopV2TaskContext.java | 4 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 56 ++- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 63 ++- .../IgniteHadoopFileSystemClientSelfTest.java | 2 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 + .../hadoop/HadoopFileSystemsTest.java | 23 +- .../collections/HadoopSkipListSelfTest.java | 4 +- modules/mesos/pom.xml | 8 +- 50 files changed, 2569 insertions(+), 813 deletions(-) ----------------------------------------------------------------------