ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [2/2] ignite git commit: IGNITE-1200 Fixed IGFS placeholder and server-side code generation.
Date Tue, 03 Nov 2015 04:47:04 GMT
IGNITE-1200 Fixed IGFS placeholder and server-side code generation.


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

Branch: refs/heads/ignite-843-rc1
Commit: 6ef6c0be6de7890d680b75b614e64c8c88890725
Parents: 31f19a1
Author: vsisko <vsisko@gridgain.com>
Authored: Tue Nov 3 11:47:11 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Nov 3 11:47:11 2015 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/controllers/models/igfs.json  | 2 ++
 modules/control-center-web/src/main/js/db.js                     | 3 ++-
 .../src/main/js/routes/generator/generator-java.js               | 4 ++--
 .../src/main/js/routes/generator/generator-xml.js                | 4 ++--
 modules/control-center-web/src/main/js/routes/summary.js         | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6ef6c0be/modules/control-center-web/src/main/js/controllers/models/igfs.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/igfs.json b/modules/control-center-web/src/main/js/controllers/models/igfs.json
index 0d08f4c..9bef578 100644
--- a/modules/control-center-web/src/main/js/controllers/models/igfs.json
+++ b/modules/control-center-web/src/main/js/controllers/models/igfs.json
@@ -274,6 +274,7 @@
           "id": "maxSpaceSize",
           "type": "number",
           "model": "maxSpaceSize",
+          "placeholder": 0,
           "tip": [
             "Maximum space available for data cache to store file system entries"
           ]
@@ -283,6 +284,7 @@
           "id": "maximumTaskRangeLength",
           "type": "number",
           "model": "maximumTaskRangeLength",
+          "placeholder": 0,
           "tip": [
             "Maximum default range size of a file being split during IGFS task execution"
           ]

http://git-wip-us.apache.org/repos/asf/ignite/blob/6ef6c0be/modules/control-center-web/src/main/js/db.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js
index df0284f..97c41c6 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -425,7 +425,8 @@ var ClusterSchema = new Schema({
 ClusterSchema.plugin(deepPopulate, {
     whitelist: [
         'caches',
-        'caches.metadatas'
+        'caches.metadatas',
+        'igfss'
     ]
 });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/6ef6c0be/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index 6ed6382..0f86c2c 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -1704,8 +1704,8 @@ $generatorJava.igfsMisc = function(igfs, varName, res) {
     $generatorJava.property(res, varName, igfs, 'blockSize', null, null, 65536);
     $generatorJava.property(res, varName, igfs, 'streamBufferSize', null, null, 65536);
     $generatorJava.property(res, varName, igfs, 'defaultMode', res.importClass('org.apache.ignite.igfs.IgfsMode'),
undefined, "DUAL_ASYNC");
-    $generatorJava.property(res, varName, igfs, 'maxSpaceSize');
-    $generatorJava.property(res, varName, igfs, 'maximumTaskRangeLength');
+    $generatorJava.property(res, varName, igfs, 'maxSpaceSize', null, null, 0);
+    $generatorJava.property(res, varName, igfs, 'maximumTaskRangeLength', null, null, 0);
     $generatorJava.property(res, varName, igfs, 'managementPort', null, null, 11400);
 
     if (igfs.pathModes && igfs.pathModes.length > 0) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/6ef6c0be/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
index f759b80..984042d 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
@@ -1259,8 +1259,8 @@ $generatorXml.igfsMisc = function(igfs, res) {
     $generatorXml.property(res, igfs, 'blockSize', undefined, 65536);
     $generatorXml.property(res, igfs, 'streamBufferSize', undefined, 65536);
     $generatorXml.property(res, igfs, 'defaultMode', undefined, "DUAL_ASYNC");
-    $generatorXml.property(res, igfs, 'maxSpaceSize');
-    $generatorXml.property(res, igfs, 'maximumTaskRangeLength');
+    $generatorXml.property(res, igfs, 'maxSpaceSize', undefined, 0);
+    $generatorXml.property(res, igfs, 'maximumTaskRangeLength', undefined, 0);
     $generatorXml.property(res, igfs, 'managementPort', undefined, 11400);
 
     res.needEmptyLine = true;

http://git-wip-us.apache.org/repos/asf/ignite/blob/6ef6c0be/modules/control-center-web/src/main/js/routes/summary.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/summary.js b/modules/control-center-web/src/main/js/routes/summary.js
index a9ce2c5..80aa97f 100644
--- a/modules/control-center-web/src/main/js/routes/summary.js
+++ b/modules/control-center-web/src/main/js/routes/summary.js
@@ -38,7 +38,7 @@ router.get('/', function (req, res) {
 
 router.post('/download', function (req, res) {
     // Get cluster with all inner objects (caches, metadata).
-    db.Cluster.findById(req.body._id).deepPopulate('caches caches.metadatas').exec(function
(err, cluster) {
+    db.Cluster.findById(req.body._id).deepPopulate('caches caches.metadatas igfss').exec(function
(err, cluster) {
         if (err)
             return res.status(500).send(err.message);
 


Mime
View raw message