rule: fix reload signal not working

CHANGELOG.md

@@ -14,6 +14,8 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 
 ### Fixed
 
+- [#4442](https://github.com/thanos-io/thanos/pull/4442) rule: fix reload signal not working
+
 ### Changed
 
 ## [v0.22.0 - in progress](https://github.com/thanos-io/thanos/tree/release-0.22)

cmd/thanos/rule.go

@@ -80,7 +80,6 @@ type ruleConfig struct {
 	ruleFiles      []string
 	objStoreConfig *extflag.PathOrContent
 	dataDir        string
-	reloadSignal   <-chan struct{}
 	lset           labels.Labels
 }
 
@@ -195,6 +194,7 @@ func registerRule(app *extkingpin.App) {
 			tracer,
 			comp,
 			*conf,
+			reload,
 			getFlagsMap(cmd.Flags()),
 			httpLogOpts,
 			grpcLogOpts,
@@ -257,6 +257,7 @@ func runRule(
 	tracer opentracing.Tracer,
 	comp component.Component,
 	conf ruleConfig,
+	reloadSignal <-chan struct{},
 	flagsMap map[string]string,
 	httpLogOpts []logging.Option,
 	grpcLogOpts []grpc_logging.Option,
@@ -483,7 +484,7 @@ func runRule(
 			}
 			for {
 				select {
-				case <-conf.reloadSignal:
+				case <-reloadSignal:
 					if err := reloadRules(logger, conf.ruleFiles, ruleMgr, conf.evalInterval, metrics); err != nil {
 						level.Error(logger).Log("msg", "reload rules by sighup failed", "err", err)
 					}

test/e2e/rule_test.go

@@ -71,9 +71,39 @@ groups:
       severity: page
     annotations:
       summary: "I always complain and I have been loaded via /-/reload."
+`
+	testAlertRuleAddedLaterSignal = `
+groups:
+- name: example
+  interval: 1s
+  partial_response_strategy: "WARN"
+  rules:
+  - alert: TestAlert_HasBeenLoadedViaWebHandler
+    # It must be based on actual metric, otherwise call to StoreAPI would be not involved.
+    expr: absent(some_metric)
+    labels:
+      severity: page
+    annotations:
+      summary: "I always complain and I have been loaded via sighup signal."
+- name: example2
+  interval: 1s
+  partial_response_strategy: "WARN"
+  rules:
+  - alert: TestAlert_HasBeenLoadedViaWebHandler
+    # It must be based on actual metric, otherwise call to StoreAPI would be not involved.
+    expr: absent(some_metric)
+    labels:
+      severity: page
+    annotations:
+      summary: "I always complain and I have been loaded via sighup signal."
 `
 )
 
+type rulesResp struct {
+	Status string
+	Data   *rulespb.RuleGroups
+}
+
 func createRuleFile(t *testing.T, path, content string) {
 	t.Helper()
 	err := ioutil.WriteFile(path, []byte(content), 0666)
@@ -97,6 +127,30 @@ func reloadRulesHTTP(t *testing.T, ctx context.Context, endpoint string) {
 	testutil.Equals(t, 200, resp.StatusCode)
 }
 
+func reloadRulesSignal(t *testing.T, r *e2ethanos.Service) {
+	c := e2e.NewCommand("kill", "-1", "1")
+	_, _, err := r.Exec(c)
+	testutil.Ok(t, err)
+}
+
+func checkReloadSuccessful(t *testing.T, ctx context.Context, endpoint string, expectedRulegroupCount int) {
+	req, err := http.NewRequestWithContext(ctx, "GET", "http://"+endpoint+"/api/v1/rules", ioutil.NopCloser(bytes.NewReader(nil)))
+	testutil.Ok(t, err)
+	resp, err := http.DefaultClient.Do(req)
+	testutil.Ok(t, err)
+	testutil.Equals(t, 200, resp.StatusCode)
+
+	body, _ := ioutil.ReadAll(resp.Body)
+	testutil.Ok(t, resp.Body.Close())
+
+	var data = rulesResp{}
+
+	testutil.Ok(t, json.Unmarshal(body, &data))
+	testutil.Equals(t, "success", data.Status)
+
+	testutil.Assert(t, len(data.Data.Groups) == expectedRulegroupCount, fmt.Sprintf("expected there to be %d rule groups", expectedRulegroupCount))
+}
+
 func rulegroupCorrectData(t *testing.T, ctx context.Context, endpoint string) {
 	req, err := http.NewRequestWithContext(ctx, "GET", "http://"+endpoint+"/api/v1/rules", ioutil.NopCloser(bytes.NewReader(nil)))
 	testutil.Ok(t, err)
@@ -108,10 +162,7 @@ func rulegroupCorrectData(t *testing.T, ctx context.Context, endpoint string) {
 	body, err := ioutil.ReadAll(resp.Body)
 	testutil.Ok(t, err)
 
-	var data struct {
-		Status string
-		Data   *rulespb.RuleGroups
-	}
+	var data = rulesResp{}
 
 	testutil.Ok(t, json.Unmarshal(body, &data))
 	testutil.Equals(t, "success", data.Status)
@@ -317,12 +368,18 @@ func TestRule(t *testing.T) {
 		rulegroupCorrectData(t, ctx, r.HTTPEndpoint())
 	})
 
-	t.Run("reload works", func(t *testing.T) {
-		// Add a new rule via /-/reload.
-		// TODO(GiedriusS): add a test for reloading via SIGHUP. Need to extend e2e framework to expose PIDs.
+	t.Run("signal reload works", func(t *testing.T) {
+		// Add a new rule via sending sighup
+		createRuleFile(t, fmt.Sprintf("%s/newrule.yaml", rulesPath), testAlertRuleAddedLaterSignal)
+		reloadRulesSignal(t, r)
+		checkReloadSuccessful(t, ctx, r.HTTPEndpoint(), 4)
+	})
 
+	t.Run("http reload works", func(t *testing.T) {
+		// Add a new rule via /-/reload.
 		createRuleFile(t, fmt.Sprintf("%s/newrule.yaml", rulesPath), testAlertRuleAddedLaterWebHandler)
 		reloadRulesHTTP(t, ctx, r.HTTPEndpoint())
+		checkReloadSuccessful(t, ctx, r.HTTPEndpoint(), 3)
 	})
 
 	queryAndAssertSeries(t, ctx, q.HTTPEndpoint(), "ALERTS", promclient.QueryOptions{