ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eb...@apache.org
Subject git commit: AMBARI-6152 Review screen blank before deployment (2.1.GlusterFS stack) (Scott Creeley via eboyd)
Date Tue, 17 Jun 2014 21:49:25 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.6.0 16df034d8 -> 0d9ca5ba6


AMBARI-6152 Review screen blank before deployment (2.1.GlusterFS stack) (Scott Creeley via
eboyd)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0d9ca5ba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d9ca5ba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d9ca5ba

Branch: refs/heads/branch-1.6.0
Commit: 0d9ca5ba640ff3d094d211855384a8c11d680c6e
Parents: 16df034
Author: Erin Boyd <eboyd@eboyd.csb>
Authored: Tue Jun 17 15:14:23 2014 -0600
Committer: Erin Boyd <eboyd@eboyd.csb>
Committed: Tue Jun 17 15:14:23 2014 -0600

----------------------------------------------------------------------
 .../stacks/HDP/2.1.GlusterFS/metainfo.xml       |  4 ++--
 .../data/stacks/HDP-2.1/service_components.json | 24 ++++++++++++++++++++
 .../app/controllers/wizard/step8_controller.js  |  6 +++++
 ambari-web/app/data/review_configs.js           | 11 ++-------
 4 files changed, 34 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0d9ca5ba/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/metainfo.xml
index e57d66f..1b08fee 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/metainfo.xml
@@ -19,6 +19,6 @@
     <versions>
 	  <active>false</active>
     </versions>
-    <extends>2.1</extends>
-    <!-- <extends>2.0.6</extends> -->
+    <!-- <extends>2.1</extends> -->
+    <extends>2.0.6</extends>
 </metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0d9ca5ba/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
index cd1ac19..454ad58 100644
--- a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
+++ b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
@@ -434,6 +434,30 @@
       ]
     },
     {
+      "href" : "http://localhost:8080/api/v1/stacks/HDP/versions/2.1/stackServices/GLUSTERFS",
+      "StackServices" : { 
+        "comments" : "An HCFS file system", 
+        "service_name" : "GLUSTERFS",
+        "service_version" : "2.1.3.0",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1"
+      },
+      "serviceComponents" : [
+        {
+          "href" : "http://localhost:8080/api/v1/stacks/HDP/versions/2.1/stackServices/GLUSTERFS/serviceComponents/GLUSTERFS",
+          "StackServiceComponents" : {
+            "component_category" : "CLIENT",
+            "component_name" : "GLUSTERFS_CLIENT",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "GLUSTERFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },          
+    {
       "href" : "http://localhost:8080/api/v1/stacks/HDP/versions/2.1/stackServices/STORM",
       "StackServices" : {
         "comments" : "Apache Hadoop Stream processing framework",

http://git-wip-us.apache.org/repos/asf/ambari/blob/0d9ca5ba/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 4aadcda..94ce1dc 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -651,6 +651,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       if (serviceObj) {
         serviceObj.get('service_components').forEach(function (_component) {
           this.assignComponentHosts(_component);
+          console.log(' ---INFO: step8: service component: ' + _service.serviceName);
         }, this);
         this.get('services').pushObject(serviceObj);
       }
@@ -666,18 +667,23 @@ App.WizardStep8Controller = Em.Controller.extend({
     var componentValue;
     if (component.get('customHandler')) {
       this[component.get('customHandler')].call(this, component);
+      console.log(' --- ---INFO: step8: in customHandler');
     }
     else {
+      console.log(' --- ---INFO: step8: NOT in customHandler');    
       if (component.get('isMaster')) {
+        console.log(' --- ---INFO: step8: component isMaster');
         componentValue = this.get('content.masterComponentHosts')
           .findProperty('component', component.component_name).hostName;
       }
       else {
+        console.log(' --- ---INFO: step8: NOT component isMaster');
         var hostsLength = this.get('content.slaveComponentHosts')
           .findProperty('componentName', component.component_name)
           .hosts.length;
         componentValue = hostsLength + Em.I18n.t('installer.step8.host' + ((hostsLength >
1) ? 's' : ''));
       }
+      console.log(' --- --- --- INFO: step8: componentValue: ' + componentValue);
       component.set('component_value', componentValue);
     }
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/0d9ca5ba/ambari-web/app/data/review_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/review_configs.js b/ambari-web/app/data/review_configs.js
index d0cbd0e..88a7f12 100644
--- a/ambari-web/app/data/review_configs.js
+++ b/ambari-web/app/data/review_configs.js
@@ -71,15 +71,8 @@ module.exports = [
       Ember.Object.create({
         service_name: 'GLUSTERFS',
         display_name: 'GLUSTERFS',
-        service_components: [
-          Ember.Object.create({
-            display_name: 'GLUSTERFS Client',
-            component_name: 'GLUSTERFS_CLIENT',
-            component_value: '',
-            isMaster: false
-          })
-        ]
-      }),
+        service_components: []
+      }),    
       Ember.Object.create({
         service_name: 'MAPREDUCE',
         display_name: 'MapReduce',


Mime
View raw message