Repository: ignite Updated Branches: refs/heads/ignite-5267 43ddc7d53 -> 3a44e3ac1
Renaming checkpoint to checkpointing in public interface Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3a44e3ac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3a44e3ac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3a44e3ac Branch: refs/heads/ignite-5267 Commit: 3a44e3ac104775d58f24f193bd1cce1518526b91 Parents: 43ddc7d Author: Denis Magda <dma...@gridgain.com> Authored: Wed May 31 17:49:48 2017 -0700 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed May 31 17:49:48 2017 -0700 ---------------------------------------------------------------------- .../PersistentStoreConfiguration.java | 65 ++++++++++---------- .../GridCacheDatabaseSharedManager.java | 12 ++-- ...entStoreRecoveryAfterFileCorruptionTest.java | 2 +- .../IgnitePersistentStoreWalTlbSelfTest.java | 4 +- .../db/RebalancingOnNotStableTopologyTest.java | 2 +- .../cache/database/db/TransactionsHangTest.java | 2 +- .../PageStoreCheckpointSimulationSelfTest.java | 2 +- .../file/WalRecoveryTxLogicalRecordsTest.java | 2 +- 8 files changed, 46 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3a44e3ac/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java index ad97b86..14e3a73 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java @@ -26,17 +26,17 @@ public class PersistentStoreConfiguration implements Serializable { private static final long serialVersionUID = 0L; /** */ - public static final int DFLT_CHECKPOINT_FREQ = 180000; + public static final int DFLT_CHECKPOINTING_FREQ = 180000; /** Lock default wait time, 10 sec. */ public static final int DFLT_LOCK_WAIT_TIME = 10 * 1000; /** */ @SuppressWarnings("UnnecessaryBoxing") - public static final Long DFLT_CHECKPOINT_PAGE_BUFFER_SIZE = new Long(256L * 1024 * 1024); + public static final Long DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE = new Long(256L * 1024 * 1024); - /** Default number of checkpoint threads. */ - public static final int DFLT_CHECKPOINT_THREADS = 1; + /** Default number of checkpointing threads. */ + public static final int DFLT_CHECKPOINTING_THREADS = 1; /** */ private static final int DFLT_WAL_HISTORY_SIZE = 20; @@ -50,17 +50,17 @@ public class PersistentStoreConfiguration implements Serializable { /** */ private String persistenteStorePath; - /** Checkpoint frequency. */ - private long checkpointFreq = DFLT_CHECKPOINT_FREQ; + /** Checkpointing frequency. */ + private long checkpointingFreq = DFLT_CHECKPOINTING_FREQ; /** Lock wait time. */ private int lockWaitTime = DFLT_LOCK_WAIT_TIME; /** */ - private Long checkpointPageBufSize = DFLT_CHECKPOINT_PAGE_BUFFER_SIZE; + private Long checkpointingPageBufSize = DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE; /** */ - private int checkpointThreads = DFLT_CHECKPOINT_THREADS; + private int checkpointingThreads = DFLT_CHECKPOINTING_THREADS; /** */ private int walHistSize = DFLT_WAL_HISTORY_SIZE; @@ -97,67 +97,68 @@ public class PersistentStoreConfiguration implements Serializable { } /** - * Gets checkpoint frequency. + * Gets checkpointing frequency. * - * @return Checkpoint frequency in milliseconds. + * @return checkpointing frequency in milliseconds. */ - public long getCheckpointFrequency() { - return checkpointFreq <= 0 ? DFLT_CHECKPOINT_FREQ : checkpointFreq; + public long getCheckpointingFrequency() { + return checkpointingFreq <= 0 ? DFLT_CHECKPOINTING_FREQ : checkpointingFreq; } /** * Sets the checkpointing frequency which is a minimal interval when the dirty pages will be written * to the Persistent Store. If the rate is high, checkpointing will be triggered more frequently. * - * @param checkpointFreq Checkpoint frequency in milliseconds. + * @param checkpointingFreq checkpointing frequency in milliseconds. * @return {@code this} for chaining. */ - public PersistentStoreConfiguration setCheckpointFrequency(long checkpointFreq) { - this.checkpointFreq = checkpointFreq; + public PersistentStoreConfiguration setCheckpointingFrequency(long checkpointingFreq) { + this.checkpointingFreq = checkpointingFreq; return this; } /** - * Gets amount of memory allocated for a checkpoint temporary buffer. + * Gets amount of memory allocated for a checkpointing temporary buffer. * - * @return Checkpoint page buffer size. + * @return checkpointing page buffer size in bytes. */ - public Long getCheckpointPageBufferSize() { - return checkpointPageBufSize; + public Long getCheckpointingPageBufferSize() { + return checkpointingPageBufSize; } /** - * Sets amount of memory allocated for the checkpoint temporary buffer. The buffer is used to create temporary - * copies of pages when the checkpoint process is in progress. + * Sets amount of memory allocated for the checkpointing temporary buffer. The buffer is used to create temporary + * copies of pages that are being written to disk and being update in parallel while the checkpointing is in + * progress. * - * @param checkpointPageBufSize Checkpoint page buffer size. + * @param checkpointingPageBufSize checkpointing page buffer size in bytes. * @return {@code this} for chaining. */ - public PersistentStoreConfiguration setCheckpointPageBufferSize(long checkpointPageBufSize) { - this.checkpointPageBufSize = checkpointPageBufSize; + public PersistentStoreConfiguration setCheckpointingPageBufferSize(long checkpointingPageBufSize) { + this.checkpointingPageBufSize = checkpointingPageBufSize; return this; } /** - * Gets a number of threads to use for the checkpoint purposes. + * Gets a number of threads to use for the checkpointing purposes. * - * @return Number of checkpoint threads. + * @return Number of checkpointing threads. */ - public int getCheckpointThreads() { - return checkpointThreads; + public int getCheckpointingThreads() { + return checkpointingThreads; } /** - * Sets a number of threads to use for the checkpoint purposes + * Sets a number of threads to use for the checkpointing purposes. * - * @param checkpointThreads Number of checkpoint threads. One thread is used by default. + * @param checkpointingThreads Number of checkpointing threads. One thread is used by default. * @return {@code this} for chaining. */ - public PersistentStoreConfiguration setCheckpointThreads(int checkpointThreads) { - this.checkpointThreads = checkpointThreads; + public PersistentStoreConfiguration setCheckpointingThreads(int checkpointingThreads) { + this.checkpointingThreads = checkpointingThreads; return this; } http://git-wip-us.apache.org/repos/asf/ignite/blob/3a44e3ac/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java index a78ba27..0f75b0d 100755 --- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java +++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java @@ -277,7 +277,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan assert dbCfg != null : "PageStore should not be created if persistence is disabled."; - checkpointFreq = dbCfg.getCheckpointFrequency(); + checkpointFreq = dbCfg.getCheckpointingFrequency(); lockWaitTime = dbCfg.getLockWaitTime(); @@ -343,12 +343,12 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan * */ @Override public void initDataBase() throws IgniteCheckedException { - Long cpBufSize = dbCfg.getCheckpointPageBufferSize(); + Long cpBufSize = dbCfg.getCheckpointingPageBufferSize(); - if (dbCfg.getCheckpointThreads() > 1) + if (dbCfg.getCheckpointingThreads() > 1) asyncRunner = new ThreadPoolExecutor( - dbCfg.getCheckpointThreads(), - dbCfg.getCheckpointThreads(), + dbCfg.getCheckpointingThreads(), + dbCfg.getCheckpointingThreads(), 30L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>() @@ -356,7 +356,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan // Intentionally use identity comparison to check if configuration default has changed. // Noinspection NumberEquality. - if (cpBufSize == PersistentStoreConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE) { + if (cpBufSize == PersistentStoreConfiguration.DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE) { MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration(); assert memCfg != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/3a44e3ac/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java index d22a12f..fd73204 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java @@ -99,7 +99,7 @@ public class IgnitePersistentStoreRecoveryAfterFileCorruptionTest extends GridCo PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); - pCfg.setCheckpointFrequency(500); + pCfg.setCheckpointingFrequency(500); cfg.setPersistentStoreConfiguration(pCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/3a44e3ac/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java index db1f644..26e2aa6 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java @@ -32,7 +32,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.configuration.PersistentStoreConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE; +import static org.apache.ignite.configuration.PersistentStoreConfiguration.DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE; /** * @@ -67,7 +67,7 @@ public class IgnitePersistentStoreWalTlbSelfTest extends GridCommonAbstractTest cfg.setPersistentStoreConfiguration( new PersistentStoreConfiguration() - .setCheckpointPageBufferSize(DFLT_CHECKPOINT_PAGE_BUFFER_SIZE + 1) + .setCheckpointingPageBufferSize(DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE + 1) ); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/3a44e3ac/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java index 7f4f287..e85c639 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java @@ -167,7 +167,7 @@ public class RebalancingOnNotStableTopologyTest extends GridCommonAbstractTest { PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); - pCfg.setCheckpointFrequency(CHECKPOINT_FREQUENCY); + pCfg.setCheckpointingFrequency(CHECKPOINT_FREQUENCY); cfg.setPersistentStoreConfiguration(pCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/3a44e3ac/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java index 074b408..3d57ba4 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java @@ -125,7 +125,7 @@ public class TransactionsHangTest extends GridCommonAbstractTest { PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); pCfg.setWalHistorySize(1); - pCfg.setCheckpointFrequency(CHECKPOINT_FREQUENCY); + pCfg.setCheckpointingFrequency(CHECKPOINT_FREQUENCY); cfg.setPersistentStoreConfiguration(pCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/3a44e3ac/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java index 92629f7..f444505 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java @@ -106,7 +106,7 @@ public class PageStoreCheckpointSimulationSelfTest extends GridCommonAbstractTes PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); - pCfg.setCheckpointFrequency(500); + pCfg.setCheckpointingFrequency(500); cfg.setPersistentStoreConfiguration(pCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/3a44e3ac/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java index cf0684a..fa53723 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java @@ -116,7 +116,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { pCfg.setWalHistorySize(WAL_HIST_SIZE); if (checkpointFreq != null) - pCfg.setCheckpointFrequency(checkpointFreq); + pCfg.setCheckpointingFrequency(checkpointFreq); cfg.setPersistentStoreConfiguration(pCfg);
