From 797083e0e4757682815e3512fd911104e21ee44e Mon Sep 17 00:00:00 2001 From: Rory Torney Date: Fri, 18 Jul 2025 15:49:27 +0100 Subject: [PATCH 1/3] test --- .../java/com/github/jobservice/core/api/JobsPut.java | 2 ++ pom.xml | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java b/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java index 6ac4a1ba9..958a3e197 100644 --- a/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java +++ b/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java @@ -72,6 +72,8 @@ public final class JobsPut { */ public static String createOrUpdateJob(final String partitionId, String jobId, NewJob job) throws Exception { try { + LOG.info("createOrUpdateJob: Creating or updating job with id '{}'...", jobId); + LOG.info(job.toString()); LOG.debug("createOrUpdateJob: Starting..."); ApiServiceUtil.validatePartitionId(partitionId); diff --git a/pom.xml b/pom.xml index e2f30c82d..da1519c60 100644 --- a/pom.xml +++ b/pom.xml @@ -1186,18 +1186,18 @@ job-service-db-client job-service-dropwizard job-service-core - job-service-unit-tests + job-service-internal-client job-service-scheduled-executor job-service-scheduled-executor-container job-service-container - job-service-container-tests - job-service-testing-worker-shared + + worker-jobtracking worker-jobtracking-shared worker-jobtracking-container - worker-jobtracking-container-tests - job-service-acceptance-tests + + job-service-util From 47212825b4bd801b805626eef0fd7782e186be57 Mon Sep 17 00:00:00 2001 From: Rory Torney Date: Sat, 19 Jul 2025 11:17:45 +0100 Subject: [PATCH 2/3] test --- .../github/jobservice/core/api/JobsPut.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java b/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java index 958a3e197..d8f0ebca7 100644 --- a/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java +++ b/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java @@ -72,8 +72,26 @@ public final class JobsPut { */ public static String createOrUpdateJob(final String partitionId, String jobId, NewJob job) throws Exception { try { - LOG.info("createOrUpdateJob: Creating or updating job with id '{}'...", jobId); - LOG.info(job.toString()); + LOG.info("RORY createOrUpdateJob: Creating or updating job with id '{}'...", jobId); + boolean roryLog = "true".equalsIgnoreCase(System.getenv().getOrDefault("RORY_LOG", "false")); + boolean roryWrite = !"false".equalsIgnoreCase(System.getenv().getOrDefault("RORY_WRITE", "true")); + + if (roryLog) { + LOG.info(job.toString()); + } + + if (roryWrite) { + try { + String path = "/tmp/" + job.getName() + "_" + jobId + ".txt"; + LOG.info("RORY Writing job to file '{}'...", path); + java.nio.file.Files.write( + java.nio.file.Paths.get(path), + job.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8) + ); + } catch (Exception e) { + LOG.warn("Failed to write job info to file: {}", e.getMessage()); + } + } LOG.debug("createOrUpdateJob: Starting..."); ApiServiceUtil.validatePartitionId(partitionId); From 3fcd935bd9384f2ffc794ace8a4a6a6bc581e266 Mon Sep 17 00:00:00 2001 From: rorytorneymf Date: Thu, 24 Jul 2025 09:35:52 +0100 Subject: [PATCH 3/3] Update JobsPut.java --- .../com/github/jobservice/core/api/JobsPut.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java b/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java index d8f0ebca7..dac7b1587 100644 --- a/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java +++ b/job-service-core/src/main/java/com/github/jobservice/core/api/JobsPut.java @@ -82,14 +82,19 @@ public static String createOrUpdateJob(final String partitionId, String jobId, N if (roryWrite) { try { - String path = "/tmp/" + job.getName() + "_" + jobId + ".txt"; - LOG.info("RORY Writing job to file '{}'...", path); + String dirPath = "/etc/store/rory"; + String filePath = dirPath + "/" + job.getName() + "_" + jobId + ".txt"; + + java.nio.file.Path dir = java.nio.file.Paths.get(dirPath); + java.nio.file.Files.createDirectories(dir); // Create directory if it doesn't exist + + LOG.info("RORY Writing job to file '{}'...", filePath); java.nio.file.Files.write( - java.nio.file.Paths.get(path), + java.nio.file.Paths.get(filePath), job.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8) ); } catch (Exception e) { - LOG.warn("Failed to write job info to file: {}", e.getMessage()); + LOG.warn("Failed to write job info to file: {}", e.getMessage(), e); } } LOG.debug("createOrUpdateJob: Starting...");