Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-406
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e74dfa68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e74dfa68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e74dfa68 Branch: refs/heads/ignite-406 Commit: e74dfa68ac5ee750c2e259cee4f6772fd3d1eeed Parents: 081046c 030c373 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Mar 12 18:28:13 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Thu Mar 12 18:28:13 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 10 +- examples/config/filesystem/example-igfs.xml | 13 +- examples/config/store/example-database.script | 15 ++ .../apache/ignite/cluster/ClusterMetrics.java | 66 ++--- .../configuration/FileSystemConfiguration.java | 55 ++--- .../igfs/IgfsIpcEndpointConfiguration.java | 241 +++++++++++++++++++ .../apache/ignite/igfs/IgfsIpcEndpointType.java | 29 +++ .../ClusterLocalNodeMetricsMXBeanImpl.java | 5 + .../ignite/internal/ClusterMetricsSnapshot.java | 26 +- .../apache/ignite/internal/IgniteKernal.java | 8 +- .../internal/processors/igfs/IgfsServer.java | 49 +++- .../processors/igfs/IgfsServerManager.java | 35 ++- .../util/ipc/IpcServerEndpointDeserializer.java | 66 ----- .../visor/node/VisorIgfsConfiguration.java | 5 +- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 4 + modules/core/src/test/config/igfs-loopback.xml | 6 +- modules/core/src/test/config/igfs-shmem.xml | 8 +- .../ignite/internal/ClusterMetricsSelfTest.java | 2 + .../processors/igfs/IgfsAbstractSelfTest.java | 24 +- ...sCachePerBlockLruEvictionPolicySelfTest.java | 12 +- .../processors/igfs/IgfsMetricsSelfTest.java | 12 +- .../processors/igfs/IgfsModesSelfTest.java | 9 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 21 +- ...dpointRegistrationOnLinuxAndMacSelfTest.java | 7 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 5 +- .../IpcServerEndpointDeserializerSelfTest.java | 160 ------------ .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 9 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 - .../hadoop/igfs/HadoopIgfsEndpoint.java | 5 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +- ...Igfs20FileSystemLoopbackPrimarySelfTest.java | 14 +- ...oopIgfs20FileSystemShmemPrimarySelfTest.java | 14 +- .../igfs/HadoopIgfsDualAbstractSelfTest.java | 25 +- ...oopSecondaryFileSystemConfigurationTest.java | 25 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 44 ++-- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 10 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 16 +- .../IgniteHadoopFileSystemClientSelfTest.java | 11 +- ...IgniteHadoopFileSystemHandshakeSelfTest.java | 14 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 10 +- ...niteHadoopFileSystemLoggerStateSelfTest.java | 12 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 12 +- ...teHadoopFileSystemSecondaryModeSelfTest.java | 23 +- ...teHadoopFileSystemShmemAbstractSelfTest.java | 12 +- .../hadoop/HadoopPopularWordsTest.java | 4 +- .../commands/top/VisorTopologyCommand.scala | 7 +- .../scala/org/apache/ignite/visor/visor.scala | 8 +- pom.xml | 14 +- 48 files changed, 686 insertions(+), 502 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74dfa68/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e74dfa68/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java ---------------------------------------------------------------------- diff --cc modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java index 1681eea,dbe2449..2679e03 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopSecondaryFileSystemConfigurationTest.java @@@ -66,13 -65,10 +65,10 @@@ public class HadoopSecondaryFileSystemC private static final String SECONDARY_AUTHORITY = "igfs_secondary:grid_secondary@127.0.0.1:11500"; /** Autogenerated secondary file system configuration path. */ - private static final String SECONDARY_CFG_PATH = "/work/core-site-test.xml"; + static final String SECONDARY_CFG_PATH = "/work/core-site-test.xml"; /** Secondary endpoint configuration. */ - protected static final Map<String, String> SECONDARY_ENDPOINT_CFG = new HashMap<String, String>() {{ - put("type", "tcp"); - put("port", "11500"); - }}; + protected static final IgfsIpcEndpointConfiguration SECONDARY_ENDPOINT_CFG; /** Group size. */ public static final int GRP_SIZE = 128;
