Remove helm/metadig-scheduler volume yamls that were unintentionally …

…commited

dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>edu.ucsb.nceas</groupId>
   <artifactId>metadig-engine</artifactId>
   <name>metadig-engine</name>
-  <version>2.4.1-SNAPSHOT</version>
+  <version>3.0.3-SNAPSHOT</version>
   <description>MetaDIG library for running metadata quality tests</description>
   <url>https://github.com/NCEAS/metadig-engine</url>
   <scm>
@@ -31,15 +31,15 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>3.13.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>17</source>
+          <target>17</target>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -85,7 +85,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>copy-jar-file</id>
@@ -109,36 +109,9 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>io.fabric8</groupId>
-        <artifactId>docker-maven-plugin</artifactId>
-        <version>0.30.0</version>
-        <configuration>
-          <images>
-            <image>
-              <name>${docker.repo}/metadig-worker:${docker.tag}</name>
-              <build>
-                <dockerFileDir>${project.basedir}/Docker/metadig-worker</dockerFileDir>
-              </build>
-            </image>
-            <image>
-              <name>${docker.repo}/metadig-scheduler:${docker.tag}</name>
-              <build>
-                <dockerFileDir>${project.basedir}/Docker/metadig-scheduler</dockerFileDir>
-              </build>
-            </image>
-            <image>
-              <name>${docker.repo}/metadig-scorer:${docker.tag}</name>
-              <build>
-                <dockerFileDir>${project.basedir}/Docker/metadig-scorer</dockerFileDir>
-              </build>
-            </image>
-          </images>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M3</version>
+        <version>3.2.5</version>
         <executions>
           <execution>
             <id>integration-test</id>
@@ -184,7 +157,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -203,24 +176,23 @@
     </repository>
   </distributionManagement>
   <properties>
-    <maven.wagon.version>3.5.3</maven.wagon.version>
-    <jython.version>2.7.2</jython.version>
-    <spring.version>3.1.4.RELEASE</spring.version>
-    <gson.version>2.6.2</gson.version>
-    <d1_cn_index_common_version>2.3.2</d1_cn_index_common_version>
-    <d1_libclient_java.version>2.3.1</d1_libclient_java.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <docker.tag>2.4.1-SNAPSHOT</docker.tag>
-    <d1_cn_index_processor_version>2.3.14</d1_cn_index_processor_version>
+    <d1_cn_index_processor_version>2.3.15</d1_cn_index_processor_version>
     <modules.test.excludes>**/LTERSuiteTest.java</modules.test.excludes>
+    <jackson.version>2.15.2</jackson.version>
     <modules.test.includes>**/*Test.java</modules.test.includes>
-    <docker.repo>metadig</docker.repo>
-    <jackson.version>2.9.8</jackson.version>
-    <json-path.version>2.4.0</json-path.version>
     <renjin.version>0.8.2567</renjin.version>
-    <log4j.version>2.17.1</log4j.version>
-    <moxy.version>2.6.3</moxy.version>
+    <gson.version>2.10.1</gson.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <log4j.version>2.23.0</log4j.version>
+    <jython.version>2.7.3</jython.version>
+    <docker.repo>metadig</docker.repo>
     <bookkeeper.version>0.1.0-SNAPSHOT</bookkeeper.version>
+    <json-path.version>2.9.0</json-path.version>
+    <d1_libclient_java.version>2.3.1</d1_libclient_java.version>
+    <spring.version>5.3.22</spring.version>
+    <d1_cn_index_common_version>2.3.2</d1_cn_index_common_version>
+    <docker.tag>2.5.0</docker.tag>
+    <moxy.version>2.7.0</moxy.version>
+    <maven.wagon.version>3.5.3</maven.wagon.version>
   </properties>
 </project>
-

helm/metadig-scheduler/Chart.yaml

@@ -21,4 +21,4 @@ version: 1.0.6
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "feature-hashstore-support"
+appVersion: "feature-hashstore-libimport"

helm/metadig-scheduler/values.yaml

@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/nceas/metadig-scheduler
   pullPolicy: Always
-  tag: "feature-hashstore-support"
+  tag: "feature-hashstore-libimport"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -107,5 +107,10 @@ persistence:
   ## @param persistence.mountPath Persistence mount path for Solr
   ##
   mountPath: "/opt/local"
+
+  # Scheduler needs access to this path to access hashstore to retrieve streams
+  metacat:
+    claimName: metadig-repos-rom
+    mountPath: "/var/data/repos"
 dns:
   config: true

helm/metadig-scorer/Chart.yaml

@@ -21,4 +21,4 @@ version: 1.0.6
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "feature-hashstore-support"
+appVersion: "feature-hashstore-libimport"

helm/metadig-scorer/values.yaml

@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/nceas/metadig-scorer
   pullPolicy: Always
-  tag: "feature-hashstore-support"
+  tag: "feature-hashstore-libimport"
 
 
 imagePullSecrets: []

helm/metadig-worker/Chart.yaml

@@ -21,4 +21,4 @@ version: 1.0.6
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "feature-hashstore-support"
+appVersion: "feature-hashstore-libimport"

helm/metadig-worker/values.yaml

@@ -10,7 +10,7 @@ labels:
 image:
   repository: ghcr.io/nceas/metadig-worker
   pullPolicy: Always
-  tag: "feature-hashstore-support"
+  tag: "feature-hashstore-libimport"
 
 imagePullSecrets: []
 nameOverride: ""

src/main/java/edu/ucsb/nceas/mdqengine/Controller.java

@@ -441,6 +441,8 @@ public void processQualityRequest(String memberNode,
             sysmeta = (SystemMetadata) tmpSysmeta;
         }
 
+        // TODO: Review localFilePath argument, this may be re-purposed for a specific hashstore
+        // TODO: May be renamed to `hashStorePath` and passed for metadig to grab sysmeta directly
         qEntry = new QueueEntry(memberNode, metadataPid, metadataDoc, qualitySuiteId, localFilePath, requestDateTime,
                 sysmeta,
                 runXML, null);

src/main/java/edu/ucsb/nceas/mdqengine/QueueEntry.java

@@ -136,10 +136,11 @@ public QueueEntry (String memberNode, String metadataPid, String metadataDoc, St
                        DateTime requestDataTime, SystemMetadata systemMetadata, String runXML, String hostname) {
         this.memberNode = memberNode;
         this.metadataPid = metadataPid;
-        this.metadataDoc = metadataDoc;
+        this.metadataDoc = metadataDoc; // Candidate for removal
         this.qualitySuiteId = qualitySuiteId;
-        this.systemMetadata = systemMetadata;
-        this.localFilePath = localFilePath;
+        this.systemMetadata = systemMetadata;  // Candidate for removal, when msg is processed,
+        // make sure it's not being used
+        this.localFilePath = localFilePath; // Possible usage for hashstore instance path
         this.requestDataTime = requestDataTime;
         this.runXML = runXML;
         this.hostname = hostname;

src/main/java/edu/ucsb/nceas/mdqengine/scheduler/MonitorJob.java

@@ -119,6 +119,7 @@ public void execute(JobExecutionContext context) throws JobExecutionException {
                 InputStream sysmeta = null;
 
                 try {
+                    // TODO: What is this metadata? Why is it needed?
                     metadata = getMetadata(run, session, store);
                 } catch (MetadigException me) {
                     JobExecutionException jee = new JobExecutionException(me);