Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion core/controlcommands/mesoscommandservent.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ package controlcommands

import (
"fmt"
"strings"
"sync"
"time"

Expand Down Expand Up @@ -144,7 +145,8 @@ func (s *Servent) RunCommand(cmd MesosCommand, receiver MesosCommandTarget) (Mes
// By the time we get here, ProcessResponse should have already added a Response to the
// pending call, and removed it from servent.pending.
case <-time.After(cmd.GetResponseTimeout()):
call.Error = fmt.Errorf("%s timed out for task %s", cmd.GetName(), receiver.TaskId.Value)
userFriendlyCommandName, _ := strings.CutPrefix(cmd.GetName(), "MesosCommand_")
call.Error = fmt.Errorf("%s timed out", userFriendlyCommandName)

log.WithPrefix("servent").
WithField("partition", cmd.GetEnvironmentId().String()).
Expand Down
4 changes: 2 additions & 2 deletions core/environment/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ func (envs *Manager) CreateEnvironment(workflowPath string, userVars map[string]
log.WithField("state", envState).
WithField("partition", env.Id().String()).
WithError(err).
Warnf("auto-transitioning environment failed %s, cleanup in progress", op)
Errorf("auto-transitioning environment failed %s, cleanup in progress", op)

the.EventWriterWithTopic(topic.Environment).WriteEvent(
NewEnvGoErrorEvent(env, fmt.Sprintf("%s failed: %v", op, err)),
Expand Down Expand Up @@ -1460,7 +1460,7 @@ func (envs *Manager) CreateAutoEnvironment(workflowPath string, userVars map[str
log.WithField("state", envState).
WithField("partition", env.Id().String()).
WithError(err).
Warnf("auto-transitioning environment failed %s, cleanup in progress", op)
Errorf("auto-transitioning environment failed %s, cleanup in progress", op)

the.EventWriterWithTopic(topic.Environment).WriteEvent(
NewEnvGoErrorEvent(env, fmt.Sprintf("%s failed: %v", op, err)),
Expand Down