projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13868: Fallback behavior when arvados_node_size tag is missing
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
jobqueue.py
diff --git
a/services/nodemanager/arvnodeman/jobqueue.py
b/services/nodemanager/arvnodeman/jobqueue.py
index 99064b3988f10f72738d2e3a1699c3c1f2ab8911..7ca9c9553721f0fa1291273bfeff5f5f9f7d0e78 100644
(file)
--- 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 logging
import re
-import subprocess
+import subprocess
32 as subprocess
import arvados.util
import arvados.util
@@
-37,8
+37,11
@@
class ServerCalculator(object):
self.scratch = 0
self.cores = 0
self.bandwidth = 0
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):
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.disk = 0
self.scratch = self.disk * 1000
self.ram = int(self.ram * node_mem_scaling)
- self.preempt
a
ble = False
+ self.preempt
i
ble = False
for name, override in kwargs.iteritems():
if name == 'instance_type': continue
if not hasattr(self, name):
for name, override in kwargs.iteritems():
if name == 'instance_type': continue
if not hasattr(self, name):