[ARVADOS] updated: 2.1.0-1167-g43ca59b6a

[Git user]

Summary of changes:
 lib/controller/integration_test.go | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

       via  43ca59b6a4122d437fcc33f625e12ac3ecb827e2 (commit)
      from  c0a8734df4cd2919fc870e97e04d1ab1f2ac64ab (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 43ca59b6a4122d437fcc33f625e12ac3ecb827e2
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Tue Aug 10 15:54:12 2021 -0300

    Improves the test -- now it seems to be correctly failing.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index fc5ed8d1a..c6d00cf0d 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -192,23 +192,38 @@ func (s *IntegrationSuite) TestGetCollectionByPDH(c *check.C) {
 func (s *IntegrationSuite) TestRemoteTokenCacheRace(c *check.C) {
 	conn1 := s.testClusters["z1111"].Conn()
 	rootctx1, _, _ := s.testClusters["z1111"].RootClients()
-	conn3 := s.testClusters["z2222"].Conn()
+	rootctx2, _, _ := s.testClusters["z2222"].RootClients()
+	conn2 := s.testClusters["z2222"].Conn()
 	userctx1, _, _, _ := s.testClusters["z1111"].UserClients(rootctx1, c, conn1, "user2 at example.com", true)
 
-	coll1, err := conn1.CollectionCreate(userctx1,
-		arvados.CreateOptions{Attrs: map[string]interface{}{}})
-	c.Assert(err, check.IsNil)
-
 	var wg1, wg2 sync.WaitGroup
+	creqs := 100
+
+	// Make concurrent requests to z2222 with a local token to make sure more
+	// than one worker is listening.
 	wg1.Add(1)
+	for i := 0; i < creqs; i++ {
+		wg2.Add(1)
+		go func() {
+			defer wg2.Done()
+			wg1.Wait()
+			_, err := conn2.UserGetCurrent(rootctx2, arvados.GetOptions{})
+			c.Check(err, check.IsNil)
+		}()
+	}
+	wg1.Done()
+	wg2.Wait()
 
-	for i := 0; i < 10; i++ {
+	// Real test pass -- use a new remote token than the one used in the warm-up
+	// phase.
+	wg1.Add(1)
+	for i := 0; i < creqs; i++ {
 		wg2.Add(1)
 		go func() {
 			defer wg2.Done()
 			wg1.Wait()
-			// Retrieve the remote collection from cluster z3333.
-			_, err := conn3.CollectionGet(userctx1, arvados.GetOptions{UUID: coll1.UUID})
+			// Retrieve the remote collection from cluster z2222.
+			_, err := conn2.UserGetCurrent(userctx1, arvados.GetOptions{})
 			c.Check(err, check.IsNil)
 		}()
 	}

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


hooks/post-receive
--