Skip to content

Commit

Permalink
Merge pull request #162 from nokia/fix141
Browse files Browse the repository at this point in the history 
use target key instead of name to store lastTargets in http loader
  • Loading branch information
@karimra
karimra authored Jun 28, 2023
2 parents fabb9a2 + ced16c4 commit 3d28cc5
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 54 deletions.
14 changes: 8 additions & 6 deletions loaders/consul_loader/consul_loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ func (c *consulLoader) runActions(ctx context.Context, tcs map[string]*types.Tar
opChan := make(chan *loaders.TargetOperation)
doneCh := make(chan struct{})
result := &loaders.TargetOperation{
Add: make([]*types.TargetConfig, 0, len(targetOp.Add)),
Add: make(map[string]*types.TargetConfig, len(targetOp.Add)),
Del: make([]string, 0, len(targetOp.Del)),
}
ctx, cancel := context.WithTimeout(ctx, c.cfg.ActionsTimeout)
Expand All @@ -501,7 +501,9 @@ func (c *consulLoader) runActions(ctx context.Context, tcs map[string]*types.Tar
close(doneCh)
return
}
result.Add = append(result.Add, op.Add...)
for n, t := range op.Add {
result.Add[n] = t
}
result.Del = append(result.Del, op.Del...)
}
}
Expand All @@ -510,16 +512,16 @@ func (c *consulLoader) runActions(ctx context.Context, tcs map[string]*types.Tar
wg := new(sync.WaitGroup)
wg.Add(len(targetOp.Add) + len(targetOp.Del))
// run OnAdd actions
for _, tAdd := range targetOp.Add {
go func(tc *types.TargetConfig) {
for n, tAdd := range targetOp.Add {
go func(n string, tc *types.TargetConfig) {
defer wg.Done()
err := c.runOnAddActions(ctx, tc.Name, tcs)
if err != nil {
c.logger.Printf("failed running OnAdd actions: %v", err)
return
}
opChan <- &loaders.TargetOperation{Add: []*types.TargetConfig{tc}}
}(tAdd)
opChan <- &loaders.TargetOperation{Add: map[string]*types.TargetConfig{n:tc}}
}(n, tAdd)
}
// run OnDelete actions
for _, tDel := range targetOp.Del {
Expand Down
14 changes: 8 additions & 6 deletions loaders/docker_loader/docker_loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ func (d *dockerLoader) runActions(ctx context.Context, tcs map[string]*types.Tar
// some actions are defined,
doneCh := make(chan struct{})
result := &loaders.TargetOperation{
Add: make([]*types.TargetConfig, 0, len(targetOp.Add)),
Add: make(map[string]*types.TargetConfig, len(targetOp.Add)),
Del: make([]string, 0, len(targetOp.Del)),
}
ctx, cancel := context.WithTimeout(ctx, d.cfg.Interval)
Expand All @@ -591,7 +591,9 @@ func (d *dockerLoader) runActions(ctx context.Context, tcs map[string]*types.Tar
close(doneCh)
return
}
result.Add = append(result.Add, op.Add...)
for n, t := range op.Add {
result.Add[n] = t
}
result.Del = append(result.Del, op.Del...)
}
}
Expand All @@ -600,16 +602,16 @@ func (d *dockerLoader) runActions(ctx context.Context, tcs map[string]*types.Tar
wg := new(sync.WaitGroup)
wg.Add(len(targetOp.Add) + len(targetOp.Del))
// run OnAdd actions
for _, tAdd := range targetOp.Add {
go func(tc *types.TargetConfig) {
for n, tAdd := range targetOp.Add {
go func(n string, tc *types.TargetConfig) {
defer wg.Done()
err := d.runOnAddActions(ctx, tc.Name, tcs)
if err != nil {
d.logger.Printf("failed running OnAdd actions: %v", err)
return
}
opChan <- &loaders.TargetOperation{Add: []*types.TargetConfig{tc}}
}(tAdd)
opChan <- &loaders.TargetOperation{Add: map[string]*types.TargetConfig{n: tc}}
}(n, tAdd)
}
// run OnDelete actions
for _, tDel := range targetOp.Del {
Expand Down
14 changes: 8 additions & 6 deletions loaders/file_loader/file_loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ func (f *fileLoader) runActions(ctx context.Context, tcs map[string]*types.Targe
// some actions are defined,
doneCh := make(chan struct{})
result := &loaders.TargetOperation{
Add: make([]*types.TargetConfig, 0, len(targetOp.Add)),
Add: make(map[string]*types.TargetConfig, len(targetOp.Add)),
Del: make([]string, 0, len(targetOp.Del)),
}
ctx, cancel := context.WithTimeout(ctx, f.cfg.Interval)
Expand All @@ -365,7 +365,9 @@ func (f *fileLoader) runActions(ctx context.Context, tcs map[string]*types.Targe
close(doneCh)
return
}
result.Add = append(result.Add, op.Add...)
for n, t := range op.Add {
result.Add[n] = t
}
result.Del = append(result.Del, op.Del...)
}
}
Expand All @@ -374,16 +376,16 @@ func (f *fileLoader) runActions(ctx context.Context, tcs map[string]*types.Targe
wg := new(sync.WaitGroup)
wg.Add(len(targetOp.Add) + len(targetOp.Del))
// run OnAdd actions
for _, tAdd := range targetOp.Add {
go func(tc *types.TargetConfig) {
for n, tAdd := range targetOp.Add {
go func(n string, tc *types.TargetConfig) {
defer wg.Done()
err := f.runOnAddActions(ctx, tc.Name, tcs)
if err != nil {
f.logger.Printf("failed running OnAdd actions: %v", err)
return
}
opChan <- &loaders.TargetOperation{Add: []*types.TargetConfig{tc}}
}(tAdd)
opChan <- &loaders.TargetOperation{Add: map[string]*types.TargetConfig{n: tc}}
}(n, tAdd)
}
// run OnDelete actions
for _, tDel := range targetOp.Del {
Expand Down
20 changes: 11 additions & 9 deletions loaders/http_loader/http_loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,9 @@ func (h *httpLoader) updateTargets(ctx context.Context, tcs map[string]*types.Ta
return
}
h.m.Lock()
for _, t := range targetOp.Add {
if _, ok := h.lastTargets[t.Name]; !ok {
h.lastTargets[t.Name] = t
for n, t := range targetOp.Add {
if _, ok := h.lastTargets[n]; !ok {
h.lastTargets[n] = t
}
}
for _, n := range targetOp.Del {
Expand Down Expand Up @@ -389,7 +389,7 @@ func (f *httpLoader) runActions(ctx context.Context, tcs map[string]*types.Targe
// some actions are defined,
doneCh := make(chan struct{})
result := &loaders.TargetOperation{
Add: make([]*types.TargetConfig, 0, len(targetOp.Add)),
Add: make(map[string]*types.TargetConfig, len(targetOp.Add)),
Del: make([]string, 0, len(targetOp.Del)),
}
ctx, cancel := context.WithTimeout(ctx, f.cfg.Interval)
Expand All @@ -405,7 +405,9 @@ func (f *httpLoader) runActions(ctx context.Context, tcs map[string]*types.Targe
close(doneCh)
return
}
result.Add = append(result.Add, op.Add...)
for n, t := range op.Add {
result.Add[n] = t
}
result.Del = append(result.Del, op.Del...)
}
}
Expand All @@ -414,16 +416,16 @@ func (f *httpLoader) runActions(ctx context.Context, tcs map[string]*types.Targe
wg := new(sync.WaitGroup)
wg.Add(len(targetOp.Add) + len(targetOp.Del))
// run OnAdd actions
for _, tAdd := range targetOp.Add {
go func(tc *types.TargetConfig) {
for n, tAdd := range targetOp.Add {
go func(n string, tc *types.TargetConfig) {
defer wg.Done()
err := f.runOnAddActions(ctx, tc.Name, tcs)
if err != nil {
f.logger.Printf("failed running OnAdd actions: %v", err)
return
}
opChan <- &loaders.TargetOperation{Add: []*types.TargetConfig{tc}}
}(tAdd)
opChan <- &loaders.TargetOperation{Add: map[string]*types.TargetConfig{n: tc}}
}(n, tAdd)
}
// run OnDelete actions
for _, tDel := range targetOp.Del {
Expand Down
10 changes: 5 additions & 5 deletions loaders/loaders.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func Register(name string, initFn Initializer) {
}

type TargetOperation struct {
Add []*types.TargetConfig
Add map[string]*types.TargetConfig
Del []string
}

Expand All @@ -73,12 +73,12 @@ func DecodeConfig(src, dst interface{}) error {

func Diff(m1, m2 map[string]*types.TargetConfig) *TargetOperation {
result := &TargetOperation{
Add: make([]*types.TargetConfig, 0),
Add: make(map[string]*types.TargetConfig, 0),
Del: make([]string, 0),
}
if len(m1) == 0 {
for _, t := range m2 {
result.Add = append(result.Add, t)
for n, t := range m2 {
result.Add[n] = t
}
return result
}
Expand All @@ -90,7 +90,7 @@ func Diff(m1, m2 map[string]*types.TargetConfig) *TargetOperation {
}
for n, t := range m2 {
if _, ok := m1[n]; !ok {
result.Add = append(result.Add, t)
result.Add[n] = t
}
}
for n := range m1 {
Expand Down
37 changes: 15 additions & 22 deletions loaders/loaders_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
package loaders

import (
"sort"
"testing"

"github.com/google/go-cmp/cmp"
Expand All @@ -24,7 +23,7 @@ var testSet = map[string]struct {
m1: nil,
m2: nil,
output: &TargetOperation{
Add: make([]*types.TargetConfig, 0),
Add: make(map[string]*types.TargetConfig, 0),
Del: make([]string, 0),
},
},
Expand All @@ -34,8 +33,8 @@ var testSet = map[string]struct {
"target1": {Name: "target1"},
},
output: &TargetOperation{
Add: []*types.TargetConfig{
{
Add: map[string]*types.TargetConfig{
"target1": {
Name: "target1",
},
},
Expand All @@ -50,7 +49,7 @@ var testSet = map[string]struct {
"target1": {Name: "target1"},
},
output: &TargetOperation{
Add: make([]*types.TargetConfig, 0),
Add: make(map[string]*types.TargetConfig, 0),
Del: make([]string, 0),
},
},
Expand All @@ -64,7 +63,7 @@ var testSet = map[string]struct {
"target2": {Name: "target2"},
},
output: &TargetOperation{
Add: make([]*types.TargetConfig, 0),
Add: make(map[string]*types.TargetConfig, 0),
Del: make([]string, 0),
},
},
Expand All @@ -74,7 +73,7 @@ var testSet = map[string]struct {
},
m2: nil,
output: &TargetOperation{
Add: make([]*types.TargetConfig, 0),
Add: make(map[string]*types.TargetConfig, 0),
Del: []string{"target1"},
},
},
Expand All @@ -87,8 +86,8 @@ var testSet = map[string]struct {
"target2": {Name: "target2"},
},
output: &TargetOperation{
Add: []*types.TargetConfig{
{
Add: map[string]*types.TargetConfig{
"target2": {
Name: "target2",
},
},
Expand All @@ -103,8 +102,8 @@ var testSet = map[string]struct {
"target2": {Name: "target2"},
},
output: &TargetOperation{
Add: []*types.TargetConfig{
{
Add: map[string]*types.TargetConfig{
"target2": {
Name: "target2",
},
},
Expand All @@ -120,11 +119,11 @@ var testSet = map[string]struct {
"target3": {Name: "target3"},
},
output: &TargetOperation{
Add: []*types.TargetConfig{
{
Add: map[string]*types.TargetConfig{
"target2": {
Name: "target2",
},
{
"target3": {
Name: "target3",
},
},
Expand All @@ -141,8 +140,8 @@ var testSet = map[string]struct {
"target3": {Name: "target3"},
},
output: &TargetOperation{
Add: []*types.TargetConfig{
{
Add: map[string]*types.TargetConfig{
"target3": {
Name: "target3",
},
},
Expand All @@ -155,12 +154,6 @@ func TestGetInstancesTagsMatches(t *testing.T) {
for name, item := range testSet {
t.Run(name, func(t *testing.T) {
res := Diff(item.m1, item.m2)
sort.Slice(res.Add, func(i, j int) bool {
return res.Add[i].Name < res.Add[j].Name
})
sort.Slice(item.output.Add, func(i, j int) bool {
return item.output.Add[i].Name < item.output.Add[j].Name
})
t.Logf("exp value: %+v", item.output)
t.Logf("got value: %+v", res)
if !cmp.Equal(item.output, res) {
Expand Down

0 comments on commit 3d28cc5

Please sign in to comment.