You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/07/12 11:14:45 UTC
[1/2] ignite git commit: IGNITE-5479 - Move constant
Repository: ignite
Updated Branches:
refs/heads/ignite-5479 af770d70a -> f3ec031d7
IGNITE-5479 - Move constant
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f3f5889
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f3f5889
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f3f5889
Branch: refs/heads/ignite-5479
Commit: 0f3f5889d6b88c7094864ebde078a853559dff0f
Parents: d6b558b
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Jul 12 14:13:44 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Jul 12 14:13:44 2017 +0300
----------------------------------------------------------------------
.../ignite/configuration/PersistentStoreConfiguration.java | 3 ---
.../cache/persistence/GridCacheDatabaseSharedManager.java | 5 ++++-
.../cache/persistence/db/wal/IgnitePdsWalTlbTest.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f3f5889/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 7706bf3..e8a0ff4 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
@@ -44,9 +44,6 @@ public class PersistentStoreConfiguration implements Serializable {
/** Default length of interval over which rate-based metric is calculated. */
public static final int DFLT_RATE_TIME_INTERVAL_MILLIS = 60_000;
- /** Default checkpointing page buffer size (may be adjusted by Ignite). */
- public static final Long DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE = 256L * 1024 * 1024 * 1024;
-
/** Default number of checkpointing threads. */
public static final int DFLT_CHECKPOINTING_THREADS = 1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f3f5889/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 122d460..c90dc1e 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
@@ -150,6 +150,9 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
/** */
public static final String IGNITE_PDS_CHECKPOINT_TEST_SKIP_SYNC = "IGNITE_PDS_CHECKPOINT_TEST_SKIP_SYNC";
+ /** Default checkpointing page buffer size (may be adjusted by Ignite). */
+ public static final Long DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE = 256L * 1024 * 1024 * 1024;
+
/** Skip sync. */
private final boolean skipSync = IgniteSystemProperties.getBoolean(IGNITE_PDS_CHECKPOINT_TEST_SKIP_SYNC);
@@ -391,7 +394,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
// Intentionally use identity comparison to check if configuration default has changed.
//noinspection NumberEquality
if (cpBufSize == 0L) {
- cpBufSize = PersistentStoreConfiguration.DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE;
+ cpBufSize = DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE;
MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f3f5889/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
index a1a7286..fd0fd34 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgnitePdsWalTlbTest.java
@@ -31,7 +31,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_CHECKPOINTING_PAGE_BUFFER_SIZE;
+import static org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager.DFLT_CHECKPOINTING_PAGE_BUFFER_SIZE;
/**
*
[2/2] ignite git commit: Merge branch 'ignite-5479' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-5479
Posted by ag...@apache.org.
Merge branch 'ignite-5479' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5479
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3ec031d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3ec031d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3ec031d
Branch: refs/heads/ignite-5479
Commit: f3ec031d7f2c8dff321ca95faaa9ee55c834606a
Parents: 0f3f588 af770d7
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Jul 12 14:14:11 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Jul 12 14:14:11 2017 +0300
----------------------------------------------------------------------
.../node/VisorPersistentStoreConfiguration.java | 4 ++--
.../Config/spring-test.xml | 4 ++++
.../IgniteConfigurationTest.cs | 8 +++++--
.../PersistentStoreConfiguration.cs | 25 +++++++++++++-------
modules/web-console/backend/app/mongo.js | 2 +-
.../generator/ConfigurationGenerator.js | 8 +++----
.../generator/defaults/Cluster.service.js | 2 +-
.../configuration/clusters/persistence.pug | 2 +-
8 files changed, 36 insertions(+), 19 deletions(-)
----------------------------------------------------------------------