Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added better task status when stopped via timeout #767

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added better task status when stopped via timeout #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions iterative/utils/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ func formatSchemaStatus(d *schema.ResourceData) string {
if status["failed"] != nil && status["failed"].(int) > 0 {
message = fmt.Sprintf("\x1b[%dmStatus: completed with errors \x1b[1m•\x1b[0m", colors["ERROR"])
}
if status["timeout"] != nil && status["timeout"].(int) > 0 {
message = fmt.Sprintf("\x1b[%dmStatus: stopped via timeout \x1b[1m•\x1b[0m", colors["WARNING"])
}
if status["running"] != nil && status["running"].(int) >= d.Get("parallelism").(int) {
message = fmt.Sprintf("\x1b[%dmStatus: running \x1b[1m•\x1b[0m", colors["WARNING"])
}
Expand Down
15 changes: 15 additions & 0 deletions iterative/utils/logger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,21 @@ func TestState3(t *testing.T) {
logger.Info("status")
}

func TestState4(t *testing.T) {
d := generateSchemaData(t, map[string]interface{}{
"name": "mytask",
"parallelism": "1",
"status": map[string]interface{}{
"running": 0,
"timeout": 1,
},
})

logger := logrus.WithFields(logrus.Fields{"d": d})
logrus.SetFormatter(&TpiFormatter{})
logger.Info("status")
}

func TestLogs(t *testing.T) {
logs := make([]interface{}, 0)
logs = append(logs, "-- Logs begin at Tue 2022-03-01 12:25:09 UTC, end at Tue 2022-03-01 12:30:30 UTC. --\nMar 01 12:25:50 tpi000000 systemd[1]: Started tpi-task.service.\nMar 01 12:25:50 tpi000000 sudo[1706]: root : TTY=unknown ; PWD=/tmp/tpi-task ; USER=root ; COMMAND=/usr/bin/apt update\nMar 01 12:25:50 tpi000000 sudo[1706]: pam_unix(sudo:session): session opened for user root by (uid=0)\nMar 01 12:25:50 tpi000000 tpi-task[1711]: WARNING: apt does not have a stable CLI interface. Use with caution in scripts.\nMar 01 12:25:50 tpi000000 tpi-task[1711]: Hit:1 http://azure.archive.ubuntu.com/ubuntu focal InRelease\nMar 01 12:25:50 tpi000000 tpi-task[1711]: Get:2 http://azure.archive.ubuntu.com/ubuntu focal-updates InRelease [114 kB]\nMar 01 12:25:50 tpi000000 tpi-task[1711]: Get:3 http://azure.archive.ubuntu.com/ubuntu focal-backports InRelease [108 kB]\nMar 01 12:25:51 tpi000000 tpi-task[1711]: Get:4 http://security.ubuntu.com/ubuntu focal-security InRelease [114 kB]\nMar 01 12:25:51 tpi000000 tpi-task[1711]: Get:5 http://azure.archive.ubuntu.com/ubuntu focal/universe amd64 Packages [8628 kB]\n")
Expand Down
4 changes: 2 additions & 2 deletions task/common/machine/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/rclone/rclone/fs/operations"
"github.com/rclone/rclone/fs/sync"

"github.com/sirupsen/logrus"
"github.com/0x2b3bfa0/logrusctx"
"github.com/sirupsen/logrus"

"terraform-provider-iterative/task/common"
)
Expand Down Expand Up @@ -114,7 +114,7 @@ func Status(ctx context.Context, remote string, initialStatus common.Status) (co
initialStatus[common.StatusCodeFailed] += 1
}
} else if statusReport.Result == "timeout" {
initialStatus[common.StatusCodeFailed] += 1
initialStatus[common.StatusCodeTimeout] += 1
}
}
return initialStatus, nil
Expand Down
1 change: 1 addition & 0 deletions task/common/values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const (
StatusCodeActive StatusCode = "running"
StatusCodeSucceeded StatusCode = "succeeded"
StatusCodeFailed StatusCode = "failed"
StatusCodeTimeout StatusCode = "timeout"
)

type Size struct {
Expand Down