From fa67e8f215159db25c69174cad09b8e03c477232 Mon Sep 17 00:00:00 2001
From: Joao Afonso <joao.afonso@cern.ch>
Date: Tue, 13 Dec 2022 17:54:51 +0100
Subject: [PATCH] v4.8.1-1 fix
---
ReleaseNotes.md | 6 ++++++
cta.spec.in | 7 +++----
objectstore/cta.proto | 6 +++---
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 84b09bed4a..edac8014f2 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -12,6 +12,12 @@
### Continuous Integration
- cta/CTA#205 - Updating EOS4/EOS4 in versionlock for v4.8.95/v5.1.5
+# v4.8.1-1
+
+## Summary
+### Bug fixes
+- cta/CTA#243 - Modify new queue cleanup protobuf fields from 'required' to 'optional'
+
# v4.8.0-1
## Summary
diff --git a/cta.spec.in b/cta.spec.in
index 6431795751..56cf408e32 100644
--- a/cta.spec.in
+++ b/cta.spec.in
@@ -587,10 +587,9 @@ echo $(jq --argjson CTA_MAJOR_VERSION $cta_major_version '. += {"cta_major_versi
%changelog
-* Tue Dec 6 2022 Joao Afonso <joao.afonso@cern.ch> - 4.8.1-1
-- Upgrade eos4/eos5 to 4.8.94/5.1.5
-- Minor changes in preparation for next catalogue schema release
-- See ReleaseNotes.md for details
+* Mon Dec 12 2022 Joao Afonso <joao.afonso@cern.ch> - 4.8.1-1
+- Fixes bug with protobuf definition
+- See ReleaseNotes.md for more details
* Mon Nov 28 2022 Joao Afonso <joao.afonso@cern.ch> - 4.8.0-1
- This CTA release contains significant changes related to repacking, including the addition of new final and temporary states
diff --git a/objectstore/cta.proto b/objectstore/cta.proto
index 9efaed027a..eec37589b8 100644
--- a/objectstore/cta.proto
+++ b/objectstore/cta.proto
@@ -547,9 +547,9 @@ message RetrieveActivityCountPair {
}
message RetrieveQueueCleanupInfo {
- required bool doCleanup = 14100;
+ optional bool doCleanup = 14100;
optional string assignedAgent = 14110;
- required uint64 heartbeat = 14120;
+ optional uint64 heartbeat = 14120;
}
message RetrieveQueue {
@@ -568,7 +568,7 @@ message RetrieveQueue {
optional string disk_system_slept_for = 10190;
optional uint64 sleep_time = 10200;
optional uint64 youngestjobcreationtime = 10210 [default = 0];
- required RetrieveQueueCleanupInfo cleanupInfo = 10220;
+ optional RetrieveQueueCleanupInfo cleanupInfo = 10220;
}
// ------------- Repack data strcutures ----------------------------------------
--
GitLab