Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-943
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d10120d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d10120d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d10120d6 Branch: refs/heads/ignite-960 Commit: d10120d67d3d6e20b25e494b03b829b20f263b5b Parents: d10fe3e 5c30f9c Author: sevdokimov <sevdoki...@gridgain.com> Authored: Fri May 29 18:57:20 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Fri May 29 18:57:20 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheMetrics.java | 187 +++++++-- .../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 ++++ .../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 +- 47 files changed, 2537 insertions(+), 805 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d10120d6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d10120d6/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ----------------------------------------------------------------------
