X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/df591042778408d03d410d5c22a669d85652d1ea..90944740f40ab0dbfc4bdfc1b16accfbf6559e4f:/services/crunch-run/logging_test.go diff --git a/services/crunch-run/logging_test.go b/services/crunch-run/logging_test.go index abac2bbecc..78f984db5b 100644 --- a/services/crunch-run/logging_test.go +++ b/services/crunch-run/logging_test.go @@ -10,11 +10,14 @@ import ( "testing" "time" + "git.curoverse.com/arvados.git/sdk/go/arvados" "git.curoverse.com/arvados.git/sdk/go/arvadosclient" . "gopkg.in/check.v1" ) -type LoggingTestSuite struct{} +type LoggingTestSuite struct { + client *arvados.Client +} type TestTimestamper struct { count int @@ -32,11 +35,18 @@ func (this *TestTimestamper) Timestamp(t time.Time) string { // Gocheck boilerplate var _ = Suite(&LoggingTestSuite{}) +func (s *LoggingTestSuite) SetUpTest(c *C) { + s.client = arvados.NewClientFromEnv() + crunchLogUpdatePeriod = time.Hour * 24 * 365 + crunchLogUpdateSize = 1 << 50 +} + func (s *LoggingTestSuite) TestWriteLogs(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} defer kc.Close() - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.CrunchLog.Timestamper = (&TestTimestamper{}).Timestamp cr.CrunchLog.Print("Hello world!") @@ -45,7 +55,7 @@ func (s *LoggingTestSuite) TestWriteLogs(c *C) { c.Check(api.Calls, Equals, 1) - mt, err := cr.LogCollection.ManifestText() + mt, err := cr.LogCollection.MarshalManifest(".") c.Check(err, IsNil) c.Check(mt, Equals, ". 74561df9ae65ee9f35d5661d42454264+83 0:83:crunch-run.txt\n") @@ -64,7 +74,8 @@ func (s *LoggingTestSuite) TestWriteLogsLarge(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} defer kc.Close() - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.CrunchLog.Timestamper = (&TestTimestamper{}).Timestamp cr.CrunchLog.Immediate = nil @@ -74,10 +85,10 @@ func (s *LoggingTestSuite) TestWriteLogsLarge(c *C) { cr.CrunchLog.Print("Goodbye") cr.CrunchLog.Close() - c.Check(api.Calls > 1, Equals, true) + c.Check(api.Calls > 0, Equals, true) c.Check(api.Calls < 2000000, Equals, true) - mt, err := cr.LogCollection.ManifestText() + mt, err := cr.LogCollection.MarshalManifest(".") c.Check(err, IsNil) c.Check(mt, Equals, ". 9c2c05d1fae6aaa8af85113ba725716d+67108864 80b821383a07266c2a66a4566835e26e+21780065 0:88888929:crunch-run.txt\n") } @@ -86,10 +97,13 @@ func (s *LoggingTestSuite) TestWriteMultipleLogs(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} defer kc.Close() - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) ts := &TestTimestamper{} cr.CrunchLog.Timestamper = ts.Timestamp - stdout := NewThrottledLogger(cr.NewLogWriter("stdout")) + w, err := cr.NewLogWriter("stdout") + c.Assert(err, IsNil) + stdout := NewThrottledLogger(w) stdout.Timestamper = ts.Timestamp cr.CrunchLog.Print("Hello world!") @@ -112,26 +126,69 @@ func (s *LoggingTestSuite) TestWriteMultipleLogs(c *C) { 2015-12-29T15:51:45.000000004Z Blurb `) - mt, err := cr.LogCollection.ManifestText() + mt, err := cr.LogCollection.MarshalManifest(".") c.Check(err, IsNil) - c.Check(mt, Equals, ""+ - ". 408672f5b5325f7d20edfbf899faee42+83 0:83:crunch-run.txt\n"+ - ". c556a293010069fa79a6790a931531d5+80 0:80:stdout.txt\n") + c.Check(mt, Equals, ". 48f9023dc683a850b1c9b482b14c4b97+163 0:83:crunch-run.txt 83:80:stdout.txt\n") +} + +func (s *LoggingTestSuite) TestLogUpdate(c *C) { + for _, trial := range []struct { + maxBytes int64 + maxDuration time.Duration + }{ + {1000, 10 * time.Second}, + {1000000, time.Millisecond}, + } { + c.Logf("max %d bytes, %s", trial.maxBytes, trial.maxDuration) + crunchLogUpdateSize = trial.maxBytes + crunchLogUpdatePeriod = trial.maxDuration + + api := &ArvTestClient{} + kc := &KeepTestClient{} + defer kc.Close() + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) + ts := &TestTimestamper{} + cr.CrunchLog.Timestamper = ts.Timestamp + w, err := cr.NewLogWriter("stdout") + c.Assert(err, IsNil) + stdout := NewThrottledLogger(w) + stdout.Timestamper = ts.Timestamp + + c.Check(cr.logUUID, Equals, "") + cr.CrunchLog.Printf("Hello %1000s", "space") + for i, t := 0, time.NewTicker(time.Millisecond); i < 5000 && cr.logUUID == ""; i++ { + <-t.C + } + c.Check(cr.logUUID, Not(Equals), "") + cr.CrunchLog.Print("Goodbye") + fmt.Fprint(stdout, "Goodbye\n") + cr.CrunchLog.Close() + stdout.Close() + w.Close() + + mt, err := cr.LogCollection.MarshalManifest(".") + c.Check(err, IsNil) + // Block packing depends on whether there's an update + // between the two Goodbyes -- either way the first + // block will be 4dc76. + c.Check(mt, Matches, `. 4dc76e0a212bfa30c39d76d8c16da0c0\+1038 (afc503bc1b9a828b4bb543cb629e936c\+78|90699dc22545cd74a0664303f70bc05a\+39 276b49339fd5203d15a93ff3de11bfb9\+39) 0:1077:crunch-run.txt 1077:39:stdout.txt\n`) + } } func (s *LoggingTestSuite) TestWriteLogsWithRateLimitThrottleBytes(c *C) { - testWriteLogsWithRateLimit(c, "crunchLogThrottleBytes", 50, 65536, "Exceeded rate 50 bytes per 60 seconds") + s.testWriteLogsWithRateLimit(c, "crunchLogThrottleBytes", 50, 65536, "Exceeded rate 50 bytes per 60 seconds") } func (s *LoggingTestSuite) TestWriteLogsWithRateLimitThrottleLines(c *C) { - testWriteLogsWithRateLimit(c, "crunchLogThrottleLines", 1, 1024, "Exceeded rate 1 lines per 60 seconds") + s.testWriteLogsWithRateLimit(c, "crunchLogThrottleLines", 1, 1024, "Exceeded rate 1 lines per 60 seconds") } func (s *LoggingTestSuite) TestWriteLogsWithRateLimitThrottleBytesPerEvent(c *C) { - testWriteLogsWithRateLimit(c, "crunchLimitLogBytesPerJob", 50, 67108864, "Exceeded log limit 50 bytes (crunch_limit_log_bytes_per_job)") + s.testWriteLogsWithRateLimit(c, "crunchLimitLogBytesPerJob", 50, 67108864, "Exceeded log limit 50 bytes (crunch_limit_log_bytes_per_job)") } -func testWriteLogsWithRateLimit(c *C, throttleParam string, throttleValue int, throttleDefault int, expected string) { +func (s *LoggingTestSuite) testWriteLogsWithRateLimit(c *C, throttleParam string, throttleValue int, throttleDefault int, expected string) { discoveryMap[throttleParam] = float64(throttleValue) defer func() { discoveryMap[throttleParam] = float64(throttleDefault) @@ -140,7 +197,8 @@ func testWriteLogsWithRateLimit(c *C, throttleParam string, throttleValue int, t api := &ArvTestClient{} kc := &KeepTestClient{} defer kc.Close() - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.CrunchLog.Timestamper = (&TestTimestamper{}).Timestamp cr.CrunchLog.Print("Hello world!") @@ -149,7 +207,7 @@ func testWriteLogsWithRateLimit(c *C, throttleParam string, throttleValue int, t c.Check(api.Calls, Equals, 1) - mt, err := cr.LogCollection.ManifestText() + mt, err := cr.LogCollection.MarshalManifest(".") c.Check(err, IsNil) c.Check(mt, Equals, ". 74561df9ae65ee9f35d5661d42454264+83 0:83:crunch-run.txt\n")