Skip to content

[SPARK-5559] [Streaming] [Test] Remove oppotunity we met flakiness when running FlumeStreamSuite #4337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

[SPARK-5559] [Streaming] [Test] Remove oppotunity we met flakiness when running FlumeStreamSuite #4337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8212e42
Modified default port used in FlumeStreamSuite from 23456 to random v…
sarutak Feb 3, 2015
9489ef9
Merge branch 'master' of git://git.apache.org/spark into SPARK-5559
sarutak Feb 8, 2015
a9029fe
Merge branch 'master' of git://git.apache.org/spark into SPARK-5559
sarutak Feb 18, 2015
33357e3
Changed "findFreePort" method in MQTTStreamSuite and FlumeStreamSuite…
sarutak Feb 18, 2015
1610ba2
Merge branch 'master' of git://git.apache.org/spark into SPARK-5559
sarutak Mar 23, 2015
c39d8b6
Merge branch 'SPARK-5559' of github.com:sarutak/spark into SPARK-5559
sarutak Mar 23, 2015
16f109f
Added `require` to Utils#startServiceOnPort
sarutak Mar 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/src/main/scala/org/apache/spark/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,6 +1878,11 @@ private[spark] object Utils extends Logging {
startService: Int => (T, Int),
conf: SparkConf,
serviceName: String = ""): (T, Int) = {

require(startPort == 0 || 1024 <= startPort && startPort < 65536,
"startPort should be between " +
"1024(including) and 65536(excluding) or 0(for a random free port).")

val serviceString = if (serviceName.isEmpty) "" else s" '$serviceName'"
val maxRetries = portMaxRetries(conf)
for (offset <- 0 to maxRetries) {
Expand Down
5 changes: 3 additions & 2 deletions external/flume/src/test/scala/org/apache/spark/streaming/flume/FlumeStreamSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import scala.concurrent.duration._
import scala.language.postfixOps

import com.google.common.base.Charsets
import org.apache.commons.lang3.RandomUtils
import org.apache.avro.ipc.NettyTransceiver
import org.apache.avro.ipc.specific.SpecificRequestor
import org.apache.flume.source.avro
Expand All @@ -40,7 +41,6 @@ import org.scalatest.concurrent.Eventually._
import org.apache.spark.{Logging, SparkConf}
import org.apache.spark.storage.StorageLevel
import org.apache.spark.streaming.{Milliseconds, StreamingContext, TestOutputStream}
import org.apache.spark.streaming.scheduler.{StreamingListener, StreamingListenerReceiverStarted}
import org.apache.spark.util.Utils

class FlumeStreamSuite extends FunSuite with BeforeAndAfter with Matchers with Logging {
Expand Down Expand Up @@ -76,7 +76,8 @@ class FlumeStreamSuite extends FunSuite with BeforeAndAfter with Matchers with L

/** Find a free port */
private def findFreePort(): Int = {
Utils.startServiceOnPort(23456, (trialPort: Int) => {
val candidatePort = RandomUtils.nextInt(1024, 65536)
Utils.startServiceOnPort(candidatePort, (trialPort: Int) => {
val socket = new ServerSocket(trialPort)
socket.close()
(null, trialPort)
Expand Down
5 changes: 4 additions & 1 deletion external/mqtt/src/test/scala/org/apache/spark/streaming/mqtt/MQTTStreamSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import java.net.{URI, ServerSocket}
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit

import org.apache.commons.lang3.RandomUtils

import scala.concurrent.duration._
import scala.language.postfixOps

Expand Down Expand Up @@ -113,7 +115,8 @@ class MQTTStreamSuite extends FunSuite with Eventually with BeforeAndAfter {
}

private def findFreePort(): Int = {
Copy link
Member

@srowen srowen Feb 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this can be refactored rather than duplicated? don't bother unless there is clearly a good common home for it in test code. I don't know if there is.

Copy link
Contributor

@JoshRosen JoshRosen Feb 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have a test utilities subproject, so this ends up getting duplicated, but note that we also have duplication of classes like LocalSparkContext; fixing this broader issue is outside the scope of this PR (there's a few JIRAs to track the creation of a "test utilities" project, though).

Utils.startServiceOnPort(23456, (trialPort: Int) => {
val candidatePort = RandomUtils.nextInt(1024, 65536)
Utils.startServiceOnPort(candidatePort, (trialPort: Int) => {
val socket = new ServerSocket(trialPort)
socket.close()
(null, trialPort)
Expand Down