ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jspei...@apache.org
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 GMT
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 <rlevas@hortonworks.com>
Authored: Wed Nov 19 16:39:24 2014 -0500
Committer: John Speidel <jspeidel@hortonworks.com>
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<Stage> stages = new ArrayList<Stage>();
     Map<String, String> payload = new HashMap<String, String>();
-    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);


Mime
View raw message