[ARVADOS] updated: 1.3.0-3168-g3f5b1be0f

Git user git at public.arvados.org
Tue Sep 15 19:32:40 UTC 2020


Summary of changes:
 lib/config/config.default.yml                      |  5 ++
 lib/config/generated_config.go                     |  5 ++
 lib/crunchrun/background.go                        | 18 ++++++
 lib/dispatchcloud/dispatcher_test.go               |  2 +
 lib/dispatchcloud/scheduler/scheduler.go           |  4 +-
 lib/dispatchcloud/test/stub_driver.go              | 50 ++++++++++++----
 lib/dispatchcloud/worker/pool.go                   | 21 ++++---
 lib/dispatchcloud/worker/worker.go                 | 35 ++++++++++-
 sdk/go/arvados/config.go                           |  1 +
 sdk/python/tests/run_test_server.py                | 25 ++++----
 .../app/controllers/arvados/v1/users_controller.rb | 10 +++-
 services/api/app/models/arvados_model.rb           |  2 +-
 services/api/lib/config_loader.rb                  | 16 ++---
 services/api/lib/enable_jobs_api.rb                | 23 +++----
 .../arvados/v1/groups_controller_test.rb           |  3 +-
 .../arvados/v1/schema_controller_test.rb           |  4 +-
 .../functional/arvados/v1/users_controller_test.rb |  9 +++
 .../functional/user_sessions_controller_test.rb    |  2 +-
 services/api/test/test_helper.rb                   | 18 +++++-
 services/api/test/unit/application_test.rb         | 12 +++-
 services/api/test/unit/collection_test.rb          |  8 +--
 services/api/test/unit/container_request_test.rb   | 10 ++--
 services/api/test/unit/job_test.rb                 |  2 +-
 services/api/test/unit/log_test.rb                 |  4 +-
 services/api/test/unit/user_test.rb                | 70 +++++++++++-----------
 25 files changed, 250 insertions(+), 109 deletions(-)

       via  3f5b1be0f705c8f1491fdca5e3b57982d97378fd (commit)
       via  c0eed4ee7f222f436beb8528e31ed344d6f9bd71 (commit)
       via  e2d623bd4c686100772924b2b15ab808bbb147d0 (commit)
       via  d6598fd6339e6219a7103781433356dfde546527 (commit)
       via  6e56f24fcafcefbe6209a9ef53d784aef16c9711 (commit)
       via  f4d0ea9ca3ef4badd38957f794d12474831cee44 (commit)
       via  e696a09cd482ddedeec742127297e90287012356 (commit)
       via  c986fef1ed1ad3967639f75d6e2d6ab0c63e4937 (commit)
       via  6350ddac78dbd2b29e5dc4117fd57300f7f8a098 (commit)
       via  62f82658619bd59644b4bdac6b83be8fe87aca0d (commit)
       via  e6f14dd73771fffb1f205729f0755623538c5590 (commit)
       via  224f4793b7c147cb3ef9a261e3a60cddb557e1f1 (commit)
       via  c8a640d527db530875b52c9975a34709a2f32f7c (commit)
       via  72298b61214bb31f0522ff966acd4d42ec3d131e (commit)
       via  8a73021bbc704581db9a71d7d6a3332d89329bd5 (commit)
       via  98bd6c43fca91b76d528c8ed5b83c655c86ffe3c (commit)
      from  407fc461d20ece8b11b7b56f29a3caff3083ff8d (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 3f5b1be0f705c8f1491fdca5e3b57982d97378fd
Merge: c0eed4ee7 e2d623bd4
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Sep 15 15:32:15 2020 -0400

    16636: Merge branch 'master' into 16636-more-metrics
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>


commit c0eed4ee7f222f436beb8528e31ed344d6f9bd71
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Sep 15 15:30:55 2020 -0400

    16636: fix logic bug in (*Scheduler) updateMetrics()
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/dispatchcloud/scheduler/scheduler.go b/lib/dispatchcloud/scheduler/scheduler.go
index b1d369ed2..c3e67dd11 100644
--- a/lib/dispatchcloud/scheduler/scheduler.go
+++ b/lib/dispatchcloud/scheduler/scheduler.go
@@ -99,7 +99,7 @@ func (sch *Scheduler) registerMetrics(reg *prometheus.Registry) {
 }
 
 func (sch *Scheduler) updateMetrics() {
-	earliest := time.Now()
+	earliest := time.Time{}
 	entries, _ := sch.queue.Entries()
 	running := sch.pool.Running()
 	for _, ent := range entries {
@@ -109,7 +109,7 @@ func (sch *Scheduler) updateMetrics() {
 			// ContainerStateLocked and running on a worker, most likely loading the
 			// payload image
 			if _, ok := running[ent.Container.UUID]; !ok {
-				if ent.Container.CreatedAt.Before(earliest) {
+				if ent.Container.CreatedAt.Before(earliest) || earliest.IsZero() {
 					earliest = ent.Container.CreatedAt
 				}
 			}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list