state: add possible error return to TaskSet.Edge() #6733
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The current code in doUpdate works on a bunch of TaskSets like alias-updates, snap-updates and those are merged into a single TaskSet in the end. With that the TaskSetEdge information gets lost. This edge is import for the Remodel() code so we need to preserve it. This PR adds a new TaskSet.AddAllWithEdges() and uses it in doUpdate() to keep the edges informations in the flat TaskSet.
Co-Authored-By: mvo5 <michael.vogt@gmail.com>
As a followup to the discussion in we had in canonical#6599 this PR implements an error return in TaskSet.Edge().
pedronis
reviewed
Apr 16, 2019
overlord/state/task.go
Outdated
| func (ts TaskSet) Edge(e TaskSetEdge) (*Task, error) { | ||
| t, ok := ts.edges[e] | ||
| if !ok { | ||
| return nil, ErrNoState |
There was a problem hiding this comment.
ErrNoState doesn't carry a lot of information, but the usage of Edge will be mostly static (afawk) so I think
fmt.Errorf("internal error: no %q edge in task set", e)
would be maybe better
There was a problem hiding this comment.
Probably slightly clearer with "missing" instead of "no"
pedronis
reviewed
Apr 16, 2019
overlord/devicestate/devicestate.go
Outdated
| return nil, nil, nil, nil, fmt.Errorf("internal error: cannot find edge task in task set: %v", ts) | ||
| edgeTask, err := ts.Edge(snapstate.DownloadAndChecksDoneEdge) | ||
| if err != nil { | ||
| return nil, nil, nil, nil, fmt.Errorf("internal error: cannot find edge task in task set: %v", err) |
There was a problem hiding this comment.
then here we could just return err
pedronis
approved these changes
Apr 17, 2019
overlord/state/task_test.go
Outdated
| c.Assert(ts.Edge(edge2), IsNil) | ||
| t, err := ts.Edge(edge1) | ||
| c.Assert(t, IsNil) | ||
| c.Assert(err, ErrorMatches, fmt.Sprintf("internal error: missing %q edge in task set", edge1)) |
There was a problem hiding this comment.
is the repr strange for the edge? I would have used a `string` in the test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As a followup to the discussion in we had in
#6599
this PR implements an error return in TaskSet.Edge().
The relevant change is in 6426c3b