fix(go.d): fix dyncfg vnodes configs (netdata#21332)

ilyam8 · web-flow · commit e5b1e5a1e196 · 2025-11-21T16:09:12.000+02:00
diff --git a/src/go/plugin/go.d/agent/jobmgr/dyncfg.go b/src/go/plugin/go.d/agent/jobmgr/dyncfg.go
@@ -29,7 +29,13 @@ func (m *Manager) dyncfgConfig(fn functions.Function) {
 
 	//m.Infof("QQ FN: '%s'", fn)
 
-	switch id := fn.Args[0]; true {
+	m.dyncfgQueuedExec(fn)
+}
+
+func (m *Manager) dyncfgQueuedExec(fn functions.Function) {
+	id := fn.Args[0]
+
+	switch {
 	case strings.HasPrefix(id, m.dyncfgCollectorPrefixValue()):
 		m.dyncfgCollectorExec(fn)
 	case strings.HasPrefix(id, m.dyncfgVnodePrefixValue()):
@@ -39,6 +45,19 @@ func (m *Manager) dyncfgConfig(fn functions.Function) {
 	}
 }
 
+func (m *Manager) dyncfgSeqExec(fn functions.Function) {
+	id := fn.Args[0]
+
+	switch {
+	case strings.HasPrefix(id, m.dyncfgCollectorPrefixValue()):
+		m.dyncfgCollectorSeqExec(fn)
+	case strings.HasPrefix(id, m.dyncfgVnodePrefixValue()):
+		m.dyncfgVnodeSeqExec(fn)
+	default:
+		m.dyncfgApi.SendCodef(fn, 503, "unknown function '%s' (%s).", fn.Name, id)
+	}
+}
+
 func unmarshalPayload(dst any, fn functions.Function) error {
 	if v := reflect.ValueOf(dst); v.Kind() != reflect.Ptr || v.IsNil() {
 		return fmt.Errorf("invalid config: expected a pointer to a struct, got a %s", v.Type())
diff --git a/src/go/plugin/go.d/agent/jobmgr/manager.go b/src/go/plugin/go.d/agent/jobmgr/manager.go
@@ -161,7 +161,7 @@ func (m *Manager) run() {
 			case <-m.ctx.Done():
 				return
 			case fn := <-m.dyncfgCh:
-				m.dyncfgCollectorSeqExec(fn)
+				m.dyncfgSeqExec(fn)
 			}
 		} else {
 			select {
@@ -172,14 +172,7 @@ func (m *Manager) run() {
 			case cfg := <-m.rmCh:
 				m.removeConfig(cfg)
 			case fn := <-m.dyncfgCh:
-				switch id := fn.Args[0]; true {
-				case strings.HasPrefix(id, m.dyncfgCollectorPrefixValue()):
-					m.dyncfgCollectorSeqExec(fn)
-				case strings.HasPrefix(id, m.dyncfgVnodePrefixValue()):
-					m.dyncfgVnodeSeqExec(fn)
-				default:
-					m.dyncfgApi.SendCodef(fn, 503, "unknown function '%s' (%s).", fn.Name, id)
-				}
+				m.dyncfgSeqExec(fn)
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func (m *Manager) run() {`
`161`	`161`	`case <-m.ctx.Done():`
`162`	`162`	`return`
`163`	`163`	`case fn := <-m.dyncfgCh:`
`164`		`- m.dyncfgCollectorSeqExec(fn)`
	`164`	`+ m.dyncfgSeqExec(fn)`
`165`	`165`	`}`
`166`	`166`	`} else {`
`167`	`167`	`select {`
`@@ -172,14 +172,7 @@ func (m *Manager) run() {`
`172`	`172`	`case cfg := <-m.rmCh:`
`173`	`173`	`m.removeConfig(cfg)`
`174`	`174`	`case fn := <-m.dyncfgCh:`
`175`		`- switch id := fn.Args[0]; true {`
`176`		`- case strings.HasPrefix(id, m.dyncfgCollectorPrefixValue()):`
`177`		`- m.dyncfgCollectorSeqExec(fn)`
`178`		`- case strings.HasPrefix(id, m.dyncfgVnodePrefixValue()):`
`179`		`- m.dyncfgVnodeSeqExec(fn)`
`180`		`- default:`
`181`		`- m.dyncfgApi.SendCodef(fn, 503, "unknown function '%s' (%s).", fn.Name, id)`
`182`		`- }`
	`175`	`+ m.dyncfgSeqExec(fn)`
`183`	`176`	`}`
`184`	`177`	`}`
`185`	`178`	`}`