Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-6083
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e92fffc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e92fffc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e92fffc Branch: refs/heads/ignite-6083 Commit: 6e92fffcada7645d364233ae6948f1bddc378cce Parents: cbf65cb 8053fc1 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Fri Apr 6 15:37:01 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Fri Apr 6 15:37:01 2018 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 158 ++++++++++--- .../colocated/GridDhtDetachedCacheEntry.java | 3 +- .../distributed/near/GridNearCacheEntry.java | 3 +- .../GridCacheDatabaseSharedManager.java | 145 ++++++++---- .../cache/persistence/file/AsyncFileIO.java | 9 +- .../cache/persistence/file/FileIO.java | 20 +- .../cache/persistence/file/FileIODecorator.java | 9 +- .../persistence/file/RandomAccessFileIO.java | 13 +- .../cache/persistence/file/UnzipFileIO.java | 7 +- ...eAbstractDataStructuresFailoverSelfTest.java | 56 ++++- .../file/IgnitePdsDiskErrorsRecoveringTest.java | 231 +++++++++++++++---- .../db/wal/IgniteWalFlushFailoverTest.java | 4 +- ...lFlushMultiNodeFailoverAbstractSelfTest.java | 4 +- .../persistence/db/wal/WalCompactionTest.java | 10 +- .../pagemem/PagesWriteThrottleSmokeTest.java | 4 +- .../file/AlignedBuffersDirectFileIO.java | 7 +- 17 files changed, 539 insertions(+), 146 deletions(-) ----------------------------------------------------------------------