You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/06/28 20:54:48 UTC

[1/2] storm git commit: STORM-3129: Fixed startTime assignment to using Storm Time util.

Repository: storm
Updated Branches:
  refs/heads/master 7893f432a -> 10f01f49c


STORM-3129: Fixed startTime assignment to using Storm Time util.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/307f01bf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/307f01bf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/307f01bf

Branch: refs/heads/master
Commit: 307f01bf7c83512ca0762935d34c70ba6073b7b2
Parents: d880767
Author: Zhengdai Hu <hu...@gmail.com>
Authored: Wed Jun 27 14:02:13 2018 -0500
Committer: Zhengdai Hu <hu...@gmail.com>
Committed: Wed Jun 27 15:09:54 2018 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/storm/daemon/supervisor/Slot.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/307f01bf/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
index 59fea1e..3fd8cad 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/supervisor/Slot.java
@@ -1025,7 +1025,7 @@ public class Slot extends Thread implements AutoCloseable, BlobChangingCallback
                 state = MachineState.RUNNING;
             }
 
-            this.startTime = System.currentTimeMillis();
+            this.startTime = Time.currentTimeMillis();
             this.newAssignment = newAssignment;
             this.pendingLocalization = null;
             this.pendingDownload = null;


[2/2] storm git commit: Merge branch 'STORM-3129' of https://github.com/zd-project/storm into STORM-3129

Posted by bo...@apache.org.
Merge branch 'STORM-3129' of https://github.com/zd-project/storm into STORM-3129

STORM-3129: Fixed startTime assignment to using Storm Time util.

This closes #2740


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/10f01f49
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/10f01f49
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/10f01f49

Branch: refs/heads/master
Commit: 10f01f49c2166c803bf6ba46f3d6bb9203a9c440
Parents: 7893f43 307f01b
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 28 15:32:56 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 28 15:32:56 2018 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/storm/daemon/supervisor/Slot.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------