Skip to content

Skip unmounting layers for sandbox container.#932

Merged
dcantah merged 1 commit intomicrosoft:masterfrom
dcantah:special-case-scratch
Jan 28, 2021
Merged

Skip unmounting layers for sandbox container.#932
dcantah merged 1 commit intomicrosoft:masterfrom
dcantah:special-case-scratch

Conversation

@dcantah
Copy link
Copy Markdown
Contributor

@dcantah dcantah commented Jan 26, 2021

  • Skip unmounting the layers for the sandbox container as we know the UVM gets torn down shortly afterwards.

Signed-off-by: Daniel Canter dcanter@microsoft.com

@dcantah dcantah requested a review from a team as a code owner January 26, 2021 03:55
Copy link
Copy Markdown
Contributor

@anmaxvl anmaxvl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment thread internal/hcsoci/resources_lcow.go Outdated
Comment thread internal/hcsoci/resources_wcow.go Outdated
Comment thread internal/layers/layers.go Outdated
@dcantah dcantah force-pushed the special-case-scratch branch 2 times, most recently from d36e24c to b8e5f80 Compare January 27, 2021 22:47
Comment thread internal/hcsoci/create.go Outdated
if err != nil {
return nil, r, err
}
isSandbox = ct == oci.KubernetesContainerTypeSandbox
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be moved out of the networking setup code path?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, now that it's used for more than just network setup

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Donezo

@dcantah dcantah force-pushed the special-case-scratch branch from b8e5f80 to d221e81 Compare January 27, 2021 23:51
Comment thread internal/hcsoci/create.go Outdated
@@ -285,13 +281,17 @@ func CreateContainer(ctx context.Context, createOptions *CreateOptions) (_ cow.C
}

// Create a network namespace if necessary.
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: this should go under the code for getting the container type........

* Skip unmounting the layers for the sandbox container as we know the UVM
gets torn down shortly afterwards.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
@dcantah dcantah force-pushed the special-case-scratch branch from d221e81 to 61e1b43 Compare January 28, 2021 01:36
Copy link
Copy Markdown

@katiewasnothere katiewasnothere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants