Skip to content

Commit

Permalink
fix(worker): worker cache display better errors (#3347)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bnjjj @yesnault
bnjjj authored and yesnault committed Sep 24, 2018
1 parent 6d057f7 commit c632b08
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
2 changes: 1 addition & 1 deletion engine/api/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func (api *API) getPullCacheHandler() service.Handler {

ioread, err := objectstore.Fetch(&cacheObject)
if err != nil {
return sdk.WrapError(err, "getPullCacheHandler> Cannot fetch artifact cache.tar")
return sdk.WrapError(sdk.ErrNotFound, "getPullCacheHandler> Cannot fetch artifact cache.tar : %v", err)
}
if _, err := io.Copy(w, ioread); err != nil {
_ = ioread.Close()
Expand Down
36 changes: 18 additions & 18 deletions engine/worker/cmd_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,30 +85,30 @@ func cachePushCmd(w *currentWorker) func(cmd *cobra.Command, args []string) {
return func(cmd *cobra.Command, args []string) {
portS := os.Getenv(WorkerServerPort)
if portS == "" {
sdk.Exit("worker cache push > %s not found, are you running inside a CDS worker job?\n", WorkerServerPort)
sdk.Exit("worker cache push > %s not found, are you running inside a CDS worker job?", WorkerServerPort)
}

port, errPort := strconv.Atoi(portS)
if errPort != nil {
sdk.Exit("worker cache push > Cannot parse '%s' as a port number : %s\n", portS, errPort)
sdk.Exit("worker cache push > Cannot parse '%s' as a port number : %s", portS, errPort)
}

if len(args) < 2 {
sdk.Exit("worker cache push > Wrong usage: Example : worker cache push myTagValue filea fileb filec\n")
sdk.Exit("worker cache push > Wrong usage: Example : worker cache push myTagValue filea fileb filec")
}

files := make([]string, len(args)-1)
for i, arg := range args[1:] {
absPath, err := filepath.Abs(arg)
if err != nil {
sdk.Exit("worker cache push > cannot have absolute path for (%s) : %s\n", absPath, err)
sdk.Exit("worker cache push > cannot have absolute path for (%s) : %s", absPath, err)
}
files[i] = absPath
}

cwd, err := os.Getwd()
if err != nil {
sdk.Exit("worker cache push > Cannot find working directory : %s\n", err)
sdk.Exit("worker cache push > Cannot find working directory : %s", err)
}

c := sdk.Cache{
Expand All @@ -119,7 +119,7 @@ func cachePushCmd(w *currentWorker) func(cmd *cobra.Command, args []string) {

data, errMarshal := json.Marshal(c)
if errMarshal != nil {
sdk.Exit("worker cache push > internal error (%s)\n", errMarshal)
sdk.Exit("worker cache push > internal error (%s)", errMarshal)
}

fmt.Printf("Worker cache push in progress... (tag: %s)\n", args[0])
Expand All @@ -129,25 +129,25 @@ func cachePushCmd(w *currentWorker) func(cmd *cobra.Command, args []string) {
bytes.NewReader(data),
)
if errRequest != nil {
sdk.Exit("worker cache push > cannot post worker cache push (Request): %s\n", errRequest)
sdk.Exit("worker cache push > cannot post worker cache push (Request): %s", errRequest)
}

client := http.DefaultClient
client.Timeout = 30 * time.Minute

resp, errDo := client.Do(req)
if errDo != nil {
sdk.Exit("worker cache push > cannot post worker cache push (Do): %s\n", errDo)
sdk.Exit("worker cache push > cannot post worker cache push (Do): %s", errDo)
}
defer resp.Body.Close()

if resp.StatusCode >= 300 {
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
sdk.Exit("cache push HTTP error %v\n", err)
sdk.Exit("cache push HTTP error %v", err)
}
cdsError := sdk.DecodeError(body)
sdk.Exit("Error: http code %d : %v\n", resp.StatusCode, cdsError)
sdk.Exit("Error: http code %d : %v", resp.StatusCode, cdsError)
}

fmt.Printf("Worker cache push with success (tag: %s)\n", args[0])
Expand Down Expand Up @@ -183,7 +183,7 @@ func (wk *currentWorker) cachePushHandler(w http.ResponseWriter, r *http.Request
if errTar != nil {
errTar = sdk.Error{
Message: "worker cache push > Cannot tar : " + errTar.Error(),
Status: http.StatusInternalServerError,
Status: http.StatusBadRequest,
}
log.Error("%v", errTar)
writeError(w, r, errTar)
Expand Down Expand Up @@ -257,7 +257,7 @@ func cachePullCmd(w *currentWorker) func(cmd *cobra.Command, args []string) {
return func(cmd *cobra.Command, args []string) {
portS := os.Getenv(WorkerServerPort)
if portS == "" {
sdk.Exit("worker cache pull > %s not found, are you running inside a CDS worker job?\n", WorkerServerPort)
sdk.Exit("worker cache pull > %s not found, are you running inside a CDS worker job?", WorkerServerPort)
}

port, errPort := strconv.Atoi(portS)
Expand All @@ -271,7 +271,7 @@ func cachePullCmd(w *currentWorker) func(cmd *cobra.Command, args []string) {

dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
if err != nil {
sdk.Exit("worker cache pull > cannot get current path: %s\n", err)
sdk.Exit("worker cache pull > cannot get current path: %s", err)
}

fmt.Printf("Worker cache pull in progress... (tag: %s)\n", args[0])
Expand All @@ -281,24 +281,24 @@ func cachePullCmd(w *currentWorker) func(cmd *cobra.Command, args []string) {
nil,
)
if errRequest != nil {
sdk.Exit("worker cache pull > cannot post worker cache pull with tag %s (Request): %s\n", args[0], errRequest)
sdk.Exit("worker cache pull > cannot post worker cache pull with tag %s (Request): %s", args[0], errRequest)
}

client := http.DefaultClient
client.Timeout = 10 * time.Minute

resp, errDo := client.Do(req)
if errDo != nil {
sdk.Exit("worker cache pull > cannot post worker cache pull (Do): %s\n", errDo)
sdk.Exit("worker cache pull > cannot post worker cache pull (Do): %s", errDo)
}

if resp.StatusCode >= 300 {
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
sdk.Exit("cache pull HTTP error %v\n", err)
sdk.Exit("cache pull HTTP error %v", err)
}
cdsError := sdk.DecodeError(body)
sdk.Exit("Error: %v -> %s\n", cdsError, string(body))
sdk.Exit("Error: %v", cdsError)
}

fmt.Printf("Worker cache pull with success (tag: %s)\n", args[0])
Expand All @@ -321,7 +321,7 @@ func (wk *currentWorker) cachePullHandler(w http.ResponseWriter, r *http.Request
if err != nil {
err = sdk.Error{
Message: "worker cache pull > Cannot pull cache : " + err.Error(),
Status: http.StatusInternalServerError,
Status: http.StatusNotFound,
}
writeError(w, r, err)
return
Expand Down
3 changes: 3 additions & 0 deletions sdk/cdsclient/client_workflow.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,9 @@ func (c *client) WorkflowCachePull(projectKey, ref string) (io.Reader, error) {
}

if code >= 400 {
if code == 404 {
return nil, fmt.Errorf("Cache not found")
}
return nil, fmt.Errorf("HTTP Code %d", code)
}

Expand Down
4 changes: 4 additions & 0 deletions sdk/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,9 @@ func ProcessError(target error, al string) (string, Error) {
target = errors.Cause(target)
cdsErr, ok := target.(Error)
if !ok || cdsErr.ID == 0 {
if ok && cdsErr.Message != "" {
return cdsErr.Message, cdsErr
}
return errorsAmericanEnglish[ErrUnknownError.ID], ErrUnknownError
}
acceptedLanguages, _, err := language.ParseAcceptLanguage(al)
Expand All @@ -503,6 +506,7 @@ func ProcessError(target error, al string) (string, Error) {
break
}
} else {
ok = true
msg = cdsErr.Message
}

Expand Down

0 comments on commit c632b08

Please sign in to comment.