Revert "Switch default persistence to segmented-journal"

This reverts commit 8fc271e2d166f9d9abe54bc8915798d213d536bb.

Reason for revert: causes regression in Magnesium SR1 release

Change-Id: Id7118f44b2c8b04a595f1727842cdd90ca6f16f4
Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>

diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
index 464645b6ae3aef4f041e97fe83edcd0028739943..e2ec0fca9ebe74479e0a73097d29e111d5481d8d 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/factory-akka.conf
@@ -124,19 +124,13 @@ odl-cluster-data {
 
     persistence {
       journal {
-        # This would activate the deprecated levedb persistence plugin. This plugin was used
-        # by default by all OpenDaylight versions, but is considered not ready for production
-        # use by Akka. Magnesium defaults to segmented-file journal (below) and this option will
-        # be removed in a future release.
-        #
-        # plugin = akka.persistence.journal.leveldb
+        plugin = akka.persistence.journal.leveldb
 
-        # The following activates the default segmented file journal. Each persistent actor
+        # The following activates the alternative segmented file journal. Each persistent actor
         # is stored in a separate directory, with multiple segment files. Segments are removed
         # when they are not longer required.
         #
-        plugin = akka.persistence.journal.segmented-file
-
+        # plugin = akka.persistence.journal.segmented-file
         segmented-file {
           class = "org.opendaylight.controller.akka.segjournal.SegmentedFileJournal"
           # Root directory for segmented journal storage