[ARVADOS] updated: 1.1.2-139-g80da197

[Git user]

Summary of changes:
 services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go |  3 ++-
 services/dispatchcloud/node_size.go                          |  3 +++
 services/nodemanager/tests/integration_test.py               | 10 ++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

       via  80da19707253af74bd78c374bfcab64b04d2dbde (commit)
       via  ba01bc2ca5bb7351442f58709b7f85aa84a20342 (commit)
      from  a88a3f5710af6eb159299231779a1e4554aa772a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 80da19707253af74bd78c374bfcab64b04d2dbde
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Jan 29 11:48:43 2018 -0500

    12199: Derate advertised node sizes by 5%.
    
    This matches nodemanager's default behavior. It aims to account for
    the difference between advertised and actual memory capacity, as well
    as making some room for system processes on the host.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index 583e0d8..73d9c16 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -387,8 +387,9 @@ func (s *StubbedSuite) TestSbatchInstanceTypeConstraint(c *C) {
 				{Name: "a1.tiny", Price: 0.02, RAM: 128000000, VCPUs: 1},
 				{Name: "a1.small", Price: 0.04, RAM: 256000000, VCPUs: 2},
 				{Name: "a1.medium", Price: 0.08, RAM: 512000000, VCPUs: 4},
+				{Name: "a1.large", Price: 0.16, RAM: 1024000000, VCPUs: 8},
 			},
-			sbatchArgs: []string{"--constraint=instancetype=a1.small"},
+			sbatchArgs: []string{"--constraint=instancetype=a1.medium"},
 		},
 		// No node types configured => no slurm constraint
 		{
diff --git a/services/dispatchcloud/node_size.go b/services/dispatchcloud/node_size.go
index 29832da..eeb3b81 100644
--- a/services/dispatchcloud/node_size.go
+++ b/services/dispatchcloud/node_size.go
@@ -18,6 +18,7 @@ import (
 var (
 	ErrConstraintsNotSatisfiable  = errors.New("constraints not satisfiable by any configured instance type")
 	ErrInstanceTypesNotConfigured = errors.New("site configuration does not list any instance types")
+	discountConfiguredRAMPercent  = 5
 )
 
 // ChooseInstanceType returns the cheapest available
@@ -26,6 +27,8 @@ func ChooseInstanceType(cc *arvados.Cluster, ctr *arvados.Container) (best arvad
 	needVCPUs := ctr.RuntimeConstraints.VCPUs
 	needRAM := ctr.RuntimeConstraints.RAM + ctr.RuntimeConstraints.KeepCacheRAM
 
+	needRAM = needRAM * 100 / int64(100-discountConfiguredRAMPercent)
+
 	if len(cc.InstanceTypes) == 0 {
 		err = ErrInstanceTypesNotConfigured
 		return

commit ba01bc2ca5bb7351442f58709b7f85aa84a20342
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Jan 29 10:22:26 2018 -0500

    12199: Log timestamps in slow integration tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/nodemanager/tests/integration_test.py b/services/nodemanager/tests/integration_test.py
index 24ae701..7b129f5 100755
--- a/services/nodemanager/tests/integration_test.py
+++ b/services/nodemanager/tests/integration_test.py
@@ -25,9 +25,13 @@ from functools import partial
 import arvados
 import StringIO
 
+formatter = logging.Formatter('%(asctime)s %(levelname)s: %(message)s')
+
+handler = logging.StreamHandler(sys.stderr)
+handler.setFormatter(formatter)
 logger = logging.getLogger("logger")
 logger.setLevel(logging.INFO)
-logger.addHandler(logging.StreamHandler(sys.stderr))
+logger.addHandler(handler)
 
 detail = logging.getLogger("detail")
 detail.setLevel(logging.INFO)
@@ -35,7 +39,9 @@ if os.environ.get("ANMTEST_LOGLEVEL"):
     detail_content = sys.stderr
 else:
     detail_content = StringIO.StringIO()
-detail.addHandler(logging.StreamHandler(detail_content))
+handler = logging.StreamHandler(detail_content)
+handler.setFormatter(formatter)
+detail.addHandler(handler)
 
 fake_slurm = None
 compute_nodes = None

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


hooks/post-receive
--