Add option to disable default ActorSystemQuarantinedEvent handling

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/QuarantinedMonitorActorPropsFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/QuarantinedMonitorActorPropsFactory.java
index 75872f4ddbf202d3ed5f4d68b22fe523072572f8..eb98c4f3399973d17f57facb9c1961aceb3ad1db 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/QuarantinedMonitorActorPropsFactory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/akka/osgi/impl/QuarantinedMonitorActorPropsFactory.java
@@ -8,6 +8,8 @@
 package org.opendaylight.controller.cluster.akka.osgi.impl;
 
 import akka.actor.Props;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigException;
 import org.opendaylight.controller.cluster.common.actor.QuarantinedMonitorActor;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
@@ -16,11 +18,23 @@ import org.slf4j.LoggerFactory;
 public final class QuarantinedMonitorActorPropsFactory {
     private static final Logger LOG = LoggerFactory.getLogger(QuarantinedMonitorActorPropsFactory.class);
 
+    private static final String DEFAULT_HANDLING_DISABLED =
+        "akka.disable-default-actor-system-quarantined-event-handling";
+
     private QuarantinedMonitorActorPropsFactory() {
 
     }
 
-    public static Props createProps(final BundleContext bundleContext) {
+    public static Props createProps(final BundleContext bundleContext, final Config akkaConfig) {
+        try {
+            if (akkaConfig.getBoolean(DEFAULT_HANDLING_DISABLED)) {
+                LOG.info("{} was set, default handling is disabled", DEFAULT_HANDLING_DISABLED);
+                return QuarantinedMonitorActor.props(() -> { });
+            }
+        } catch (ConfigException configEx) {
+            LOG.info("Akka config doesn't contain property {}. Therefore default handling will be used",
+                DEFAULT_HANDLING_DISABLED);
+        }
         return QuarantinedMonitorActor.props(() -> {
             // restart the entire karaf container
             LOG.warn("Restarting karaf container");