kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix jobs-related bug in task conversion

Browse source 
While working on some other code, noticed a bug in the jobs code. We're
adding job version after we're checking if there are port configs.
Before, if there were no port configs, the job version would be missing,
because we would return before trying to convert.

This moves the jobs version conversion above that code, so we don't
accidentally return before it.

Signed-off-by: Drew Erny <derny@mirantis.com>
This commit is contained in:
Drew Erny 2020-12-02 12:27:23 -06:00
parent ca520bd1b8
commit dd752ec87a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
daemon/cluster/convert/task.go
View file

@ -51,6 +51,12 @@ func TaskFromGRPC(t swarmapi.Task) (types.Task, error) {
task.NetworksAttachments = append(task.NetworksAttachments, networkAttachmentFromGRPC(na)) task.NetworksAttachments = append(task.NetworksAttachments, networkAttachmentFromGRPC(na))
} }
if t.JobIteration != nil {
task.JobIteration = &types.Version{
Index: t.JobIteration.Index,
}
}
if t.Status.PortStatus == nil { if t.Status.PortStatus == nil {
return task, nil return task, nil
} }
@ -65,11 +71,5 @@ func TaskFromGRPC(t swarmapi.Task) (types.Task, error) {
}) })
} }
if t.JobIteration != nil {
task.JobIteration = &types.Version{
Index: t.JobIteration.Index,
}
}
return task, nil return task, nil
} }