dyncfg: send reset on reload (#1374)

agent/agent.go

@@ -96,9 +96,11 @@ func serve(a *Agent) {
 	var wg sync.WaitGroup
 
 	var exit bool
+	var reload bool
 
 	for {
 		ctx, cancel := context.WithCancel(context.Background())
+		ctx = context.WithValue(ctx, "reload", reload)
 
 		wg.Add(1)
 		go func() { defer wg.Done(); a.run(ctx) }()
@@ -115,7 +117,7 @@ func serve(a *Agent) {
 		cancel()
 
 		func() {
-			timeout := time.Second * 15
+			timeout := time.Second * 10
 			t := time.NewTimer(timeout)
 			defer t.Stop()
 			done := make(chan struct{})
@@ -134,6 +136,7 @@ func serve(a *Agent) {
 			os.Exit(0)
 		}
 
+		reload = true
 		time.Sleep(time.Second)
 	}
 }

agent/discovery/dyncfg/config.go

@@ -18,6 +18,7 @@ type Config struct {
 
 type NetdataDyncfgAPI interface {
 	DynCfgEnable(string) error
+	DynCfgReset() error
 	DyncCfgRegisterModule(string) error
 	DynCfgRegisterJob(_, _, _ string) error
 	DynCfgReportJobStatus(_, _, _, _ string) error

agent/discovery/dyncfg/dyncfg.go

@@ -67,6 +67,10 @@ func (d *Discovery) Run(ctx context.Context, in chan<- []*confgroup.Group) {
 
 	d.in = in
 
+	if reload, ok := ctx.Value("reload").(bool); ok && reload {
+		_ = d.API.DynCfgReset()
+	}
+
 	_ = d.API.DynCfgEnable(d.Plugin)
 
 	for k := range d.Modules {

agent/discovery/dyncfg/dyncfg_test.go

@@ -201,6 +201,10 @@ func (m *mockApi) DynCfgEnable(string) error {
 	return nil
 }
 
+func (m *mockApi) DynCfgReset() error {
+	return nil
+}
+
 func (m *mockApi) DyncCfgRegisterModule(string) error {
 	m.callsDyncCfgRegisterModule++
 	return nil

agent/functions/manager.go

@@ -56,12 +56,13 @@ func (m *Manager) Run(ctx context.Context) {
 			return
 		}
 
-		go func() { <-ctx.Done(); r.Cancel(); _ = r.Close() }()
+		go func() { <-ctx.Done(); r.Cancel() }()
 
 		wg.Add(1)
 		go func() { defer wg.Done(); m.run(r) }()
 
 		wg.Wait()
+		_ = r.Close()
 	}
 
 	<-ctx.Done()

agent/netdataapi/api.go

@@ -174,6 +174,11 @@ func (a *API) DynCfgEnable(pluginName string) error {
 	return err
 }
 
+func (a *API) DynCfgReset() error {
+	_, err := a.Write([]byte("DYNCFG_RESET\n"))
+	return err
+}
+
 func (a *API) DyncCfgRegisterModule(moduleName string) error {
 	_, err := fmt.Fprintf(a, "DYNCFG_REGISTER_MODULE '%s' job_array\n\n", moduleName)
 	return err

agent/netdataapi/api_test.go

@@ -273,6 +273,19 @@ func TestAPI_DynCfgEnable(t *testing.T) {
 	)
 }
 
+func TestAPI_DynCfgReset(t *testing.T) {
+	buf := &bytes.Buffer{}
+	a := API{Writer: buf}
+
+	_ = a.DynCfgReset()
+
+	assert.Equal(
+		t,
+		"DYNCFG_RESET\n",
+		buf.String(),
+	)
+}
+
 func TestAPI_DyncCfgRegisterModule(t *testing.T) {
 	buf := &bytes.Buffer{}
 	a := API{Writer: buf}