Merge pull request #4704 from gchq/planb

Plan B State Store

CHANGELOG.md

@@ -30,6 +30,19 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 * Issue **#4693** : Add the property `stroom.session.maxInactiveInterval` to control the HTTP session expiry. Defaults to `1d`.
 
 
+## [v7.8-planb-beta.9] - 2025-01-21
+
+* Change `receiptId` format to `<epoch ms>_<seq no>_<(P|S)>_<proxyId or stroom nodeName>`. `P|S` represents stroom or Proxy.
+
+* Change stroom to also set the `receiptId` meta attribute on receipt or upload.
+
+* Change proxy logging to still log datafeed events even if the `metaKeys` config prop is empty.
+
+* Issue **#4695** : Change proxy to re-create the proxy ID in proxy-id.txt if the value in there does not match the required pattern.
+
+* Fix the sleep time in UniqueIdGenerator (from 50ms to 0.1ms).
+
+
 ## [v7.8-beta.8] - 2025-01-10
 
 * Fix tests that were breaking the build.
@@ -1165,7 +1178,8 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 * Issue **#3830** : Add S3 data storage option.
 
 
-[Unreleased]: https://github.com/gchq/stroom/compare/v7.8-beta.8...HEAD
+[Unreleased]: https://github.com/gchq/stroom/compare/v7.8-planb-beta.9...HEAD
+[v7.8-planb-beta.9]: https://github.com/gchq/stroom/compare/v7.8-beta.8...v7.8-planb-beta.9
 [v7.8-beta.8]: https://github.com/gchq/stroom/compare/v7.8-beta.7...v7.8-beta.8
 [v7.8-beta.7]: https://github.com/gchq/stroom/compare/v7.8-beta.6...v7.8-beta.7
 [v7.8-beta.6]: https://github.com/gchq/stroom/compare/v7.8-beta.5...v7.8-beta.6

content-packs.yml

@@ -5,98 +5,107 @@
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name : "event-logging-xml-schema",
     path : "source/event-logging-xml-schema/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "example-index",
     path: "source/example-index/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "internal-dashboards",
     path: "source/internal-dashboards/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "internal-statistics-sql",
     path: "source/internal-statistics-sql/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "internal-statistics-stroom-stats",
     path: "source/internal-statistics-stroom-stats/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "standard-pipelines",
     path: "source/standard-pipelines/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "stroom-101",
     path: "source/stroom-101/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "stroom-logs",
     path: "source/stroom-logs/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "template-pipelines",
     path: "source/template-pipelines/stroomContent",
     repo: {
       name: "stroom-content",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "state",
     path: "source/state/stroomContent",
     repo: {
       name: "state",
       uri : "https://github.com/gchq/stroom-content.git",
-      branch: "7.5",
-      commit: "d5371bd52c8f812fdace2c35d40d84fc79c1f49d"
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
+    }
+  }, {
+    name: "planb",
+    path: "source/planb/stroomContent",
+    repo: {
+      name: "planb",
+      uri : "https://github.com/gchq/stroom-content.git",
+      branch: "planb",
+      commit: "d9e12119e51877eaf8d015d4b5ead52b34f33b62"
     }
   }, {
     name: "stroom-visualisations",

settings.gradle

@@ -201,6 +201,9 @@ include 'stroom-node:stroom-node-impl-db-jooq'
 // Pipeline
 include 'stroom-pipeline'
 
+// Plan B
+include 'stroom-state:stroom-planb-impl'
+
 // Processor
 include 'stroom-processor:stroom-processor-api'
 include 'stroom-processor:stroom-processor-impl'
@@ -221,7 +224,6 @@ include 'stroom-query:stroom-query-language'
 include 'stroom-query:stroom-query-language-api'
 
 // State store
-include 'stroom-state:stroom-state-api'
 include 'stroom-state:stroom-state-impl'
 
 // Suggestions

stroom-app-gwt/src/main/java/stroom/app/client/gin/AppGinjectorUser.java

@@ -73,6 +73,8 @@
 import stroom.monitoring.client.gin.MonitoringModule;
 import stroom.pipeline.client.gin.PipelineGinjector;
 import stroom.pipeline.client.gin.PipelineModule;
+import stroom.planb.client.gin.PlanBGinjector;
+import stroom.planb.client.gin.PlanBModule;
 import stroom.preferences.client.gin.UserPreferencesGinjector;
 import stroom.preferences.client.gin.UserPreferencesModule;
 import stroom.query.client.gin.QueryModule;
@@ -163,6 +165,7 @@
         S3ConfigModule.class,
         ScyllaDbModule.class,
         StateStoreModule.class,
+        PlanBModule.class
 })
 public interface AppGinjectorUser extends
         AboutGinjector,
@@ -205,7 +208,8 @@ public interface AppGinjectorUser extends
         XMLSchemaGinjector,
         S3ConfigGinjector,
         ScyllaDbGinjector,
