Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8CB911011A for ; Wed, 19 Nov 2014 21:46:08 +0000 (UTC) Received: (qmail 18138 invoked by uid 500); 19 Nov 2014 21:46:08 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 18107 invoked by uid 500); 19 Nov 2014 21:46:08 -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 18098 invoked by uid 99); 19 Nov 2014 21:46:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Nov 2014 21:46:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 13C5F94550C; Wed, 19 Nov 2014 21:46:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jspeidel@apache.org To: commits@ambari.apache.org Message-Id: <0c46f7399c524d6a8085f3eb3f3f1acd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-7985. Add server side command functionality. Fixes issue introduced in original submission of this patch. Date: Wed, 19 Nov 2014 21:46:07 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk cb8987357 -> a52b04976 AMBARI-7985. Add server side command functionality. Fixes issue introduced in original submission of this patch. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a52b0497 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a52b0497 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a52b0497 Branch: refs/heads/trunk Commit: a52b04976f09b34e37467238811baab5fbb9102b Parents: cb89873 Author: Robert Levas Authored: Wed Nov 19 16:39:24 2014 -0500 Committer: John Speidel Committed: Wed Nov 19 16:40:45 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/ambari/server/actionmanager/Stage.java | 2 +- .../apache/ambari/server/actionmanager/TestActionScheduler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a52b0497/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java index 01f2085..974acd4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java @@ -331,7 +331,7 @@ public class Stage { cmdParams.putAll(commandParams); } if (timeout != null) { - cmdParams.put(ExecutionCommand.KeyNames.COMMAND_TIMEOUT, NumberFormat.getIntegerInstance().format(timeout)); + cmdParams.put(ExecutionCommand.KeyNames.COMMAND_TIMEOUT, Long.toString(timeout)); } cmd.setCommandParams(cmdParams); http://git-wip-us.apache.org/repos/asf/ambari/blob/a52b0497/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java index c5c5bde..0640c34 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java @@ -496,7 +496,7 @@ public class TestActionScheduler { List stages = new ArrayList(); Map payload = new HashMap(); - final Stage s = getStageWithServerAction(1, 977, payload, "test", 300); + final Stage s = getStageWithServerAction(1, 977, payload, "test", 1200); stages.add(s); ActionDBAccessor db = mock(ActionDBAccessor.class);