Skip to content
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

add blocking entries to avoid premature reconciliation of hosted zone #50

Merged
merged 1 commit into from
Dec 9, 2019
Merged

add blocking entries to avoid premature reconciliation of hosted zone #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 47 additions & 4 deletions pkg/dns/provider/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ type state struct {
providerzones map[resources.ObjectName]map[string]*dnsHostedZone
providersecrets map[resources.ObjectName]resources.ObjectName

entries Entries
outdated Entries
entries Entries
outdated Entries
blockingEntries map[resources.ObjectName]time.Time

dnsnames DNSNames

Expand Down Expand Up @@ -120,6 +121,7 @@ func NewDNSState(ctx Context, classes *controller.Classes, config Config) *state
providersecrets: map[resources.ObjectName]resources.ObjectName{},
entries: Entries{},
outdated: Entries{},
blockingEntries: map[resources.ObjectName]time.Time{},
dnsnames: map[string]*Entry{},
}
}
Expand Down Expand Up @@ -657,6 +659,7 @@ func (this *state) _UpdateLocalProvider(logger logger.LogContext, obj *dnsutils.
logger.Infof(" forwarded: %s", utils.Strings(z.ForwardedDomains()...))
}
}
this.addBlockingEntries(logger, entries)
this.TriggerEntries(logger, entries)
}
if last != nil && !last.IsValid() && new.IsValid() {
Expand Down Expand Up @@ -722,11 +725,24 @@ func (this *state) GetEntriesByOwner(owners utils.StringSet) Entries {
}

func (this *state) TriggerEntries(logger logger.LogContext, entries Entries) {
for _, e := range this.entries {
for _, e := range entries {
this.TriggerEntry(logger, e)
}
}

func (this *state) addBlockingEntries(logger logger.LogContext, entries Entries) {
if len(entries) == 0 {
return
}
logger.Infof("blocking hosted zone reconciliation for %d entries", len(entries))
now := time.Now()
for _, e := range entries {
if _, ok := this.blockingEntries[e.ObjectName()]; !ok {
this.blockingEntries[e.ObjectName()] = now
}
}
}

func (this *state) TriggerEntry(logger logger.LogContext, e *Entry) {
if logger != nil {
logger.Infof("trigger entry %s", e.ClusterKey())
Expand Down Expand Up @@ -814,7 +830,7 @@ func (this *state) removeLocalProvider(logger logger.LogContext, obj *dnsutils.D
this.removeProviderForZone(n, pname)
}
}
this.TriggerEntries(logger, entries)
this.TriggerEntries(logger, this.entries)
_, err := this.registerSecret(logger, nil, cur)
if err != nil {
return reconcile.Delay(logger, err)
Expand Down Expand Up @@ -876,6 +892,8 @@ func (this *state) AddEntryVersion(logger logger.LogContext, v *EntryVersion, st
this.lock.Lock()
defer this.lock.Unlock()

delete(this.blockingEntries, v.ObjectName())

var new *Entry
old := this.entries[v.ObjectName()]
if old == nil {
Expand Down Expand Up @@ -1049,6 +1067,8 @@ func (this *state) EntryDeleted(logger logger.LogContext, key resources.ObjectKe
this.lock.Lock()
defer this.lock.Unlock()

delete(this.blockingEntries, key.ObjectName())

old := this.entries[key.ObjectName()]
if old != nil {
zoneid, _, _ := this.getZoneForName(old.DNSName())
Expand Down Expand Up @@ -1135,7 +1155,30 @@ func (this *state) GetZoneReconcilation(logger logger.LogContext, zoneid string)
return 0, hasProviders, req
}

func (this *state) reconcileZoneBlockingEntries(logger logger.LogContext) int {
this.lock.RLock()
defer this.lock.RUnlock()

// remove long blockings to avoid blocking forever
maxBlocking := 10 * time.Minute
outdated := time.Now().Add(-1 * maxBlocking)
for n, t := range this.blockingEntries {
if t.Before(outdated) {
// should never happen
delete(this.blockingEntries, n)
logger.Warnf("deleting blocking entry %s because blocked longer than %fm", n, maxBlocking.Minutes())
}
}
return len(this.blockingEntries)
}

func (this *state) ReconcileZone(logger logger.LogContext, zoneid string) reconcile.Status {
blockingCount := this.reconcileZoneBlockingEntries(logger)
if blockingCount > 0 {
logger.Infof("reconciliation of zone %s is blocked due to %d pending entry reconciliations", zoneid, blockingCount)
return reconcile.Succeeded(logger).RescheduleAfter(5 * time.Second)
}

delay, hasProviders, req := this.GetZoneReconcilation(logger, zoneid)
if req == nil || req.zone == nil {
if !hasProviders {
Expand Down