You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/07/09 22:19:40 UTC
spark git commit: [MINOR] [STREAMING] Fix log statements in
ReceiverSupervisorImpl
Repository: spark
Updated Branches:
refs/heads/master 0b0b9ceaf -> 7ce3b818f
[MINOR] [STREAMING] Fix log statements in ReceiverSupervisorImpl
Log statements incorrectly showed that the executor was being stopped when receiver was being stopped.
Author: Tathagata Das <ta...@gmail.com>
Closes #7328 from tdas/fix-log and squashes the following commits:
9cc6e99 [Tathagata Das] Fix log statements.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7ce3b818
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7ce3b818
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7ce3b818
Branch: refs/heads/master
Commit: 7ce3b818fb1ba3f291eda58988e4808e999cae3a
Parents: 0b0b9ce
Author: Tathagata Das <ta...@gmail.com>
Authored: Thu Jul 9 13:19:36 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Thu Jul 9 13:19:36 2015 -0700
----------------------------------------------------------------------
.../apache/spark/streaming/receiver/ReceiverSupervisor.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7ce3b818/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceiverSupervisor.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceiverSupervisor.scala b/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceiverSupervisor.scala
index 33be067..eeb14ca 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceiverSupervisor.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/receiver/ReceiverSupervisor.scala
@@ -182,12 +182,12 @@ private[streaming] abstract class ReceiverSupervisor(
/** Wait the thread until the supervisor is stopped */
def awaitTermination() {
+ logInfo("Waiting for receiver to be stopped")
stopLatch.await()
- logInfo("Waiting for executor stop is over")
if (stoppingError != null) {
- logError("Stopped executor with error: " + stoppingError)
+ logError("Stopped receiver with error: " + stoppingError)
} else {
- logWarning("Stopped executor without error")
+ logInfo("Stopped receiver without error")
}
if (stoppingError != null) {
throw stoppingError
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org