projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7478: Replaces term 'preemptable' with 'preemptible'
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
jobqueue.py
diff --git
a/services/nodemanager/arvnodeman/jobqueue.py
b/services/nodemanager/arvnodeman/jobqueue.py
index 99064b3988f10f72738d2e3a1699c3c1f2ab8911..e91764474fbd10edb28463368588329125e0a3db 100644
(file)
--- a/
services/nodemanager/arvnodeman/jobqueue.py
+++ b/
services/nodemanager/arvnodeman/jobqueue.py
@@
-38,7
+38,7
@@
class ServerCalculator(object):
self.cores = 0
self.bandwidth = 0
self.price = 9999999
self.cores = 0
self.bandwidth = 0
self.price = 9999999
- self.preempt
a
ble = False
+ self.preempt
i
ble = False
self.extra = {}
def meets_constraints(self, **kwargs):
self.extra = {}
def meets_constraints(self, **kwargs):
@@
-58,7
+58,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):