From: Ajay Lele <ajayslele@gmail.com>
Date: Mon, 15 Oct 2018 18:23:37 +0000 (-0700)
Subject: Update procedure to restart controller on quarantined condition.
X-Git-Tag: release/fluorine-sr2~17
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c2a865db4d33bd1d90019279ebeefc5a1d8af438;hp=70003a00e3a5002cd58594b8a71dead5f00381e3;p=controller.git

Update procedure to restart controller on quarantined condition.

There was a behavior change in Karaf [0] because of which restarting
the container now requires the system property karaf.restart to be
set to true in addition to karaf.restart.jvm property. Update
controller restart logic on quarantined condition for the same.

[0] https://issues.apache.org/jira/browse/KARAF-5179

Change-Id: I7b93eb87f53870efea70f2c9a9b82eeca783aa0b
Signed-off-by: Ajay Lele <ajayslele@gmail.com>
(cherry picked from commit 8db9c583f92f65d03d7688d5b65cecf7a906d918)
---

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 31d68d9b6a..75872f4ddb 100644
--- 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
@@ -25,6 +25,7 @@ public final class QuarantinedMonitorActorPropsFactory {
             // restart the entire karaf container
             LOG.warn("Restarting karaf container");
             System.setProperty("karaf.restart.jvm", "true");
+            System.setProperty("karaf.restart", "true");
             bundleContext.getBundle(0).stop();
         });
     }