From 82fc11737efa8ea441b5840ddb59c8cdad4d7b4c Mon Sep 17 00:00:00 2001 From: Aymeric Ducroquetz Date: Wed, 20 Jan 2021 11:56:49 +0100 Subject: [PATCH] xcute: Only allow one job at the same time on all meta2 services When the peers are changed, the old value is overwritten. Thus, if 2 jobs change the peers at the same time, one of the 2 values will be overwritten by the other and the peers will not be good. --- oio/xcute/jobs/meta2_decommissioner.py | 2 +- oio/xcute/jobs/meta2_rebuilder.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oio/xcute/jobs/meta2_decommissioner.py b/oio/xcute/jobs/meta2_decommissioner.py index 80a22898f0..a36c510d83 100644 --- a/oio/xcute/jobs/meta2_decommissioner.py +++ b/oio/xcute/jobs/meta2_decommissioner.py @@ -68,7 +68,7 @@ def sanitize_params(cls, job_params): sanitized_job_params['dst'] = job_params.get('dst') - return sanitized_job_params, 'meta2/%s' % src + return sanitized_job_params, 'meta2' def __init__(self, conf, logger=None): super(Meta2DecommissionJob, self).__init__(conf, logger=logger) diff --git a/oio/xcute/jobs/meta2_rebuilder.py b/oio/xcute/jobs/meta2_rebuilder.py index 8f36721b67..2752312398 100644 --- a/oio/xcute/jobs/meta2_rebuilder.py +++ b/oio/xcute/jobs/meta2_rebuilder.py @@ -65,7 +65,7 @@ def sanitize_params(cls, job_params): raise ValueError('Missing service ID') sanitized_job_params['service_id'] = service_id - return sanitized_job_params, 'meta2/%s' % service_id + return sanitized_job_params, 'meta2' def __init__(self, conf, logger=None): super(Meta2RebuildJob, self).__init__(conf, logger=logger)