Repository: spark Updated Branches: refs/heads/master b6e76edf3 -> 64c14618d
[SPARK-6602][Core]Remove unnecessary synchronized A follow-up pr to address https://github.com/apache/spark/pull/5392#discussion_r33627528 Author: zsxwing <zsxw...@gmail.com> Closes #7141 from zsxwing/pr5392-follow-up and squashes the following commits: fcf7b50 [zsxwing] Remove unnecessary synchronized Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/64c14618 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/64c14618 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/64c14618 Branch: refs/heads/master Commit: 64c14618d3f4ede042bd3f6a542bc17a730afb0e Parents: b6e76ed Author: zsxwing <zsxw...@gmail.com> Authored: Tue Jun 30 21:57:07 2015 -0700 Committer: Reynold Xin <r...@databricks.com> Committed: Tue Jun 30 21:57:07 2015 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/deploy/master/Master.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/64c14618/core/src/main/scala/org/apache/spark/deploy/master/Master.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala index 3e7c167..4807076 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala @@ -518,12 +518,9 @@ private[master] class Master( } private def completeRecovery() { - // TODO Why synchronized // Ensure "only-once" recovery semantics using a short synchronization period. - synchronized { - if (state != RecoveryState.RECOVERING) { return } - state = RecoveryState.COMPLETING_RECOVERY - } + if (state != RecoveryState.RECOVERING) { return } + state = RecoveryState.COMPLETING_RECOVERY // Kill off any workers and apps that didn't respond to us. workers.filter(_.state == WorkerState.UNKNOWN).foreach(removeWorker) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
