Merge pull request #4505 from npinaeva/configurable-db-timeout

Bump OVSDBTimeout and make it configurable.
ovn-org · Jul 26, 2024 · 4d3c99f · 4d3c99f
2 parents e4f63cc + b07fbde
commit 4d3c99f
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 69 deletions.
diff --git a/go-controller/pkg/config/config.go b/go-controller/pkg/config/config.go
@@ -35,6 +35,8 @@ const DefaultAPIServer = "http://localhost:8443"
 // Default IANA-assigned UDP port number for VXLAN
 const DefaultVXLANPort = 4789
 
+const DefaultDBTxnTimeout = time.Second * 100
+
 // The following are global config parameters that other modules may access directly
 var (
 	// Build information. Populated at build-time.
@@ -67,6 +69,7 @@ var (
 		OpenFlowProbe:         180,    // in Seconds
 		OfctrlWaitBeforeClear: 0,      // in Milliseconds
 		MonitorAll:            true,
+		OVSDBTxnTimeout:       DefaultDBTxnTimeout,
 		LFlowCacheEnable:      true,
 		RawClusterSubnets:     "10.128.0.0/14/23",
 		Zone:                  types.OvnDefaultZone,
@@ -247,6 +250,9 @@ type DefaultConfig struct {
 	// instead of conditionally monitoring the data relevant to this node only.
 	// By default monitor-all is enabled.
 	MonitorAll bool `gcfg:"monitor-all"`
+	// OVSDBTxnTimeout is the timeout for db transaction, may be useful to increase for high-scale clusters.
+	// default value is 100 seconds.
+	OVSDBTxnTimeout time.Duration `gcfg:"db-txn-timeout"`
 	// The  boolean  flag  indicates  if  ovn-controller  should
 	// enable/disable the logical flow in-memory cache  it  uses
 	// when processing Southbound database logical flow changes.
@@ -630,6 +636,7 @@ func PrepareTestConfig() error {
 	OvnKubeNode = savedOvnKubeNode
 	ClusterManager = savedClusterManager
 	EnableMulticast = false
+	Default.OVSDBTxnTimeout = 5 * time.Second
 
 	if err := completeConfig(); err != nil {
 		return err
@@ -799,6 +806,13 @@ var CommonFlags = []cli.Flag{
 		Destination: &cliConfig.Default.MonitorAll,
 		Value:       Default.MonitorAll,
 	},
+	&cli.DurationFlag{
+		Name: "db-txn-timeout",
+		Usage: "OVSDBTxnTimeout is the timeout for db transaction in seconds, " +
+			"may be useful to increase for high-scale clusters. default value is 60 seconds.",
+		Destination: &cliConfig.Default.OVSDBTxnTimeout,
+		Value:       Default.OVSDBTxnTimeout,
+	},
 	&cli.BoolFlag{
 		Name: "enable-lflow-cache",
 		Usage: "Enable the logical flow in-memory cache it uses " +

diff --git a/go-controller/pkg/libovsdb/libovsdb.go b/go-controller/pkg/libovsdb/libovsdb.go
@@ -146,7 +146,7 @@ func NewSBClientWithConfig(cfg config.OvnAuthConfig, promRegistry prometheus.Reg
 		return nil, err
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout*2)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout*2)
 	go func() {
 		<-stopCh
 		cancel()
@@ -211,7 +211,7 @@ func NewNBClientWithConfig(cfg config.OvnAuthConfig, promRegistry prometheus.Reg
 		return nil, err
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout*2)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout*2)
 	go func() {
 		<-stopCh
 		cancel()

diff --git a/go-controller/pkg/libovsdb/ops/acl.go b/go-controller/pkg/libovsdb/ops/acl.go
@@ -7,8 +7,8 @@ import (
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
 
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 )
 
 // GetACLName returns the ACL name if it has one otherwise returns
@@ -29,7 +29,7 @@ type aclPredicate func(*nbdb.ACL) bool
 
 // FindACLsWithPredicate looks up ACLs from the cache based on a given predicate
 func FindACLsWithPredicate(nbClient libovsdbclient.Client, p aclPredicate) ([]*nbdb.ACL, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	acls := []*nbdb.ACL{}
 	err := nbClient.WhereCache(p).List(ctx, &acls)

diff --git a/go-controller/pkg/libovsdb/ops/address_set.go b/go-controller/pkg/libovsdb/ops/address_set.go
@@ -6,8 +6,8 @@ import (
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
 
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 )
 
 type addressSetPredicate func(*nbdb.AddressSet) bool
@@ -33,7 +33,7 @@ func getNonZeroAddressSetMutableFields(as *nbdb.AddressSet) []interface{} {
 // FindAddressSetsWithPredicate looks up address sets from the cache based on a
 // given predicate
 func FindAddressSetsWithPredicate(nbClient libovsdbclient.Client, p addressSetPredicate) ([]*nbdb.AddressSet, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	found := []*nbdb.AddressSet{}
 	err := nbClient.WhereCache(p).List(ctx, &found)

diff --git a/go-controller/pkg/libovsdb/ops/chassis.go b/go-controller/pkg/libovsdb/ops/chassis.go
@@ -6,13 +6,13 @@ import (
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	"k8s.io/apimachinery/pkg/util/sets"
 
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 )
 
 // ListChassis looks up all chassis from the cache
 func ListChassis(sbClient libovsdbclient.Client) ([]*sbdb.Chassis, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	searchedChassis := []*sbdb.Chassis{}
 	err := sbClient.List(ctx, &searchedChassis)
@@ -21,7 +21,7 @@ func ListChassis(sbClient libovsdbclient.Client) ([]*sbdb.Chassis, error) {
 
 // ListChassisPrivate looks up all chassis private models from the cache
 func ListChassisPrivate(sbClient libovsdbclient.Client) ([]*sbdb.ChassisPrivate, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	found := []*sbdb.ChassisPrivate{}
 	err := sbClient.List(ctx, &found)

diff --git a/go-controller/pkg/libovsdb/ops/lbgroup.go b/go-controller/pkg/libovsdb/ops/lbgroup.go
@@ -6,8 +6,8 @@ import (
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
 
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 )
 
 // CreateOrUpdateLoadBalancerGroup creates or updates the provided load balancer
@@ -76,7 +76,7 @@ type loadBalancerGroupPredicate func(*nbdb.LoadBalancerGroup) bool
 // FindLoadBalancerGroupsWithPredicate looks up load balancer groups from the
 // cache based on a given predicate
 func FindLoadBalancerGroupsWithPredicate(nbClient libovsdbclient.Client, p loadBalancerGroupPredicate) ([]*nbdb.LoadBalancerGroup, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	groups := []*nbdb.LoadBalancerGroup{}
 	err := nbClient.WhereCache(p).List(ctx, &groups)

diff --git a/go-controller/pkg/libovsdb/ops/loadbalancer.go b/go-controller/pkg/libovsdb/ops/loadbalancer.go
@@ -3,11 +3,10 @@ package ops
 import (
 	"context"
 
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
-
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
 
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
 )
 
@@ -133,7 +132,7 @@ func DeleteLoadBalancers(nbClient libovsdbclient.Client, lbs []*nbdb.LoadBalance
 // ListLoadBalancers looks up all load balancers from the cache
 func ListLoadBalancers(nbClient libovsdbclient.Client) ([]*nbdb.LoadBalancer, error) {
 	lbs := []*nbdb.LoadBalancer{}
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	err := nbClient.List(ctx, &lbs)
 	return lbs, err

diff --git a/go-controller/pkg/libovsdb/ops/model_client.go b/go-controller/pkg/libovsdb/ops/model_client.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 
 	"github.com/ovn-org/libovsdb/client"
@@ -464,7 +465,7 @@ func (m *modelClient) where(opModel *operationModel) error {
 		// no indexes available
 		return errNoIndexes
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	var err error
 	if err = m.client.Where(copyModel).List(ctx, opModel.ExistingResult); err != nil {
@@ -484,7 +485,7 @@ func (m *modelClient) where(opModel *operationModel) error {
 }
 
 func (m *modelClient) whereCache(opModel *operationModel) error {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	var err error
 	if err = m.client.WhereCache(opModel.ModelPredicate).List(ctx, opModel.ExistingResult); err != nil {

diff --git a/go-controller/pkg/libovsdb/ops/portgroup.go b/go-controller/pkg/libovsdb/ops/portgroup.go
@@ -5,16 +5,16 @@ import (
 
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 )
 
 type portGroupPredicate func(group *nbdb.PortGroup) bool
 
 // FindPortGroupsWithPredicate looks up port groups from the cache based on a
 // given predicate
 func FindPortGroupsWithPredicate(nbClient libovsdbclient.Client, p portGroupPredicate) ([]*nbdb.PortGroup, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	found := []*nbdb.PortGroup{}
 	err := nbClient.WhereCache(p).List(ctx, &found)

diff --git a/go-controller/pkg/libovsdb/ops/qos.go b/go-controller/pkg/libovsdb/ops/qos.go
@@ -5,16 +5,16 @@ import (
 
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 )
 
 type QoSPredicate func(*nbdb.QoS) bool
 
 // FindQoSesWithPredicate looks up QoSes from the cache based on a
 // given predicate
 func FindQoSesWithPredicate(nbClient libovsdbclient.Client, p QoSPredicate) ([]*nbdb.QoS, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	found := []*nbdb.QoS{}
 	err := nbClient.WhereCache(p).List(ctx, &found)

diff --git a/go-controller/pkg/libovsdb/ops/router.go b/go-controller/pkg/libovsdb/ops/router.go
@@ -8,8 +8,8 @@ import (
 
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
@@ -39,7 +39,7 @@ func GetLogicalRouter(nbClient libovsdbclient.Client, router *nbdb.LogicalRouter
 // FindLogicalRoutersWithPredicate looks up logical routers from the cache based on a
 // given predicate
 func FindLogicalRoutersWithPredicate(nbClient libovsdbclient.Client, p logicalRouterPredicate) ([]*nbdb.LogicalRouter, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	found := []*nbdb.LogicalRouter{}
 	err := nbClient.WhereCache(p).List(ctx, &found)
@@ -142,7 +142,7 @@ type logicalRouterPortPredicate func(*nbdb.LogicalRouterPort) bool
 // FindLogicalRouterPortWithPredicate looks up logical router port from
 // the cache based on a given predicate
 func FindLogicalRouterPortWithPredicate(nbClient libovsdbclient.Client, p logicalRouterPortPredicate) ([]*nbdb.LogicalRouterPort, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	found := []*nbdb.LogicalRouterPort{}
 	err := nbClient.WhereCache(p).List(ctx, &found)
@@ -249,7 +249,7 @@ type logicalRouterPolicyPredicate func(*nbdb.LogicalRouterPolicy) bool
 // FindLogicalRouterPoliciesWithPredicate looks up logical router policies from
 // the cache based on a given predicate
 func FindLogicalRouterPoliciesWithPredicate(nbClient libovsdbclient.Client, p logicalRouterPolicyPredicate) ([]*nbdb.LogicalRouterPolicy, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	found := []*nbdb.LogicalRouterPolicy{}
 	err := nbClient.WhereCache(p).List(ctx, &found)
@@ -557,7 +557,7 @@ type logicalRouterStaticRoutePredicate func(*nbdb.LogicalRouterStaticRoute) bool
 // FindLogicalRouterStaticRoutesWithPredicate looks up logical router static
 // routes from the cache based on a given predicate
 func FindLogicalRouterStaticRoutesWithPredicate(nbClient libovsdbclient.Client, p logicalRouterStaticRoutePredicate) ([]*nbdb.LogicalRouterStaticRoute, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	found := []*nbdb.LogicalRouterStaticRoute{}
 	err := nbClient.WhereCache(p).List(ctx, &found)
@@ -1001,7 +1001,7 @@ func GetNAT(nbClient libovsdbclient.Client, nat *nbdb.NAT) (*nbdb.NAT, error) {
 // FindNATsWithPredicate looks up NATs from the cache based on a given predicate
 func FindNATsWithPredicate(nbClient libovsdbclient.Client, predicate natPredicate) ([]*nbdb.NAT, error) {
 	nats := []*nbdb.NAT{}
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	err := nbClient.WhereCache(predicate).List(ctx, &nats)
 	return nats, err

diff --git a/go-controller/pkg/libovsdb/ops/switch.go b/go-controller/pkg/libovsdb/ops/switch.go
@@ -8,8 +8,8 @@ import (
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
 
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 )
 
 // LOGICAL_SWITCH OPs
@@ -20,7 +20,7 @@ type switchPredicate func(*nbdb.LogicalSwitch) bool
 // based on a given predicate
 func FindLogicalSwitchesWithPredicate(nbClient libovsdbclient.Client, p switchPredicate) ([]*nbdb.LogicalSwitch, error) {
 	found := []*nbdb.LogicalSwitch{}
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	err := nbClient.WhereCache(p).List(ctx, &found)
 	return found, err

diff --git a/go-controller/pkg/libovsdb/ops/template_var.go b/go-controller/pkg/libovsdb/ops/template_var.go
@@ -5,15 +5,15 @@ import (
 
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	libovsdb "github.com/ovn-org/libovsdb/ovsdb"
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/nbdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 )
 
 type chassisTemplateVarPredicate func(*nbdb.ChassisTemplateVar) bool
 
 // ListTemplateVar looks up all chassis template variables.
 func ListTemplateVar(nbClient libovsdbclient.Client) ([]*nbdb.ChassisTemplateVar, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 
 	templatesList := []*nbdb.ChassisTemplateVar{}

diff --git a/go-controller/pkg/libovsdb/ops/transact.go b/go-controller/pkg/libovsdb/ops/transact.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ovn-org/libovsdb/client"
 	"github.com/ovn-org/libovsdb/model"
 	"github.com/ovn-org/libovsdb/ovsdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 )
 
 // TransactWithRetry will attempt a transaction several times if it receives an error indicating that the client
@@ -41,7 +41,7 @@ func TransactAndCheck(c client.Client, ops []ovsdb.Operation) ([]ovsdb.Operation
 
 	klog.V(5).Infof("Configuring OVN: %+v", ops)
 
-	ctx, cancel := context.WithTimeout(context.TODO(), types.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.TODO(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 
 	results, err := TransactWithRetry(ctx, c, ops)

diff --git a/go-controller/pkg/ovn/controller/unidling/unidle.go b/go-controller/pkg/ovn/controller/unidling/unidle.go
@@ -9,8 +9,8 @@ import (
 	libovsdbclient "github.com/ovn-org/libovsdb/client"
 	"github.com/ovn-org/libovsdb/model"
 	"github.com/ovn-org/libovsdb/ovsdb"
+	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
-	ovntypes "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
 	kapi "k8s.io/api/core/v1"
@@ -62,7 +62,7 @@ func NewController(recorder record.EventRecorder, serviceInformer cache.SharedIn
 	klog.Info("Populating Initial ContollerEvent events")
 
 	var controllerEvents []sbdb.ControllerEvent
-	ctx, cancel := context.WithTimeout(context.Background(), ovntypes.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	err := sbClient.List(ctx, &controllerEvents)
 	if err != nil {
@@ -178,7 +178,7 @@ func (uc *unidlingController) handleLbEmptyBackendsEvent(event sbdb.ControllerEv
 	if err != nil {
 		return err
 	}
-	ctx, cancel := context.WithTimeout(context.Background(), ovntypes.OVSDBTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 	defer cancel()
 	result, err := uc.sbClient.Transact(ctx, op...)
 	if err != nil {

diff --git a/go-controller/pkg/ovn/controller/unidling/unidle_test.go b/go-controller/pkg/ovn/controller/unidling/unidle_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/sbdb"
 	libovsdbtest "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/testing/libovsdb"
-	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
 	"golang.org/x/net/context"
 	kapi "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -100,7 +99,7 @@ var _ = Describe("Unidling Controller", func() {
 		// Controller_Event is deleted
 		Eventually(
 			func() int {
-				ctx, _ := context.WithTimeout(context.Background(), types.OVSDBTimeout)
+				ctx, _ := context.WithTimeout(context.Background(), config.Default.OVSDBTxnTimeout)
 				var events []sbdb.ControllerEvent
 				err = sbClient.List(ctx, &events)
 				Expect(err).NotTo(HaveOccurred())