github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5464 from prometheus/rel291 

Prepare 2.9.1
pull/5470/head v2.9.1
Brian Brazil 2019-04-16 14:52:27 +01:00 committed by GitHub
parent 1a9cdbd024 a9309a2e1e
commit ad71f2785f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 84 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
## 2.9.1 / 2019-04-16
* [BUGFIX] Discovery/kubernetes: fix missing label sanitization #5462
* [BUGFIX] Remote_write: Prevent reshard concurrent with calling stop #5460
## 2.9.0 / 2019-04-15 ## 2.9.0 / 2019-04-15
This releases uses Go 1.12, which includes a change in how memory is released This releases uses Go 1.12, which includes a change in how memory is released

2
VERSION
View File

@ -1 +1 @@
2.9.0 2.9.1

20
discovery/kubernetes/endpoints_test.go
View File

@ -357,7 +357,7 @@ func TestEndpointsDiscoveryWithService(t *testing.T) {
Name: "testendpoints", Name: "testendpoints",
Namespace: "default", Namespace: "default",
Labels: map[string]string{ Labels: map[string]string{
"app": "test", "app/name": "test",
}, },
}, },
} }
@ -387,11 +387,11 @@ func TestEndpointsDiscoveryWithService(t *testing.T) {
}, },
}, },
Labels: model.LabelSet{ Labels: model.LabelSet{
"__meta_kubernetes_namespace": "default", "__meta_kubernetes_namespace": "default",
"__meta_kubernetes_endpoints_name": "testendpoints", "__meta_kubernetes_endpoints_name": "testendpoints",
"__meta_kubernetes_service_label_app": "test", "__meta_kubernetes_service_label_app_name": "test",
"__meta_kubernetes_service_labelpresent_app": "true", "__meta_kubernetes_service_labelpresent_app_name": "true",
"__meta_kubernetes_service_name": "testendpoints", "__meta_kubernetes_service_name": "testendpoints",
}, },
Source: "endpoints/default/testendpoints", Source: "endpoints/default/testendpoints",
}, },
@ -410,7 +410,7 @@ func TestEndpointsDiscoveryWithServiceUpdate(t *testing.T) {
Name: "testendpoints", Name: "testendpoints",
Namespace: "default", Namespace: "default",
Labels: map[string]string{ Labels: map[string]string{
"app": "test", "app/name": "test",
}, },
}, },
} }
@ -422,7 +422,7 @@ func TestEndpointsDiscoveryWithServiceUpdate(t *testing.T) {
Name: "testendpoints", Name: "testendpoints",
Namespace: "default", Namespace: "default",
Labels: map[string]string{ Labels: map[string]string{
"app": "svc", "app/name": "svc",
"component": "testing", "component": "testing",
}, },
}, },
@ -455,8 +455,8 @@ func TestEndpointsDiscoveryWithServiceUpdate(t *testing.T) {
Labels: model.LabelSet{ Labels: model.LabelSet{
"__meta_kubernetes_namespace": "default", "__meta_kubernetes_namespace": "default",
"__meta_kubernetes_endpoints_name": "testendpoints", "__meta_kubernetes_endpoints_name": "testendpoints",
"__meta_kubernetes_service_label_app": "svc", "__meta_kubernetes_service_label_app_name": "svc",
"__meta_kubernetes_service_labelpresent_app": "true", "__meta_kubernetes_service_labelpresent_app_name": "true",
"__meta_kubernetes_service_name": "testendpoints", "__meta_kubernetes_service_name": "testendpoints",
"__meta_kubernetes_service_label_component": "testing", "__meta_kubernetes_service_label_component": "testing",
"__meta_kubernetes_service_labelpresent_component": "true", "__meta_kubernetes_service_labelpresent_component": "true",

16
discovery/kubernetes/ingress_test.go
View File

@ -36,8 +36,8 @@ func makeIngress(tls TLSMode) *v1beta1.Ingress {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "testingress", Name: "testingress",
Namespace: "default", Namespace: "default",
Labels: map[string]string{"testlabel": "testvalue"}, Labels: map[string]string{"test/label": "testvalue"},
Annotations: map[string]string{"testannotation": "testannotationvalue"}, Annotations: map[string]string{"test/annotation": "testannotationvalue"},
}, },
Spec: v1beta1.IngressSpec{ Spec: v1beta1.IngressSpec{
TLS: nil, TLS: nil,
@ -118,12 +118,12 @@ func expectedTargetGroups(ns string, tls TLSMode) map[string]*targetgroup.Group
}, },
}, },
Labels: model.LabelSet{ Labels: model.LabelSet{
"__meta_kubernetes_ingress_name": "testingress", "__meta_kubernetes_ingress_name": "testingress",
"__meta_kubernetes_namespace": lv(ns), "__meta_kubernetes_namespace": lv(ns),
"__meta_kubernetes_ingress_label_testlabel": "testvalue", "__meta_kubernetes_ingress_label_test_label": "testvalue",
"__meta_kubernetes_ingress_labelpresent_testlabel": "true", "__meta_kubernetes_ingress_labelpresent_test_label": "true",
"__meta_kubernetes_ingress_annotation_testannotation": "testannotationvalue", "__meta_kubernetes_ingress_annotation_test_annotation": "testannotationvalue",
"__meta_kubernetes_ingress_annotationpresent_testannotation": "true", "__meta_kubernetes_ingress_annotationpresent_test_annotation": "true",
}, },
Source: key, Source: key,
}, },

