marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG: Fixed cleanup method for zombie containers

Browse Source
This commit is contained in:
frikky
2021-01-03 17:22:22 +01:00
parent faae62e1ab
commit a176ae8eba
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/onprem/orborus/orborus.go
+4 -5
View File
@@ -645,9 +645,10 @@ func zombiecheck(ctx context.Context, workerTimeout int) error {
stopContainers := []string{} stopContainers := []string{}
removeContainers := []string{} removeContainers := []string{}
log.Printf("[INFO] Baseimage: %s, Workertimeout: %d", baseimagename, int64(workerTimeout)) log.Printf("[INFO] Baseimage: %s, Workertimeout: %d", baseimagename, int64(workerTimeout))
baseString := `/bin/sh -c 'python app.py --log-level DEBUG'`
for _, container := range containers { for _, container := range containers {
// Skip random containers. Only handle things related to Shuffle. // Skip random containers. Only handle things related to Shuffle.
if !strings.Contains(container.Image, baseimagename) { if !strings.Contains(container.Image, baseimagename) && container.Command != baseString && container.Command != "./worker" {
shuffleFound := false shuffleFound := false
for _, item := range container.Labels { for _, item := range container.Labels {
if item == "shuffle" { if item == "shuffle" {
@@ -670,7 +671,7 @@ func zombiecheck(ctx context.Context, workerTimeout int) error {
for _, name := range container.Names { for _, name := range container.Names {
// FIXME - add name_version_uid_uid regex check as well // FIXME - add name_version_uid_uid regex check as well
if strings.HasPrefix(name, "/shuffle") { if strings.HasPrefix(name, "/shuffle") && !strings.HasPrefix(name, "/shuffle-subflow") {
continue continue
} }
@@ -679,7 +680,6 @@ func zombiecheck(ctx context.Context, workerTimeout int) error {
// Need to check time here too because a container can be removed the same instant as its created // Need to check time here too because a container can be removed the same instant as its created
if container.State != "running" && currenttime-container.Created > int64(workerTimeout) { if container.State != "running" && currenttime-container.Created > int64(workerTimeout) {
log.Printf("Should remove above container because not running and old")
removeContainers = append(removeContainers, container.ID) removeContainers = append(removeContainers, container.ID)
containerNames[container.ID] = name containerNames[container.ID] = name
} }
@@ -687,7 +687,6 @@ func zombiecheck(ctx context.Context, workerTimeout int) error {
// stopcontainer & removecontainer // stopcontainer & removecontainer
//log.Printf("Time: %d - %d", currenttime-container.Created, int64(workerTimeout)) //log.Printf("Time: %d - %d", currenttime-container.Created, int64(workerTimeout))
if container.State == "running" && currenttime-container.Created > int64(workerTimeout) { if container.State == "running" && currenttime-container.Created > int64(workerTimeout) {
log.Printf("Should remove above container because RUNNING and old")
stopContainers = append(stopContainers, container.ID) stopContainers = append(stopContainers, container.ID)
containerNames[container.ID] = name containerNames[container.ID] = name
} }
@@ -709,7 +708,7 @@ func zombiecheck(ctx context.Context, workerTimeout int) error {
log.Printf("[INFO] Should REMOVE %d containers.", len(removeContainers)) log.Printf("[INFO] Should REMOVE %d containers.", len(removeContainers))
for _, containername := range removeContainers { for _, containername := range removeContainers {
dockercli.ContainerRemove(ctx, containername, removeOptions) go dockercli.ContainerRemove(ctx, containername, removeOptions)
} }
return nil return nil