Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9B1EA200D27 for ; Wed, 25 Oct 2017 13:06:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 995A9160BDA; Wed, 25 Oct 2017 11:06:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B7BAA1609E5 for ; Wed, 25 Oct 2017 13:06:52 +0200 (CEST) Received: (qmail 81855 invoked by uid 500); 25 Oct 2017 11:06:52 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 81846 invoked by uid 99); 25 Oct 2017 11:06:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Oct 2017 11:06:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D065EDFA0C; Wed, 25 Oct 2017 11:06:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: <26bfecf7cd2640f2be5106b5c53c7316@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-6748 Web Console: Added checkpointPageBufferSize for DataRegionConfiguration. Date: Wed, 25 Oct 2017 11:06:51 +0000 (UTC) archived-at: Wed, 25 Oct 2017 11:06:53 -0000 Repository: ignite Updated Branches: refs/heads/ignite-6748 9c0b0f07f -> 31a8b9a14 IGNITE-6748 Web Console: Added checkpointPageBufferSize for DataRegionConfiguration. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31a8b9a1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31a8b9a1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31a8b9a1 Branch: refs/heads/ignite-6748 Commit: 31a8b9a14ffc29e7fe4d2c78936f1fb7506b4b6f Parents: 9c0b0f0 Author: vsisko Authored: Wed Oct 25 18:06:48 2017 +0700 Committer: Alexey Kuznetsov Committed: Wed Oct 25 18:06:48 2017 +0700 ---------------------------------------------------------------------- .../visor/node/VisorDataRegionConfiguration.java | 13 +++++++++++++ .../visor/node/VisorDataStorageConfiguration.java | 2 +- modules/web-console/backend/app/mongo.js | 6 ++++-- .../configuration/generator/ConfigurationGenerator.js | 5 ++++- .../generator/defaults/Cluster.service.js | 3 ++- .../states/configuration/clusters/data-storage.pug | 6 ++++++ 6 files changed, 30 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/31a8b9a1/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataRegionConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataRegionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataRegionConfiguration.java index 394e294..179e789 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataRegionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataRegionConfiguration.java @@ -68,6 +68,9 @@ public class VisorDataRegionConfiguration extends VisorDataTransferObject { /** Enable Ignite Native Persistence. */ private boolean persistenceEnabled; + /** Temporary buffer size for checkpoints in bytes. */ + private long checkpointPageBufSize; + /** * Default constructor. */ @@ -94,6 +97,7 @@ public class VisorDataRegionConfiguration extends VisorDataTransferObject { metricsSubIntervalCount = plc.getMetricsSubIntervalCount(); metricsRateTimeInterval = plc.getMetricsRateTimeInterval(); persistenceEnabled = plc.isPersistenceEnabled(); + checkpointPageBufSize = plc.getCheckpointPageBufferSize(); } /** @@ -188,6 +192,13 @@ public class VisorDataRegionConfiguration extends VisorDataTransferObject { return persistenceEnabled; } + /** + * @return Amount of memory allocated for a checkpoint temporary buffer in bytes. + */ + public long getCheckpointPageBufferSize() { + return checkpointPageBufSize; + } + /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { U.writeString(out, name); @@ -201,6 +212,7 @@ public class VisorDataRegionConfiguration extends VisorDataTransferObject { out.writeInt(metricsSubIntervalCount); out.writeLong(metricsRateTimeInterval); out.writeBoolean(persistenceEnabled); + out.writeLong(checkpointPageBufSize); } /** {@inheritDoc} */ @@ -216,6 +228,7 @@ public class VisorDataRegionConfiguration extends VisorDataTransferObject { metricsSubIntervalCount = in.readInt(); metricsRateTimeInterval = in.readLong(); persistenceEnabled = in.readBoolean(); + checkpointPageBufSize = in.readLong(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/31a8b9a1/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java index 72d3c11..8470fe1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorDataStorageConfiguration.java @@ -390,7 +390,7 @@ public class VisorDataStorageConfiguration extends VisorDataTransferObject { U.writeString(out, storagePath); out.writeLong(checkpointFreq); out.writeLong(lockWaitTime); - out.writeLong(checkpointPageBufSize); + out.writeLong(0); out.writeInt(checkpointThreads); U.writeEnum(out, checkpointWriteOrder); out.writeInt(walHistSize); http://git-wip-us.apache.org/repos/asf/ignite/blob/31a8b9a1/modules/web-console/backend/app/mongo.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js index b4bc9fc..5b02a72 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -977,7 +977,8 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose metricsEnabled: Boolean, metricsSubIntervalCount: Number, metricsRateTimeInterval: Number, - persistenceEnabled: Boolean + persistenceEnabled: Boolean, + checkpointPageBufferSize: Number }, dataRegionConfigurations: [{ name: String, @@ -990,7 +991,8 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose metricsEnabled: Boolean, metricsSubIntervalCount: Number, metricsRateTimeInterval: Number, - persistenceEnabled: Boolean + persistenceEnabled: Boolean, + checkpointPageBufferSize: Number }], storagePath: String, metricsEnabled: Boolean, http://git-wip-us.apache.org/repos/asf/ignite/blob/31a8b9a1/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js index d9342e7..1b12d52 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js @@ -1345,7 +1345,7 @@ export default class IgniteConfigurationGenerator { static dataRegionConfiguration(dataRegionCfg) { const plcBean = new Bean('org.apache.ignite.configuration.DataRegionConfiguration', 'dataRegionCfg', dataRegionCfg, clusterDflts.dataStorageConfiguration.dataRegionConfigurations); - return plcBean.stringProperty('name') + plcBean.stringProperty('name') .longProperty('initialSize') .longProperty('maxSize') .stringProperty('swapPath') @@ -1354,8 +1354,11 @@ export default class IgniteConfigurationGenerator { .intProperty('emptyPagesPoolSize') .intProperty('metricsSubIntervalCount') .longProperty('metricsRateTimeInterval') + .longProperty('checkpointPageBufferSize') .boolProperty('metricsEnabled') .boolProperty('persistenceEnabled'); + + return plcBean; } // Generate data storage configuration. http://git-wip-us.apache.org/repos/asf/ignite/blob/31a8b9a1/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js index bafb202..f636869 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/defaults/Cluster.service.js @@ -327,7 +327,8 @@ const DFLT_CLUSTER = { emptyPagesPoolSize: 100, metricsEnabled: false, metricsSubIntervalCount: 5, - metricsRateTimeInterval: 60000 + metricsRateTimeInterval: 60000, + checkpointPageBufferSize: 0 }, metricsEnabled: false, alwaysWriteFullPages: false, http://git-wip-us.apache.org/repos/asf/ignite/blob/31a8b9a1/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug index a635739..82c6dbe 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/data-storage.pug @@ -102,6 +102,9 @@ include /app/helpers/jade/mixins +number('Metrics rate time interval:', dfltRegionModel + '.metricsRateTimeInterval', '"DfltRegionRateTimeInterval" + $index', 'true', '60000', '1000', 'Time interval for allocation rate and eviction rate monitoring purposes') .details-row + +number('Checkpoint page buffer:', dfltRegionModel + '.checkpointPageBufferSize', '"DfltCheckpointPageBufferSize" + $index', + 'true', '0', '0', 'Amount of memory allocated for a checkpoint temporary buffer in bytes') + .details-row +checkbox('Metrics enabled', dfltRegionModel + '.metricsEnabled', '"DfltRegionMetricsEnabled" + $index', 'Whether memory metrics are enabled by default on node startup') .details-row @@ -156,6 +159,9 @@ include /app/helpers/jade/mixins .settings-row +number('Metrics rate time interval:', 'model.metricsRateTimeInterval', '"DataRegionRateTimeInterval" + $index', 'true', '60000', '1000', 'Time interval for allocation rate and eviction rate monitoring purposes') + .details-row + +number('Checkpoint page buffer:', 'model.checkpointPageBufferSize', '"DataRegionCheckpointPageBufferSize" + $index', + 'true', '0', '0', 'Amount of memory allocated for a checkpoint temporary buffer in bytes') .settings-row +checkbox('Metrics enabled', 'model.metricsEnabled', '"DataRegionMetricsEnabled" + $index', 'Whether memory metrics are enabled by default on node startup')