aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorCharles Reiss <charles@eecs.berkeley.edu>2012-12-06 18:38:34 -0800
committerCharles Reiss <charles@eecs.berkeley.edu>2012-12-06 18:38:34 -0800
commit714c8d32d56c64c259931dc15f41db959f667ee0 (patch)
tree23bed1b2393664eda91da6e2e5394de1be719d96 /core
parent8f0819520c8ca8a2d33b6d07f77f07e2df994aa8 (diff)
downloadspark-714c8d32d56c64c259931dc15f41db959f667ee0.tar.gz
spark-714c8d32d56c64c259931dc15f41db959f667ee0.tar.bz2
spark-714c8d32d56c64c259931dc15f41db959f667ee0.zip
Don't divide by milliseconds by 1000 more.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/storage/BlockManagerMaster.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/storage/BlockManagerMaster.scala b/core/src/main/scala/spark/storage/BlockManagerMaster.scala
index 4ab73a6c0d..a5cdbae4da 100644
--- a/core/src/main/scala/spark/storage/BlockManagerMaster.scala
+++ b/core/src/main/scala/spark/storage/BlockManagerMaster.scala
@@ -308,7 +308,7 @@ private[spark] class BlockManagerMasterActor(val isLocal: Boolean) extends Actor
logInfo("Got Register Msg from master node, don't register it")
} else {
blockManagerInfo += (blockManagerId -> new BlockManagerInfo(
- blockManagerId, System.currentTimeMillis() / 1000, maxMemSize))
+ blockManagerId, System.currentTimeMillis(), maxMemSize))
}
blockManagerIdByHost += (blockManagerId.ip -> blockManagerId)
logDebug("Got in register 1" + tmp + Utils.getUsedTimeMs(startTimeMs))