You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mi...@apache.org on 2016/05/03 08:18:50 UTC
ambari git commit: AMBARI-14605: '[RAM_DISK]' configured in
dfs.datanode.data.dir validates failed (yaolei via mithmatt)
Repository: ambari
Updated Branches:
refs/heads/trunk f57185fbf -> 1fce0cabb
AMBARI-14605: '[RAM_DISK]' configured in dfs.datanode.data.dir validates failed (yaolei via mithmatt)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1fce0cab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1fce0cab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1fce0cab
Branch: refs/heads/trunk
Commit: 1fce0cabb96da233a283dcb428a3abd93fc8cd4c
Parents: f57185f
Author: Matt <mm...@pivotal.io>
Authored: Mon May 2 23:16:52 2016 -0700
Committer: Matt <mm...@pivotal.io>
Committed: Mon May 2 23:16:52 2016 -0700
----------------------------------------------------------------------
ambari-web/app/utils/validator.js | 6 +++---
ambari-web/test/utils/validator_test.js | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1fce0cab/ambari-web/app/utils/validator.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/validator.js b/ambari-web/app/utils/validator.js
index 9d11746..2906749 100644
--- a/ambari-web/app/utils/validator.js
+++ b/ambari-web/app/utils/validator.js
@@ -76,9 +76,9 @@ module.exports = {
* @returns {boolean}
*/
isValidDataNodeDir: function(value) {
- var dirRegex = /^(\[[0-9a-zA-Z]+\])?(file:\/\/)?(\/[0-9a-z]*)/;
- var winRegex = /^(\[[0-9a-zA-Z]+\])?[a-zA-Z]:\\[0-9a-zA-Z]*/;
- var winUrlRegex = /^(\[[0-9a-zA-Z]+\])?file:\/\/\/[a-zA-Z]:\/[0-9a-zA-Z]*/;
+ var dirRegex = /^(\[[0-9a-zA-Z]+_?[0-9a-zA-Z]+\])?(file:\/\/)?(\/[0-9a-z]*)/;
+ var winRegex = /^(\[[0-9a-zA-Z]+_?[0-9a-zA-Z]+\])?[a-zA-Z]:\\[0-9a-zA-Z]*/;
+ var winUrlRegex = /^(\[[0-9a-zA-Z]+_?[0-9a-zA-Z]+\])?file:\/\/\/[a-zA-Z]:\/[0-9a-zA-Z]*/;
var dirs = value.split(',');
if (dirs.some(function (i) {return i.startsWith(' '); })) {
return false;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1fce0cab/ambari-web/test/utils/validator_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/validator_test.js b/ambari-web/test/utils/validator_test.js
index ef90561..f70d1ba 100644
--- a/ambari-web/test/utils/validator_test.js
+++ b/ambari-web/test/utils/validator_test.js
@@ -332,7 +332,10 @@ describe('validator', function () {
{m:'"[ssd] /1a2b3c" - invalid',i:'[ssd] /1a2b3c',e:false},
{m:'"[/1a2b3c]" - invalid',i:'[/1a2b3c]',e:false},
{m:'"[s]ss /sd" - invalid',i:'[s]ss /sd',e:false},
- {m:'" [s]ss/sd" - invalid',i:' [s]ss/sd',e:false}
+ {m:'" [s]ss/sd" - invalid',i:' [s]ss/sd',e:false},
+ {m:'"[RAM_DISK]/1a2b3c" - valid',i:'[RAM_DISK]/1a2b3c',e:true},
+ {m:'"[RAMDISK_]/1a2b3c" - invalid',i:'[RAMDISK_]/1a2b3c',e:false},
+ {m:'"[_RAMDISK]/1a2b3c" - invalid',i:'[_RAMDISK]/1a2b3c',e:false}
];
tests.forEach(function(test) {
it(test.m + ' ', function () {