ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-12304. Summary:500 error when attempting to add service (too much data being stored via persist) (rzang)
Date Tue, 07 Jul 2015 20:24:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 23cdd769a -> 26dcf89c6


AMBARI-12304. Summary:500 error when attempting to add service (too much data being stored
via persist) (rzang)


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

Branch: refs/heads/trunk
Commit: 26dcf89c67afc5729f4e8a89ffbec13c379a73f9
Parents: 23cdd76
Author: Richard Zang <rzang@apache.org>
Authored: Tue Jul 7 13:21:22 2015 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Tue Jul 7 13:24:39 2015 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/installer.js                  |  3 ---
 .../controllers/main/admin/kerberos/wizard_controller.js |  1 -
 ambari-web/app/controllers/wizard.js                     |  1 -
 ambari-web/app/routes/add_kerberos_routes.js             |  1 -
 ambari-web/app/routes/installer.js                       |  1 -
 ambari-web/app/utils/db.js                               | 11 -----------
 6 files changed, 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 08c417c..a311e99 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -65,7 +65,6 @@ App.InstallerController = App.WizardController.extend({
     'installOptions',
     'allHostNamesPattern',
     'serviceComponents',
-    'advancedServiceConfig',
     'clientInfo',
     'selectedServiceNames',
     'serviceConfigGroups',
@@ -484,8 +483,6 @@ App.InstallerController = App.WizardController.extend({
     var serviceConfigProperties = this.getDBProperty('serviceConfigProperties');
     this.set('content.serviceConfigProperties', serviceConfigProperties);
     console.log("InstallerController.loadServiceConfigProperties: loaded config ", serviceConfigProperties);
-
-    this.set('content.advancedServiceConfig', this.getDBProperty('advancedServiceConfig'));
   },
   /**
    * Generate clients list for selected services and save it to model

http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index 510d1a0..5251b66 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -164,7 +164,6 @@ App.KerberosWizardController = App.WizardController.extend({
     App.config.loadAdvancedConfig(serviceName, function (properties) {
       loadAdvancedConfigResult.pushObjects(properties);
       self.set('content.advancedServiceConfig', loadAdvancedConfigResult);
-      self.setDBProperty('advancedServiceConfig', loadAdvancedConfigResult);
       dependentController.set('isAdvancedConfigLoaded', true);
     });
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index 49b9700..205c56a 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -854,7 +854,6 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
         });
         loadAdvancedConfigResult.pushObjects(clusterProperties);
         self.set('content.advancedServiceConfig', loadAdvancedConfigResult);
-        self.setDBProperty('advancedServiceConfig', loadAdvancedConfigResult);
         dependentController.set('isAdvancedConfigLoaded', true);
       });
     };

http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/routes/add_kerberos_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_kerberos_routes.js b/ambari-web/app/routes/add_kerberos_routes.js
index c7ad43d..e3a40f8 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -140,7 +140,6 @@ module.exports = App.WizardRoute.extend({
 
       kerberosWizardController.saveKerberosOption(kerberosStep1controller);
       kerberosWizardController.setDBProperty('serviceConfigProperties', null);
-      kerberosWizardController.setDBProperty('advancedServiceConfig', null);
       router.transitionTo('step2');
     }
   }),

http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index 808e4f2..97fbca0 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -282,7 +282,6 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
             controller.saveSlaveComponentHosts(wizardStep6Controller);
             controller.get('content').set('serviceConfigProperties', null);
             controller.setDBProperty('serviceConfigProperties', null);
-            controller.setDBProperty('advancedServiceConfig', null);
             controller.setDBProperty('serviceConfigGroups', null);
             controller.setDBProperty('recommendationsHostGroups', wizardStep6Controller.get('content.recommendationsHostGroups'));
             controller.setDBProperty('recommendationsConfigs', null);

http://git-wip-us.apache.org/repos/asf/ambari/blob/26dcf89c/ambari-web/app/utils/db.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/db.js b/ambari-web/app/utils/db.js
index e9099f6..6006539 100644
--- a/ambari-web/app/utils/db.js
+++ b/ambari-web/app/utils/db.js
@@ -297,12 +297,6 @@ App.db.setServiceConfigs = function (serviceConfigs) {
   localStorage.setObject('ambari', App.db.data);
 };
 
-App.db.setAdvancedServiceConfig = function (serviceConfigs) {
-  App.db.data = localStorage.getObject('ambari');
-  App.db.data.Installer.advanceServiceConfigs = serviceConfigs;
-  localStorage.setObject('ambari', App.db.data);
-};
-
 App.db.setServiceConfigProperties = function (configProperties) {
   App.db.data = localStorage.getObject('ambari');
   App.db.data.Installer.configProperties = configProperties;
@@ -689,11 +683,6 @@ App.db.getServiceConfigs = function () {
   return App.db.data.Installer.serviceConfigs;
 };
 
-App.db.getAdvancedServiceConfig = function () {
-  App.db.data = localStorage.getObject('ambari');
-  return App.db.data.Installer.advanceServiceConfigs;
-};
-
 App.db.getServiceConfigProperties = function () {
   App.db.data = localStorage.getObject('ambari');
   return App.db.data.Installer.configProperties;


Mime
View raw message