Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@muttcg
muttcg committed Aug 2, 2023
2 parents 3c96790 + 417aa9c commit 4b1a98c
Show file tree
Hide file tree
Showing 23 changed files with 39 additions and 23 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.gbif.registry</groupId>
<artifactId>registry-parent</artifactId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
<name>GBIF Registry Parent</name>
<description>GBIF Registry project</description>

Expand Down
2 changes: 1 addition & 1 deletion registry-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.gbif.registry</groupId>
<artifactId>registry-parent</artifactId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>

<artifactId>registry-cli</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion registry-directory/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-doi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-domain/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-events/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions registry-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>registry-examples</artifactId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>

<packaging>jar</packaging>

Expand Down
2 changes: 1 addition & 1 deletion registry-identity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-mail/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-messaging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-oaipmh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
7 changes: 7 additions & 0 deletions ...e/src/main/java/org/gbif/registry/persistence/mapper/pipelines/PipelineProcessMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,11 @@ long searchCount(
* @param pipelineExecutionKey key of the process
*/
void markPipelineExecutionIfFinished(@Param("pipelineExecutionKey") long pipelineExecutionKey);

/**
* When interpretation is allowed for failed identifiers, execution must have running status
*
* @param pipelineExecutionKey key of the process
*/
void markPipelineExecutionAsRunning(@Param("pipelineExecutionKey") long pipelineExecutionKey);
}
6 changes: 6 additions & 0 deletions ...c/main/resources/org/gbif/registry/persistence/mapper/pipelines/PipelineProcessMapper.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,12 @@
WHERE finished = false;
</update>

<update id="markPipelineExecutionAsRunning">
UPDATE pipeline_execution
SET finished = false
WHERE key = #{pipelineExecutionKey,jdbcType=BIGINT};
</update>

<select id="getRunningPipelineProcessCount" resultType="Long">
SELECT COUNT(1)
FROM pipeline_execution pe
Expand Down
2 changes: 1 addition & 1 deletion registry-pipelines/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
7 changes: 5 additions & 2 deletions ...main/java/org/gbif/registry/pipelines/DefaultRegistryPipelinesHistoryTrackingService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,8 @@ public void allowAbsentIndentifiersCommon(UUID datasetKey, Integer attempt) {
process.getExecutions().stream().max(Comparator.comparingLong(PipelineExecution::getKey));

if (execution.isPresent()) {
Set<PipelineStep> steps = execution.get().getSteps();
PipelineExecution pipelineExecution = execution.get();
Set<PipelineStep> steps = pipelineExecution.getSteps();
Optional<PipelineStep> identifierStep =
steps.stream().filter(x -> x.getType() == StepType.VERBATIM_TO_IDENTIFIER).findAny();

Expand All @@ -791,6 +792,8 @@ public void allowAbsentIndentifiersCommon(UUID datasetKey, Integer attempt) {
mapper.updatePipelineStep(step);
});

mapper.markPipelineExecutionAsRunning(pipelineExecution.getKey());

// Send message to interpretaton
PipelinesVerbatimMessage message =
objectMapper.readValue(pipelineStep.getMessage(), PipelinesVerbatimMessage.class);
Expand All @@ -808,7 +811,7 @@ public void allowAbsentIndentifiersCommon(UUID datasetKey, Integer attempt) {
attempt);
} else {
LOG.warn(
"Execution ID - {} doesn't contain failed identifier step", execution.get().getKey());
"Execution ID - {} doesn't contain failed identifier step", pipelineExecution.getKey());
}
}
} catch (IOException ex) {
Expand Down
2 changes: 1 addition & 1 deletion registry-search/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-surety/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-ws-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>registry-parent</artifactId>
<groupId>org.gbif.registry</groupId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion registry-ws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.gbif.registry</groupId>
<artifactId>registry-parent</artifactId>
<version>3.94.14-SNAPSHOT</version>
<version>3.94.15-SNAPSHOT</version>
</parent>
<artifactId>registry-ws</artifactId>
<name>GBIF Registry Webservices</name>
Expand Down

0 comments on commit 4b1a98c

Please sign in to comment.