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 51AE0200C42 for ; Fri, 10 Mar 2017 21:46:34 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4F25E160B96; Fri, 10 Mar 2017 20:46:34 +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 C9DBE160B92 for ; Fri, 10 Mar 2017 21:46:32 +0100 (CET) Received: (qmail 67956 invoked by uid 500); 10 Mar 2017 20:46:30 -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 67414 invoked by uid 99); 10 Mar 2017 20:46:30 -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, 10 Mar 2017 20:46:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 039E3DFFD8; Fri, 10 Mar 2017 20:46:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Date: Fri, 10 Mar 2017 20:46:50 -0000 Message-Id: <0ac6faef9e124e51ac3b32e15ceca26d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/50] ambari git commit: AMBARI-20379. Error during moving ResourceManager without Tez installed (akovalenko) archived-at: Fri, 10 Mar 2017 20:46:34 -0000 AMBARI-20379. Error during moving ResourceManager without Tez installed (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8ce47e0c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8ce47e0c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8ce47e0c Branch: refs/heads/branch-dev-logsearch Commit: 8ce47e0cbd5caaaee7f444ddca1afefafceede1d Parents: a101205 Author: Aleksandr Kovalenko Authored: Thu Mar 9 16:33:17 2017 +0200 Committer: Aleksandr Kovalenko Committed: Thu Mar 9 17:59:16 2017 +0200 ---------------------------------------------------------------------- .../main/service/reassign/step4_controller.js | 17 +++++++++-------- .../service/reassign/step4_controller_test.js | 19 +++++++++++++++++-- 2 files changed, 26 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce47e0c/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 f87d05b..9a40283 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -106,16 +106,17 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro * Set dependent host-components to dependentHostComponents * @param {string} componentName */ - setDependentHostComponents: function(componentName) { + setDependentHostComponents: function (componentName) { + var installedServices = App.Service.find().mapProperty('serviceName'); var installedComponents = App.Host.find(this.get('content.reassignHosts.target')) - .get('hostComponents') - .mapProperty('componentName'); + .get('hostComponents') + .mapProperty('componentName'); var dependenciesToInstall = App.StackServiceComponent.find(componentName) - .get('dependencies') - .mapProperty('componentName') - .filter(function(component) { - return !installedComponents.contains(component); - }); + .get('dependencies') + .filter(function (component) { + return !installedComponents.contains(component.componentName) && installedServices.contains(component.serviceName); + }) + .mapProperty('componentName'); this.set('dependentHostComponents', dependenciesToInstall); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/8ce47e0c/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 612efd0..0b00412 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 @@ -1090,19 +1090,34 @@ describe('App.ReassignMasterWizardStep4Controller', function () { }) ] })); + sinon.stub(App.Service, 'find').returns([ + Em.Object.create({ + serviceName: 'S1' + }), + Em.Object.create({ + serviceName: 'S2' + }) + ]); sinon.stub(App.StackServiceComponent, 'find').returns(Em.Object.create({ dependencies: [ Em.Object.create({ - componentName: 'C1' + componentName: 'C1', + serviceName: 'S1' + }), + Em.Object.create({ + componentName: 'C2', + serviceName: 'S2' }), Em.Object.create({ - componentName: 'C2' + componentName: 'C3', + serviceName: 'S3' }) ] })); }); afterEach(function() { App.Host.find.restore(); + App.Service.find.restore(); App.StackServiceComponent.find.restore(); });