Delete shim workloads tasks in pod. #1271
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
This commit supports restarting containers and pods using CRI. Delete task request now removes tasks from `pod`'s `workloadTasks` map, and added `DeleteTask` function to `shimPod` interface so new tasks can use the same ID (ie, so a task can be restarted in a running pod). Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
|
Thanks for splitting these up! |
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
dcantah
reviewed
Feb 7, 2022
dcantah
reviewed
Feb 7, 2022
dcantah
reviewed
Feb 7, 2022
dcantah
reviewed
Feb 7, 2022
dcantah
reviewed
Feb 8, 2022
| if err != nil { | ||
| return nil, errors.Wrapf(err, "could not get pod %q to delete task %q", s.tid, req.ID) | ||
| if req.ExecID == "" { | ||
| // delete is for a task, and not an exec |
There was a problem hiding this comment.
This should be above req.ExecID
dcantah
reviewed
Feb 8, 2022
| err = p.DeleteTask(ctx, req.ID) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("could not delete task %q in pod %q: %w", req.ID, s.tid, err) | ||
|
|
helsaawy
force-pushed
the
he/shimdelete
branch
from
8e1e778
to
5fdfa50
Compare
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
force-pushed
the
he/shimdelete
branch
from
5fdfa50
to
5e5baea
Compare
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.
This commit supports restarting containers and pods using CRI:
kevpar/cri#13
This PR allows the service to remove tasks from a
podsworkloadTasksmap after the task and associatedexecs have been shut down during in a delete task request, allowing for proper deletion of the task and freeing up associated resources whenreceived by the service. Namely, this frees up the deleted task's ID, so that new tasks can be created with that same ID after the original task has been deleted (ie, so a task can be restarted within a running pod).
A
DeleteTaskfunction was added to theshimPodinterface to implement most of this functionality.Additionally, the service, in
deleteInternal, resets its internal reference to the init task (shimPod or shimTask) reference,taskOrPod, if the delete is issued for the init task, as a marker that the service is no longer operational and to prevent future operations from occurring.Signed-off-by: Hamza El-Saawy hamzaelsaawy@microsoft.com