ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-6274 During upgrade to HDP 2.1 from 2.0 with NN HA enable, ha.zookeeper.quorum is missing in core-site.xml (Adding new Services reverts global and core-site configurations). (atkach)
Date Wed, 25 Jun 2014 17:52:42 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 20e214feb -> b19009e39


AMBARI-6274 During upgrade to HDP 2.1 from 2.0 with NN HA enable, ha.zookeeper.quorum is missing
in core-site.xml (Adding new Services reverts global and core-site configurations). (atkach)


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

Branch: refs/heads/trunk
Commit: b19009e398143c237b514dd4f34891e63dddc16e
Parents: 20e214f
Author: atkach <atkach@hortonworks.com>
Authored: Wed Jun 25 20:46:29 2014 +0300
Committer: atkach <atkach@hortonworks.com>
Committed: Wed Jun 25 20:46:29 2014 +0300

----------------------------------------------------------------------
 .../app/controllers/wizard/step7_controller.js  | 24 +++++++++++---------
 ambari-web/app/routes/add_service_routes.js     |  1 +
 ambari-web/app/templates/wizard/step7.hbs       |  2 +-
 ambari-web/app/views/wizard/step7_view.js       |  8 +------
 4 files changed, 16 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b19009e3/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index e81a095..d5db177 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -100,6 +100,16 @@ App.WizardStep7Controller = Em.Controller.extend({
   isAdvancedConfigLoaded: true,
 
   /**
+   * Are applied to service configs loaded
+   * @type {bool}
+   */
+  isAppliedConfigLoaded: true,
+
+  isConfigsLoaded: function () {
+    return (this.get('isAdvancedConfigLoaded') && this.get('isAppliedConfigLoaded'));
+  }.property('isAdvancedConfigLoaded', 'isAppliedConfigLoaded'),
+
+  /**
    * Should Next-button be disabled
    * @type {bool}
    */
@@ -178,7 +188,6 @@ App.WizardStep7Controller = Em.Controller.extend({
   /**
    * Clear controller's properties:
    *  <ul>
-   *    <li>serviceConfigTags</li>
    *    <li>stepConfigs</li>
    *    <li>filter</li>
    *  </ul>
@@ -186,7 +195,6 @@ App.WizardStep7Controller = Em.Controller.extend({
    * @method clearStep
    */
   clearStep: function () {
-    this.get('serviceConfigTags').clear();
     this.get('stepConfigs').clear();
     this.set('filter', '');
     this.get('filterColumns').setEach('selected', false);
@@ -621,20 +629,13 @@ App.WizardStep7Controller = Em.Controller.extend({
     }
   },
 
-  checkConfigLoad: function() {
-    if (this.get('wizardController.name') === 'addServiceController') {
-      this.set('isAdvancedConfigLoaded', false);
-    }
-  },
-
   /**
    * On load function
    * @method loadStep
    */
   loadStep: function () {
     console.log("TRACE: Loading step7: Configure Services");
-    if (!this.get('isAdvancedConfigLoaded')) {
-      this.getConfigTags();
+    if (!this.get('isConfigsLoaded')) {
       return;
     }
     this.clearStep();
@@ -747,6 +748,7 @@ App.WizardStep7Controller = Em.Controller.extend({
    * @method getConfigTags
    */
   getConfigTags: function () {
+    this.set('isAppliedConfigLoaded', false);
     return App.ajax.send({
       name: 'config.tags',
       sender: this,
@@ -781,7 +783,7 @@ App.WizardStep7Controller = Em.Controller.extend({
       }
     }
     this.set('serviceConfigTags', serviceConfigTags);
-    this.set('isAdvancedConfigLoaded', true);
+    this.set('isAppliedConfigLoaded', true);
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/b19009e3/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index d2ac777..0a5a545 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -188,6 +188,7 @@ module.exports = App.WizardRoute.extend({
         var wizardStep7Controller = router.get('wizardStep7Controller');
         controller.loadAllPriorSteps();
         controller.loadAdvancedConfigs(wizardStep7Controller);
+        wizardStep7Controller.getConfigTags();
         wizardStep7Controller.set('wizardController', controller);
         controller.connectOutlet('wizardStep7', controller.get('content'));
       })

http://git-wip-us.apache.org/repos/asf/ambari/blob/b19009e3/ambari-web/app/templates/wizard/step7.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step7.hbs b/ambari-web/app/templates/wizard/step7.hbs
index eb4fb76..4d59338 100644
--- a/ambari-web/app/templates/wizard/step7.hbs
+++ b/ambari-web/app/templates/wizard/step7.hbs
@@ -23,7 +23,7 @@
     {{t installer.step7.body}}
   </div>
 
-  {{#if isAdvancedConfigLoaded}}
+  {{#if isConfigsLoaded}}
     {{view App.ServicesConfigView}}
   {{else}}
     <div class="spinner"></div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b19009e3/ambari-web/app/views/wizard/step7_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step7_view.js b/ambari-web/app/views/wizard/step7_view.js
index 2a89c28..e1348b7 100644
--- a/ambari-web/app/views/wizard/step7_view.js
+++ b/ambari-web/app/views/wizard/step7_view.js
@@ -20,11 +20,5 @@
 var App = require('app');
 
 App.WizardStep7View = Em.View.extend({
-
-  templateName: require('templates/wizard/step7'),
-
-  willInsertElement: function () {
-    this.get('controller').checkConfigLoad();
-  }
-
+  templateName: require('templates/wizard/step7')
 });


Mime
View raw message