Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2026-07-16 20:50:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/secondary: reset catalog members on ID change (#8281)

Browse Source 
Signed-off-by: houyuwushang <liuluoqianqiu@outlook.com>
This commit is contained in:
houyuwushang
2026-07-15 09:51:12 +08:00
committed by GitHub
parent 5131b8f944
commit 7cd99da013
3 changed files with 135 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugin/secondary/catalog.go
View File

@@ -58,11 +58,17 @@ func (s *Secondary) applyCatalog(origin string, cat *catalog.Catalog, catalogZon
memberZones[member.Zone] = struct{}{}
if existing, ok := s.Z[member.Zone]; ok {
if dyn, ok := s.dynamicZones[member.Zone]; ok && dyn.catalog == origin && existing != nil {
dyn, dynamic := s.dynamicZones[member.Zone]
if !dynamic || dyn.catalog != origin || existing == nil {
log.Warningf("Skipping catalog member zone %s from %s: zone already exists", member.Zone, origin)
continue
}
log.Warningf("Skipping catalog member zone %s from %s: zone already exists", member.Zone, origin)
continue
if dyn.memberID == member.ID {
continue
}
previousID := dyn.memberID
s.removeDynamicZoneLocked(member.Zone, origin)
log.Infof("Reset catalog member zone %s from %s after member ID changed from %s to %s", member.Zone, origin, previousID, member.ID)
}
z := file.NewZone(member.Zone, "stdin")
@@ -75,7 +81,7 @@ func (s *Secondary) applyCatalog(origin string, cat *catalog.Catalog, catalogZon
s.Z[member.Zone] = z
s.Names = append(s.Names, member.Zone)
s.zoneNames[z] = member.Zone
s.dynamicZones[member.Zone] = &dynamicZone{catalog: origin, shutdown: shutdown}
s.dynamicZones[member.Zone] = &dynamicZone{catalog: origin, memberID: member.ID, shutdown: shutdown}
starts = append(starts, dynamicZoneStart{origin: member.Zone, zone: z, shutdown: shutdown})
log.Infof("Added catalog member zone %s from catalog %s", member.Zone, origin)
}
@@ -84,18 +90,9 @@ func (s *Secondary) applyCatalog(origin string, cat *catalog.Catalog, catalogZon
if _, ok := memberZones[member]; ok {
continue
}
dyn, ok := s.dynamicZones[member]
if !ok || dyn.catalog != origin {
continue
if s.removeDynamicZoneLocked(member, origin) {
log.Infof("Removed catalog member zone %s from catalog %s", member, origin)
}
dyn.stopOnce.Do(func() { close(dyn.shutdown) })
delete(s.dynamicZones, member)
if z := s.Z[member]; z != nil {
delete(s.zoneNames, z)
}
delete(s.Z, member)
s.Names = removeZoneName(s.Names, member)
log.Infof("Removed catalog member zone %s from catalog %s", member, origin)
}
s.catalogMemberZones[origin] = memberZones
s.zoneMu.Unlock()
@@ -105,6 +102,23 @@ func (s *Secondary) applyCatalog(origin string, cat *catalog.Catalog, catalogZon
}
}
// removeDynamicZoneLocked removes a zone only when it belongs to catalog.
// The caller must hold s.zoneMu for writing.
func (s *Secondary) removeDynamicZoneLocked(zone, catalog string) bool {
dyn, ok := s.dynamicZones[zone]
if !ok || dyn.catalog != catalog {
return false
}
dyn.stopOnce.Do(func() { close(dyn.shutdown) })
delete(s.dynamicZones, zone)
if z := s.Z[zone]; z != nil {
delete(s.zoneNames, z)
}
delete(s.Z, zone)
s.Names = removeZoneName(s.Names, zone)
return true
}
func (s *Secondary) ensureZoneStateLocked() {
if s.Z == nil {
s.Z = make(map[string]*file.Zone)