* internal/servers/controller: refactor WaitForNextWorkerStatusUpdate * internal/servers/worker: use connId instead of conn.GetConnectionId() * internal/servers/worker: remove Worker.logClose * internal/session: complement versus inclusive state search * internal/session: use ScanRows instead of Scan * internal/session: make closeConnectionsForDeadServersCte results gormable * internal/tests/cluster: rename TestWorkerSessionCleanup to TestSessionCleanup * Simplify SQL query for CloseConnectionsForDeadWorkers (#1410) Co-authored-by: Michael Gaffney <mgaffney@users.noreply.github.com>
This commit is contained in:
1 parent
cab3dd6986
commit
1ebb8efab6
6 files changed
+52
-90
No files matched your search
@@ -644,31 +644,26 @@ func (tc *TestController) AddClusterControllerMember(t *testing.T, opts *TestCon
|
||||
// period, this function returns an error.
|
||||
func (tc *TestController) WaitForNextWorkerStatusUpdate(workerId string) error {
|
||||
tc.Logger().Debug("waiting for next status report from worker", "worker", workerId)
|
||||
|
||||
if err := tc.waitForNextWorkerStatusUpdate(workerId); err != nil {
|
||||
tc.Logger().Error("error waiting for next status report from worker", "worker", workerId, "err", err)
|
||||
return err
|
||||
}
|
||||
|
||||
tc.Logger().Debug("waiting for next status report from worker received successfully", "worker", workerId)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (tc *TestController) waitForNextWorkerStatusUpdate(workerId string) error {
|
||||
waitStatusStart := time.Now()
|
||||
ctx, cancel := context.WithTimeout(tc.ctx, tc.b.StatusGracePeriodDuration)
|
||||
defer cancel()
|
||||
var err error
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
if err = func() error {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
|
||||
case <-time.After(time.Second):
|
||||
// pass
|
||||
case <-time.After(time.Second):
|
||||
// pass
|
||||
}
|
||||
|
||||
return nil
|
||||
}(); err != nil {
|
||||
break
|
||||
}
|
||||
|
||||
var waitStatusCurrent time.Time
|
||||
var err error
|
||||
tc.Controller().WorkerStatusUpdateTimes().Range(func(k, v interface{}) bool {
|
||||
if k == nil || v == nil {
|
||||
err = fmt.Errorf("nil key or value on entry: key=%#v value=%#v", k, v)
|
||||
@@ -696,7 +691,7 @@ func (tc *TestController) waitForNextWorkerStatusUpdate(workerId string) error {
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
break
|
||||
}
|
||||
|
||||
if waitStatusCurrent.Sub(waitStatusStart) > 0 {
|
||||
@@ -704,5 +699,11 @@ func (tc *TestController) waitForNextWorkerStatusUpdate(workerId string) error {
|
||||
}
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
tc.Logger().Error("error waiting for next status report from worker", "worker", workerId, "err", err)
|
||||
return err
|
||||
}
|
||||
|
||||
tc.Logger().Debug("waiting for next status report from worker received successfully", "worker", workerId)
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user