Skip to content

Removes servicing/pending updates#158

Closed
lowenna wants to merge 1 commit intomasterfrom
jjh/removeservicing
Closed

Removes servicing/pending updates#158
lowenna wants to merge 1 commit intomasterfrom
jjh/removeservicing

Conversation

@lowenna
Copy link
Contributor

@lowenna lowenna commented Feb 9, 2018

Signed-off-by: John Howard jhoward@microsoft.com

@darrenstahlmsft PTAL. Removes support for functionality that didn't work in RS1..RS3 and was removed in RS4 (cupdate no longer exists)

Don't merge until moby/moby#36267 has been merged. Steps are:

  1. Wait for Windows: Remove servicing mode moby/moby#36267 to be merged
  2. Merge this
  3. New HCSShim release
  4. Open PR to re-vendor back into moby/moby

return nil
}

// Shutdown requests a container shutdown, if IsPending() on the error returned is true,
Copy link
Contributor

Choose a reason for hiding this comment

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

This IsPending is different than PendingUpdates. It is about the HCS doing the shutdown/terminate on a different thread as an async task.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, yes, you're right. I was over-zealous on removing. Reinstated

return nil
}

// Terminate requests a container terminate, if IsPending() on the error returned is true,
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed as well

@darstahl
Copy link
Contributor

When we merge this, it will need to be a major version update as it breaks back-compat.

We should be able to merge this here and purge the servicing code in same PR as the revendor, no?

We'll also need to pull this from containerd as well as any other consumers.

@sunjayBhatia FYI something you might need to update in winc.

@sunjayBhatia
Copy link
Contributor

@darrenstahlmsft we do not use that container method or property currently but thanks for letting us know!

@darstahl
Copy link
Contributor

LGTM other than nits

Signed-off-by: John Howard <jhoward@microsoft.com>
@lowenna lowenna force-pushed the jjh/removeservicing branch from 48b159b to f83ea5e Compare February 13, 2018 20:02
@lowenna
Copy link
Contributor Author

lowenna commented Feb 13, 2018

@darrenstahlmsft I didn't want another change to HCSShim being merged and a revendor going into moby/moby accidentally breaking down-level daemons. Hence the ordering in the description. As a breaking change, this would probably bump the release to v1.0.0

@darstahl
Copy link
Contributor

LGTM. Holding merge for the breaking change, so we can hopefully get #160 in and backported to older Docker versions without taking the breaking change with it.

@darstahl
Copy link
Contributor

@jhowardmsft we haven't been using real semantic version numbering for previous releases. For breaking changes we've just been updating the minor version (v0.7.0).

We should eventually tag something as v1.0.0 and use proper semantic versioning eventually though... Maybe the v2 schema can be the 1.0 (or 2.0)? We can discuss later though, as it is not relevant to this PR.

@lowenna
Copy link
Contributor Author

lowenna commented Mar 16, 2018

@darrenstahlmsft Still hold off merging? I saw you closed #160.

@darstahl
Copy link
Contributor

Yes, please hold off on merging breaking changes for now. #160 was closed for different reasons, but if we can hold off on this as well for a bit, it will make things easier.

@darstahl
Copy link
Contributor

This is fine to merge now from my end.

Copy link
Contributor

@darstahl darstahl left a comment

Choose a reason for hiding this comment

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

LGTM

@lowenna
Copy link
Contributor Author

lowenna commented May 10, 2018

Actually, going to close this - I have a very slightly different version in the v2 work I'm doing.

@lowenna lowenna closed this May 10, 2018
@lowenna lowenna deleted the jjh/removeservicing branch May 19, 2018 06:50
dcantah pushed a commit to dcantah/hcsshim that referenced this pull request Mar 17, 2021
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