mirror of
https://github.com/containrrr/watchtower.git
synced 2026-02-16 20:28:07 +01:00
Fix high application downtime during container update
This commit is contained in:
parent
3d18c7ec48
commit
b451c94ddc
2 changed files with 60 additions and 30 deletions
|
|
@ -35,22 +35,50 @@ func Update(client container.Client, params types.UpdateParams) error {
|
|||
containers[i].Stale = stale
|
||||
}
|
||||
|
||||
containers, err = sorter.SortByDependencies(containers)
|
||||
checkDependencies(containers)
|
||||
|
||||
var dependency_sorted_graphs [][]container.Container
|
||||
|
||||
undirected_nodes := make(map[string][]string)
|
||||
for i:= 0; i < len(containers); i++ {
|
||||
undirected_nodes[containers[i].Name()] = containers[i].Links()
|
||||
}
|
||||
|
||||
for i:= 0; i< len(containers); i++ {
|
||||
for j:=0; j < len(containers[i].Links()); j++ {
|
||||
undirected_nodes[containers[i].Links()[j]] = append(undirected_nodes[containers[i].Links()[j]], containers[i].Name())
|
||||
}
|
||||
}
|
||||
|
||||
dependency_sorted_graphs, err = sorter.SortByDependencies(containers,undirected_nodes)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
checkDependencies(containers)
|
||||
|
||||
if params.MonitorOnly {
|
||||
if params.LifecycleHooks {
|
||||
lifecycle.ExecutePostChecks(client, params)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
//shared map for independent and linked update
|
||||
imageIDs := make(map[string]bool)
|
||||
|
||||
stopContainersInReversedOrder(containers, client, params)
|
||||
restartContainersInSortedOrder(containers, client, params)
|
||||
//Use ordered start and stop for each independent set of containers
|
||||
for _, dependency_graph:= range dependency_sorted_graphs {
|
||||
stopContainersInReversedOrder(dependency_graph, client, params)
|
||||
restartContainersInSortedOrder(dependency_graph, client, params, imageIDs)
|
||||
}
|
||||
|
||||
//clean up outside after containers updated
|
||||
if params.Cleanup {
|
||||
for imageID := range imageIDs {
|
||||
if err := client.RemoveImageByID(imageID); err != nil {
|
||||
log.Error(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if params.LifecycleHooks {
|
||||
lifecycle.ExecutePostChecks(client, params)
|
||||
|
|
@ -86,9 +114,7 @@ func stopStaleContainer(container container.Container, client container.Client,
|
|||
}
|
||||
}
|
||||
|
||||
func restartContainersInSortedOrder(containers []container.Container, client container.Client, params types.UpdateParams) {
|
||||
imageIDs := make(map[string]bool)
|
||||
|
||||
func restartContainersInSortedOrder(containers []container.Container, client container.Client, params types.UpdateParams, imageIDs map[string]bool) {
|
||||
for _, container := range containers {
|
||||
if !container.Stale {
|
||||
continue
|
||||
|
|
@ -96,13 +122,6 @@ func restartContainersInSortedOrder(containers []container.Container, client con
|
|||
restartStaleContainer(container, client, params)
|
||||
imageIDs[container.ImageID()] = true
|
||||
}
|
||||
if params.Cleanup {
|
||||
for imageID := range imageIDs {
|
||||
if err := client.RemoveImageByID(imageID); err != nil {
|
||||
log.Error(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func restartStaleContainer(container container.Container, client container.Client, params types.UpdateParams) {
|
||||
|
|
@ -144,3 +163,12 @@ func checkDependencies(containers []container.Container) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
func Find(links []string, target string) bool {
|
||||
for i:=0; i < len(links); i++{
|
||||
if links[i] == target{
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue