diff options
| author | zsxwing <zsxwing@gmail.com> | 2015-06-30 21:57:07 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-06-30 21:57:07 -0700 |
| commit | 64c14618d3f4ede042bd3f6a542bc17a730afb0e (patch) | |
| tree | 4f12804465eb52c16671086df6aea1228e8a31e3 /core | |
| parent | b6e76edf3005c078b407f63b0a05d3a28c18c742 (diff) | |
| download | spark-64c14618d3f4ede042bd3f6a542bc17a730afb0e.tar.gz spark-64c14618d3f4ede042bd3f6a542bc17a730afb0e.tar.bz2 spark-64c14618d3f4ede042bd3f6a542bc17a730afb0e.zip | |
[SPARK-6602][Core]Remove unnecessary synchronized
A follow-up pr to address https://github.com/apache/spark/pull/5392#discussion_r33627528
Author: zsxwing <zsxwing@gmail.com>
Closes #7141 from zsxwing/pr5392-follow-up and squashes the following commits:
fcf7b50 [zsxwing] Remove unnecessary synchronized
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 7 |
1 files changed, 2 insertions, 5 deletions
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 3e7c167228..48070768f6 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) |