From 0e5eaffeedc1306834be2b92fc861d23527c3f56 Mon Sep 17 00:00:00 2001 From: cfuselli Date: Fri, 15 Dec 2023 10:13:51 +0100 Subject: [PATCH 1/2] fix runs being deleted while written --- amstrax/auto_processing/copy_live.py | 2 +- amstrax/auto_processing/delete_live.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/amstrax/auto_processing/copy_live.py b/amstrax/auto_processing/copy_live.py index f334e870..a0b8768a 100644 --- a/amstrax/auto_processing/copy_live.py +++ b/amstrax/auto_processing/copy_live.py @@ -44,7 +44,7 @@ def get_rundocs(runsdb, args): base_query = { # end is at least 1 second ago - 'end': {'$lt': datetime.datetime.now() - datetime.timedelta(seconds=1)}, + 'end': {'$lt': datetime.datetime.now() - datetime.timedelta(seconds=10)}, 'number': {'$gt': args.min_run_number}, 'data': { '$elemMatch': { diff --git a/amstrax/auto_processing/delete_live.py b/amstrax/auto_processing/delete_live.py index 3e576e9a..7aa2b921 100644 --- a/amstrax/auto_processing/delete_live.py +++ b/amstrax/auto_processing/delete_live.py @@ -31,6 +31,8 @@ def get_old_runs(runsdb, days, args): """ cutoff_date = datetime.datetime.now() - datetime.timedelta(days=days) query = { + # always make sure we do not mess with data currentrly being written + 'end': {'$lt': datetime.datetime.now() - datetime.timedelta(seconds=30)}, '$or': [ {'end': {'$lte': cutoff_date}, 'data': {'$all': [ @@ -45,6 +47,8 @@ def get_old_runs(runsdb, days, args): if args.only_stoomboot and not args.production: query = { + # always make sure we do not mess with data currentrly being written + 'end': {'$lt': datetime.datetime.now() - datetime.timedelta(seconds=30)}, '$or': [ {'end': {'$lte': cutoff_date}, 'data': {'$all': [ From 5a3928606d8c4d079f260a49b592193633cee6f6 Mon Sep 17 00:00:00 2001 From: cfuselli Date: Fri, 15 Dec 2023 10:15:45 +0100 Subject: [PATCH 2/2] fix runs being deleted while written --- amstrax/auto_processing/copy_live.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amstrax/auto_processing/copy_live.py b/amstrax/auto_processing/copy_live.py index a0b8768a..1463ede1 100644 --- a/amstrax/auto_processing/copy_live.py +++ b/amstrax/auto_processing/copy_live.py @@ -44,7 +44,7 @@ def get_rundocs(runsdb, args): base_query = { # end is at least 1 second ago - 'end': {'$lt': datetime.datetime.now() - datetime.timedelta(seconds=10)}, + 'end': {'$lt': datetime.datetime.now() - datetime.timedelta(seconds=30)}, 'number': {'$gt': args.min_run_number}, 'data': { '$elemMatch': {