14
discovery/kubernetes/node_test.go
View File

@ -59,8 +59,8 @@ func TestNodeDiscoveryBeforeStart(t *testing.T) {
obj := makeNode( obj := makeNode(
"test", "test",
"1.2.3.4", "1.2.3.4",
map[string]string{"testlabel": "testvalue"}, map[string]string{"test-label": "testvalue"},
map[string]string{"testannotation": "testannotationvalue"}, map[string]string{"test-annotation": "testannotationvalue"},
) )
c.CoreV1().Nodes().Create(obj) c.CoreV1().Nodes().Create(obj)
}, },
@ -75,11 +75,11 @@ func TestNodeDiscoveryBeforeStart(t *testing.T) {
}, },
}, },
Labels: model.LabelSet{ Labels: model.LabelSet{
"__meta_kubernetes_node_name": "test", "__meta_kubernetes_node_name": "test",
"__meta_kubernetes_node_label_testlabel": "testvalue", "__meta_kubernetes_node_label_test_label": "testvalue",
"__meta_kubernetes_node_labelpresent_testlabel": "true", "__meta_kubernetes_node_labelpresent_test_label": "true",
"__meta_kubernetes_node_annotation_testannotation": "testannotationvalue", "__meta_kubernetes_node_annotation_test_annotation": "testannotationvalue",
"__meta_kubernetes_node_annotationpresent_testannotation": "true", "__meta_kubernetes_node_annotationpresent_test_annotation": "true",
}, },
Source: "node/test", Source: "node/test",
}, },

2
discovery/kubernetes/pod.go
View File

