Skip to content

BUILD/MINOR: Switch order on inside c.Start(), so restart will work and run Start() synchronously and split SyncData() into its own goroutine #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cxfcxf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

BUILD/MINOR: Switch order on inside c.Start(), so restart will work and run Start() synchronously and split SyncData() into its own goroutine #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63a4b84
BUILD/MINOR: Switch order on inside c.Start(), so restart will work
cxfcxf Mar 11, 2026
29430c5
BUILD/MINOR: move c.SyncData() out to main as go routine and run c.St…
cxfcxf Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion deploy/tests/integration/base-suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ func (suite *BaseSuite) StartController() {
annotations.InitCfgSnippet()
annotations.DisableConfigSnippets(testController.OSArgs.DisableConfigSnippets)

go testController.Controller.Start()
testController.Controller.Start()
go testController.Controller.SyncData()
}

func (suite *BaseSuite) StopController() {
Expand Down
9 changes: 6 additions & 3 deletions deploy/tests/tnr/routeacl/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ func (suite *UseBackendSuite) UseBackendFixture() (eventChan chan k8ssync.SyncDa
WithUpdateStatusManager(&updateStatusManager{}).
WithArgs(osArgs).Build()

go controller.Start()
controller.Start()
go controller.SyncData()

// Now sending store events for test setup
ns := store.Namespace{Name: "ns", Status: store.ADDED}
Expand Down Expand Up @@ -239,7 +240,8 @@ func (suite *UseBackendSuite) NonWildcardHostFixture() (eventChan chan k8ssync.S
WithUpdateStatusManager(&updateStatusManager{}).
WithArgs(osArgs).Build()

go controller.Start()
controller.Start()
go controller.SyncData()

// Now sending store events for test setup
ns := store.Namespace{Name: "ns", Status: store.ADDED}
Expand Down Expand Up @@ -345,7 +347,8 @@ func (suite *UseBackendSuite) WildcardHostFixture() (eventChan chan k8ssync.Sync
WithUpdateStatusManager(&updateStatusManager{}).
WithArgs(osArgs).Build()

go controller.Start()
controller.Start()
go controller.SyncData()

// Now sending store events for test setup
ns := store.Namespace{Name: "ns", Status: store.ADDED}
Expand Down
3 changes: 2 additions & 1 deletion deploy/tests/ut/acls/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ func (suite *ACLSuite) UseACLFixture() (eventChan chan k8ssync.SyncDataEvent) {
WithUpdateStatusManager(&FakeUpdateSatusManager{}).
WithArgs(osArgs).Build()

go controller.Start()
controller.Start()
go controller.SyncData()

backend := v3.Backend{
ObjectMeta: metav1.ObjectMeta{
Expand Down
3 changes: 2 additions & 1 deletion deploy/tests/ut/httprequests/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ func (suite *HTTPRequestsSuite) UseHTTPRequestsFixture() (eventChan chan k8ssync
WithUpdateStatusManager(&FakeUpdateSatusManager{}).
WithArgs(osArgs).Build()

go controller.Start()
controller.Start()
go controller.SyncData()

backend := v3.Backend{
ObjectMeta: metav1.ObjectMeta{
Expand Down
3 changes: 2 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,9 @@ func main() {

c.SetGatewayAPIInstalled(isGatewayAPIInstalled)

c.Start()
go k.MonitorChanges(eventChan, stop, osArgs, isGatewayAPIInstalled)
go c.Start()
go c.SyncData()
// Catch QUIT signals
signalC := make(chan os.Signal, 1)
signal.Notify(signalC, os.Interrupt, syscall.SIGTERM, syscall.SIGUSR1)
Expand Down
7 changes: 3 additions & 4 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ func (c *HAProxyController) clientAPIClosure(fn func() error) (err error) {

// Start initializes and runs HAProxyController
func (c *HAProxyController) Start() {
_, errStart := (c.haproxy.Service("start"))
logger.Panic(errStart)

logger.Panic(c.clientAPIClosure(func() error {
err := c.haproxy.PeerEntryDelete("localinstance", "local")
if err != nil {
Expand All @@ -100,10 +103,6 @@ func (c *HAProxyController) Start() {
c.initHandlers()
logger.Error(c.setupHAProxyRules())
logger.Error(os.Chdir(c.haproxy.Env.CfgDir))
_, errStart := (c.haproxy.Service("start"))
logger.Panic(errStart)

c.SyncData()
}

// Stop handles shutting down HAProxyController
Expand Down
Loading