X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2d29045a1b392251b777639634e527abfd8b06e2..b89ab7f9270acfabe9139d14d7071cf117b39bd4:/lib/controller/handler_test.go?ds=inline

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index 39c2b1c68e..0ffe0255f5 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -19,6 +19,7 @@ import (
 	"testing"
 	"time"
 
+	"git.arvados.org/arvados.git/lib/controller/rpc"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
 	"git.arvados.org/arvados.git/sdk/go/auth"
@@ -494,3 +495,67 @@ func (s *HandlerSuite) TestTrashSweep(c *check.C) {
 		time.Sleep(time.Second / 10)
 	}
 }
+
+func (s *HandlerSuite) TestContainerLogSweep(c *check.C) {
+	s.cluster.SystemRootToken = arvadostest.SystemRootToken
+	s.cluster.Containers.Logging.SweepInterval = arvados.Duration(time.Second / 10)
+	s.handler.CheckHealth()
+	ctx := auth.NewContext(s.ctx, &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
+	logentry, err := s.handler.federation.LogCreate(ctx, arvados.CreateOptions{Attrs: map[string]interface{}{
+		"object_uuid": arvadostest.CompletedContainerUUID,
+		"event_type":  "stderr",
+		"properties": map[string]interface{}{
+			"text": "test trash sweep\n",
+		},
+	}})
+	c.Assert(err, check.IsNil)
+	defer s.handler.federation.LogDelete(ctx, arvados.DeleteOptions{UUID: logentry.UUID})
+	deadline := time.Now().Add(5 * time.Second)
+	for {
+		if time.Now().After(deadline) {
+			c.Log("timed out")
+			c.FailNow()
+		}
+		logentries, err := s.handler.federation.LogList(ctx, arvados.ListOptions{Filters: []arvados.Filter{{"uuid", "=", logentry.UUID}}, Limit: -1})
+		c.Assert(err, check.IsNil)
+		if len(logentries.Items) == 0 {
+			break
+		}
+		time.Sleep(time.Second / 10)
+	}
+}
+
+func (s *HandlerSuite) TestLogActivity(c *check.C) {
+	s.cluster.SystemRootToken = arvadostest.SystemRootToken
+	s.cluster.Users.ActivityLoggingPeriod = arvados.Duration(24 * time.Hour)
+	s.handler.CheckHealth()
+
+	testServer := newServerFromIntegrationTestEnv(c)
+	testServer.Server.Handler = httpserver.AddRequestIDs(httpserver.LogRequests(s.handler))
+	c.Assert(testServer.Start(), check.IsNil)
+	defer testServer.Close()
+
+	u, _ := url.Parse("http://" + testServer.Addr)
+	client := rpc.NewConn(s.cluster.ClusterID, u, true, rpc.PassthroughTokenProvider)
+
+	starttime := time.Now()
+	for i := 0; i < 4; i++ {
+		for _, token := range []string{
+			arvadostest.ActiveTokenV2,
+			arvadostest.ActiveToken,
+			arvadostest.SpectatorToken,
+		} {
+			ctx := auth.NewContext(s.ctx, &auth.Credentials{Tokens: []string{token}})
+			_, err := client.CollectionList(ctx, arvados.ListOptions{})
+			c.Assert(err, check.IsNil)
+		}
+	}
+	db, err := s.handler.db(s.ctx)
+	c.Assert(err, check.IsNil)
+	for _, userUUID := range []string{arvadostest.ActiveUserUUID, arvadostest.SpectatorUserUUID} {
+		var rows int
+		err = db.QueryRowContext(s.ctx, `select count(uuid) from logs where object_uuid = $1 and event_at > $2`, arvadostest.ActiveUserUUID, starttime.UTC()).Scan(&rows)
+		c.Assert(err, check.IsNil)
+		c.Check(rows, check.Equals, 1, check.Commentf("expect 1 row for user uuid %s", userUUID))
+	}
+}