From 2b27a86723ef6ffdfd30f32c21c8a6da06583a61 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 22 Sep 2012 00:49:25 -0400 Subject: [PATCH] Convert constant load values to settings --- apps/job_processor/tasks.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/job_processor/tasks.py b/apps/job_processor/tasks.py index 48d4f14628..6c14c31c40 100644 --- a/apps/job_processor/tasks.py +++ b/apps/job_processor/tasks.py @@ -10,11 +10,7 @@ from clustering.models import Node from .models import JobQueue, JobQueueItem from .exceptions import JobQueueNoPendingJobs from .literals import JOB_QUEUE_STATE_STARTED - -LOCK_EXPIRE = 10 -MAX_CPU_LOAD = 60.0 -MAX_MEMORY_USAGE = 60.0 -NODE_MAX_WORKERS = len(psutil.cpu_percent(interval=0.1, percpu=True)) # Get CPU/cores count +from .settings import MAX_CPU_LOAD, MAX_MEMORY_USAGE, NODE_MAX_WORKERS logger = logging.getLogger(__name__) @@ -25,7 +21,7 @@ def job_queue_poll(): # Poll job queues if node is not overloaded lock_id = u'job_queue_poll' try: - lock = Lock.acquire_lock(lock_id, LOCK_EXPIRE) + lock = Lock.acquire_lock(lock_id) except LockError: pass else: