Merge branch 'palantir-master' into branch-2.2.0-palantir4-k8s

palantir · Mar 7, 2017 · b802972 · b802972
2 parents 9ad4bd0 + 0edc9a4
commit b802972
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/core/src/test/scala/org/apache/spark/scheduler/SparkListenerWithClusterSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/SparkListenerWithClusterSuite.scala
@@ -37,7 +37,8 @@ class SparkListenerWithClusterSuite extends SparkFunSuite with LocalSparkContext
     sc = new SparkContext("local-cluster[2,1,1024]", "SparkListenerSuite")
   }
 
-  test("SparkListener sends executor added message") {
+  // flakes in palantir/spark
+  ignore("SparkListener sends executor added message") {
     val listener = new SaveExecutorInfo
     sc.addSparkListener(listener)
 

diff --git a/core/src/test/scala/org/apache/spark/storage/BlockManagerReplicationSuite.scala b/core/src/test/scala/org/apache/spark/storage/BlockManagerReplicationSuite.scala
@@ -460,7 +460,8 @@ class BlockManagerProactiveReplicationSuite extends BlockManagerReplicationBehav
   conf.set("spark.storage.exceptionOnPinLeak", "true")
 
   (2 to 5).foreach{ i =>
-    test(s"proactive block replication - $i replicas - ${i - 1} block manager deletions") {
+    // flakes in palantir/spark
+    ignore(s"proactive block replication - $i replicas - ${i - 1} block manager deletions") {
       testProactiveReplication(i)
     }
   }

diff --git a/core/src/test/scala/org/apache/spark/util/collection/ExternalSorterSuite.scala b/core/src/test/scala/org/apache/spark/util/collection/ExternalSorterSuite.scala
@@ -59,7 +59,8 @@ class ExternalSorterSuite extends SparkFunSuite with LocalSparkContext {
     cleanupIntermediateFilesInShuffle(withFailures = false)
   }
 
-  test("cleanup of intermediate files in shuffle with failures") {
+  // flakes in palantir/spark
+  ignore("cleanup of intermediate files in shuffle with failures") {
     cleanupIntermediateFilesInShuffle(withFailures = true)
   }
 

diff --git a/external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaSourceSuite.scala b/external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaSourceSuite.scala
@@ -954,7 +954,8 @@ class KafkaSourceStressForDontFailOnDataLossSuite extends StreamTest with Shared
     }
   }
 
-  test("stress test for failOnDataLoss=false") {
+  // flakes in palantir/spark
+  ignore("stress test for failOnDataLoss=false") {
     val reader = spark
       .readStream
       .format("kafka")

diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
@@ -199,7 +199,8 @@ class CliSuite extends SparkFunSuite with BeforeAndAfterAll with Logging {
     )
   }
 
-  test("Commands using SerDe provided in --jars") {
+  // flakes in palantir/spark
+  ignore("Commands using SerDe provided in --jars") {
     val jarFile =
       "../hive/src/test/resources/hive-hcatalog-core-0.13.1.jar"
         .split("/")