ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [58/59] [abbrv] ignite git commit: IGNITE-4988 Code cleanup for ignite-2.0.
Date Fri, 28 Apr 2017 06:58:19 GMT
IGNITE-4988 Code cleanup for ignite-2.0.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/14f4b33f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/14f4b33f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/14f4b33f

Branch: refs/heads/master
Commit: 14f4b33f1b49392ded97eeb49fa16fae62d17606
Parents: 33f68e2
Author: Vasiliy Sisko <vsisko@gridgain.com>
Authored: Fri Apr 28 13:51:34 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Apr 28 13:51:34 2017 +0700

----------------------------------------------------------------------
 modules/web-console/backend/app/mongo.js        | 68 +++++++++++++++++++-
 .../modules/configuration/Version.service.js    |  2 +-
 .../generator/ConfigurationGenerator.js         |  2 -
 .../frontend/app/modules/demo/Demo.module.js    |  4 +-
 4 files changed, 69 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/14f4b33f/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 e16aa02..b525419 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -258,6 +258,7 @@ module.exports.factory = function(passportMongo, settings, pluginMongo,
mongoose
         writeBehindFlushSize: Number,
         writeBehindFlushFrequency: Number,
         writeBehindFlushThreadCount: Number,
+        writeBehindCoalescing: Boolean,
 
         invalidate: Boolean,
         defaultLockTimeout: Number,
@@ -319,7 +320,11 @@ module.exports.factory = function(passportMongo, settings, pluginMongo,
mongoose
                     maxSize: Number
                 }
             }
-        }
+        },
+        evictionFilter: String,
+        memoryPolicyName: String,
+        sqlIndexMaxInlineSize: Number,
+        topologyValidator: String
     });
 
     CacheSchema.index({name: 1, space: 1}, {unique: true});
@@ -365,7 +370,8 @@ module.exports.factory = function(passportMongo, settings, pluginMongo,
mongoose
             userName: String
         },
         colocateMetadata: Boolean,
-        relaxedConsistency: Boolean
+        relaxedConsistency: Boolean,
+        updateFileLenOnFlush: Boolean
     });
 
     IgfsSchema.index({name: 1, space: 1}, {unique: true});
@@ -377,6 +383,7 @@ module.exports.factory = function(passportMongo, settings, pluginMongo,
mongoose
     const ClusterSchema = new Schema({
         space: {type: ObjectId, ref: 'Space', index: true},
         name: {type: String},
+        activeOnStart: Boolean,
         localHost: String,
         discovery: {
             localAddress: String,
@@ -850,6 +857,63 @@ module.exports.factory = function(passportMongo, settings, pluginMongo,
mongoose
             Custom: {
                 className: String
             }
+        },
+        warmupClosure: String,
+        hadoopConfiguration: {
+            finishedJobInfoTtl: Number,
+            mapReducePlanner: String,
+            maxParallelTasks: Number,
+            naxTaskQueueSize: Number,
+            nativeLibraryNames: [String]
+        },
+        serviceConfigurations: [{
+            name: String,
+            service: String,
+            maxPerNodeCount: Number,
+            totalCount: Number,
+            nodeFilter: {
+                kind: {type: String, enum: ['Default', 'Exclude', 'IGFS', 'OnNodes', 'Custom']},
+                Exclude: {
+                    nodeId: String
+                },
+                IGFS: {
+                    igfs: {type: ObjectId, ref: 'Igfs'}
+                },
+                Custom: {
+                    className: String
+                }
+            },
+            cache: {type: ObjectId, ref: 'Cache'},
+            affinityKey: String
+        }],
+        cacheSanityCheckEnabled: Boolean,
+        classLoader: String,
+        consistentId: String,
+        failureDetectionTimeout: Number,
+        workDirectory: String,
+        lateAffinityAssignment: Boolean,
+        utilityCacheKeepAliveTime: Number,
+        asyncCallbackPoolSize: Number,
+        dataStreamerThreadPoolSize: Number,
+        queryThreadPoolSize: Number,
+        stripedPoolSize: Number,
+        serviceThreadPoolSize: Number,
+        utilityCacheThreadPoolSize: Number,
+        executorConfiguration: [{
+            name: String,
+            poolSize: Number
+        }],
+        memoryConfiguration: {
+            pageSize: Number,
+            systemCacheMemorySize: Number,
+            concurrencyLevel: Number,
+            defaultMemoryPolicyName: String,
+            memoryPolicies: [{
+                name: String,
+                maxSize: Number,
+                swapFilePath: String,
+                pageEvictionMode: {type: String, enum: ['DISABLED', 'RANDOM_LRU', 'RANDOM_2_LRU']}
+            }]
         }
     });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/14f4b33f/modules/web-console/frontend/app/modules/configuration/Version.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/Version.service.js b/modules/web-console/frontend/app/modules/configuration/Version.service.js
index 164bd20..1cbe635 100644
--- a/modules/web-console/frontend/app/modules/configuration/Version.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/Version.service.js
@@ -24,7 +24,7 @@ const numberComparator = (a, b) => a > b ? 1 : a < b ? -1 : 0;
 
 export default class IgniteVersion {
     /** Current product version. */
-    static ignite = '1.9.0';
+    static ignite = '2.0.0';
 
     /**
      * Tries to parse product version from it's string representation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/14f4b33f/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 354a8ff..8856e03 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -1769,8 +1769,6 @@ export default class IgniteConfigurationGenerator {
             return cfg;
 
         cfg.stringProperty('name')
-            .stringProperty('name', 'dataCacheName', (name) => name + '-data')
-            .stringProperty('name', 'metaCacheName', (name) => name + '-meta')
             .enumProperty('defaultMode');
 
         return cfg;

http://git-wip-us.apache.org/repos/asf/ignite/blob/14f4b33f/modules/web-console/frontend/app/modules/demo/Demo.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/demo/Demo.module.js b/modules/web-console/frontend/app/modules/demo/Demo.module.js
index dc763b3..99ea2cb 100644
--- a/modules/web-console/frontend/app/modules/demo/Demo.module.js
+++ b/modules/web-console/frontend/app/modules/demo/Demo.module.js
@@ -117,7 +117,7 @@ angular
         return items;
     }];
 }])
-.service('DemoInfo', ['$rootScope', '$modal', '$state', '$q', 'igniteDemoInfo', 'AgentManager',
($rootScope, $modal, $state, $q, igniteDemoInfo, agentMonitor) => {
+.service('DemoInfo', ['$rootScope', '$modal', '$state', '$q', 'igniteDemoInfo', 'AgentManager',
($rootScope, $modal, $state, $q, igniteDemoInfo, agentMgr) => {
     const scope = $rootScope.$new();
 
     let closePromise = null;
@@ -165,7 +165,7 @@ angular
 
             return dialog.$promise
                 .then(dialog.show)
-                .then(() => Promise.race([agentMonitor.awaitAgent(), closePromise.promise]))
+                .then(() => Promise.race([agentMgr.awaitAgent(), closePromise.promise]))
                 .then(() => scope.hasAgents = true);
         }
     };


Mime
View raw message