From 29e388c1ec192ed485044f9886c31103509e7f6b Mon Sep 17 00:00:00 2001 From: Jindrich Luza Date: Wed, 18 Nov 2015 18:07:56 +0100 Subject: [PATCH] - droping workers test fix --- server/pulp/server/async/scheduler.py | 3 ++- server/pulp/server/async/worker_watcher.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/pulp/server/async/scheduler.py b/server/pulp/server/async/scheduler.py index ac4bfe6..ba9c737 100644 --- a/server/pulp/server/async/scheduler.py +++ b/server/pulp/server/async/scheduler.py @@ -127,6 +127,7 @@ class CeleryProcessTimeoutMonitor(threading.Thread): resource_manager_count = 0 scheduler_count = 0 for worker in worker_list: + _logger.error("worker.last:%s worker.name:%s oldest:%s" % (worker.last_heartbeat, worker.name, oldest_heartbeat_time)) if worker.last_heartbeat < oldest_heartbeat_time: msg = _("Worker '%s' has gone missing, removing from list of workers") % worker.name _logger.error(msg) @@ -235,7 +236,7 @@ class Scheduler(beat.Scheduler): # this is not an event that gets sent anywhere. We process it # immediately. - scheduler_event = {'timestamp': time.time(), + scheduler_event = {'timestamp': float(datetime.utcnow().strftime("%s")), 'type': 'scheduler-event', 'hostname': ("%s@%s" % (SCHEDULER_WORKER_NAME, platform.node()))} worker_watcher.handle_worker_heartbeat(scheduler_event) diff --git a/server/pulp/server/async/worker_watcher.py b/server/pulp/server/async/worker_watcher.py index 5052442..9d1fcfa 100644 --- a/server/pulp/server/async/worker_watcher.py +++ b/server/pulp/server/async/worker_watcher.py @@ -81,7 +81,8 @@ def handle_worker_heartbeat(event): _logger.info(msg) Worker.objects(name=event_info['worker_name']).\ - update_one(set__last_heartbeat=event_info['timestamp'], upsert=True) + update_one(set__last_heartbeat=datetime.utcfromtimestamp(event.get("local_received", event['timestamp'])), upsert=True) + def handle_worker_offline(event): -- 2.1.0