[38/40] ambari git commit: AMBARI-14910: HAWQ hdfs-client.xml should be updated when NN HA in enabled (mithmatt via jaoki)

2016-02-05 Thread ncole 
AMBARI-14910: HAWQ hdfs-client.xml should be updated when NN HA in enabled 
(mithmatt via jaoki)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 26ad97b6406008981ce8bec6158f6a47bb1459a4
Parents: bb864df
Author: Jun Aoki 
Authored: Fri Feb 5 13:23:36 2016 -0800
Committer: Jun Aoki 
Committed: Fri Feb 5 13:23:36 2016 -0800

--
 .../nameNode/rollback_controller.js | 24 +++
 .../nameNode/step3_controller.js|  3 +
 .../nameNode/step9_controller.js| 23 ---
 ambari-web/app/data/HDP2/ha_properties.js   | 68 +++-
 .../nameNode/step3_controller_test.js   | 49 --
 5 files changed, 139 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/26ad97b6/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
index 465a1d2..6895c6c 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
@@ -251,17 +251,19 @@ App.HighAvailabilityRollbackController = 
App.HighAvailabilityProgressPageControl
 });
   },
   restoreHawqConfigs: function(){
-this.loadConfigTag("hawqSiteTag");
-var hawqSiteTag = this.get("content.hawqSiteTag");
-App.ajax.send({
-  name: 'admin.high_availability.load_hawq_configs',
-  sender: this,
-  data: {
-hawqSiteTag: hawqSiteTag
-  },
-  success: 'onLoadHawqConfigs',
-  error: 'onTaskError'
-});
+var tags = ['hawqSiteTag', 'hdfsClientTag'];
+tags.forEach(function (tagName) {
+  var tag = this.get("content." + tagName);
+  App.ajax.send({
+name: 'admin.high_availability.load_hawq_configs',
+sender: this,
+data: {
+  tagName: tag
+},
+success: 'onLoadHawqConfigs',
+error: 'onTaskError'
+  });
+}, this);
   },
 
   deletePXF: function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/26ad97b6/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
