Skip to content

Commit bef8ac5

Browse files
teoteo
committed
[executor] Include environment ID in log messages
1 parent 6c4ecfd commit bef8ac5

9 files changed

Lines changed: 402 additions & 250 deletions

File tree

‎executor/executable/basictask.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ func (t *BasicTask) makeTransitionFunc() transitioner.DoTransitionFunc {
3636
// If it's a basic task role, we make a RUNNING-state based transition function
3737
// otherwise we process the hooks spec.
3838
return func(ei transitioner.EventInfo) (newState string, err error) {
39-
log.WithField("event", ei.Evt).
39+
log.WithField("partition", t.knownEnvironmentId.String()).
40+
WithField("event", ei.Evt).
4041
Debug("executor basic task transitioner requesting transition")
4142

4243
switch {

‎executor/executable/basictaskcommon.go‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,21 @@ import (
4545

4646
type basicTaskBase struct {
4747
taskBase
48-
taskCmd *exec.Cmd
49-
transitioner transitioner.Transitioner
48+
taskCmd *exec.Cmd
49+
transitioner transitioner.Transitioner
5050
pendingFinalTaskStateCh chan mesos.TaskState
5151
}
5252

5353
func (t *basicTaskBase) startBasicTask() (err error) {
5454
t.taskCmd, err = prepareTaskCmd(t.Tci)
5555
if err != nil {
5656
msg := "cannot build task command"
57-
log.WithFields(logrus.Fields{
58-
"id": t.ti.TaskID.Value,
59-
"task": t.ti.Name,
60-
"error": err,
61-
}).
57+
log.WithField("partition", t.knownEnvironmentId.String()).
58+
WithFields(logrus.Fields{
59+
"id": t.ti.TaskID.Value,
60+
"task": t.ti.Name,
61+
"error": err,
62+
}).
6263
Error(msg)
6364
return err
6465
}
@@ -78,10 +79,12 @@ func (t *basicTaskBase) startBasicTask() (err error) {
7879
switch *t.Tci.Log {
7980
case "stdout":
8081
stdoutLog := log.WithPrefix("task-stdout").
82+
WithField("partition", t.knownEnvironmentId.String()).
8183
WithField("task", t.ti.Name).
8284
WithField("nohooks", true).
8385
WriterLevel(logrus.TraceLevel)
8486
stderrLog := log.WithPrefix("task-stderr").
87+
WithField("partition", t.knownEnvironmentId.String()).
8588
WithField("task", t.ti.Name).
8689
WithField("nohooks", true).
8790
WriterLevel(logrus.TraceLevel)
@@ -92,9 +95,11 @@ func (t *basicTaskBase) startBasicTask() (err error) {
9295

9396
case "all":
9497
stdoutLog := log.WithPrefix("task-stdout").
98+
WithField("partition", t.knownEnvironmentId.String()).
9599
WithField("task", t.ti.Name).
96100
WriterLevel(logrus.TraceLevel)
97101
stderrLog := log.WithPrefix("task-stderr").
102+
WithField("partition", t.knownEnvironmentId.String()).
98103
WithField("task", t.ti.Name).
99104
WriterLevel(logrus.TraceLevel)
100105

@@ -113,7 +118,8 @@ func (t *basicTaskBase) startBasicTask() (err error) {
113118
err = t.taskCmd.Start()
114119

115120
if err != nil {
116-
log.WithFields(logrus.Fields{
121+
log.WithField("partition", t.knownEnvironmentId.String()).
122+
WithFields(logrus.Fields{
117123
"id": t.ti.TaskID.Value,
118124
"task": t.ti.Name,
119125
"error": err,
@@ -123,7 +129,8 @@ func (t *basicTaskBase) startBasicTask() (err error) {
123129

124130
return err
125131
}
126-
log.WithField("id", t.ti.TaskID.Value).
132+
log.WithField("partition", t.knownEnvironmentId.String()).
133+
WithField("id", t.ti.TaskID.Value).
127134
WithField("task", t.ti.Name).
128135
Debug("basic task started")
129136

@@ -146,17 +153,19 @@ func (t *basicTaskBase) startBasicTask() (err error) {
146153
}
147154

148155
if err != nil {
149-
log.WithFields(logrus.Fields{
156+
log.WithField("partition", t.knownEnvironmentId.String()).
157+
WithFields(logrus.Fields{
150158
"id": t.ti.TaskID.Value,
151159
"task": t.ti.Name,
152160
"error": err.Error(),
153161
"level": infologger.IL_Devel,
154162
}).
155163
Error("task terminated with error")
156-
log.WithField("level", infologger.IL_Support).
164+
log.WithField("partition", t.knownEnvironmentId.String()).
165+
WithField("level", infologger.IL_Support).
157166
Errorf("task terminated with error: %s %s",
158-
tciCommandStr,
159-
err.Error())
167+
tciCommandStr,
168+
err.Error())
160169
pendingState = mesos.TASK_FAILED
161170
}
162171

@@ -169,14 +178,15 @@ func (t *basicTaskBase) startBasicTask() (err error) {
169178
}
170179

171180
select {
172-
case pending := <- t.pendingFinalTaskStateCh:
181+
case pending := <-t.pendingFinalTaskStateCh:
173182
pendingState = pending
174183
processTerminatedOnItsOwn = false
175184
default:
176185
}
177186

178187
if errStdout != nil || errStderr != nil {
179-
log.WithFields(logrus.Fields{
188+
log.WithField("partition", t.knownEnvironmentId.String()).
189+
WithFields(logrus.Fields{
180190
"errStderr": errStderr,
181191
"errStdout": errStdout,
182192
"id": t.ti.TaskID.Value,
@@ -198,7 +208,7 @@ func (t *basicTaskBase) startBasicTask() (err error) {
198208
btt.FinalMesosState = pendingState
199209
btt.Stderr = stderrBuf.String()
200210
btt.Stdout = stdoutBuf.String()
201-
t.sendDeviceEvent(btt)
211+
t.sendDeviceEvent(t.knownEnvironmentId, btt)
202212
}
203213
}()
204214

@@ -225,6 +235,7 @@ func (t *basicTaskBase) ensureBasicTaskKilled() (err error) {
225235
err = syscall.Kill(-pid, syscall.SIGKILL)
226236
if err != nil {
227237
log.WithError(err).
238+
WithField("partition", t.knownEnvironmentId.String()).
228239
WithField("taskId", t.ti.GetTaskID()).
229240
Warning("could not kill task")
230241
}
@@ -239,12 +250,13 @@ func (t *basicTaskBase) doLaunch(transitionFunc transitioner.DoTransitionFunc) e
239250
}
240251

241252
t.transitioner = transitioner.NewTransitioner(t.Tci.ControlMode, transitionFunc)
242-
log.WithField("payload", string(t.ti.GetData()[:])).
253+
log.WithField("partition", t.knownEnvironmentId.String()).
254+
WithField("payload", string(t.ti.GetData()[:])).
243255
WithField("task", t.ti.Name).
244-
WithField("level",infologger.IL_Devel).
256+
WithField("level", infologger.IL_Devel).
245257
Debug("basic task staged")
246258

247-
go t.sendStatus(mesos.TASK_RUNNING, "")
259+
go t.sendStatus(t.knownEnvironmentId, mesos.TASK_RUNNING, "")
248260

249261
return nil
250262
}
@@ -272,6 +284,6 @@ func (t *basicTaskBase) Kill() error {
272284
t.taskCmd = nil
273285
}
274286

275-
go t.sendStatus(mesos.TASK_FINISHED, "")
287+
go t.sendStatus(t.knownEnvironmentId, mesos.TASK_FINISHED, "")
276288
return nil
277289
}

0 commit comments

Comments
 (0)