You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/07/12 10:06:17 UTC
ignite git commit: IGNITE-5479 Fixed Visor and Web Console.
Repository: ignite
Updated Branches:
refs/heads/ignite-5479 73aebfe69 -> fbc4b67c0
IGNITE-5479 Fixed Visor and Web Console.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fbc4b67c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fbc4b67c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fbc4b67c
Branch: refs/heads/ignite-5479
Commit: fbc4b67c0f195cbda2f5256160da2f4dca942eb1
Parents: 73aebfe
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Jul 12 17:06:04 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Jul 12 17:06:04 2017 +0700
----------------------------------------------------------------------
.../visor/node/VisorPersistentStoreConfiguration.java | 4 ++--
modules/web-console/backend/app/mongo.js | 2 +-
.../configuration/generator/ConfigurationGenerator.js | 8 ++++----
.../configuration/generator/defaults/Cluster.service.js | 2 +-
.../modules/states/configuration/clusters/persistence.pug | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbc4b67c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPersistentStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPersistentStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPersistentStoreConfiguration.java
index abbab4c..128f43a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPersistentStoreConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPersistentStoreConfiguration.java
@@ -138,7 +138,7 @@ public class VisorPersistentStoreConfiguration extends VisorDataTransferObject {
/**
* @return Checkpointing page buffer size in bytes.
*/
- public Long getCheckpointingPageBufferSize() {
+ public long getCheckpointingPageBufferSize() {
return checkpointingPageBufSize;
}
@@ -236,7 +236,7 @@ public class VisorPersistentStoreConfiguration extends VisorDataTransferObject {
/**
* Gets the fsync delay, in nanoseconds.
*/
- public long getWalFsyncDelay() {
+ public long getWalFsyncDelayNanos() {
return walFsyncDelay;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbc4b67c/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 aa11e0b..57af928 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -1006,7 +1006,7 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
walSegmentSize: Number,
walHistorySize: Number,
walFlushFrequency: Number,
- walFsyncDelay: Number,
+ walFsyncDelayNanos: Number,
walRecordIteratorBufferSize: Number,
lockWaitTime: Number,
rateTimeInterval: Number,
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbc4b67c/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 8c9b14c..8299b9b 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1477,17 +1477,17 @@ export default class IgniteConfigurationGenerator {
.boolProperty('metricsEnabled')
.boolProperty('alwaysWriteFullPages')
.intProperty('checkpointingFrequency')
- .intProperty('checkpointingPageBufferSize')
+ .longProperty('checkpointingPageBufferSize')
.intProperty('checkpointingThreads')
.stringProperty('walStorePath')
.stringProperty('walArchivePath')
.intProperty('walSegments')
.intProperty('walSegmentSize')
.intProperty('walHistorySize')
- .intProperty('walFlushFrequency')
- .intProperty('walFsyncDelay')
+ .longProperty('walFlushFrequency')
+ .longProperty('walFsyncDelayNanos')
.intProperty('walRecordIteratorBufferSize')
- .intProperty('lockWaitTime')
+ .longProperty('lockWaitTime')
.intProperty('rateTimeInterval')
.intProperty('tlbSize')
.intProperty('subIntervals');
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbc4b67c/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 a4680bf..1c7fc44 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
@@ -340,7 +340,7 @@ const DFLT_CLUSTER = {
walSegmentSize: 67108864,
walHistorySize: 20,
walFlushFrequency: 2000,
- walFsyncDelay: 1,
+ walFsyncDelayNanos: 1000,
walRecordIteratorBufferSize: 67108864,
lockWaitTime: 10000,
rateTimeInterval: 60000,
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbc4b67c/modules/web-console/frontend/app/modules/states/configuration/clusters/persistence.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/persistence.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/persistence.pug
index 7fd0966..50a569b 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/persistence.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/persistence.pug
@@ -62,7 +62,7 @@ include /app/helpers/jade/mixins
+number('WAL flush frequency:', `${model}.walFlushFrequency`, '"PersistenceWalFlushFrequency"', enabled, '2000', '1',
'How often will be fsync, in milliseconds. In background mode, exist thread which do fsync by timeout')
.settings-row
- +number('WAL fsync delay:', `${model}.walFsyncDelay`, '"PersistenceWalFsyncDelay"', enabled, '1', '1', 'WAL fsync delay, in nanoseconds')
+ +number('WAL fsync delay:', `${model}.walFsyncDelayNanos`, '"PersistenceWalFsyncDelay"', enabled, '1000', '1', 'WAL fsync delay, in nanoseconds')
.settings-row
+number('WAL record iterator buffer size:', `${model}.walRecordIteratorBufferSize`, '"PersistenceWalRecordIteratorBufferSize"', enabled, '67108864', '1',
'How many bytes iterator read from disk(for one reading), during go ahead WAL')