index b420687..4e4df60 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
@@ -100,6 +100,9 @@ App.HighAvailabilityWizardStep3Controller = 
Em.Controller.extend({
   var hawqSiteTag = data.Clusters.desired_configs['hawq-site'].tag;
   urlParams.push('(type=hawq-site&tag=' + hawqSiteTag + ')');
   this.set("hawqSiteTag", {name : "hawqSiteTag", value : hawqSiteTag});
+  var hdfsClientTag = data.Clusters.desired_configs['hdfs-client'].tag;
+  urlParams.push('(type=hdfs-client&tag=' + hdfsClientTag + ')');
+  this.set("hdfsClientTag", {name : "hdfsClientTag", value : 
hdfsClientTag});
 }
 App.ajax.send({
   name: 'admin.get.all_configurations',

http://git-wip-us.apache.org/repos/asf/ambari/blob/26ad97b6/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
index 7745c6b..934d133 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
@@ -118,16 +118,19 @@ App.HighAvailabilityWizardStep9Controller = 
App.HighAvailabilityProgressPageCont
 
   reconfigureHawq: function () {
 var data = this.get('content.serviceConfigProperties');
-var configData = this.reconfigureSites(['hawq-site'], data, 
Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE')));
-App.ajax.send({
-  name: 'common.service.configurations',
-  sender: this,
-  data: {
-desired_config: configData

ambari git commit: AMBARI-14910: HAWQ hdfs-client.xml should be updated when NN HA in enabled (mithmatt via jaoki)

2016-02-05 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 e417b5262 -> 360d5d2d4


AMBARI-14910: HAWQ hdfs-client.xml should be updated when NN HA in enabled 
(mithmatt via jaoki)


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

Branch: refs/heads/branch-2.2
Commit: 360d5d2d4c5add7073dfdeeeaf5cbed05d55d4b9
Parents: e417b52
Author: Jun Aoki 
Authored: Fri Feb 5 13:24:49 2016 -0800
Committer: Jun Aoki 
Committed: Fri Feb 5 13:24:49 2016 -0800

--
 .../nameNode/rollback_controller.js | 25 +++
 .../nameNode/step3_controller.js| 36 +++
 .../nameNode/step9_controller.js| 23 ---
 ambari-web/app/data/HDP2/ha_properties.js   | 68 +++-
 4 files changed, 119 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/360d5d2d/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
index 4aa2d73..b305845 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
@@ -268,17 +268,20 @@ App.HighAvailabilityRollbackController = 
App.HighAvailabilityProgressPageControl
 });
   },
   restoreHawqConfigs: function(){
-this.loadConfigTag("hawqSiteTag");
-var hawqSiteTag = this.get("content.hawqSiteTag");
-App.ajax.send({
-  name: 'admin.high_availability.load_hawq_configs',
-  sender: this,
-  data: {
-hawqSiteTag: hawqSiteTag
-  },
-  success: 'onLoadHawqConfigs',
-  error: 'onTaskError'
-});
+var tags = ['hawqSiteTag', 'hdfsClientTag'];
+tags.forEach(function (tagName) {
+  this.loadConfigTag(tagName);
+  var tag = this.get("content." + tagName);
+  App.ajax.send({
+name: 'admin.high_availability.load_hawq_configs',
+sender: this,
+data: {
+  tagName: tag
+},
+success: 'onLoadHawqConfigs',
+error: 'onTaskError'
+  });
+}, this);
   },
 
   deletePXF: function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/360d5d2d/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
index bf5b96a..5baf90f 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
@@ -88,6 +88,9 @@ App.HighAvailabilityWizardStep3Controller = 
Em.Controller.extend({
   var hawqSiteTag = data.Clusters.desired_configs['hawq-site'].tag;
   urlParams.push('(type=hawq-site&tag=' + hawqSiteTag + ')');
   this.set("hawqSiteTag", {name : "hawqSiteTag", value : hawqSiteTag});
+  var hdfsClientTag = data.Clusters.desired_configs['hdfs-client'].tag;
+  urlParams.push('(type=hdfs-client&tag=' + hdfsClientTag + ')');
+  this.set("hdfsClientTag", {name : "hdfsClientTag", value : 
hdfsClientTag});
 }
 App.ajax.send({
   name: 'admin.get.all_configurations',
@@ -111,8 +114,13 @@ App.HighAvailabilityWizardStep3Controller = 
Em.Controller.extend({
 
   tweakServiceConfigs: function(configs) {
 var nameServiceId = this.get('content.nameServiceId');
-var nameServiceConfig = configs.findProperty('name','dfs.nameservices');
-this.setConfigInitialValue(nameServiceConfig,nameServiceId);
+var filesToChange = ['hdfs-site'];
+// If HAWQ is on the cluster, update dfs.nameservices in hdfs-client.xml 
for HAWQ to work with NN HA
+if (App.Service.find().someProperty('serviceName', 'HAWQ')) 
filesToChange.push('hdfs-client');
+filesToChange.forEach(function (filename) {
+  var nameServiceConfig = configs.filterProperty('filename', 
filename).findProperty('name','dfs.nameservices');
+  this.setConfigInitialValue(nameServiceConfig,nameServiceId);
+}, this);
 var defaultFsConfig = configs.findProperty('name','fs.defaultFS');
 this.setConfigInitialValue(defaultFsConfig, "hdfs://" + nameServiceId);
 this.tweakServiceConfigNames(configs,nameServiceId);
@@ -151,15 +159,21 @@ App.HighAva

ambari git commit: AMBARI-14910: HAWQ hdfs-client.xml should be updated when NN HA in enabled (mithmatt via jaoki)

2016-02-05 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/trunk bb864df5d -> 26ad97b64


AMBARI-14910: HAWQ hdfs-client.xml should be updated when NN HA in enabled 
(mithmatt via jaoki)


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

Branch: refs/heads/trunk
Commit: 26ad97b6406008981ce8bec6158f6a47bb1459a4
Parents: bb864df
Author: Jun Aoki 
Authored: Fri Feb 5 13:23:36 2016 -0800
Committer: Jun Aoki 
Committed: Fri Feb 5 13:23:36 2016 -0800

--
 .../nameNode/rollback_controller.js | 24 +++
 .../nameNode/step3_controller.js|  3 +
 .../nameNode/step9_controller.js| 23 ---
 ambari-web/app/data/HDP2/ha_properties.js   | 68 +++-
 .../nameNode/step3_controller_test.js   | 49 --
 5 files changed, 139 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/26ad97b6/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
index 465a1d2..6895c6c 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/rollback_controller.js
@@ -251,17 +251,19 @@ App.HighAvailabilityRollbackController = 
App.HighAvailabilityProgressPageControl
 });
   },
   restoreHawqConfigs: function(){
-this.loadConfigTag("hawqSiteTag");
-var hawqSiteTag = this.get("content.hawqSiteTag");
-App.ajax.send({
-  name: 'admin.high_availability.load_hawq_configs',
-  sender: this,
-  data: {
-hawqSiteTag: hawqSiteTag
-  },
-  success: 'onLoadHawqConfigs',
-  error: 'onTaskError'
-});
+var tags = ['hawqSiteTag', 'hdfsClientTag'];
+tags.forEach(function (tagName) {
+  var tag = this.get("content." + tagName);
+  App.ajax.send({
+name: 'admin.high_availability.load_hawq_configs',
+sender: this,
+data: {
+  tagName: tag
+},
+success: 'onLoadHawqConfigs',
+error: 'onTaskError'
+  });
+}, this);
   },
 
   deletePXF: function(){

http://git-wip-us.apache.org/repos/asf/ambari/blob/26ad97b6/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
index b420687..4e4df60 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
@@ -100,6 +100,9 @@ App.HighAvailabilityWizardStep3Controller = 
Em.Controller.extend({
   var hawqSiteTag = data.Clusters.desired_configs['hawq-site'].tag;
   urlParams.push('(type=hawq-site&tag=' + hawqSiteTag + ')');
   this.set("hawqSiteTag", {name : "hawqSiteTag", value : hawqSiteTag});
+  var hdfsClientTag = data.Clusters.desired_configs['hdfs-client'].tag;
+  urlParams.push('(type=hdfs-client&tag=' + hdfsClientTag + ')');
+  this.set("hdfsClientTag", {name : "hdfsClientTag", value : 
hdfsClientTag});
 }
 App.ajax.send({
   name: 'admin.get.all_configurations',

http://git-wip-us.apache.org/repos/asf/ambari/blob/26ad97b6/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
index 7745c6b..934d133 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
@@ -118,16 +118,19 @@ App.HighAvailabilityWizardStep9Controller = 
App.HighAvailabilityProgressPageCont
 
   reconfigureHawq: function () {
 var data = this.get('content.serviceConfigProperties');
-var configData = this.reconfigureSites(['hawq-site'], data, 
Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE')));
-App.ajax.send({
-  name: 'common.service.configurations',
-  sen