Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-4705

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00de323d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00de323d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00de323d

Branch: refs/heads/ignite-4705
Commit: 00de323dfd09822097b7b103ef77d43f2742da32
Parents: f81e774 3ca46d1
Author: sboikov <[email protected]>
Authored: Wed Feb 22 14:47:29 2017 +0300
Committer: sboikov <[email protected]>
Committed: Wed Feb 22 14:47:29 2017 +0300

----------------------------------------------------------------------
 config/hadoop/default-config.xml                |  29 --
 examples/config/filesystem/example-igfs.xml     |  27 --
 .../JettyRestProcessorAbstractSelfTest.java     |  23 --
 .../configuration/FileSystemConfiguration.java  |  75 +++--
 .../org/apache/ignite/internal/IgnitionEx.java  |   9 +-
 .../processors/cache/GridCacheAdapter.java      |   3 +-
 .../processors/cache/GridCacheProcessor.java    |   5 +-
 .../processors/igfs/IgfsDataManager.java        |  11 +-
 .../internal/processors/igfs/IgfsImpl.java      |   2 +-
 .../processors/igfs/IgfsMetaManager.java        |  13 +-
 .../internal/processors/igfs/IgfsProcessor.java | 130 +-------
 .../internal/processors/igfs/IgfsUtils.java     | 215 +++++++++++--
 .../callback/PlatformCallbackGateway.java       |   4 +-
 .../visor/node/VisorIgfsConfiguration.java      |   4 +-
 .../visor/node/VisorNodeDataCollectorJob.java   |   6 +-
 modules/core/src/test/config/igfs-loopback.xml  |  27 --
 modules/core/src/test/config/igfs-shmem.xml     |  27 --
 .../ignite/igfs/IgfsEventsAbstractSelfTest.java |  51 ++-
 .../igfs/IgfsFragmentizerAbstractSelfTest.java  |  17 +-
 .../ignite/igfs/IgfsFragmentizerSelfTest.java   |   3 +-
 .../igfs/IgfsAbstractBaseSelfTest.java          |  17 +-
 .../igfs/IgfsBackupFailoverSelfTest.java        |   7 +-
 ...lockMessageSystemPoolStarvationSelfTest.java |  17 +-
 ...sCachePerBlockLruEvictionPolicySelfTest.java |  18 +-
 .../processors/igfs/IgfsCacheSelfTest.java      |  19 +-
 .../igfs/IgfsDataManagerSelfTest.java           |  33 +-
 .../processors/igfs/IgfsMaxSizeSelfTest.java    |   6 +-
 .../igfs/IgfsMetaManagerSelfTest.java           |   6 +-
 .../processors/igfs/IgfsMetricsSelfTest.java    |  16 +-
 .../processors/igfs/IgfsModesSelfTest.java      |  51 ++-
 .../processors/igfs/IgfsOneClientNodeTest.java  |  13 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |  25 +-
 .../igfs/IgfsProcessorValidationSelfTest.java   | 320 ++++---------------
 ...gfsSecondaryFileSystemInjectionSelfTest.java |   8 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |  17 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |  27 +-
 .../processors/igfs/IgfsStartCacheTest.java     |  28 +-
 .../processors/igfs/IgfsStreamsSelfTest.java    |  46 +--
 .../processors/igfs/IgfsTaskSelfTest.java       |   8 +-
 .../IgfsAbstractRecordResolverSelfTest.java     |   8 +-
 .../ipc/shmem/IpcSharedMemoryNodeStartup.java   |  30 +-
 .../test/config/hadoop-fs-open-test/grid-0.xml  |  57 ++--
 .../test/config/hadoop-fs-open-test/grid-1.xml  |  57 ++--
 .../test/config/hadoop-fs-open-test/grid-2.xml  |  57 ++--
 .../test/config/igfs-cli-config-dual-async.xml  |  57 ++--
 .../test/config/igfs-cli-config-dual-sync.xml   |  57 ++--
 .../src/test/config/igfs-cli-config-primary.xml |  57 ++--
 .../src/test/config/igfs-cli-config-proxy.xml   |  57 ++--
 .../impl/HadoopAbstractMapReduceTest.java       |   6 +-
 .../hadoop/impl/HadoopAbstractSelfTest.java     |  18 +-
 .../igfs/HadoopFIleSystemFactorySelfTest.java   |   8 +-
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |  52 +--
 .../igfs/HadoopIgfsDualAbstractSelfTest.java    |   8 +-
 ...oopSecondaryFileSystemConfigurationTest.java |  69 ++--
 .../igfs/IgfsNearOnlyMultiNodeSelfTest.java     |   6 +-
 .../IgniteHadoopFileSystemAbstractSelfTest.java |  67 ++--
 ...niteHadoopFileSystemClientBasedOpenTest.java |   3 +-
 .../IgniteHadoopFileSystemClientSelfTest.java   |  56 ++--
 ...IgniteHadoopFileSystemHandshakeSelfTest.java |   8 +-
 .../IgniteHadoopFileSystemIpcCacheSelfTest.java |  47 +--
 ...niteHadoopFileSystemLoggerStateSelfTest.java |  22 +-
 ...condaryFileSystemInitializationSelfTest.java |  30 +-
 .../org/apache/ignite/spring/sprint-exclude.xml |   2 -
 63 files changed, 891 insertions(+), 1311 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/00de323d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

Reply via email to