wg.Wait()
}
-func (s *ClientSuite) TestContainerLog(c *check.C) {
+func (s *ClientSuite) TestContainerRequestLog(c *check.C) {
arvadostest.StartKeep(2, true)
- ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(20*time.Second))
+ ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(30*time.Second))
defer cancel()
rpcconn := rpc.NewConn("",
c.Log("running logs command on queued container")
var stdout, stderr bytes.Buffer
- cmd := exec.CommandContext(ctx, "go", "run", ".", "logs", "-poll=250ms", cr.UUID)
+ cmd := exec.CommandContext(ctx, "go", "run", ".", "logs", "-f", "-poll=250ms", cr.UUID)
cmd.Env = append(cmd.Env, os.Environ()...)
cmd.Env = append(cmd.Env, "ARVADOS_API_TOKEN="+arvadostest.SystemRootToken)
cmd.Stdout = io.MultiWriter(&stdout, os.Stderr)
}})
c.Assert(err, check.IsNil)
+ const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
fCrunchrun, err := cfs.OpenFile("crunch-run.txt", os.O_CREATE|os.O_WRONLY, 0777)
c.Assert(err, check.IsNil)
- _, err = fmt.Fprintln(fCrunchrun, "line 1 of crunch-run.txt")
+ _, err = fmt.Fprintf(fCrunchrun, "%s line 1 of crunch-run.txt\n", time.Now().UTC().Format(rfc3339NanoFixed))
c.Assert(err, check.IsNil)
fStderr, err := cfs.OpenFile("stderr.txt", os.O_CREATE|os.O_WRONLY, 0777)
c.Assert(err, check.IsNil)
- _, err = fmt.Fprintln(fStderr, "line 1 of stderr")
+ _, err = fmt.Fprintf(fStderr, "%s line 1 of stderr\n", time.Now().UTC().Format(rfc3339NanoFixed))
c.Assert(err, check.IsNil)
+
+ {
+ // Without "-f", just show the existing logs and
+ // exit. Timeout needs to be long enough for "go run".
+ ctxNoFollow, cancel := context.WithDeadline(ctx, time.Now().Add(time.Second*5))
+ defer cancel()
+ cmdNoFollow := exec.CommandContext(ctxNoFollow, "go", "run", ".", "logs", "-poll=250ms", cr.UUID)
+ buf, err := cmdNoFollow.CombinedOutput()
+ c.Check(err, check.IsNil)
+ c.Check(string(buf), check.Matches, `(?ms).*line 1 of stderr\n`)
+ }
+
time.Sleep(time.Second * 2)
- _, err = fmt.Fprintln(fCrunchrun, "line 2 of crunch-run.txt")
+ _, err = fmt.Fprintf(fCrunchrun, "%s line 2 of crunch-run.txt", time.Now().UTC().Format(rfc3339NanoFixed))
c.Assert(err, check.IsNil)
- _, err = fmt.Fprintln(fStderr, "--end--")
+ _, err = fmt.Fprintf(fStderr, "%s --end--", time.Now().UTC().Format(rfc3339NanoFixed))
c.Assert(err, check.IsNil)
for deadline := time.Now().Add(20 * time.Second); time.Now().Before(deadline) && !strings.Contains(stdout.String(), "--end--"); time.Sleep(time.Second / 10) {
}
- c.Check(stdout.String(), check.Matches, `(?ms).*stderr\.txt +--end--\n.*`)
+ c.Check(stdout.String(), check.Matches, `(?ms).*stderr\.txt +20\S+Z --end--\n.*`)
mtxt, err := cfs.MarshalManifest(".")
c.Assert(err, check.IsNil)
{
ctx, cancel := context.WithDeadline(ctx, time.Now().Add(time.Second*5))
defer cancel()
- cmd := exec.CommandContext(ctx, "go", "run", ".", "logs", cr.UUID)
+ cmd := exec.CommandContext(ctx, "go", "run", ".", "logs", "-f", cr.UUID)
cmd.Env = append(cmd.Env, os.Environ()...)
cmd.Env = append(cmd.Env, "ARVADOS_API_TOKEN="+arvadostest.SystemRootToken)
buf, err := cmd.CombinedOutput()