You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2018/01/23 18:12:26 UTC

spark git commit: [SPARK-20664][SPARK-23103][CORE] Follow-up: remove workaround for .

Repository: spark
Updated Branches:
  refs/heads/master ee572ba8c -> bdebb8e48


[SPARK-20664][SPARK-23103][CORE] Follow-up: remove workaround for .

Author: Marcelo Vanzin <va...@cloudera.com>

Closes #20353 from vanzin/SPARK-20664.


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

Branch: refs/heads/master
Commit: bdebb8e48eafcca0382d1a3173b2f3ce969abab3
Parents: ee572ba
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Tue Jan 23 10:12:13 2018 -0800
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Tue Jan 23 10:12:13 2018 -0800

----------------------------------------------------------------------
 .../org/apache/spark/deploy/history/FsHistoryProviderSuite.scala | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/bdebb8e4/core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala b/core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala
index 787de59..fde5f25 100644
--- a/core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala
+++ b/core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala
@@ -716,9 +716,7 @@ class FsHistoryProviderSuite extends SparkFunSuite with BeforeAndAfter with Matc
   }
 
   test("SPARK-21571: clean up removes invalid history files") {
-    // TODO: "maxTime" becoming negative in cleanLogs() causes this test to fail, so avoid that
-    // until we figure out what's causing the problem.
-    val clock = new ManualClock(TimeUnit.DAYS.toMillis(120))
+    val clock = new ManualClock()
     val conf = createTestConf().set(MAX_LOG_AGE_S.key, s"2d")
     val provider = new FsHistoryProvider(conf, clock) {
       override def getNewLastScanTime(): Long = clock.getTimeMillis()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org