Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IGNITE-10522 added removing .tmp checkpoint files on start #5571

Closed
wants to merge 8 commits into from
Closed

IGNITE-10522 added removing .tmp checkpoint files on start #5571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cd8bc7
IGNITE-10522 added removing .tmp checkpoint files on start
akalash Dec 4, 2018
67d03cb
IGNITE-10522 fixed typo
akalash Dec 4, 2018
588bf50
IGNITE-10522 added ignite_quit
akalash Dec 5, 2018
e5bcd2a
IGNITE-10522 decreased time to load data
akalash Dec 5, 2018
9d21a09
IGNITE-10522 decreased amount of load data
akalash Dec 6, 2018
cd5fdac
IGNITE-10522 fixed javadoc
akalash Dec 6, 2018
c0b689f
IGNITE-10522 removed additionalRemoteJvmArgs
akalash Dec 7, 2018
c524d34
IGNITE-10522 removed additionalRemoteJvmArgs
akalash Dec 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...g/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
import static org.apache.ignite.failure.FailureType.CRITICAL_ERROR;
import static org.apache.ignite.failure.FailureType.SYSTEM_WORKER_TERMINATION;
import static org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.CHECKPOINT_RECORD;
import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.TMP_FILE_MATCHER;
import static org.apache.ignite.internal.util.IgniteUtils.checkpointBufferSize;

/**
Expand Down Expand Up @@ -537,10 +538,7 @@ private DataRegionConfiguration createMetastoreDataRegionConfig(DataStorageConfi
*/
@Override public void cleanupTempCheckpointDirectory() throws IgniteCheckedException {
try {
try (DirectoryStream<Path> files = Files.newDirectoryStream(
cpDir.toPath(),
path -> path.endsWith(FilePageStoreManager.TMP_SUFFIX))
) {
try (DirectoryStream<Path> files = Files.newDirectoryStream(cpDir.toPath(), TMP_FILE_MATCHER::matches)) {
for (Path path : files)
Files.delete(path);
}
Expand Down
6 changes: 6 additions & 0 deletions ...va/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.file.DirectoryStream;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.PathMatcher;
import java.nio.file.StandardCopyOption;
import java.util.AbstractList;
import java.util.Arrays;
Expand Down Expand Up @@ -118,6 +120,10 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen
/** */
public static final String META_STORAGE_NAME = "metastorage";

/** Matcher for searching of *.tmp files. */
public static final PathMatcher TMP_FILE_MATCHER =
FileSystems.getDefault().getPathMatcher("glob:**" + TMP_SUFFIX);

/** Marshaller. */
private static final Marshaller marshaller = new JdkMarshaller();

Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3584,7 +3584,7 @@ public static boolean delete(Path path) {
}
}

if (path.endsWith("jar")) {
if (path.toFile().getName().endsWith("jar")) {
try {
// Why do we do this?
new JarFile(path.toString(), false).close();
Expand Down
5 changes: 2 additions & 3 deletions modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.ignite.testframework.junits;

import javax.cache.configuration.Factory;
import javax.cache.configuration.FactoryBuilder;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.lang.annotation.Annotation;
Expand All @@ -41,8 +43,6 @@
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import javax.cache.configuration.Factory;
import javax.cache.configuration.FactoryBuilder;
import junit.framework.TestCase;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
Expand All @@ -62,7 +62,6 @@
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.events.EventType;
import org.apache.ignite.failure.FailureHandler;
import org.apache.ignite.failure.NoOpFailureHandler;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
Expand Down
Loading