X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c4b2d43234205a0d9b1310e55b1f00dee9c20625..8ab6b482342b95ad35775867bcdb8fd691b78fb7:/services/nodemanager/arvnodeman/jobqueue.py?ds=sidebyside diff --git a/services/nodemanager/arvnodeman/jobqueue.py b/services/nodemanager/arvnodeman/jobqueue.py index 99064b3988..7ca9c95537 100644 --- a/services/nodemanager/arvnodeman/jobqueue.py +++ b/services/nodemanager/arvnodeman/jobqueue.py @@ -7,7 +7,7 @@ from __future__ import absolute_import, print_function import logging import re -import subprocess +import subprocess32 as subprocess import arvados.util @@ -37,8 +37,11 @@ class ServerCalculator(object): self.scratch = 0 self.cores = 0 self.bandwidth = 0 - self.price = 9999999 - self.preemptable = False + # price is multiplied by 1000 to get the node weight + # the maximum node weight is 4294967280 + # so use invalid node weight 4294967 * 1000 = 4294967000 + self.price = 4294967 + self.preemptible = False self.extra = {} def meets_constraints(self, **kwargs): @@ -58,7 +61,7 @@ class ServerCalculator(object): self.disk = 0 self.scratch = self.disk * 1000 self.ram = int(self.ram * node_mem_scaling) - self.preemptable = False + self.preemptible = False for name, override in kwargs.iteritems(): if name == 'instance_type': continue if not hasattr(self, name):