test(session): Speed up some tests around dead worker cleanup
This removes or reduces the time that is waited in a number of tests by allowing the grace period time be a configuration option on the connection repository.
This commit is contained in:
8 files changed
+72
-52
No files matched your search
@@ -303,7 +303,7 @@ func (c *Controller) registerJobs() error {
|
||||
// registerSessionConnectionCleanupJob is a helper method to abstract
|
||||
// registering the session connection cleanup job specifically.
|
||||
func (c *Controller) registerSessionConnectionCleanupJob() error {
|
||||
sessionConnectionCleanupJob, err := newSessionConnectionCleanupJob(c.ConnectionRepoFn, int(c.conf.StatusGracePeriodDuration.Seconds()))
|
||||
sessionConnectionCleanupJob, err := newSessionConnectionCleanupJob(c.ConnectionRepoFn, c.conf.StatusGracePeriodDuration)
|
||||
if err != nil {
|
||||
return fmt.Errorf("error creating session cleanup job: %w", err)
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package controller_test
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/hashicorp/boundary/api/authmethods"
|
||||
"github.com/hashicorp/boundary/api/authtokens"
|
||||
@@ -38,7 +37,6 @@ func TestAuthenticationMulti(t *testing.T) {
|
||||
require.NoError(json.Unmarshal(token1Result.GetRawAttributes(), token1))
|
||||
require.NotNil(token1)
|
||||
|
||||
time.Sleep(5 * time.Second)
|
||||
auth = authmethods.NewClient(c2.Client())
|
||||
token2Result, err := auth.Authenticate(c2.Context(), c2.Server().DevPasswordAuthMethodId, "login", map[string]interface{}{"login_name": c2.Server().DevLoginName, "password": c2.Server().DevPassword})
|
||||
require.Nil(err)
|
||||
|
||||
@@ -27,7 +27,7 @@ type sessionConnectionCleanupJob struct {
|
||||
|
||||
// The amount of time to give disconnected workers before marking
|
||||
// their connections as closed.
|
||||
gracePeriod int
|
||||
gracePeriod time.Duration
|
||||
|
||||
// The total number of connections closed in the last run.
|
||||
totalClosed int
|
||||
@@ -36,7 +36,7 @@ type sessionConnectionCleanupJob struct {
|
||||
// newSessionConnectionCleanupJob instantiates the session cleanup job.
|
||||
func newSessionConnectionCleanupJob(
|
||||
connectionRepoFn common.ConnectionRepoFactory,
|
||||
gracePeriod int,
|
||||
gracePeriod time.Duration,
|
||||
) (*sessionConnectionCleanupJob, error) {
|
||||
const op = "controller.newNewSessionConnectionCleanupJob"
|
||||
switch {
|
||||
@@ -44,7 +44,7 @@ func newSessionConnectionCleanupJob(
|
||||
return nil, errors.NewDeprecated(errors.InvalidParameter, op, "missing connectionRepoFn")
|
||||
case gracePeriod < session.DeadWorkerConnCloseMinGrace:
|
||||
return nil, errors.NewDeprecated(
|
||||
errors.InvalidParameter, op, fmt.Sprintf("invalid gracePeriod, must be greater than %d", session.DeadWorkerConnCloseMinGrace))
|
||||
errors.InvalidParameter, op, fmt.Sprintf("invalid gracePeriod, must be greater than %s", session.DeadWorkerConnCloseMinGrace))
|
||||
}
|
||||
|
||||
return &sessionConnectionCleanupJob{
|
||||
@@ -102,7 +102,7 @@ func (j *sessionConnectionCleanupJob) Run(ctx context.Context) error {
|
||||
event.WithInfo(
|
||||
"private_id", result.ServerId,
|
||||
"update_time", result.LastUpdateTime,
|
||||
"grace_period_seconds", j.gracePeriod,
|
||||
"grace_period_seconds", j.gracePeriod.Seconds(),
|
||||
"number_connections_closed", result.NumberConnectionsClosed,
|
||||
))
|
||||
|
||||
|
||||
@@ -26,6 +26,9 @@ var _ = scheduler.Job(new(sessionConnectionCleanupJob))
|
||||
func TestSessionConnectionCleanupJob(t *testing.T) {
|
||||
t.Parallel()
|
||||
ctx := context.Background()
|
||||
|
||||
const gracePeriod = 1 * time.Second
|
||||
|
||||
require, assert := require.New(t), assert.New(t)
|
||||
conn, _ := db.TestSetup(t, "postgres")
|
||||
rw := db.New(conn)
|
||||
@@ -35,7 +38,7 @@ func TestSessionConnectionCleanupJob(t *testing.T) {
|
||||
serversRepo, err := servers.NewRepository(rw, rw, kms)
|
||||
require.NoError(err)
|
||||
sessionRepo, err := session.NewRepository(rw, rw, kms)
|
||||
connectionRepo, err := session.NewConnectionRepository(ctx, rw, rw, kms)
|
||||
connectionRepo, err := session.NewConnectionRepository(ctx, rw, rw, kms, session.WithDeadWorkerConnCloseMinGrace(gracePeriod))
|
||||
require.NoError(err)
|
||||
|
||||
numConns := 12
|
||||
@@ -101,10 +104,11 @@ func TestSessionConnectionCleanupJob(t *testing.T) {
|
||||
func() (*session.ConnectionRepository, error) { return connectionRepo, nil },
|
||||
session.DeadWorkerConnCloseMinGrace,
|
||||
)
|
||||
job.gracePeriod = gracePeriod // by-pass factory assert so we dont have to wait so long
|
||||
require.NoError(err)
|
||||
|
||||
// sleep the status grace period.
|
||||
time.Sleep(time.Second * time.Duration(session.DeadWorkerConnCloseMinGrace))
|
||||
time.Sleep(gracePeriod)
|
||||
|
||||
// Push an upsert to the first worker so that its status has been
|
||||
// updated.
|
||||
@@ -160,7 +164,7 @@ func TestSessionConnectionCleanupJobNewJobErr(t *testing.T) {
|
||||
ctx,
|
||||
errors.WithCode(errors.InvalidParameter),
|
||||
errors.WithOp(op),
|
||||
errors.WithMsg(fmt.Sprintf("invalid gracePeriod, must be greater than %d", session.DeadWorkerConnCloseMinGrace)),
|
||||
errors.WithMsg(fmt.Sprintf("invalid gracePeriod, must be greater than %s", session.DeadWorkerConnCloseMinGrace)),
|
||||
))
|
||||
require.Nil(job)
|
||||
}
|
||||
Reference in new issue
Block a user