Forráskód Böngészése

AMBARI-5456. Fix UI Unit tests. (onechiporenko)

Oleg Nechiporenko 11 éve
szülő
commit
f6d0436c68

+ 3 - 3
ambari-web/app/utils/configs/defaults_providers/hive_defaults_provider.js

@@ -26,14 +26,14 @@ App.HiveDefaultsProvider = App.YARNDefaultsProvider.extend({
     'hive.auto.convert.join.noconditionaltask.size': null
   },
 
-  getDefaults : function(localDB) {
+  getDefaults: function (localDB) {
     var configs = this._super(localDB);
     if (configs['yarn.scheduler.maximum-allocation-mb'] != null && configs['mapreduce.map.memory.mb'] != null
-        && configs['mapreduce.reduce.memory.mb'] != null) {
+      && configs['mapreduce.reduce.memory.mb'] != null) {
       var containerSize = configs['mapreduce.map.memory.mb'] > 2048 ? configs['mapreduce.map.memory.mb'] : configs['mapreduce.reduce.memory.mb'];
       containerSize = Math.min(configs['yarn.scheduler.maximum-allocation-mb'], containerSize);
       configs['hive.auto.convert.join.noconditionaltask.size'] = Math.round(containerSize / 3) * 1048576; // MB to Bytes
-      configs['hive.tez.java.opts'] = "-server -Xmx"+containerSize+"m -Djava.net.preferIPv4Stack=true";
+      configs['hive.tez.java.opts'] = "-server -Xmx" + containerSize + "m -Djava.net.preferIPv4Stack=true";
       configs['hive.tez.container.size'] = containerSize;
     } else {
       jQuery.extend(configs, this.get('configsTemplate'));

+ 11 - 5
ambari-web/test/utils/configs/defaults_providers/hive_defaults_provider_test.js

@@ -22,7 +22,7 @@ require('utils/configs/defaults_providers/yarn_defaults_provider');
 describe('HiveDefaultsProvider', function() {
 
   describe('#getDefaults', function() {
-    var tests = [
+    var tests = Em.A([
       {
         localDB: {},
         m: 'Empty localDB',
@@ -68,7 +68,9 @@ describe('HiveDefaultsProvider', function() {
           'yarn.scheduler.maximum-allocation-mb': 20480,
           'yarn.scheduler.minimum-allocation-mb': 2560,
           'mapreduce.task.io.sort.mb': 1024,
-          'hive.tez.container.size': 2560
+          'hive.tez.container.size': 2560,
+          'hive.auto.convert.join.noconditionaltask.size': 894435328,
+          'hive.tez.java.opts': '-server -Xmx2560m -Djava.net.preferIPv4Stack=true'
         }
       },
       {
@@ -99,7 +101,9 @@ describe('HiveDefaultsProvider', function() {
           'yarn.scheduler.maximum-allocation-mb': 8192,
           'yarn.scheduler.minimum-allocation-mb': 1024,
           'mapreduce.task.io.sort.mb': 410,
-          'hive.tez.container.size': 1024
+          'hive.tez.container.size': 1024,
+          'hive.auto.convert.join.noconditionaltask.size': 357564416,
+          'hive.tez.java.opts': '-server -Xmx1024m -Djava.net.preferIPv4Stack=true'
         }
       },
       {
@@ -130,10 +134,12 @@ describe('HiveDefaultsProvider', function() {
           'yarn.scheduler.maximum-allocation-mb': 69632,
           'yarn.scheduler.minimum-allocation-mb': 8704,
           'mapreduce.task.io.sort.mb': 1024,
-          'hive.tez.container.size': 8704
+          'hive.tez.container.size': 8704,
+          'hive.auto.convert.join.noconditionaltask.size': 3041918976,
+          'hive.tez.java.opts': '-server -Xmx8704m -Djava.net.preferIPv4Stack=true'
         }
       }
-    ];
+    ]);
     tests.forEach(function(test) {
       describe(test.m, function() {
         var defaultsProvider = App.HiveDefaultsProvider.create();