Skip to content

Avoid creating timer each time SyncHostVersion is called, instead use… #897

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

Merged
merged 4 commits into from
Jun 16, 2021
Merged

Avoid creating timer each time SyncHostVersion is called, instead use… #897

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef1e06c
Avoid creating timer each time SyncHostVersion is called, instead use…
neaggarwMS Jun 11, 2021
52818b4
incorporate feedback
neaggarwMS Jun 14, 2021
c680f22
Use time.Tick instead of NewTicker
neaggarwMS Jun 14, 2021
d3314a1
Handle SyncNodeStatus too
neaggarwMS Jun 14, 2021
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
25 changes: 19 additions & 6 deletions cns/service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,9 +567,12 @@ func main() {
}
go func(ep, vnet, node string) {
// Periodically poll DNC for node updates
tickerChannel := time.Tick(time.Duration(cnsconfig.ManagedSettings.NodeSyncIntervalInSeconds) * time.Second)
for {
<-time.NewTicker(time.Duration(cnsconfig.ManagedSettings.NodeSyncIntervalInSeconds) * time.Second).C
httpRestService.SyncNodeStatus(ep, vnet, node, json.RawMessage{})
select {
case <-tickerChannel:
httpRestService.SyncNodeStatus(ep, vnet, node, json.RawMessage{})
}
}
}(privateEndpoint, infravnet, nodeID)
}
Expand Down Expand Up @@ -743,9 +746,14 @@ func InitializeMultiTenantController(httpRestService cns.HTTPService, cnsconfig
rootCxt := context.Background()
go func() {
// Periodically poll vfp programmed NC version from NMAgent
tickerChannel := time.Tick(cnsconfig.SyncHostNCVersionIntervalMs * time.Millisecond)
for {
<-time.NewTicker(cnsconfig.SyncHostNCVersionIntervalMs * time.Millisecond).C
httpRestServiceImpl.SyncHostNCVersion(rootCxt, cnsconfig.ChannelMode, cnsconfig.SyncHostNCTimeoutMs)
select {
case <-tickerChannel:
httpRestServiceImpl.SyncHostNCVersion(rootCxt, cnsconfig.ChannelMode, cnsconfig.SyncHostNCTimeoutMs)
case <-rootCxt.Done():
return
}
}
}()

Expand Down Expand Up @@ -842,9 +850,14 @@ func InitializeCRDState(httpRestService cns.HTTPService, cnsconfig configuration
rootCxt := context.Background()
go func() {
// Periodically poll vfp programmed NC version from NMAgent
tickerChannel := time.Tick(cnsconfig.SyncHostNCVersionIntervalMs * time.Millisecond)
for {
<-time.NewTicker(cnsconfig.SyncHostNCVersionIntervalMs * time.Millisecond).C
httpRestServiceImplementation.SyncHostNCVersion(rootCxt, cnsconfig.ChannelMode, cnsconfig.SyncHostNCTimeoutMs)
select {
case <-tickerChannel:
httpRestServiceImplementation.SyncHostNCVersion(rootCxt, cnsconfig.ChannelMode, cnsconfig.SyncHostNCTimeoutMs)
case <-rootCxt.Done():
return
}
}

logger.Printf("[Azure CNS] Exiting SyncHostNCVersion")
Expand Down