-        StateStoreGinjector {
+        StateStoreGinjector,
+        PlanBGinjector {
 
     // Default implementation of standard resources
     EventBus getEventBus();

stroom-app-gwt/src/main/resources/stroom/app/App.gwt.xml

@@ -100,6 +100,7 @@
     <inherits name="stroom.dashboard.Dashboard" />
     <inherits name="stroom.state.ScyllaDb" />
     <inherits name="stroom.state.StateStore" />
+    <inherits name="stroom.planb.PlanB" />
 
     <inherits name="stroom.query.Query" />
 

stroom-app/build.gradle

@@ -178,8 +178,8 @@ dependencies {
     implementation project(':stroom-security:stroom-security-openid-api')
     implementation project(':stroom-servicediscovery:stroom-servicediscovery-api')
     implementation project(':stroom-servicediscovery:stroom-servicediscovery-impl')
-    implementation project(':stroom-state:stroom-state-api')
     implementation project(':stroom-state:stroom-state-impl')
+    implementation project(':stroom-state:stroom-planb-impl')
     implementation project(':stroom-statistics:stroom-statistics-api')
     implementation project(':stroom-statistics:stroom-statistics-impl')
     implementation project(':stroom-statistics:stroom-statistics-impl-hbase')
@@ -821,4 +821,70 @@ tasks.register('Stroom Node 1 (GWT Super Dev)', JavaExec) {
     args = ['server', 'local.yml']
 }
 
+tasks.register('Stroom Node 2 (GWT Super Dev)', JavaExec) {
+    doFirst {
+        // We have to alter the existing jvm args rather than set them so that we don't lose debug args added by
+        // IJ Idea.
+        def jvmArgsCopy = []
+        for (arg in jvmArgs) {
+            jvmArgsCopy.add(arg)
+        }
+        //    -DgwtSuperDevMode=true
+        //    -Xmx4g
+        //    -Devent.logging.validate=true
+        //    --add-opens java.base/java.nio=ALL-UNNAMED
+        //    --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+        //    --add-opens java.base/java.lang=ALL-UNNAMED
+        jvmArgsCopy.add("-DgwtSuperDevMode=true")
+        jvmArgsCopy.add("-Xmx4g")
+        jvmArgsCopy.add("-Devent.logging.validate=true")
+        jvmArgsCopy.add("--add-opens")
+        jvmArgsCopy.add("java.base/java.nio=ALL-UNNAMED")
+        jvmArgsCopy.add("--add-opens")
+        jvmArgsCopy.add("java.base/sun.nio.ch=ALL-UNNAMED")
+        jvmArgsCopy.add("--add-opens")
+        jvmArgsCopy.add("java.base/java.lang=ALL-UNNAMED")
+        jvmArgs = jvmArgsCopy
+    }
+
+    group = 'application'
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = 'stroom.app.App'
+    workingDir = '../'
+    args = ['server', 'local2.yml']
+}
+
+tasks.register('Stroom Node 3 (GWT Super Dev)', JavaExec) {
+    doFirst {
+        // We have to alter the existing jvm args rather than set them so that we don't lose debug args added by
+        // IJ Idea.
+        def jvmArgsCopy = []
+        for (arg in jvmArgs) {
+            jvmArgsCopy.add(arg)
+        }
+        //    -DgwtSuperDevMode=true
+        //    -Xmx4g
+        //    -Devent.logging.validate=true
+        //    --add-opens java.base/java.nio=ALL-UNNAMED
+        //    --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+        //    --add-opens java.base/java.lang=ALL-UNNAMED
+        jvmArgsCopy.add("-DgwtSuperDevMode=true")
+        jvmArgsCopy.add("-Xmx4g")
+        jvmArgsCopy.add("-Devent.logging.validate=true")
+        jvmArgsCopy.add("--add-opens")
+        jvmArgsCopy.add("java.base/java.nio=ALL-UNNAMED")
+        jvmArgsCopy.add("--add-opens")
+        jvmArgsCopy.add("java.base/sun.nio.ch=ALL-UNNAMED")
+        jvmArgsCopy.add("--add-opens")
+        jvmArgsCopy.add("java.base/java.lang=ALL-UNNAMED")
+        jvmArgs = jvmArgsCopy
+    }
+
+    group = 'application'
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = 'stroom.app.App'
+    workingDir = '../'
+    args = ['server', 'local3.yml']
+}
+
 // vim: set tabstop=4 shiftwidth=4 expandtab:

stroom-app/src/main/java/stroom/app/guice/CoreModule.java

@@ -103,6 +103,7 @@ protected void configure() {
         install(new stroom.analytics.rule.impl.AnalyticRuleModule());
         install(new stroom.analytics.rule.impl.ReportModule());
         install(new stroom.state.impl.StateModule());
+        install(new stroom.planb.impl.PlanBModule());
         install(new stroom.statistics.impl.InternalStatisticsModule());
         install(new stroom.statistics.impl.hbase.entity.StroomStatsStoreModule());
         install(new stroom.statistics.impl.hbase.internal.InternalModule());