Filip's comments

Signed-off-by: haanhvu <haanh6594@gmail.com>
thanos-io · May 15, 2023 · b9ff267 · b9ff267
1 parent 73adb73
commit b9ff267
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/pkg/receive/multitsdb.go b/pkg/receive/multitsdb.go
@@ -571,9 +571,6 @@ func (t *MultiTSDB) startTSDB(logger log.Logger, tenantID string, tenant *tenant
 
 	lset, err := t.extractTenantsLabels(tenantID, initialLset)
 	if err != nil {
-		t.mtx.Lock()
-		delete(t.tenants, tenantID)
-		t.mtx.Unlock()
 		return err
 	}
 
@@ -682,9 +679,6 @@ func (t *MultiTSDB) SetHashringConfig(cfg []HashringConfig) error {
 				if hc.ExternalLabels != nil {
 					extendedLset, err := extendLabels(lset, hc.ExternalLabels, t.logger)
 					if err != nil {
-						t.mtx.Lock()
-						delete(t.tenants, tenantID)
-						t.mtx.Unlock()
 						return errors.Wrap(err, "failed to extend external labels for tenant "+tenantID)
 					}
 					lset = extendedLset
@@ -894,6 +888,9 @@ func extendLabels(labelSet labels.Labels, extend map[string]string, logger log.L
 		extendLabels = append(extendLabels, labels.Label{Name: name, Value: value})
 	}
 
+	sort.Sort(labelSet)
+	sort.Sort(extendLabels)
+
 	extendedLabelSet := make(labels.Labels, 0, len(labelSet)+len(extendLabels))
 	for len(labelSet) > 0 && len(extendLabels) > 0 {
 		d := strings.Compare(labelSet[0].Name, extendLabels[0].Name)

diff --git a/pkg/receive/receive_test.go b/pkg/receive/receive_test.go
@@ -117,9 +117,9 @@ func TestAddingExternalLabelsForTenants(t *testing.T) {
 					Endpoints: []string{"node1"},
 					Tenants:   []string{"tenant1", "tenant2", "tenant3"},
 					ExternalLabels: map[string]string{
-						"name1": "value1",
-						"name2": "value2",
 						"name3": "value3",
+						"name2": "value2",
+						"name1": "value1",
 					},
 				},
 			},
@@ -148,9 +148,9 @@ func TestAddingExternalLabelsForTenants(t *testing.T) {
 					Endpoints: []string{"node2"},
 					Tenants:   []string{"tenant4", "tenant5", "tenant6"},
 					ExternalLabels: map[string]string{
-						"name4": "value4",
-						"name5": "value5",
 						"name6": "value6",
+						"name5": "value5",
+						"name4": "value4",
 					},
 				},
 			},
@@ -176,9 +176,9 @@ func TestAddingExternalLabelsForTenants(t *testing.T) {
 					Endpoints: []string{"node1"},
 					Tenants:   []string{"tenant1", "tenant2", "tenant3"},
 					ExternalLabels: map[string]string{
-						"name1": "value1",
-						"name2": "value2",
 						"name3": "value3",
+						"name2": "value2",
+						"name1": "value1",
 					},
 				},
 				{
@@ -366,9 +366,9 @@ func TestLabelSetsOfTenantsWhenChangingLabels(t *testing.T) {
 			Endpoints: []string{"node2"},
 			Tenants:   []string{"tenant4", "tenant5", "tenant6"},
 			ExternalLabels: map[string]string{
-				"name4": "value4",
-				"name5": "value5",
 				"name6": "value6",
+				"name5": "value5",
+				"name4": "value4",
 			},
 		},
 	}
@@ -587,9 +587,9 @@ func TestAddingLabelsWhenTenantAppearsInMultipleHashrings(t *testing.T) {
 			Endpoints: []string{"node1"},
 			Tenants:   []string{"tenant1", "tenant2", "tenant3"},
 			ExternalLabels: map[string]string{
-				"name1": "value1",
-				"name2": "value2",
 				"name3": "value3",
+				"name2": "value2",
+				"name1": "value1",
 			},
 		},
 		{