Skip to content

Commit

Permalink
dashboard: fix bugs in presubmit dashboard.
Browse files Browse the repository at this point in the history
- Replace "gsutil stat" with "gsutil ls" because "gsutil stat" doesn't work
  on dirs.
- Change the logic of downloading/caching results.tar.gz to make things more
  efficient.

Change-Id: I22447f2a3df5bb52c54babf94a01035020a0d599
  • Loading branch information
jinjingforever committed Apr 21, 2016
1 parent a1b0943 commit fd26d3b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 25 deletions.
47 changes: 24 additions & 23 deletions dashboard/presubmit.go
Original file line number Diff line number Diff line change
Expand Up @@ -287,36 +287,37 @@ func displayPresubmitPage(jirix *jiri.X, w http.ResponseWriter, r *http.Request)
// The dir structure is:
// <root>/presubmit/<n>/<os>/<arch>/<job>/<part>/...
n := r.Form.Get("n")
presubmitDir := filepath.Join(root, "presubmit", n)
if err := s.MkdirAll(presubmitDir, os.FileMode(0700)).Done(); err != nil {
presubmitCacheDir := filepath.Join(root, "presubmit")
presubmitTars := filepath.Join(root, "presubmitTarFiles", n)
if err := s.MkdirAll(presubmitCacheDir, os.FileMode(0700)).
MkdirAll(presubmitTars, os.FileMode(0700)).Done(); err != nil {
return err
}
// Try downloading the tar file first.
tarFile := "results.tar.gz"
if _, err := cache.StoreGoogleStorageFile(jirix, presubmitDir, resultsBucketFlag+"/v0/presubmit/"+n, tarFile); err == nil {
if err := s.
Chdir(presubmitDir).
RemoveAll("darwin").RemoveAll("linux").
Run("tar", "-zxf", tarFile).
Run("bash", "-c", fmt.Sprintf("mv %s/* .", n)).
RemoveAll(n).RemoveAll(tarFile).Done(); err != nil {
return err
}
} else {
if err := s.RemoveAll(presubmitDir).Done(); err != nil {
return err
}
_, err := cache.StoreGoogleStorageFile(jirix, filepath.Join(root, "presubmit"), resultsBucketFlag+"/v0/presubmit", n)
if err != nil {
return err
presubmitResultsDir := filepath.Join(presubmitCacheDir, n)

if _, err := s.Stat(presubmitResultsDir); err != nil {
// Try downloading the tar file first.
tarFile := "results.tar.gz"
if _, err := cache.StoreGoogleStorageFile(jirix, presubmitTars, resultsBucketFlag+"/v0/presubmit/"+n, tarFile); err == nil {
if err := s.
Chdir(presubmitTars).
Run("tar", "-zxf", tarFile, "-C", presubmitCacheDir).Done(); err != nil {
return err
}
} else {
_, err := cache.StoreGoogleStorageFile(jirix, presubmitCacheDir, resultsBucketFlag+"/v0/presubmit", n)
if err != nil {
return err
}
}

}

params := extractParams(r)
switch {
case params.arch == "" || params.osName == "" || params.job == "":
// Generate the summary page.
data, err := params.generateSummaryData(jirix, n, presubmitDir)
data, err := params.generateSummaryData(jirix, n, presubmitResultsDir)
if err != nil {
return err
}
Expand All @@ -326,7 +327,7 @@ func displayPresubmitPage(jirix *jiri.X, w http.ResponseWriter, r *http.Request)
return nil
case params.testSuite == "":
// Generate the job detail page.
path := filepath.Join(presubmitDir, params.osName, params.arch, params.job)
path := filepath.Join(presubmitResultsDir, params.osName, params.arch, params.job)
data, err := params.generateJobData(jirix, n, path)
if err != nil {
return err
Expand All @@ -336,7 +337,7 @@ func displayPresubmitPage(jirix *jiri.X, w http.ResponseWriter, r *http.Request)
}
case (params.testClass != "" || params.testSuite != "") && params.testCase != "":
// Generate the test detail page.
path := filepath.Join(presubmitDir, params.osName, params.arch, params.job, params.partIndex)
path := filepath.Join(presubmitResultsDir, params.osName, params.arch, params.job, params.partIndex)
data, err := params.generateTestData(jirix, n, path)
if err != nil {
return err
Expand Down
4 changes: 2 additions & 2 deletions presubmit/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -838,8 +838,8 @@ func processRemoteTestResults(jirix *jiri.X) error {
// We don't fail the "result" phase in those cases.
s := jirix.NewSeq()
remoteResultsPath := gsPrefix + fmt.Sprintf("presubmit/%d", jenkinsBuildNumberFlag)
if err := s.Last("gsutil", "stat", remoteResultsPath); err != nil {
fmt.Fprintf(jirix.Stderr(), "Results not exist: %s", remoteResultsPath)
if err := s.Last("gsutil", "ls", remoteResultsPath); err != nil {
fmt.Fprintf(jirix.Stderr(), "Results not exist: %s\n", remoteResultsPath)
return nil
}

Expand Down

0 comments on commit fd26d3b

Please sign in to comment.