[ARVADOS] updated: ea0d81ddfee63590ab3a7f79dbf37e9e1688fcde

Git user git at public.curoverse.com
Thu May 12 10:42:16 EDT 2016


Summary of changes:
 services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  discards  b84068982f17bebc093a3cc54b6b4fa0e4bf3a77 (commit)
  discards  2e34fd27dc93b091c3862b763cf9d1569317dc0f (commit)
       via  ea0d81ddfee63590ab3a7f79dbf37e9e1688fcde (commit)
       via  0b7ba9ebf4cb0de48fec24743f57badd56c9fef6 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (b84068982f17bebc093a3cc54b6b4fa0e4bf3a77)
            \
             N -- N -- N (ea0d81ddfee63590ab3a7f79dbf37e9e1688fcde)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 ea0d81ddfee63590ab3a7f79dbf37e9e1688fcde
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu May 12 10:23:31 2016 -0400

    8128: Fix test race.

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go
index 848d723..4023870 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.go
@@ -131,10 +131,14 @@ func dispatchLocal(pollInterval time.Duration, crunchRunCommand string) {
 		return
 	}
 
-	for i := 0; i < len(containers.Items); i++ {
-		log.Printf("About to run queued container %v", containers.Items[i].UUID)
+	for _, c := range containers.Items {
+		log.Printf("About to run queued container %v", c.UUID)
 		// Run the container
-		go run(containers.Items[i].UUID, crunchRunCommand, pollInterval)
+		waitGroup.Add(1)
+		go func(c Container) {
+			run(c.UUID, crunchRunCommand, pollInterval)
+			waitGroup.Done()
+		}(c)
 	}
 }
 
@@ -187,10 +191,6 @@ func run(uuid string, crunchRunCommand string, pollInterval time.Duration) {
 
 	log.Printf("Starting container %v", uuid)
 
-	// Add this crunch job to waitGroup
-	waitGroup.Add(1)
-	defer waitGroup.Done()
-
 	updateState(uuid, "Running")
 
 	cmdExited := make(chan struct{})

commit 0b7ba9ebf4cb0de48fec24743f57badd56c9fef6
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu May 12 10:09:29 2016 -0400

    8128: Fix unreasonably short poll intervals in test.

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local_test.go b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
index baa1478..e3ab3a4 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@ -147,7 +147,7 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
 		sigChan <- syscall.SIGTERM
 	}()
 
-	runQueuedContainers(1, 1, crunchCmd)
+	runQueuedContainers(time.Second, time.Second, crunchCmd)
 
 	// Wait for all running crunch jobs to complete / terminate
 	waitGroup.Wait()

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list