mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Review comments; print container logs on failure

Browse source
This commit is contained in:
Kegan Dougal 2021-07-07 11:43:55 +01:00
parent dd308b2bc2
commit 8d674f2118
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cmd/dendrite-upgrade-tests/main.go
View file

@ -103,7 +103,9 @@ func downloadArchive(cli *http.Client, tmpDir, archiveURL string, dockerfile []b
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
return nil, fmt.Errorf("got HTTP %d", resp.StatusCode) return nil, fmt.Errorf("got HTTP %d", resp.StatusCode)
} }
os.Mkdir(tmpDir, os.ModePerm) if err = os.Mkdir(tmpDir, os.ModePerm); err != nil {
return nil, fmt.Errorf("failed to make temporary directory: %s", err)
}
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
// dump the tarball temporarily, stripping the top-level directory // dump the tarball temporarily, stripping the top-level directory
err = extract.Archive(context.Background(), resp.Body, tmpDir, func(inPath string) string { err = extract.Archive(context.Background(), resp.Body, tmpDir, func(inPath string) string {
@ -233,7 +235,7 @@ func calculateVersions(cli *http.Client, from, to string) ([]string, error) {
for _, sv := range semvers { for _, sv := range semvers {
versions = append(versions, sv.Original()) versions = append(versions, sv.Original())
} }
if *flagTo == "HEAD" { if to == "HEAD" {
versions = append(versions, "HEAD") versions = append(versions, "HEAD")
} }
return versions, nil return versions, nil
@ -309,7 +311,7 @@ func runImage(dockerClient *client.Client, volumeName, version, imageID string)
versionsURL := fmt.Sprintf("%s/_matrix/client/versions", baseURL) versionsURL := fmt.Sprintf("%s/_matrix/client/versions", baseURL)
// hit /versions to check it is up // hit /versions to check it is up
var lastErr error var lastErr error
for i := 0; i < 100; i++ { for i := 0; i < 500; i++ {
res, err := http.Get(versionsURL) res, err := http.Get(versionsURL)
if err != nil { if err != nil {
lastErr = fmt.Errorf("GET %s => error: %s", versionsURL, err) lastErr = fmt.Errorf("GET %s => error: %s", versionsURL, err)
@ -324,6 +326,19 @@ func runImage(dockerClient *client.Client, volumeName, version, imageID string)
lastErr = nil lastErr = nil
break break
} }
if lastErr != nil {
logs, err := dockerClient.ContainerLogs(context.Background(), containerID, types.ContainerLogsOptions{
ShowStdout: true,
ShowStderr: true,
})
// ignore errors when cannot get logs, it's just for debugging anyways
if err == nil {
logbody, err := ioutil.ReadAll(logs)
if err == nil {
log.Printf("Container logs:\n\n%s\n\n", string(logbody))
}
}
}
return baseURL, containerID, lastErr return baseURL, containerID, lastErr
} }

3
cmd/dendrite-upgrade-tests/tests.go
View file

@ -167,6 +167,9 @@ func verifyTestsRan(baseURL string, branchNames []string) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to /directory: %s", err) return fmt.Errorf("failed to /directory: %s", err)
} }
if r.RoomID == "" {
return fmt.Errorf("/directory lookup returned no room ID")
}
log.Println(" public room exists: OK") log.Println(" public room exists: OK")
history, err := client.Messages(r.RoomID, client.Store.LoadNextBatch(client.UserID), "", 'b', 100) history, err := client.Messages(r.RoomID, client.Store.LoadNextBatch(client.UserID), "", 'b', 100)