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 3CBA0200B81 for ; Tue, 13 Sep 2016 14:30:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3B650160AD2; Tue, 13 Sep 2016 12:30:57 +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 86E06160AC6 for ; Tue, 13 Sep 2016 14:30:56 +0200 (CEST) Received: (qmail 74937 invoked by uid 500); 13 Sep 2016 12:30:55 -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 74928 invoked by uid 99); 13 Sep 2016 12:30:55 -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; Tue, 13 Sep 2016 12:30:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 839DBDFD9F; Tue, 13 Sep 2016 12:30:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akovalenko@apache.org To: commits@ambari.apache.org Message-Id: <83da02cd82a54577818200668bb24fe1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17504 If client install fails there is no way to reinstall after fixing the issue in the UI. (akovalenko) Date: Tue, 13 Sep 2016 12:30:55 +0000 (UTC) archived-at: Tue, 13 Sep 2016 12:30:57 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.5 673f524b1 -> 275d5dffc AMBARI-17504 If client install fails there is no way to reinstall after fixing the issue in the UI. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/275d5dff Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/275d5dff Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/275d5dff Branch: refs/heads/branch-2.5 Commit: 275d5dffcbbb9ea7976c650bf50f09320e034e8f Parents: 673f524 Author: Aleksandr Kovalenko Authored: Thu Jun 30 17:45:56 2016 +0300 Committer: Aleksandr Kovalenko Committed: Tue Sep 13 15:30:29 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + ambari-web/app/templates/main/host/summary.hbs | 7 +++++++ ambari-web/app/views/main/host/summary.js | 15 ++++++++++++++- ambari-web/test/views/main/host/summary_test.js | 19 +++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/275d5dff/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index c7bab8d..0640916 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -2482,6 +2482,7 @@ Em.I18n.translations = { 'hosts.host.details.for.postfix':'{0} for host', 'hosts.host.details.setRackId':'Set Rack', 'host.host.details.installClients': 'Install clients', + 'host.host.details.reinstallClients': 'Reinstall clients', 'host.host.componentFilter.master':'Master Components', 'host.host.componentFilter.slave':'Slave Components', http://git-wip-us.apache.org/repos/asf/ambari/blob/275d5dff/ambari-web/app/templates/main/host/summary.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/summary.hbs b/ambari-web/app/templates/main/host/summary.hbs index b812f4b..7cf3314 100644 --- a/ambari-web/app/templates/main/host/summary.hbs +++ b/ambari-web/app/templates/main/host/summary.hbs @@ -95,6 +95,13 @@ {{t host.host.details.installClients}} + {{#if view.anyClientFailedToInstall}} +
  • + + {{t host.host.details.reinstallClients}} + +
    • + {{/if}} {{#each option in view.clientsWithCustomCommands}}
  • http://git-wip-us.apache.org/repos/asf/ambari/blob/275d5dff/ambari-web/app/views/main/host/summary.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/summary.js b/ambari-web/app/views/main/host/summary.js index 840b93f..80c4890 100644 --- a/ambari-web/app/views/main/host/summary.js +++ b/ambari-web/app/views/main/host/summary.js @@ -204,6 +204,12 @@ App.MainHostSummaryView = Em.View.extend(App.TimeRangeMixin, { areClientWithStaleConfigs: Em.computed.someBy('clients', 'staleConfigs', true), /** + * List of install failed clients + * @type {App.HostComponent[]} + */ + installFailedClients: Em.computed.filterBy('clients', 'workStatus', 'INSTALL_FAILED'), + + /** * Template for addable component * @type {Em.Object} */ @@ -333,9 +339,16 @@ App.MainHostSummaryView = Em.View.extend(App.TimeRangeMixin, { }.property('controller'), /** - * Call installClients method from controller for not installed components + * Call installClients method from controller for not installed client components */ installClients: function () { this.get('controller').installClients(this.get('notInstalledClientComponents')); + }, + + /** + * Call installClients method from controller for not install failed client components + */ + reinstallClients: function () { + this.get('controller').installClients(this.get('installFailedClients')); } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/275d5dff/ambari-web/test/views/main/host/summary_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/host/summary_test.js b/ambari-web/test/views/main/host/summary_test.js index 4c91dea..31b6d94 100644 --- a/ambari-web/test/views/main/host/summary_test.js +++ b/ambari-web/test/views/main/host/summary_test.js @@ -675,4 +675,23 @@ describe('App.MainHostSummaryView', function() { expect(mainHostSummaryView.get('controller.installClients').calledWith([1,2,3])).to.be.true; }); }); + + describe("#reinstallClients()", function () { + + beforeEach(function () { + var controller = {installClients: Em.K}; + sinon.spy(controller, 'installClients'); + mainHostSummaryView.set('controller', controller); + mainHostSummaryView.reopen({'installFailedClients': [1,2,3]}); + }); + + afterEach(function () { + mainHostSummaryView.get('controller.installClients').restore(); + }); + + it("should call installClients method from controller", function () { + mainHostSummaryView.reinstallClients(); + expect(mainHostSummaryView.get('controller.installClients').calledWith([1,2,3])).to.be.true; + }); + }); });