Merge pull request #5367 from gchq/gh-5364_planb_segfault

#5364 Change PlanB snapshots to prevent closure when in use

Author: stroomdev66

stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/PlanBConfig.java

@@ -134,4 +134,85 @@ public int hashCode() {
                 minTimeToKeepEnvOpen,
                 snapshotRetryFetchInterval);
     }
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public Builder copy() {
+        return new Builder(this);
+    }
+
+    public static class Builder {
+
+        private CacheConfig stateDocCache;
+        private List<String> nodeList;
+        private String path;
+        private StroomDuration minTimeToKeepSnapshots;
+        private StroomDuration minTimeToKeepEnvOpen;
+        private StroomDuration snapshotRetryFetchInterval;
+
+        public Builder() {
+            // Set defaults
+            this.stateDocCache = CacheConfig
+                    .builder()
+                    .maximumSize(1000L)
+                    .expireAfterWrite(StroomDuration.ofMinutes(10))
+                    .build();
+            this.nodeList = Collections.emptyList();
+            this.path = "${stroom.home}/planb";
+            this.minTimeToKeepSnapshots = StroomDuration.ofMinutes(10);
+            this.minTimeToKeepEnvOpen = StroomDuration.ofMinutes(1);
+            this.snapshotRetryFetchInterval = StroomDuration.ofMinutes(1);
+        }
+
+        public Builder(final PlanBConfig config) {
+            this.stateDocCache = config.stateDocCache;
+            this.nodeList = config.nodeList;
+            this.path = config.path;
+            this.minTimeToKeepSnapshots = config.minTimeToKeepSnapshots;
+            this.minTimeToKeepEnvOpen = config.minTimeToKeepEnvOpen;
+            this.snapshotRetryFetchInterval = config.snapshotRetryFetchInterval;
+        }
+
+        public Builder stateDocCache(final CacheConfig stateDocCache) {
+            this.stateDocCache = stateDocCache;
+            return this;
+        }
+
+        public Builder nodeList(final List<String> nodeList) {
+            this.nodeList = nodeList;
+            return this;
+        }
+
+        public Builder path(final String path) {
+            this.path = path;
+            return this;
+        }
+
+        public Builder minTimeToKeepSnapshots(final StroomDuration minTimeToKeepSnapshots) {
+            this.minTimeToKeepSnapshots = minTimeToKeepSnapshots;
+            return this;
+        }
+
+        public Builder minTimeToKeepEnvOpen(final StroomDuration minTimeToKeepEnvOpen) {
+            this.minTimeToKeepEnvOpen = minTimeToKeepEnvOpen;
+            return this;
+        }
+
+        public Builder snapshotRetryFetchInterval(final StroomDuration snapshotRetryFetchInterval) {
+            this.snapshotRetryFetchInterval = snapshotRetryFetchInterval;
+            return this;
+        }
+
+        public PlanBConfig build() {
+            return new PlanBConfig(
+                    stateDocCache,
+                    nodeList,
+                    path,
+                    minTimeToKeepSnapshots,
+                    minTimeToKeepEnvOpen,
+                    snapshotRetryFetchInterval);
+        }
+    }
 }

stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/data/ShardManager.java

@@ -7,7 +7,9 @@
 import stroom.planb.impl.PlanBConfig;
 import stroom.planb.impl.PlanBDocCache;
 import stroom.planb.impl.PlanBDocStore;
+import stroom.planb.impl.data.SnapshotShard.DbFactory;
 import stroom.planb.impl.db.Db;
+import stroom.planb.impl.db.PlanBDb;
 import stroom.planb.impl.db.StatePaths;
 import stroom.planb.shared.PlanBDoc;
 import stroom.task.api.TaskContext;
@@ -41,6 +43,9 @@ public class ShardManager {
     public static final String CLEANUP_TASK_NAME = "Plan B Cleanup";
     public static final String SNAPSHOT_CREATOR_TASK_NAME = "Plan B Snapshot Creator";
 
+    private static final DbFactory DB_FACTORY = (doc, dbDir, byteBuffers, readOnly) ->
+            PlanBDb.open(doc, dbDir, byteBuffers, true);
+
     private final ByteBuffers byteBuffers;
     private final PlanBDocCache planBDocCache;
     private final PlanBDocStore planBDocStore;
@@ -256,7 +261,8 @@ private Shard createShard(final PlanBDoc doc) {
                     configProvider,
                     statePaths,
                     fileTransferClient,
-                    doc);
+                    doc,
+                    DB_FACTORY);
         }
         return new StoreShard(
                 byteBuffers,