@ -188,7 +188,7 @@ func podLabels(pod *apiv1.Pod) model.LabelSet {
for k, v := range pod.Labels { for k, v := range pod.Labels {
ln := strutil.SanitizeLabelName(k) ln := strutil.SanitizeLabelName(k)
ls[model.LabelName(podLabelPrefix+k)] = lv(v) ls[model.LabelName(podLabelPrefix+ln)] = lv(v)
ls[model.LabelName(podLabelPresentPrefix+ln)] = presentValue ls[model.LabelName(podLabelPresentPrefix+ln)] = presentValue
} }

32
discovery/kubernetes/pod_test.go
View File

@ -33,8 +33,8 @@ func makeMultiPortPods() *v1.Pod {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "testpod", Name: "testpod",
Namespace: "default", Namespace: "default",
Labels: map[string]string{"testlabel": "testvalue"}, Labels: map[string]string{"test/label": "testvalue"},
Annotations: map[string]string{"testannotation": "testannotationvalue"}, Annotations: map[string]string{"test/annotation": "testannotationvalue"},
UID: types.UID("abc123"), UID: types.UID("abc123"),
OwnerReferences: []metav1.OwnerReference{ OwnerReferences: []metav1.OwnerReference{
{ {
@ -178,20 +178,20 @@ func TestPodDiscoveryBeforeRun(t *testing.T) {
}, },
}, },
Labels: model.LabelSet{ Labels: model.LabelSet{
"__meta_kubernetes_pod_name": "testpod", "__meta_kubernetes_pod_name": "testpod",
"__meta_kubernetes_namespace": "default", "__meta_kubernetes_namespace": "default",
"__meta_kubernetes_pod_label_testlabel": "testvalue", "__meta_kubernetes_pod_label_test_label": "testvalue",
"__meta_kubernetes_pod_labelpresent_testlabel": "true", "__meta_kubernetes_pod_labelpresent_test_label": "true",
"__meta_kubernetes_pod_annotation_testannotation": "testannotationvalue", "__meta_kubernetes_pod_annotation_test_annotation": "testannotationvalue",
"__meta_kubernetes_pod_annotationpresent_testannotation": "true", "__meta_kubernetes_pod_annotationpresent_test_annotation": "true",
"__meta_kubernetes_pod_node_name": "testnode", "__meta_kubernetes_pod_node_name": "testnode",
"__meta_kubernetes_pod_ip": "1.2.3.4", "__meta_kubernetes_pod_ip": "1.2.3.4",
"__meta_kubernetes_pod_host_ip": "2.3.4.5", "__meta_kubernetes_pod_host_ip": "2.3.4.5",
"__meta_kubernetes_pod_ready": "true", "__meta_kubernetes_pod_ready": "true",
"__meta_kubernetes_pod_phase": "Running", "__meta_kubernetes_pod_phase": "Running",
"__meta_kubernetes_pod_uid": "abc123", "__meta_kubernetes_pod_uid": "abc123",
"__meta_kubernetes_pod_controller_kind": "testcontrollerkind", "__meta_kubernetes_pod_controller_kind": "testcontrollerkind",
"__meta_kubernetes_pod_controller_name": "testcontrollername", "__meta_kubernetes_pod_controller_name": "testcontrollername",
}, },
Source: "pod/default/testpod", Source: "pod/default/testpod",
}, },

16
discovery/kubernetes/service_test.go
View File

@ -28,8 +28,8 @@ func makeMultiPortService() *v1.Service {
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "testservice", Name: "testservice",
Namespace: "default", Namespace: "default",
Labels: map[string]string{"testlabel": "testvalue"}, Labels: map[string]string{"test-label": "testvalue"},
Annotations: map[string]string{"testannotation": "testannotationvalue"}, Annotations: map[string]string{"test-annotation": "testannotationvalue"},
}, },
Spec: v1.ServiceSpec{ Spec: v1.ServiceSpec{
Ports: []v1.ServicePort{ Ports: []v1.ServicePort{
@ -186,12 +186,12 @@ func TestServiceDiscoveryUpdate(t *testing.T) {
}, },
}, },
Labels: model.LabelSet{ Labels: model.LabelSet{
"__meta_kubernetes_service_name": "testservice", "__meta_kubernetes_service_name": "testservice",
"__meta_kubernetes_namespace": "default", "__meta_kubernetes_namespace": "default",
"__meta_kubernetes_service_label_testlabel": "testvalue", "__meta_kubernetes_service_label_test_label": "testvalue",
"__meta_kubernetes_service_labelpresent_testlabel": "true", "__meta_kubernetes_service_labelpresent_test_label": "true",
"__meta_kubernetes_service_annotation_testannotation": "testannotationvalue", "__meta_kubernetes_service_annotation_test_annotation": "testannotationvalue",
"__meta_kubernetes_service_annotationpresent_testannotation": "true", "__meta_kubernetes_service_annotationpresent_test_annotation": "true",
}, },
Source: "svc/default/testservice", Source: "svc/default/testservice",
}, },

5
storage/remote/queue_manager.go
View File

@ -322,9 +322,12 @@ func (t *QueueManager) Stop() {
defer level.Info(t.logger).Log("msg", "Remote storage stopped.") defer level.Info(t.logger).Log("msg", "Remote storage stopped.")
close(t.quit) close(t.quit)
t.wg.Wait()
// Wait for all QueueManager routines to end before stopping shards and WAL watcher. This
// is to ensure we don't end up executing a reshard and shards.stop() at the same time, which
// causes a closed channel panic.
t.shards.stop() t.shards.stop()
t.watcher.Stop() t.watcher.Stop()
t.wg.Wait()
// On shutdown, release the strings in the labels from the intern pool. // On shutdown, release the strings in the labels from the intern pool.
t.seriesMtx.Lock() t.seriesMtx.Lock()

24
storage/remote/queue_manager_test.go
View File

@ -233,6 +233,30 @@ func TestReshard(t *testing.T) {
c.waitForExpectedSamples(t) c.waitForExpectedSamples(t)
} }
func TestReshardRaceWithStop(t *testing.T) {
c := NewTestStorageClient()
var m *QueueManager
h := sync.Mutex{}
h.Lock()
go func() {
for {
m = NewQueueManager(nil, "", newEWMARate(ewmaWeight, shardUpdateDuration), config.DefaultQueueConfig, nil, nil, c, defaultFlushDeadline)
m.Start()
h.Unlock()
h.Lock()
m.Stop()
}
}()
for i := 1; i < 100; i++ {
h.Lock()
m.reshardChan <- i
h.Unlock()
}
}
func createTimeseries(n int) ([]tsdb.RefSample, []tsdb.RefSeries) { func createTimeseries(n int) ([]tsdb.RefSample, []tsdb.RefSeries) {
samples := make([]tsdb.RefSample, 0, n) samples := make([]tsdb.RefSample, 0, n)
series := make([]tsdb.RefSeries, 0, n) series := make([]tsdb.RefSeries, 0, n)