From 9be7945861a39974172826fc2d27ba8f5b8c3827 Mon Sep 17 00:00:00 2001
From: 10087686 <wang.jiaochun@zte.com.cn>
Date: Thu, 8 Jun 2017 10:58:09 +0100
Subject: [PATCH] [SPARK-21006][TESTS] Create rpcEnv and run later needs
shutdown and awaitTermination
Signed-off-by: 10087686 <wang.jiaochunzte.com.cn>
## What changes were proposed in this pull request?
When run test("port conflict") case, we need run anotherEnv.shutdown() and anotherEnv.awaitTermination() for free resource.
(Please fill in changes proposed in this fix)
## How was this patch tested?
run RpcEnvSuit.scala Utest
(Please explain how this patch was tested. E.g. unit tests, integration tests, manual tests)
(If this patch involves UI changes, please attach a screenshot; otherwise, remove this)
Please review http://spark.apache.org/contributing.html before opening a pull request.
Author: 10087686 <wang.jiaochun@zte.com.cn>
Closes #18226 from wangjiaochun/master.
---
core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala b/core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala
index 31d9dd3de8..59d8c14d74 100644
--- a/core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala
+++ b/core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala
@@ -633,7 +633,12 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll {
test("port conflict") {
val anotherEnv = createRpcEnv(new SparkConf(), "remote", env.address.port)
- assert(anotherEnv.address.port != env.address.port)
+ try {
+ assert(anotherEnv.address.port != env.address.port)
+ } finally {
+ anotherEnv.shutdown()
+ anotherEnv.awaitTermination()
+ }
}
private def testSend(conf: SparkConf): Unit = {
--
GitLab