fix(provider): remove waitgroup for lease withdraw (#1618)

fixes #eng-282 Signed-off-by: Artur Troian <[email protected]>
akash-network · Jun 16, 2022 · 5b4883c · 5b4883c
1 parent 02ea8c9
commit 5b4883c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/provider/balance_checker.go b/provider/balance_checker.go
@@ -197,6 +197,8 @@ func (bc *balanceChecker) run(startCh chan<- error) {
 				<-lState.tm.C
 			}
 		}
+
+		bc.log.Debug("shutdown complete")
 	}()
 
 	leaseCheckCh := make(chan leaseCheckResponse, 1)
@@ -308,8 +310,6 @@ loop:
 			}
 		}
 	}
-
-	bc.log.Debug("shutdown complete")
 }
 
 func (bc *balanceChecker) timerFunc(ctx context.Context, d time.Duration, lid mtypes.LeaseID, scheduledWithdraw bool, ch chan<- leaseCheckResponse) *time.Timer {

diff --git a/provider/cluster/manager.go b/provider/cluster/manager.go
@@ -239,13 +239,14 @@ loop:
 		dm.log.Debug("read from runch during shutdown")
 	}
 
-	dm.log.Debug("waiting on dm.wg")
-	dm.wg.Wait()
-
 	if nil != dm.withdrawal {
 		dm.log.Debug("waiting on withdrawal")
-		dm.withdrawal.lc.Shutdown(nil)
+		<-dm.withdrawal.lc.Done()
 	}
+
+	dm.log.Debug("waiting on dm.wg")
+	dm.wg.Wait()
+
 	dm.log.Info("shutdown complete")
 }
 
@@ -256,12 +257,6 @@ func (dm *deploymentManager) startWithdrawal() error {
 		return err
 	}
 
-	dm.wg.Add(1)
-	go func() {
-		defer dm.wg.Done()
-		<-dm.lc.Done()
-	}()
-
 	return nil
 }