Skip to content
Permalink
Browse files

Avoid None.get exception in (rare?) case that no readLocks exist

  • Loading branch information
srowen committed Mar 14, 2017
1 parent 1c7275e commit 27234e154db18cbc614053446713636a69046090
Showing with 2 additions and 2 deletions.
  1. +2 −2 core/src/main/scala/org/apache/spark/storage/BlockInfoManager.scala
@@ -23,7 +23,7 @@ import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.reflect.ClassTag

import com.google.common.collect.ConcurrentHashMultiset
import com.google.common.collect.{ConcurrentHashMultiset, ImmutableMultiset}

import org.apache.spark.{SparkException, TaskContext}
import org.apache.spark.internal.Logging
@@ -340,7 +340,7 @@ private[storage] class BlockInfoManager extends Logging {
val blocksWithReleasedLocks = mutable.ArrayBuffer[BlockId]()

val readLocks = synchronized {
readLocksByTask.remove(taskAttemptId).get
readLocksByTask.remove(taskAttemptId).getOrElse(ImmutableMultiset.of())
}
val writeLocks = synchronized {
writeLocksByTask.remove(taskAttemptId).getOrElse(Seq.empty)

0 comments on commit 27234e1

Please sign in to comment.
You can’t perform that action at this time.