瀏覽代碼

AMBARI-6928. Remove the restriction for minimum one filesystem check. (jaimin)

Jaimin Jetly 10 年之前
父節點
當前提交
9f7c878c91
共有 2 個文件被更改,包括 5 次插入19 次删除
  1. 1 17
      ambari-web/app/controllers/wizard/step4_controller.js
  2. 4 2
      ambari-web/app/models/stack_service.js

+ 1 - 17
ambari-web/app/controllers/wizard/step4_controller.js

@@ -87,15 +87,6 @@ App.WizardStep4Controller = Em.ArrayController.extend({
     this.filterProperty('isInstalled', false).setEach('isSelected', false);
     this.filterProperty('isInstalled', false).setEach('isSelected', false);
   },
   },
 
 
-  /**
-   * Check whether we should turn on <code>HDFS or GLUSTERFS</code> service
-   * @return {bool}
-   * @method noDFSs
-   */
-  noDFSs: function () {
-    return  !this.filterProperty('isDFS',true).someProperty('isSelected',true);
-  },
-
   /**
   /**
    * Check if multiple distributed file systems were selected
    * Check if multiple distributed file systems were selected
    * @return {bool}
    * @return {bool}
@@ -241,14 +232,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({
     var primaryDFS = this.findProperty('isPrimaryDFS',true);
     var primaryDFS = this.findProperty('isPrimaryDFS',true);
     var primaryDfsDisplayName = primaryDFS.get('displayNameOnSelectServicePage');
     var primaryDfsDisplayName = primaryDFS.get('displayNameOnSelectServicePage');
     var primaryDfsServiceName = primaryDFS.get('serviceName');
     var primaryDfsServiceName = primaryDFS.get('serviceName');
-     if (this.noDFSs()) {
-       this.addValidationError({
-         id: 'fsCheck',
-         callback: this.needToAddServicePopup,
-         callbackParams: [{serviceName: primaryDfsServiceName, selected: true},'fsCheck', primaryDfsDisplayName]
-       });
-     }
-     else if (this.multipleDFSs()) {
+     if (this.multipleDFSs()) {
        var dfsServices = this.filterProperty('isDFS',true).filterProperty('isSelected',true).mapProperty('serviceName');
        var dfsServices = this.filterProperty('isDFS',true).filterProperty('isSelected',true).mapProperty('serviceName');
        var services = dfsServices.map(function (item){
        var services = dfsServices.map(function (item){
          return  {
          return  {

+ 4 - 2
ambari-web/app/models/stack_service.js

@@ -228,14 +228,16 @@ App.StackService.displayOrder = [
 
 
 App.StackService.dependency = {
 App.StackService.dependency = {
   'HDP-1': {
   'HDP-1': {
+    'HDFS': ['MAPREDUCE', 'HBASE', 'SQOOP'],
     'MAPREDUCE': ['PIG', 'OOZIE', 'HIVE'],
     'MAPREDUCE': ['PIG', 'OOZIE', 'HIVE'],
     'ZOOKEEPER': ['HBASE', 'HIVE', 'WEBHCAT']
     'ZOOKEEPER': ['HBASE', 'HIVE', 'WEBHCAT']
   },
   },
   'HDP-2': {
   'HDP-2': {
+    'ZOOKEEPER': ['HDFS', 'HBASE', 'HIVE', 'WEBHCAT', 'STORM'],
+    'HDFS': ['YARN', 'HBASE', 'FLUME', 'SQOOP'],
     'YARN': ['PIG', 'OOZIE', 'HIVE', 'TEZ'],
     'YARN': ['PIG', 'OOZIE', 'HIVE', 'TEZ'],
     'TEZ': ['YARN'],
     'TEZ': ['YARN'],
-    'OOZIE': ['FALCON'],
-    'ZOOKEEPER': ['HDFS', 'HBASE', 'HIVE', 'WEBHCAT', 'STORM']
+    'OOZIE': ['FALCON']
   }
   }
 };
 };