From 78d6d330b080766424a3c29e838d0b0d0b147f8f Mon Sep 17 00:00:00 2001
From: lugrazet <Luke.Grazette@CERN.CH>
Date: Tue, 28 Nov 2023 09:28:04 +0000
Subject: [PATCH 1/5] upload __full__metadata.yaml too
---
handlers/BandwidthTestHandler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/handlers/BandwidthTestHandler.py b/handlers/BandwidthTestHandler.py
index bf886687..7acfcbc6 100644
--- a/handlers/BandwidthTestHandler.py
+++ b/handlers/BandwidthTestHandler.py
@@ -513,7 +513,7 @@ class BandwidthTestHandler(BaseHandler):
# Only do so if test was completely successful.
if options == "Moore_hlt2_bandwidth" and slot == "lhcb-master" and status:
from datetime import datetime
- for fsuffix in ["__full.mdf", ".tck.json"]:
+ for fsuffix in ["__full.mdf", ".tck.json", "__full__metadata.yaml"]:
full_stream_out = os.path.join(
directory, 'tmp', 'MDF',
--
GitLab
From 975338999bc3d9ff69db3d4da834752b74c2bd28 Mon Sep 17 00:00:00 2001
From: lugrazet <Luke.Grazette@CERN.CH>
Date: Tue, 28 Nov 2023 09:31:14 +0000
Subject: [PATCH 2/5] formatting ...
---
handlers/BandwidthTestHandler.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/handlers/BandwidthTestHandler.py b/handlers/BandwidthTestHandler.py
index 7acfcbc6..aa869284 100644
--- a/handlers/BandwidthTestHandler.py
+++ b/handlers/BandwidthTestHandler.py
@@ -513,7 +513,9 @@ class BandwidthTestHandler(BaseHandler):
# Only do so if test was completely successful.
if options == "Moore_hlt2_bandwidth" and slot == "lhcb-master" and status:
from datetime import datetime
- for fsuffix in ["__full.mdf", ".tck.json", "__full__metadata.yaml"]:
+ for fsuffix in [
+ "__full.mdf", ".tck.json", "__full__metadata.yaml"
+ ]:
full_stream_out = os.path.join(
directory, 'tmp', 'MDF',
--
GitLab
From 1ddbc363eb6f10964523aa60afad38c09baa40ac Mon Sep 17 00:00:00 2001
From: lugrazet <Luke.Grazette@CERN.CH>
Date: Tue, 28 Nov 2023 15:16:48 +0000
Subject: [PATCH 3/5] updated the decsription
---
handlers/BandwidthTestHandler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/handlers/BandwidthTestHandler.py b/handlers/BandwidthTestHandler.py
index aa869284..8f3de5bb 100644
--- a/handlers/BandwidthTestHandler.py
+++ b/handlers/BandwidthTestHandler.py
@@ -509,7 +509,7 @@ class BandwidthTestHandler(BaseHandler):
process,
)
- # Copy the full stream MDF and tck.json to eos for use in sprucing tests
+ # Copy the full stream MDF, tck.json and metadata.yaml to eos for use in sprucing tests
# Only do so if test was completely successful.
if options == "Moore_hlt2_bandwidth" and slot == "lhcb-master" and status:
from datetime import datetime
--
GitLab
From 5f837318f31f563d2ea20a6b9bb88b601920b834 Mon Sep 17 00:00:00 2001
From: lugrazet <Luke.Grazette@CERN.CH>
Date: Wed, 6 Dec 2023 12:17:54 +0000
Subject: [PATCH 4/5] Moore_spruce_latest
---
handlers/BandwidthTestHandler.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/handlers/BandwidthTestHandler.py b/handlers/BandwidthTestHandler.py
index 8f3de5bb..27847701 100644
--- a/handlers/BandwidthTestHandler.py
+++ b/handlers/BandwidthTestHandler.py
@@ -537,7 +537,8 @@ class BandwidthTestHandler(BaseHandler):
"lhcb-master",
]) and (options in [
"Moore_hlt2_bandwidth", "Moore_hlt2_2023_bandwidth",
- "Moore_spruce_bandwidth", "AllenInMoore_hlt1_bandwidth"
+ "Moore_spruce_bandwidth", "AllenInMoore_hlt1_bandwidth",
+ "Moore_spruce_latest"
]):
csv_rate_table_names = [
f for f in list_outputs() if f.endswith(".csv")
--
GitLab
From 7ef59d2dadb8c3681a50c4d20a122dd27c7a9ef2 Mon Sep 17 00:00:00 2001
From: Ross John Hunter <ross.john.hunter@cern.ch>
Date: Thu, 7 Dec 2023 17:25:57 +0100
Subject: [PATCH 5/5] silly mis-naming fix
---
handlers/BandwidthTestHandler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/handlers/BandwidthTestHandler.py b/handlers/BandwidthTestHandler.py
index 27847701..be05c8c7 100644
--- a/handlers/BandwidthTestHandler.py
+++ b/handlers/BandwidthTestHandler.py
@@ -538,7 +538,7 @@ class BandwidthTestHandler(BaseHandler):
]) and (options in [
"Moore_hlt2_bandwidth", "Moore_hlt2_2023_bandwidth",
"Moore_spruce_bandwidth", "AllenInMoore_hlt1_bandwidth",
- "Moore_spruce_latest"
+ "Moore_spruce_latest_bandwidth"
]):
csv_rate_table_names = [
f for f in list_outputs() if f.endswith(".csv")
--
GitLab