From 5aa6720dffa86910ee73eb5b64e895bc08b33676 Mon Sep 17 00:00:00 2001 From: Noah Hilverling Date: Wed, 20 Mar 2019 15:15:30 +0100 Subject: [PATCH] Finish work before killing workers --- configobject/sync/sync.go | 40 --------------------------------------- 1 file changed, 40 deletions(-) diff --git a/configobject/sync/sync.go b/configobject/sync/sync.go index 65662eef..5d119c31 100644 --- a/configobject/sync/sync.go +++ b/configobject/sync/sync.go @@ -174,14 +174,6 @@ func InsertPrepWorker(super *supervisor.Supervisor, ctx *Context, done chan stru ChBack: chInsertBack, } for i, key := range chunk.Keys { - select { - case _, ok := <-done: - if !ok { - return - } - default: - } - if chunk.Configs[i] == nil || chunk.Checksums[i] == nil { continue } @@ -254,14 +246,6 @@ func UpdateCompWorker(super *supervisor.Supervisor, ctx *Context, done chan stru prep := func(chunk *icingadb_connection.ChecksumChunk, mysqlChecksums map[string]map[string]string) { changed := make([]string, 0) for i, key := range chunk.Keys { - select { - case _, ok := <-done: - if !ok { - return - } - default: - } - if chunk.Checksums[i] == nil { continue } @@ -299,14 +283,6 @@ func UpdateCompWorker(super *supervisor.Supervisor, ctx *Context, done chan stru go func() { for chunk := range ch { - select { - case _, ok := <-done: - if !ok { - return - } - default: - } - go prep(chunk, checksums) } }() @@ -319,14 +295,6 @@ func UpdatePrepWorker(super *supervisor.Supervisor, ctx *Context, done chan stru ChBack: chUpdateBack, } for i, key := range chunk.Keys { - select { - case _, ok := <-done: - if !ok { - return - } - default: - } - if chunk.Configs[i] == nil || chunk.Checksums[i] == nil { continue } @@ -355,14 +323,6 @@ func UpdatePrepWorker(super *supervisor.Supervisor, ctx *Context, done chan stru ch := super.Rdbw.PipeConfigChunks(done, keys, ctx.ObjectType) go func() { for chunk := range ch { - select { - case _, ok := <-done: - if !ok { - return - } - default: - } - go prep(chunk) } }()