From e900e88dcabcb74a81dcd5860e3607653a4e8a0a Mon Sep 17 00:00:00 2001 From: Stephen R Pietrowicz Date: Wed, 18 Sep 2024 14:49:30 -0500 Subject: [PATCH 1/6] Update config to 9.x version --- apps/atoods/values-tucson-teststand.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/atoods/values-tucson-teststand.yaml b/apps/atoods/values-tucson-teststand.yaml index 7ca384f0..23196f33 100644 --- a/apps/atoods/values-tucson-teststand.yaml +++ b/apps/atoods/values-tucson-teststand.yaml @@ -43,19 +43,21 @@ configfile: - butler: instrument: lsst.obs.lsst.Latiss class: - import : lsst.ctrl.oods.gen3ButlerIngester - name : Gen3ButlerIngester + import : lsst.ctrl.oods.fileAttendant + name : FileAttendant stagingDirectory : /data/lsstdata/TTS/auxtel/oods/gen3butler/raw badFileDirectory: /data/lsstdata/TTS/auxtel/oods/gen3butler/badfiles repoDirectory : /repo/LATISS collections: - LATISS/raw/all + cleanCollections: + - collection: LATISS/raw/all + filesOlderThan: + <<: *interval + days: 30 scanInterval: <<: *interval hours: 1 - filesOlderThan: - <<: *interval - days: 30 batchSize: 20 scanInterval: <<: *interval @@ -69,7 +71,7 @@ configfile: clearEmptyDirectoriesAndOldFiles: - /data/lsstdata/TTS/auxtel/oods/gen3butler/badfiles - /data/staging/auxtel/oods - - /data/staging/auxtel/forwarder + - /data/staging/auxtel/camera scanInterval: <<: *interval hours: 1 From 8b063b8498aacc2b9194a578a080b5fa94f5f380 Mon Sep 17 00:00:00 2001 From: Stephen R Pietrowicz Date: Wed, 18 Sep 2024 15:04:23 -0500 Subject: [PATCH 2/6] Update ingesterClass section --- apps/atoods/values-tucson-teststand.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/atoods/values-tucson-teststand.yaml b/apps/atoods/values-tucson-teststand.yaml index 23196f33..cfa1eec5 100644 --- a/apps/atoods/values-tucson-teststand.yaml +++ b/apps/atoods/values-tucson-teststand.yaml @@ -42,9 +42,9 @@ configfile: butlers: - butler: instrument: lsst.obs.lsst.Latiss - class: - import : lsst.ctrl.oods.fileAttendant - name : FileAttendant + ingesterClass: + ingesterType: lsst.ctrl.oods.fileAttendant + ingesterName : FileAttendant stagingDirectory : /data/lsstdata/TTS/auxtel/oods/gen3butler/raw badFileDirectory: /data/lsstdata/TTS/auxtel/oods/gen3butler/badfiles repoDirectory : /repo/LATISS From 30e6545297d1ee396275ee104450ba95b1b9528a Mon Sep 17 00:00:00 2001 From: Stephen R Pietrowicz Date: Wed, 18 Sep 2024 15:16:44 -0500 Subject: [PATCH 3/6] Move ingesterClass section --- apps/atoods/values-tucson-teststand.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/atoods/values-tucson-teststand.yaml b/apps/atoods/values-tucson-teststand.yaml index cfa1eec5..0590adf9 100644 --- a/apps/atoods/values-tucson-teststand.yaml +++ b/apps/atoods/values-tucson-teststand.yaml @@ -37,14 +37,15 @@ configfile: minutes: 0 seconds: 0 + ingesterClass: + ingesterType: lsst.ctrl.oods.fileAttendant + ingesterName : FileAttendant + ingester: imageStagingDirectory: /data/staging/auxtel/oods butlers: - butler: instrument: lsst.obs.lsst.Latiss - ingesterClass: - ingesterType: lsst.ctrl.oods.fileAttendant - ingesterName : FileAttendant stagingDirectory : /data/lsstdata/TTS/auxtel/oods/gen3butler/raw badFileDirectory: /data/lsstdata/TTS/auxtel/oods/gen3butler/badfiles repoDirectory : /repo/LATISS From 9058cbb14ab8549f2bb8473c31555817ba15b407 Mon Sep 17 00:00:00 2001 From: Stephen R Pietrowicz Date: Wed, 18 Sep 2024 15:23:24 -0500 Subject: [PATCH 4/6] Correct ingester name --- apps/atoods/values-tucson-teststand.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/atoods/values-tucson-teststand.yaml b/apps/atoods/values-tucson-teststand.yaml index 0590adf9..a3b99074 100644 --- a/apps/atoods/values-tucson-teststand.yaml +++ b/apps/atoods/values-tucson-teststand.yaml @@ -38,8 +38,8 @@ configfile: seconds: 0 ingesterClass: - ingesterType: lsst.ctrl.oods.fileAttendant - ingesterName : FileAttendant + ingesterType: lsst.ctrl.oods.fileIngester + ingesterName : FileIngester ingester: imageStagingDirectory: /data/staging/auxtel/oods From 25fc544acd0c673203509a287b1a95c4364fa8cd Mon Sep 17 00:00:00 2001 From: Stephen R Pietrowicz Date: Wed, 18 Sep 2024 15:29:44 -0500 Subject: [PATCH 5/6] Add FileAttendant --- apps/atoods/values-tucson-teststand.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/atoods/values-tucson-teststand.yaml b/apps/atoods/values-tucson-teststand.yaml index a3b99074..325a1060 100644 --- a/apps/atoods/values-tucson-teststand.yaml +++ b/apps/atoods/values-tucson-teststand.yaml @@ -45,6 +45,9 @@ configfile: imageStagingDirectory: /data/staging/auxtel/oods butlers: - butler: + class: + import: lsst.ctrl.oods.fileAttendant + name : FileAttendant instrument: lsst.obs.lsst.Latiss stagingDirectory : /data/lsstdata/TTS/auxtel/oods/gen3butler/raw badFileDirectory: /data/lsstdata/TTS/auxtel/oods/gen3butler/badfiles From 2c5b9eb785aa3a5ce7e43ac522fe1b6dd035d316 Mon Sep 17 00:00:00 2001 From: Stephen R Pietrowicz Date: Wed, 18 Sep 2024 17:20:15 -0500 Subject: [PATCH 6/6] Change ComCam TTS configuration to use 9.x format --- apps/ccoods/values-tucson-teststand.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/apps/ccoods/values-tucson-teststand.yaml b/apps/ccoods/values-tucson-teststand.yaml index a908ed01..60e78843 100644 --- a/apps/ccoods/values-tucson-teststand.yaml +++ b/apps/ccoods/values-tucson-teststand.yaml @@ -37,25 +37,31 @@ configfile: minutes: 0 seconds: 0 + ingesterClass: + ingesterType: lsst.ctrl.oods.fileIngester + ingesterName : FileIngester + ingester: imageStagingDirectory: /data/staging/comcam/oods butlers: - butler: - instrument: lsst.obs.lsst.LsstComCam class: - import : lsst.ctrl.oods.gen3ButlerIngester - name : Gen3ButlerIngester + import : lsst.ctrl.oods.fileAttendant + name : FileAttendant + instrument: lsst.obs.lsst.LsstComCam stagingDirectory : /data/lsstdata/TTS/comcam/oods/gen3butler/raw badFileDirectory: /data/lsstdata/TTS/comcam/oods/gen3butler/badfiles repoDirectory : /repo/LSSTComCam collections: - LSSTComCam/raw/all + cleanCollections: + - collection: LSSTComCam/raw/all + filesOlderThan: + <<: *interval + days: 30 scanInterval: <<: *interval hours: 1 - filesOlderThan: - <<: *interval - days: 30 batchSize: 20 scanInterval: <<: *interval @@ -69,7 +75,7 @@ configfile: clearEmptyDirectoriesAndOldFiles: - /data/lsstdata/TTS/comcam/oods/gen3butler/badfiles - /data/staging/comcam/oods - - /data/staging/comcam/forwarder + - /data/staging/comcam/camera scanInterval: <<: *interval hours: 1