Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B2456200BCE for ; Fri, 2 Dec 2016 21:26:04 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B10E7160B08; Fri, 2 Dec 2016 20:26:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 46330160B3A for ; Fri, 2 Dec 2016 21:26:03 +0100 (CET) Received: (qmail 36627 invoked by uid 500); 2 Dec 2016 20:26:01 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 35378 invoked by uid 99); 2 Dec 2016 20:26:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2016 20:26:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 693F2F177F; Fri, 2 Dec 2016 20:26:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Fri, 02 Dec 2016 20:26:36 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [38/50] [abbrv] ambari git commit: AMBARI-19063. Do not change timeline.metrics.service.webapp.address in move wizard (akovalenko) archived-at: Fri, 02 Dec 2016 20:26:04 -0000 AMBARI-19063. Do not change timeline.metrics.service.webapp.address in move wizard (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e242fc09 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e242fc09 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e242fc09 Branch: refs/heads/branch-dev-patch-upgrade Commit: e242fc091abe15bc59e8572c43d9227c97e7a247 Parents: 2de7ee8 Author: Aleksandr Kovalenko Authored: Fri Dec 2 15:43:15 2016 +0200 Committer: Aleksandr Kovalenko Committed: Fri Dec 2 15:44:42 2016 +0200 ---------------------------------------------------------------------- .../main/service/reassign/step4_controller.js | 19 ++++++++++--------- .../service/reassign/step4_controller_test.js | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e242fc09/ambari-web/app/controllers/main/service/reassign/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js index 26ac68c..64c2a8e 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -71,6 +71,12 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro hostComponents: [], /** + * List of components, that do not need reconfiguration for moving to another host + * Reconfigure command will be skipped + */ + componentsWithoutReconfiguration: ['METRICS_COLLECTOR'], + + /** * Map with lists of related services. * Used to define list of services to stop/start. */ @@ -189,14 +195,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro } }, { - componentName: 'METRICS_COLLECTOR', - configs: { - 'ams-site': { - 'timeline.metrics.service.webapp.address': ':6188' - } - } - }, - { componentName: 'HISTORYSERVER', configs: { 'mapred-site': { @@ -398,6 +396,10 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro this.removeTasks(['startZooKeeperServers', 'startNameNode']); } + if (this.get('componentsWithoutReconfiguration').contains(componentName)) { + this.removeTasks(['reconfigure']); + } + if (!this.get('content.reassignComponentsInMM.length')) { this.removeTasks(['stopHostComponentsInMaintenanceMode']); } @@ -542,7 +544,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro 'HIVE_SERVER': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'], 'HIVE_METASTORE': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'], 'MYSQL_SERVER': ['hive-site'], - 'METRICS_COLLECTOR': ['ams-site'], 'HISTORYSERVER': ['mapred-site'] }, http://git-wip-us.apache.org/repos/asf/ambari/blob/e242fc09/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js index 5e7b0e3..9a73524 100644 --- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js +++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js @@ -295,7 +295,7 @@ describe('App.ReassignMasterWizardStep4Controller', function () { controller.set('tasks', commandsForDB); controller.removeUnneededTasks(); - expect(controller.get('tasks').mapProperty('id')).to.eql([1,2,5,6,8,9,10,12]); + expect(controller.get('tasks').mapProperty('id')).to.eql([1,2,5,6,8,10,12]); }); it('reassign component is Mysql Server', function () {