diff options
| author | Jhon Honce <jhonce@redhat.com> | 2021-10-11 18:07:49 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2021-10-12 09:53:19 -0700 |
| commit | 0459484bdf51b3aabc51f2ae82136b6b0f3d88ba (patch) | |
| tree | 63251819c8a2fd7b61480aa761f7e761c66c9b1c /cmd/podman | |
| parent | 2fcec59445267e8c8e06005539701a172d3db8a5 (diff) | |
| download | podman-0459484bdf51b3aabc51f2ae82136b6b0f3d88ba.tar.gz podman-0459484bdf51b3aabc51f2ae82136b6b0f3d88ba.tar.bz2 podman-0459484bdf51b3aabc51f2ae82136b6b0f3d88ba.zip | |
Fix CI flake on time of shutdown for API service
* Increase timeout for tests to 10s
* To aid in debugging add PID to shutdown package logging
* Added new message for forced service shutdown
* Always wait for HTTP server to shutdown, duration of 0 not friendly
to clients
Note: The log event
"IdleTracker: StateClosed transition by connection marked un-managed"
denotes a TCP connection has been initiated but no HTTP request was sent.
And is expected during these tests.
Fixes #11921
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/system/service_abi.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go index 0a4be6aea..b9bd7538f 100644 --- a/cmd/podman/system/service_abi.go +++ b/cmd/podman/system/service_abi.go @@ -93,7 +93,7 @@ func restService(flags *pflag.FlagSet, cfg *entities.PodmanConfig, opts entities return err } defer func() { - if err := server.Shutdown(false); err != nil { + if err := server.Shutdown(true); err != nil { logrus.Warnf("Error when stopping API service: %s", err) } }() |