Propagate TimeoutException when ActorSystem fails to terminate

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / akka / impl / ActorSystemProviderImpl.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
index 14aedffd2ab59ecd866df71d66eaf6827adb2b28..6e805b33d7893045b431f3314cd18525a3bce5e4 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/impl/ActorSystemProviderImpl.java
@@ -11,6 +11,7 @@ import akka.actor.ActorSystem;
 import akka.actor.Props;
 import com.typesafe.config.Config;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import org.opendaylight.controller.cluster.ActorSystemProvider;
 import org.opendaylight.controller.cluster.ActorSystemProviderListener;
 import org.opendaylight.controller.cluster.common.actor.QuarantinedMonitorActor;
@@ -20,13 +21,14 @@ import org.opendaylight.yangtools.util.ListenerRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import scala.concurrent.Await;
-import scala.concurrent.duration.Duration;
+import scala.concurrent.duration.FiniteDuration;
 
 public class ActorSystemProviderImpl implements ActorSystemProvider, AutoCloseable {
     private static final String ACTOR_SYSTEM_NAME = "opendaylight-cluster-data";
-    static final Logger LOG = LoggerFactory.getLogger(ActorSystemProviderImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActorSystemProviderImpl.class);
+
     private final ActorSystem actorSystem;
-    private final ListenerRegistry<ActorSystemProviderListener> listeners = new ListenerRegistry<>();
+    private final ListenerRegistry<ActorSystemProviderListener> listeners = ListenerRegistry.create();
 
     public ActorSystemProviderImpl(
             final ClassLoader classLoader, final Props quarantinedMonitorActorProps, final Config akkaConfig) {
@@ -50,14 +52,8 @@ public class ActorSystemProviderImpl implements ActorSystemProvider, AutoCloseab
     }
 
     @Override
-    @SuppressWarnings("checkstyle:IllegalCatch")
-    public void close() {
+    public void close() throws TimeoutException, InterruptedException {
         LOG.info("Shutting down ActorSystem");
-
-        try {
-            Await.result(actorSystem.terminate(), Duration.create(10, TimeUnit.SECONDS));
-        } catch (final Exception e) {
-            LOG.warn("Error awaiting actor termination", e);
-        }
+        Await.result(actorSystem.terminate(), FiniteDuration.create(10, TimeUnit.SECONDS));
     }
 }