From 71e024c0070d8f3df7795624cdf560dbd269a78b Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Mon, 9 Jan 2023 13:11:31 +0100 Subject: [PATCH] Fix worship posts jobs getting stuck --- config/delta/rules.js | 19 +----------------- config/jobs-controller/config.json | 32 ++++++++++++++++++++++++++++++ docker-compose.yml | 23 +++++---------------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/config/delta/rules.js b/config/delta/rules.js index 0578070..2b2899f 100644 --- a/config/delta/rules.js +++ b/config/delta/rules.js @@ -158,6 +158,7 @@ export default [ }, { match: { + // anything }, callback: { url: 'http://delta-producer-pub-graph-maintainer-worship-posts/delta', @@ -173,24 +174,6 @@ export default [ ] } }, - { - match: { - graph: { - type: 'uri', - value: 'http://redpencil.data.gift/id/deltas/producer/worship-posts' - } - }, - callback: { - url: 'http://delta-producer-json-diff-publisher-worship-posts/delta', - method: 'POST' - }, - options: { - resourceFormat: 'v0.0.1', - gracePeriod: 1000, - ignoreFromSelf: true, - optOutMuScopeIds: [ "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync" ] - } - }, { match: { predicate: { diff --git a/config/jobs-controller/config.json b/config/jobs-controller/config.json index 928128b..5817d84 100644 --- a/config/jobs-controller/config.json +++ b/config/jobs-controller/config.json @@ -94,5 +94,37 @@ "nextIndex": "0" } ] + }, + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts": { + "tasksConfiguration": [ + { + "currentOperation": null, + "nextOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/initialPublicationGraphSyncing", + "nextIndex": "0" + }, + { + "currentOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/initialPublicationGraphSyncing", + "nextOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/deltaDumpFileCreation", + "nextIndex": "1" + } + ] + }, + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts": { + "tasksConfiguration": [ + { + "currentOperation": null, + "nextOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/healing/patchPublicationGraph", + "nextIndex": "0" + } + ] + }, + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/worship-posts": { + "tasksConfiguration": [ + { + "currentOperation": null, + "nextOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/deltaDumpFileCreation", + "nextIndex": "0" + } + ] } } diff --git a/docker-compose.yml b/docker-compose.yml index f183269..e016296 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -436,6 +436,11 @@ services: USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive SKIP_MU_AUTH_INITIAL_SYNC: "true" HEALING_PATCH_GRAPH_BATCH_SIZE: 500 + SERVE_DELTA_FILES: "true" + PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/worship-posts" + DELTA_INTERVAL_MS: 10000 + PRETTY_PRINT_DIFF_JSON: "true" + ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" volumes: - ./config/delta-producer/worship-posts:/config - ./data/files/:/share @@ -444,24 +449,6 @@ services: - triplestore:virtuoso restart: always logging: *default-logging - delta-producer-json-diff-publisher-worship-posts: - image: lblod/delta-producer-json-diff-file-publisher:0.2.3 - environment: - MAX_BODY_SIZE: "50mb" - ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" - RELATIVE_FILE_PATH: "deltas/worship-posts" - PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/worship-posts" - PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/worship-posts" - DELTA_INTERVAL_MS: 10000 - PRETTY_PRINT_DIFF_JSON: "true" - volumes: - - ./data/files:/share - labels: - - "logging=true" - links: - - db:database - restart: always - logging: *default-logging ################################################################################ # DELTA WORSHIP POSTS: END ################################################################################