Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.10 backport] Upgrade containerd/fifo to v1.1.0 #45216

Merged
merged 1 commit into from
Mar 29, 2023
Merged

[20.10 backport] Upgrade containerd/fifo to v1.1.0 #45216

merged 1 commit into from
Mar 29, 2023

Conversation

corhere
Copy link
Contributor

@corhere corhere commented Mar 27, 2023

- What I did

- How I did it

- How to verify it

- Description for the changelog

  • Fixed an issue with the daemon crashing on startup during container restore

- A picture of a cute animal (not mandatory but encouraged)

@corhere
Upgrade containerd/fifo to v1.1.0
a9c02c2 
Signed-off-by: Cory Snider <csnider@mirantis.com>
@corhere corhere added this to the 20.10.24 milestone Mar 27, 2023
thaJeztah
thaJeztah approved these changes Mar 27, 2023
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@corhere
Copy link
Contributor Author

corhere commented Mar 27, 2023 

[2023-03-27T21:26:32.205Z] === RUN   TestHealthCheckProcessKilled
[2023-03-27T21:26:42.195Z]     health_test.go:112: timeout hit after 10s: waiting for container healthcheck logs
[2023-03-27T21:27:38.482Z] --- FAIL: TestHealthCheckProcessKilled (60.89s)

It's probably just a flake, but since container logs are very FIFO-adjacent I've kicked off another CI run to make sure it isn't actually a regression.

@corhere
Copy link
Contributor Author

corhere commented Mar 27, 2023

Integration tests passed the second time.

Though hack/generate-swagger-api.sh is non-deterministic? 
[2023-03-27T22:31:39.560Z] The result of hack/generate-swagger-api.sh differs
[2023-03-27T22:31:39.560Z] 
[2023-03-27T22:31:39.560Z] diff --git a/api/types/container/container_wait.go b/api/types/container/container_wait.go
[2023-03-27T22:31:39.560Z] index 49e05ae669..c2e69b5b25 100644
[2023-03-27T22:31:39.560Z] --- a/api/types/container/container_wait.go
[2023-03-27T22:31:39.560Z] +++ b/api/types/container/container_wait.go
[2023-03-27T22:31:39.560Z] @@ -6,14 +6,6 @@ package container // import "github.com/docker/docker/api/types/container"
[2023-03-27T22:31:39.560Z]  // See hack/generate-swagger-api.sh
[2023-03-27T22:31:39.560Z]  // ----------------------------------------------------------------------------
[2023-03-27T22:31:39.560Z]  
[2023-03-27T22:31:39.560Z] -// ContainerWaitOKBodyError container waiting error, if any
[2023-03-27T22:31:39.560Z] -// swagger:model ContainerWaitOKBodyError
[2023-03-27T22:31:39.560Z] -type ContainerWaitOKBodyError struct {
[2023-03-27T22:31:39.560Z] -
[2023-03-27T22:31:39.560Z] -	// Details of an error
[2023-03-27T22:31:39.560Z] -	Message string `json:"Message,omitempty"`
[2023-03-27T22:31:39.560Z] -}
[2023-03-27T22:31:39.560Z] -
[2023-03-27T22:31:39.560Z]  // ContainerWaitOKBody OK response to ContainerWait operation
[2023-03-27T22:31:39.560Z]  // swagger:model ContainerWaitOKBody
[2023-03-27T22:31:39.560Z]  type ContainerWaitOKBody struct {
[2023-03-27T22:31:39.560Z] @@ -26,3 +18,11 @@ type ContainerWaitOKBody struct {
[2023-03-27T22:31:39.560Z]  	// Required: true
[2023-03-27T22:31:39.560Z]  	StatusCode int64 `json:"StatusCode"`
[2023-03-27T22:31:39.560Z]  }
[2023-03-27T22:31:39.560Z] +
[2023-03-27T22:31:39.560Z] +// ContainerWaitOKBodyError container waiting error, if any
[2023-03-27T22:31:39.560Z] +// swagger:model ContainerWaitOKBodyError
[2023-03-27T22:31:39.560Z] +type ContainerWaitOKBodyError struct {
[2023-03-27T22:31:39.560Z] +
[2023-03-27T22:31:39.560Z] +	// Details of an error
[2023-03-27T22:31:39.560Z] +	Message string `json:"Message,omitempty"`
[2023-03-27T22:31:39.560Z] +}
[2023-03-27T22:31:39.560Z] 
[2023-03-27T22:31:39.560Z] Please update api/swagger.yaml with any API changes, then 
[2023-03-27T22:31:39.560Z] run hack/generate-swagger-api.sh.

@thaJeztah
Copy link
Member

Yup; it uses a map internally, which makes it sort results randomly. We worked around this on master and 23.0, but not in 20.10

See

@thaJeztah thaJeztah merged commit 83679bb into moby:20.10 Mar 29, 2023
@corhere corhere deleted the backport-20.10/containerd-fifo_v1.1 branch April 24, 2023 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@neersighted neersighted neersighted approved these changes

Assignees
No one assigned
Labels
impact/changelog kind/bugfix PR's that fix bugs status/4-merge
Projects
None yet
Milestone
20.10.24
Development

Successfully merging this pull request may close these issues.
3 participants
@corhere @thaJeztah @neersighted