[ARVADOS] created: dd908b5334b5016a3f8a6cf2daa464b9a4f86d2b

[Git user]

        at  dd908b5334b5016a3f8a6cf2daa464b9a4f86d2b (commit)


commit dd908b5334b5016a3f8a6cf2daa464b9a4f86d2b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue May 2 21:26:55 2017 -0400

    11369: Log node sizes at startup.  Fix setting of scratch disk size.

diff --git a/services/nodemanager/arvnodeman/jobqueue.py b/services/nodemanager/arvnodeman/jobqueue.py
index f6e9249..66cf73a 100644
--- a/services/nodemanager/arvnodeman/jobqueue.py
+++ b/services/nodemanager/arvnodeman/jobqueue.py
@@ -25,7 +25,9 @@ class ServerCalculator(object):
                          'extra']:
                 setattr(self, name, getattr(self.real, name))
             self.cores = kwargs.pop('cores')
-            self.scratch = self.disk
+            # libcloud disk sizes are in GB, Arvados/SLURM are in MB
+            # multiply by 1000 instead of 1024 to err on low side
+            self.scratch = self.disk * 1000
             self.ram = int(self.ram * node_mem_scaling)
             for name, override in kwargs.iteritems():
                 if not hasattr(self, name):
@@ -53,6 +55,10 @@ class ServerCalculator(object):
         self.logger = logging.getLogger('arvnodeman.jobqueue')
         self.logged_jobs = set()
 
+        self.logger.info("Using cloud node sizes:")
+        for s in self.cloud_sizes:
+            self.logger.info(str(s.__dict__))
+
     @staticmethod
     def coerce_int(x, fallback):
         try:

-----------------------------------------------------------------------


hooks/post-receive
--