Selaa lähdekoodia

AMBARI-8275 Ambari does not allow Heterogenous Storage directory configuration. (ababiichuk)

aBabiichuk 10 vuotta sitten
vanhempi
commit
2fdf2403a1
2 muutettua tiedostoa jossa 3 lisäystä ja 2 poistoa
  1. 2 2
      ambari-web/app/utils/validator.js
  2. 1 0
      ambari-web/test/utils/validator_test.js

+ 2 - 2
ambari-web/app/utils/validator.js

@@ -62,10 +62,10 @@ module.exports = {
    * @returns {boolean}
    */
   isValidDataNodeDir: function(value) {
-    var floatRegex = /^(\[[0-9a-z]+\])?(\/[0-9a-z]*)/;
+    var dirRegex = /^(\[[0-9a-zA-Z]+\])?(\/[0-9a-z]*)/;
     var dirs = value.replace(/,/g,' ').trim().split(new RegExp("\\s+", "g"));
     for(var i = 0; i < dirs.length; i++){
-      if(!floatRegex.test(dirs[i])){
+      if(!dirRegex.test(dirs[i])){
         return false;
       }
     }

+ 1 - 0
ambari-web/test/utils/validator_test.js

@@ -306,6 +306,7 @@ describe('validator', function () {
       {m:'"/abc" - valid',i:'/abc',e:true},
       {m:'"/1a2b3c" - valid',i:'/1a2b3c',e:true},
       {m:'"[ssd]/1a2b3c" - valid',i:'[ssd]/1a2b3c',e:true},
+      {m:'"[DISK]/1a2b3c" - valid',i:'[DISK]/1a2b3c',e:true},
       {m:'"[] /1a2b3c" - invalid',i:'[] /1a2b3c',e:false},
       {m:'"[ssd] /1a2b3c" - invalid',i:'[ssd] /1a2b3c',e:false},
       {m:'"[/1a2b3c]" - invalid',i:'[/1a2b3c]',e:false},