ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sangee...@apache.org
Subject ambari git commit: AMBARI-19206: When Namenode HA is enabled, hbase.rootdir property for ambari-metrics (distributed) does not get updated (sangeetar)
Date Wed, 28 Dec 2016 19:25:39 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a76c5c8b2 -> eae2a4c5e


AMBARI-19206: When Namenode HA is enabled, hbase.rootdir property for ambari-metrics (distributed)
does not get updated (sangeetar)


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

Branch: refs/heads/branch-2.5
Commit: eae2a4c5e4b4b5dc279d9553d025fb00eb337849
Parents: a76c5c8
Author: Sangeeta Ravindran <sangeetar@apache.org>
Authored: Wed Dec 28 11:25:14 2016 -0800
Committer: Sangeeta Ravindran <sangeetar@apache.org>
Committed: Wed Dec 28 11:25:14 2016 -0800

----------------------------------------------------------------------
 .../nameNode/rollback_controller.js              |  1 +
 .../nameNode/step9_controller.js                 | 19 ++++++++++++++++++-
 ambari-web/app/messages.js                       | 11 ++++++-----
 .../nameNode/step3_controller_test.js            |  4 ++--
 4 files changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/eae2a4c5/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 fc44724..262a3e6 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
@@ -75,6 +75,7 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl
       'deleteSNameNode',
       'startAllServices',
       'reconfigureHBase',
+      'reconfigureAMS',
       'reconfigureAccumulo',
       'reconfigureHawq',
       'installPXF',

http://git-wip-us.apache.org/repos/asf/ambari/blob/eae2a4c5/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 713e1c3..b98c2df 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
@@ -22,7 +22,7 @@ App.HighAvailabilityWizardStep9Controller = App.HighAvailabilityProgressPageCont
 
   name:"highAvailabilityWizardStep9Controller",
 
-  commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'installPXF', 'reconfigureRanger',
'reconfigureHBase', 'reconfigureAccumulo', 'reconfigureHawq', 'deleteSNameNode', 'stopHDFS',
'startAllServices'],
+  commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'installPXF', 'reconfigureRanger',
'reconfigureHBase', 'reconfigureAMS', 'reconfigureAccumulo', 'reconfigureHawq', 'deleteSNameNode',
'stopHDFS', 'startAllServices'],
 
   hbaseSiteTag: "",
   accumuloSiteTag: "",
@@ -45,6 +45,9 @@ App.HighAvailabilityWizardStep9Controller = App.HighAvailabilityProgressPageCont
     if (!App.Service.find().someProperty('serviceName', 'HBASE')) {
       tasksToRemove.push('reconfigureHBase');
     }
+    if (!App.Service.find().someProperty('serviceName', 'AMBARI_METRICS')) {
+      tasksToRemove.push('reconfigureAMS');
+    }
     if (!App.Service.find().someProperty('serviceName', 'ACCUMULO')) {
       tasksToRemove.push('reconfigureAccumulo');
     }
@@ -261,6 +264,20 @@ App.HighAvailabilityWizardStep9Controller = App.HighAvailabilityProgressPageCont
     });
   },
 
+  reconfigureAMS: function () {
+    var data = this.get('content.serviceConfigProperties');
+    var configData = this.reconfigureSites(['ams-hbase-site'], data, Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE',
false)));
+    App.ajax.send({
+      name: 'common.service.configurations',
+      sender: this,
+      data: {
+        desired_config: configData
+      },
+      success: 'saveConfigTag',
+      error: 'onTaskError'
+    });
+  },
+
   reconfigureAccumulo: function () {
     var data = this.get('content.serviceConfigProperties');
     var configData = this.reconfigureSites(['accumulo-site'], data, Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE',
false)));

http://git-wip-us.apache.org/repos/asf/ambari/blob/eae2a4c5/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index cd984c5..01382bd 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1420,11 +1420,12 @@ Em.I18n.translations = {
   'admin.highAvailability.wizard.step9.task3.title':'Install PXF',
   'admin.highAvailability.wizard.step9.task4.title':'Reconfigure Ranger',
   'admin.highAvailability.wizard.step9.task5.title':'Reconfigure HBase',
-  'admin.highAvailability.wizard.step9.task6.title':'Reconfigure Accumulo',
-  'admin.highAvailability.wizard.step9.task7.title':'Reconfigure HAWQ',
-  'admin.highAvailability.wizard.step9.task8.title':'Delete Secondary NameNode',
-  'admin.highAvailability.wizard.step9.task9.title':'Stop HDFS',
-  'admin.highAvailability.wizard.step9.task10.title':'Start All Services',
+  'admin.highAvailability.wizard.step9.task6.title':'Reconfigure AMS',
+  'admin.highAvailability.wizard.step9.task7.title':'Reconfigure Accumulo',
+  'admin.highAvailability.wizard.step9.task8.title':'Reconfigure HAWQ',
+  'admin.highAvailability.wizard.step9.task9.title':'Delete Secondary NameNode',
+  'admin.highAvailability.wizard.step9.task10.title':'Stop HDFS',
+  'admin.highAvailability.wizard.step9.task11.title':'Start All Services',
   'admin.highAvailability.wizard.step9.notice.completed':'NameNode HA has been enabled successfully.',
 
   'admin.highAvailability.wizard.step3.curNameNode': '<b>Current NameNode:</b>
',

http://git-wip-us.apache.org/repos/asf/ambari/blob/eae2a4c5/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
b/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
index 10989e0..98d71da 100644
--- a/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/highAvailability/nameNode/step3_controller_test.js
@@ -49,7 +49,7 @@ describe('App.HighAvailabilityWizardStep3Controller', function() {
       {
         type: 'ams-hbase-site',
         properties: {
-          'hbase.rootdir': 'file:///var/lib/ambari-metrics-collector/hbase'
+          'hbase.rootdir': 'hdfs://h1:8020/user/ams/hbase'
         }
       },
       {
@@ -346,7 +346,7 @@ describe('App.HighAvailabilityWizardStep3Controller', function() {
           name: 'hbase.rootdir',
           filename: 'ams-hbase-site'
         },
-        value: 'file:///var/lib/ambari-metrics-collector/hbase'
+        value: 'hdfs://' + nameServiceId + '/user/ams/hbase'
       },
       {
         config: {


Mime
View raw message