Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
import org.apache.ignite.internal.processors.cache.GridCacheSharedManagerAdapter;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GroupPartitionIdPair;
import org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointMarkersStorage;
import org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointProgress;
import org.apache.ignite.internal.processors.cache.persistence.evict.FairFifoPageEvictionTracker;
import org.apache.ignite.internal.processors.cache.persistence.evict.NoOpPageEvictionTracker;
import org.apache.ignite.internal.processors.cache.persistence.evict.PageEvictionTracker;
import org.apache.ignite.internal.processors.cache.persistence.evict.Random2LruPageEvictionTracker;
import org.apache.ignite.internal.processors.cache.persistence.evict.RandomLruPageEvictionTracker;
import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderSettings;
import org.apache.ignite.internal.processors.cache.persistence.freelist.AbstractFreeList;
import org.apache.ignite.internal.processors.cache.persistence.freelist.CacheFreeList;
Expand Down Expand Up @@ -967,9 +967,10 @@ public void cleanupRestoredCaches() {
}

/**
* Clean checkpoint directory
* {@link CheckpointMarkersStorage#cpDir}. The operation
* Clean checkpoint directory. The operation
* is necessary when local node joined to baseline topology with different consistentId.
*
* @see NodeFileTree#checkpoint()
*/
public void cleanupCheckpointDirectory() throws IgniteCheckedException {
// No-op.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3630,13 +3630,15 @@ private void stopAutoRollover() {
if (walAutoArchiveAfterInactivity > 0 || walForceArchiveTimeout > 0) {
assert timeoutRolloverMux != null;

GridTimeoutProcessor timeOutProc = cctx.time();
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not relates to an issue, just for warn removing


synchronized (timeoutRolloverMux) {
TimeoutRollover timeoutRollover = this.timeoutRollover;

if (timeoutRollover != null) {
timeoutRollover.cancel();

cctx.time().removeTimeoutObject(timeoutRollover);
timeOutProc.removeTimeoutObject(timeoutRollover);

this.timeoutRollover = null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void testAutoArchiveWithoutNullPointerException() throws Exception {
}

/**
* Checking the absence of a race between the deactivation of the VAL and
* Checking the absence of a race between the deactivation of the WAL and
* automatic archiving, which may lead to a fail of the node.
*
* @throws Exception If failed.
Expand Down Expand Up @@ -253,7 +253,10 @@ public void testNoRaceAutoArchiveAndDeactivation() throws Exception {

assertTrue(l.await(getTestTimeout(), MILLISECONDS));

dbMgr(n).forceCheckpoint("test reason");
dbMgr(n).enableCheckpoints(false).get(getTestTimeout());
walMgr(n).onDeActivate(n.context());

stop.set(true);

fut.get(getTestTimeout());
Expand Down
Loading