From ea7f9258521d31a813a2ba6d33899c90862149e4 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 13 Jul 2018 10:41:06 +0800 Subject: [PATCH] Revert "worker_db: Only warn on repeated archive read if dataset changed" Breaks numpy arrays. This reverts commit 141fcaaa8afa9baceaf98747cc1f8085d4535f3d. --- artiq/master/worker_db.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/master/worker_db.py b/artiq/master/worker_db.py index 22190a087..1a4ef61e6 100644 --- a/artiq/master/worker_db.py +++ b/artiq/master/worker_db.py @@ -227,9 +227,9 @@ class DatasetManager: else: data = self.ddb.get(key) if archive: - if self.archive.get(key, data) != data: - logger.warning("Older value of dataset '%s' is already in " - "archive, overwriting", key, stack_info=True) + if key in self.archive: + logger.warning("Dataset '%s' is already in archive, " + "overwriting", key, stack_info=True) self.archive[key] = data return data