瀏覽代碼

AMBARI-2857. Fix for changed properties and UI (ncole)

Nate Cole 12 年之前
父節點
當前提交
26fcd451a3
共有 1 個文件被更改,包括 16 次插入6 次删除
  1. 16 6
      ambari-web/app/controllers/main/service/info/configs.js

+ 16 - 6
ambari-web/app/controllers/main/service/info/configs.js

@@ -687,12 +687,22 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
 
 
       if (serviceName === 'HDFS') {
       if (serviceName === 'HDFS') {
         var hdfsConfigs = self.get('stepConfigs').findProperty('serviceName', 'HDFS').get('configs');
         var hdfsConfigs = self.get('stepConfigs').findProperty('serviceName', 'HDFS').get('configs');
-        if (
-          hdfsConfigs.findProperty('name', 'dfs_name_dir').get('isNotDefaultValue') ||
-          hdfsConfigs.findProperty('name', 'fs_checkpoint_dir').get('isNotDefaultValue') ||
-          hdfsConfigs.findProperty('name', 'dfs_data_dir').get('isNotDefaultValue')
-        ) {
-          dirChanged = true;
+        if (App.get('isHadoop2Stack')) {
+          if (
+            hdfsConfigs.findProperty('name', 'dfs_namenode_name_dir').get('isNotDefaultValue') ||
+            hdfsConfigs.findProperty('name', 'dfs_namenode_checkpoint_dir').get('isNotDefaultValue') ||
+            hdfsConfigs.findProperty('name', 'dfs_datanode_data_dir').get('isNotDefaultValue')
+          ) {
+            dirChanged = true;
+          }
+        } else {
+          if (
+            hdfsConfigs.findProperty('name', 'dfs_name_dir').get('isNotDefaultValue') ||
+            hdfsConfigs.findProperty('name', 'fs_checkpoint_dir').get('isNotDefaultValue') ||
+            hdfsConfigs.findProperty('name', 'dfs_data_dir').get('isNotDefaultValue')
+          ) {
+            dirChanged = true;
+          }
         }
         }
       } else if (serviceName === 'MAPREDUCE') {
       } else if (serviceName === 'MAPREDUCE') {
         var mapredConfigs = self.get('stepConfigs').findProperty('serviceName', 'MAPREDUCE').get('configs');
         var mapredConfigs = self.get('stepConfigs').findProperty('serviceName', 'MAPREDUCE').get('configs');