Repository: spark Updated Branches: refs/heads/branch-1.0 886508d3b -> 952e0d698
[SPARK-2379] Fix the bug that streaming's receiver may fall into a dead loop Author: joyyoj <suns...@gmail.com> Closes #1694 from joyyoj/SPARK-2379 and squashes the following commits: d73790d [joyyoj] SPARK-2379 Fix the bug that streaming's receiver may fall into a dead loop 22e7821 [joyyoj] Merge remote-tracking branch 'apache/master' 3f4a602 [joyyoj] Merge remote-tracking branch 'remotes/apache/master' f4660c5 [joyyoj] [SPARK-1998] SparkFlumeEvent with body bigger than 1020 bytes are not read properly (cherry picked from commit b270309d7608fb749e402cd5afd36087446be398) Signed-off-by: Tathagata Das <tathagata.das1...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/952e0d69 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/952e0d69 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/952e0d69 Branch: refs/heads/branch-1.0 Commit: 952e0d69841b6218e7d1b8b23e7d74a4fcb1b381 Parents: 886508d Author: joyyoj <suns...@gmail.com> Authored: Fri Aug 1 13:41:55 2014 -0700 Committer: Tathagata Das <tathagata.das1...@gmail.com> Committed: Fri Aug 1 13:42:16 2014 -0700 ---------------------------------------------------------------------- .../org/apache/spark/streaming/receiver/ReceiverSupervisor.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/952e0d69/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 09be3a5..1f0244c 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 @@ -138,7 +138,7 @@ private[streaming] abstract class ReceiverSupervisor( onReceiverStop(message, error) } catch { case t: Throwable => - stop("Error stopping receiver " + streamId, Some(t)) + logError("Error stopping receiver " + streamId + t.getStackTraceString) } }
