root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into main 

Closes gh-26701
This commit is contained in:
Madhura Bhave 2021-05-28 14:38:28 -07:00
parent b8b0430139 5314bda48d
commit 54c3194164
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment.adoc
View File

@ -17,4 +17,4 @@ include::deployment/cloud.adoc[]
include::deployment/installing.adoc[]
include::deployment/whats-next.adoc[]
include::deployment/whats-next.adoc[]

4
spring-boot-project/spring-boot-docs/src/docs/asciidoc/deployment/cloud.adoc
View File

@ -138,6 +138,10 @@ The preStop handler can be configured via the PodSpec in the pod's configuration
Once the pre-stop hook has completed, SIGTERM will be sent to the container and <<features#features.graceful-shutdown,graceful shutdown>> will begin, allowing any remaining in-flight requests to complete.
NOTE: When Kubernetes sends a SIGTERM signal to the pod, it waits for a specified time called the termination grace period (the default for which is 30 seconds).
If the containers are still running after the grace period, they are sent the SIGKILL signal and forcibly removed.
If the pod takes longer than 30 seconds to shut down, which could be because you've increased spring.lifecycle.timeout-per-shutdown-phase, make sure to increase the termination grace period by setting the `terminationGracePeriodSeconds` option in the Pod YAML.
[[deployment.cloud.heroku]]