Repository: ignite Updated Branches: refs/heads/master 525a77547 -> 6e7b86e8e
Refactoring to improve constant usage for file suffixes. - Fixes #4652. Signed-off-by: Dmitriy Govorukhin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e7b86e8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e7b86e8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e7b86e8 Branch: refs/heads/master Commit: 6e7b86e8ed127904e3799144527c90ff5818a674 Parents: 525a775 Author: Pavel Voronkin <[email protected]> Authored: Tue Sep 4 12:41:14 2018 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Tue Sep 4 12:41:14 2018 +0300 ---------------------------------------------------------------------- .../GridCacheDatabaseSharedManager.java | 11 ++++----- .../persistence/file/FilePageStoreManager.java | 12 +++++++--- .../cache/persistence/wal/FileDescriptor.java | 3 ++- .../wal/FileWriteAheadLogManager.java | 23 +++++++++++-------- .../wal/FsyncModeFileWriteAheadLogManager.java | 24 ++++++++++++-------- .../file/IgnitePdsDiskErrorsRecoveringTest.java | 5 ++-- .../IgniteNodeStoppedDuringDisableWALTest.java | 5 ++-- .../persistence/db/wal/WalCompactionTest.java | 5 ++-- .../impl/v2/HadoopV2JobResourceManager.java | 3 ++- .../submitter/command/StartCommand.java | 3 ++- 10 files changed, 57 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index a86b9f5..f06fd05 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -217,9 +217,6 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan /** Checkpoint file name pattern. */ public static final Pattern CP_FILE_NAME_PATTERN = Pattern.compile("(\\d+)-(.*)-(START|END)\\.bin"); - /** Checkpoint file temporary suffix. This is needed to safe writing checkpoint markers through temporary file and renaming. */ - public static final String FILE_TMP_SUFFIX = ".tmp"; - /** Node started file suffix. */ public static final String NODE_STARTED_FILE_NAME_SUFFIX = "-node-started.bin"; @@ -498,13 +495,13 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan } /** - * Cleanup checkpoint directory from all temporary files {@link #FILE_TMP_SUFFIX}. + * Cleanup checkpoint directory from all temporary files. */ @Override public void cleanupTempCheckpointDirectory() throws IgniteCheckedException { try { try (DirectoryStream<Path> files = Files.newDirectoryStream( cpDir.toPath(), - path -> path.endsWith(FILE_TMP_SUFFIX)) + path -> path.endsWith(FilePageStoreManager.TMP_SUFFIX)) ) { for (Path path : files) Files.delete(path); @@ -886,7 +883,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan FileWALPointer p = (FileWALPointer)ptr; String fileName = U.currentTimeMillis() + NODE_STARTED_FILE_NAME_SUFFIX; - String tmpFileName = fileName + FILE_TMP_SUFFIX; + String tmpFileName = fileName + FilePageStoreManager.TMP_SUFFIX; ByteBuffer buf = ByteBuffer.allocate(FileWALPointer.POINTER_SIZE); buf.order(ByteOrder.nativeOrder()); @@ -2666,7 +2663,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan */ public void writeCheckpointEntry(ByteBuffer entryBuf, CheckpointEntry cp, CheckpointEntryType type) throws StorageException { String fileName = checkpointFileName(cp, type); - String tmpFileName = fileName + FILE_TMP_SUFFIX; + String tmpFileName = fileName + FilePageStoreManager.TMP_SUFFIX; try { try (FileIO io = ioFactory.create(Paths.get(cpDir.getAbsolutePath(), skipSync ? fileName : tmpFileName).toFile(), http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java index aa09241..020f84e 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java @@ -77,6 +77,12 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen /** File suffix. */ public static final String FILE_SUFFIX = ".bin"; + /** Suffix for zip files */ + public static final String ZIP_SUFFIX = ".zip"; + + /** Suffix for tmp files */ + public static final String TMP_SUFFIX = ".tmp"; + /** Partition file prefix. */ public static final String PART_FILE_PREFIX = "part-"; @@ -96,7 +102,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen public static final String CACHE_DATA_FILENAME = "cache_data.dat"; /** */ - public static final String CACHE_DATA_TMP_FILENAME = CACHE_DATA_FILENAME + ".tmp"; + public static final String CACHE_DATA_TMP_FILENAME = CACHE_DATA_FILENAME + TMP_SUFFIX; /** */ public static final String DFLT_STORE_DIR = "db"; @@ -341,7 +347,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen if (overwrite || !file.exists() || file.length() == 0) { try { - File tmp = new File(file.getParent(), file.getName() + ".tmp"); + File tmp = new File(file.getParent(), file.getName() + TMP_SUFFIX); tmp.createNewFile(); @@ -596,7 +602,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen Path cacheWorkDirPath = cacheWorkDir.toPath(); - Path tmp = cacheWorkDirPath.getParent().resolve(cacheWorkDir.getName() + ".tmp"); + Path tmp = cacheWorkDirPath.getParent().resolve(cacheWorkDir.getName() + TMP_SUFFIX); if (Files.exists(tmp) && Files.isDirectory(tmp) && Files.exists(tmp.resolve(IgniteCacheSnapshotManager.TEMP_FILES_COMPLETENESS_MARKER))) { http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileDescriptor.java index 39052cc..a73248a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileDescriptor.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache.persistence.wal; +import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; import org.apache.ignite.internal.util.typedef.internal.SB; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -121,7 +122,7 @@ public class FileDescriptor implements Comparable<FileDescriptor>, AbstractWalRe /** {@inheritDoc} */ @Override public boolean isCompressed() { - return file.getName().endsWith(".zip"); + return file.getName().endsWith(FilePageStoreManager.ZIP_SUFFIX); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java index 61def1e..eb5ae95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java @@ -92,6 +92,7 @@ import org.apache.ignite.internal.processors.cache.persistence.DataStorageMetric import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.file.FileIO; import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory; +import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory; import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderSettings; import org.apache.ignite.internal.processors.cache.persistence.wal.AbstractWalRecordsIterator.AbstractFileDescriptor; @@ -534,7 +535,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl String segmentName = FileDescriptor.fileName(i); File file = new File(walArchiveDir, segmentName); - File fileZip = new File(walArchiveDir, segmentName + ".zip"); + File fileZip = new File(walArchiveDir, segmentName + FilePageStoreManager.ZIP_SUFFIX); if (file.exists()) res.add(file); @@ -909,7 +910,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl private boolean hasIndex(long absIdx) { String segmentName = FileDescriptor.fileName(absIdx); - String zipSegmentName = FileDescriptor.fileName(absIdx) + ".zip"; + String zipSegmentName = FileDescriptor.fileName(absIdx) + FilePageStoreManager.ZIP_SUFFIX; boolean inArchive = new File(walArchiveDir, segmentName).exists() || new File(walArchiveDir, zipSegmentName).exists(); @@ -1496,7 +1497,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl if (log.isDebugEnabled()) log.debug("Creating new file [exists=" + file.exists() + ", file=" + file.getAbsolutePath() + ']'); - File tmp = new File(file.getParent(), file.getName() + ".tmp"); + File tmp = new File(file.getParent(), file.getName() + FilePageStoreManager.TMP_SUFFIX); formatFile(tmp); @@ -1911,7 +1912,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl String name = FileDescriptor.fileName(absIdx); - File dstTmpFile = new File(walArchiveDir, name + ".tmp"); + File dstTmpFile = new File(walArchiveDir, name + FilePageStoreManager.TMP_SUFFIX); File dstFile = new File(walArchiveDir, name); @@ -2104,9 +2105,10 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl if (currReservedSegment == -1) continue; - File tmpZip = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment) + ".zip" + ".tmp"); + File tmpZip = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment) + + FilePageStoreManager.ZIP_SUFFIX + FilePageStoreManager.TMP_SUFFIX); - File zip = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment) + ".zip"); + File zip = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment) + FilePageStoreManager.ZIP_SUFFIX); File raw = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment)); if (!Files.exists(raw.toPath())) @@ -2265,8 +2267,10 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl if (isCancelled()) break; - File zip = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress) + ".zip"); - File unzipTmp = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress) + ".tmp"); + File zip = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress) + + FilePageStoreManager.ZIP_SUFFIX); + File unzipTmp = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress) + + FilePageStoreManager.TMP_SUFFIX); File unzip = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress)); try (ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(zip))); @@ -3061,7 +3065,8 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl if (!desc.file().exists()) { FileDescriptor zipFile = new FileDescriptor( - new File(walArchiveDir, FileDescriptor.fileName(desc.idx()) + ".zip")); + new File(walArchiveDir, FileDescriptor.fileName(desc.idx()) + + FilePageStoreManager.ZIP_SUFFIX)); if (!zipFile.file.exists()) { throw new FileNotFoundException("Both compressed and raw segment files are missing in archive " + http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java index 91d3218..0f15d49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java @@ -87,6 +87,7 @@ import org.apache.ignite.internal.processors.cache.persistence.DataStorageMetric import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.file.FileIO; import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory; +import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderSettings; import org.apache.ignite.internal.processors.cache.persistence.wal.crc.PureJavaCrc32; import org.apache.ignite.internal.processors.cache.persistence.wal.record.HeaderRecord; @@ -618,7 +619,7 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda String segmentName = FileDescriptor.fileName(i); File file = new File(walArchiveDir, segmentName); - File fileZip = new File(walArchiveDir, segmentName + ".zip"); + File fileZip = new File(walArchiveDir, segmentName + FilePageStoreManager.ZIP_SUFFIX); if (file.exists()) res.add(file); @@ -815,7 +816,7 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda private boolean hasIndex(long absIdx) { String segmentName = FileDescriptor.fileName(absIdx); - String zipSegmentName = FileDescriptor.fileName(absIdx) + ".zip"; + String zipSegmentName = FileDescriptor.fileName(absIdx) + FilePageStoreManager.ZIP_SUFFIX; boolean inArchive = new File(walArchiveDir, segmentName).exists() || new File(walArchiveDir, zipSegmentName).exists(); @@ -1345,7 +1346,7 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda if (log.isDebugEnabled()) log.debug("Creating new file [exists=" + file.exists() + ", file=" + file.getAbsolutePath() + ']'); - File tmp = new File(file.getParent(), file.getName() + ".tmp"); + File tmp = new File(file.getParent(), file.getName() + FilePageStoreManager.TMP_SUFFIX); formatFile(tmp); @@ -1740,7 +1741,7 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda String name = FileDescriptor.fileName(absIdx); - File dstTmpFile = new File(walArchiveDir, name + ".tmp"); + File dstTmpFile = new File(walArchiveDir, name + FilePageStoreManager.TMP_SUFFIX); File dstFile = new File(walArchiveDir, name); @@ -1934,9 +1935,11 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda if (currReservedSegment == -1) continue; - File tmpZip = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment) + ".zip" + ".tmp"); + File tmpZip = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment) + + FilePageStoreManager.ZIP_SUFFIX + FilePageStoreManager.TMP_SUFFIX); - File zip = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment) + ".zip"); + File zip = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment) + + FilePageStoreManager.ZIP_SUFFIX); File raw = new File(walArchiveDir, FileDescriptor.fileName(currReservedSegment)); if (!Files.exists(raw.toPath())) @@ -2073,8 +2076,10 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda if (isCancelled()) break; - File zip = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress) + ".zip"); - File unzipTmp = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress) + ".tmp"); + File zip = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress) + + FilePageStoreManager.ZIP_SUFFIX); + File unzipTmp = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress) + + FilePageStoreManager.TMP_SUFFIX); File unzip = new File(walArchiveDir, FileDescriptor.fileName(segmentToDecompress)); try (ZipInputStream zis = new ZipInputStream(new BufferedInputStream(new FileInputStream(zip))); @@ -3146,7 +3151,8 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda if (!desc.file().exists()) { FileDescriptor zipFile = new FileDescriptor( - new File(walArchiveDir, FileDescriptor.fileName(desc.idx()) + ".zip")); + new File(walArchiveDir, FileDescriptor.fileName(desc.idx()) + + FilePageStoreManager.ZIP_SUFFIX)); if (!zipFile.file.exists()) { throw new FileNotFoundException("Both compressed and raw segment files are missing in archive " + http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java index 7efe29b..bd30696 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java @@ -44,6 +44,7 @@ import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabase import org.apache.ignite.internal.processors.cache.persistence.file.FileIO; import org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator; import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory; +import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIO; import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory; import org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager; @@ -158,7 +159,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest { */ public void testRecoveringOnNodeStartMarkerWriteFail() throws Exception { // Fail to write node start marker tmp file at the second checkpoint. Pass only initial checkpoint. - ioFactory = new FilteringFileIOFactory("started.bin" + GridCacheDatabaseSharedManager.FILE_TMP_SUFFIX, new LimitedSizeFileIOFactory(new RandomAccessFileIOFactory(), 20)); + ioFactory = new FilteringFileIOFactory("started.bin" + FilePageStoreManager.TMP_SUFFIX, new LimitedSizeFileIOFactory(new RandomAccessFileIOFactory(), 20)); IgniteEx grid = startGrid(0); grid.cluster().active(true); @@ -213,7 +214,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest { */ public void testRecoveringOnCheckpointBeginFail() throws Exception { // Fail to write checkpoint start marker tmp file at the second checkpoint. Pass only initial checkpoint. - ioFactory = new FilteringFileIOFactory("START.bin" + GridCacheDatabaseSharedManager.FILE_TMP_SUFFIX, new LimitedSizeFileIOFactory(new RandomAccessFileIOFactory(), 20)); + ioFactory = new FilteringFileIOFactory("START.bin" + FilePageStoreManager.TMP_SUFFIX, new LimitedSizeFileIOFactory(new RandomAccessFileIOFactory(), 20)); final IgniteEx grid = startGrid(0); grid.cluster().active(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java index 80198e8..a744ab1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNodeStoppedDuringDisableWALTest.java @@ -37,6 +37,7 @@ import org.apache.ignite.internal.pagemem.wal.WALIterator; import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.WalStateManager.WALDisableContext; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; +import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFoldersResolver; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -47,7 +48,7 @@ import org.junit.Assert; import static java.nio.file.FileVisitResult.CONTINUE; import static java.nio.file.Files.walkFileTree; import static org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager.CP_FILE_NAME_PATTERN; -import static org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager.FILE_TMP_SUFFIX; + import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.INDEX_FILE_NAME; import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.META_STORAGE_NAME; import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.PART_FILE_PREFIX; @@ -208,7 +209,7 @@ public class IgniteNodeStoppedDuringDisableWALTest extends GridCommonAbstractTes boolean failed = false; - if (name.endsWith(FILE_TMP_SUFFIX)) + if (name.endsWith(FilePageStoreManager.TMP_SUFFIX)) failed = true; if (CP_FILE_NAME_PATTERN.matcher(name).matches()) http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java index f890d61..e617455 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java @@ -33,6 +33,7 @@ import org.apache.ignite.configuration.WALMode; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.pagemem.FullPageId; import org.apache.ignite.internal.pagemem.wal.record.PageSnapshot; +import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; import org.apache.ignite.internal.processors.cache.persistence.wal.FileDescriptor; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -163,7 +164,7 @@ public class WalCompactionTest extends GridCommonAbstractTest { File walDir = new File(dbDir, "wal"); File archiveDir = new File(walDir, "archive"); File nodeArchiveDir = new File(archiveDir, nodeFolderName); - File walSegment = new File(nodeArchiveDir, FileDescriptor.fileName(0) + ".zip"); + File walSegment = new File(nodeArchiveDir, FileDescriptor.fileName(0) + FilePageStoreManager.ZIP_SUFFIX); assertTrue(walSegment.exists()); assertTrue(walSegment.length() < WAL_SEGMENT_SIZE / 2); // Should be compressed at least in half. @@ -358,7 +359,7 @@ public class WalCompactionTest extends GridCommonAbstractTest { File walDir = new File(dbDir, "wal"); File archiveDir = new File(walDir, "archive"); File nodeArchiveDir = new File(archiveDir, nodeFolderName); - File walSegment = new File(nodeArchiveDir, FileDescriptor.fileName(0) + ".zip"); + File walSegment = new File(nodeArchiveDir, FileDescriptor.fileName(0) + FilePageStoreManager.ZIP_SUFFIX); assertTrue(walSegment.exists()); assertTrue(walSegment.length() < WAL_SEGMENT_SIZE / 2); // Should be compressed at least in half. http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2JobResourceManager.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2JobResourceManager.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2JobResourceManager.java index 52e394b..18dbf20 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2JobResourceManager.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2JobResourceManager.java @@ -26,6 +26,7 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.hadoop.util.RunJar; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils; import org.apache.ignite.internal.processors.hadoop.HadoopJobId; import org.apache.ignite.internal.processors.hadoop.impl.fs.HadoopFileSystemsUtils; @@ -234,7 +235,7 @@ class HadoopV2JobResourceManager { if (archiveNameLC.endsWith(".jar")) RunJar.unJar(archiveFile, dstPath); - else if (archiveNameLC.endsWith(".zip")) + else if (archiveNameLC.endsWith(FilePageStoreManager.ZIP_SUFFIX)) FileUtil.unZip(archiveFile, dstPath); else if (archiveNameLC.endsWith(".tar.gz") || archiveNameLC.endsWith(".tgz") || http://git-wip-us.apache.org/repos/asf/ignite/blob/6e7b86e8/modules/tensorflow/src/main/java/org/apache/ignite/tensorflow/submitter/command/StartCommand.java ---------------------------------------------------------------------- diff --git a/modules/tensorflow/src/main/java/org/apache/ignite/tensorflow/submitter/command/StartCommand.java b/modules/tensorflow/src/main/java/org/apache/ignite/tensorflow/submitter/command/StartCommand.java index 082b363..0202b8e 100644 --- a/modules/tensorflow/src/main/java/org/apache/ignite/tensorflow/submitter/command/StartCommand.java +++ b/modules/tensorflow/src/main/java/org/apache/ignite/tensorflow/submitter/command/StartCommand.java @@ -28,6 +28,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import org.apache.commons.io.IOUtils; import org.apache.ignite.Ignite; +import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager; import org.apache.ignite.tensorflow.cluster.TensorFlowClusterGatewayManager; import org.apache.ignite.tensorflow.cluster.TensorFlowJobArchive; import picocli.CommandLine; @@ -97,7 +98,7 @@ public class StartCommand extends AbstractCommand { if (file.isDirectory()) return zipDirectory(file); - else if (jobArchivePath.endsWith(".zip")) + else if (jobArchivePath.endsWith(FilePageStoreManager.ZIP_SUFFIX)) return zipArchive(file); else return zipFile(file);
