Merge pull request #6561 from cortexproject/cherry-pick-5921

Cherry pick 5921 and release v1.17.2
cortexproject · Jan 28, 2025 · 312b610 · 312b610
2 parents 62b2513 + f7d7d59
commit 312b610
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows-doc.md b/.github/workflows-doc.md
@@ -69,7 +69,7 @@ As of October 2020, GitHub Actions do not persist between different jobs in the
 - name: Compressing Images
         run: tar -zcvf images.tar.gz /tmp/images
       - name: Cache Images
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Docker Images
           path: ./images.tar.gz

diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml
@@ -107,7 +107,7 @@ jobs:
           touch build-image/.uptodate
           make BUILD_IN_CONTAINER=false web-build
       - name: Upload Website Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: website public
           path: website/public/
@@ -119,7 +119,7 @@ jobs:
       - name: Create Docker Images Archive
         run: tar -cvf images.tar /tmp/images
       - name: Upload Docker Images Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Docker Images
           path: ./images.tar
@@ -152,7 +152,7 @@ jobs:
           sudo mkdir -p /go/src/github.com/cortexproject/cortex
           sudo ln -s $GITHUB_WORKSPACE/* /go/src/github.com/cortexproject/cortex
       - name: Download Docker Images Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: Docker Images
       - name: Extract Docker Images Archive
@@ -205,7 +205,7 @@ jobs:
       - name: Install Docker Client
         run: sudo ./.github/workflows/scripts/install-docker.sh
       - name: Download Docker Images Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: Docker Images
       - name: Extract Docker Images Archive
@@ -239,7 +239,7 @@ jobs:
           mkdir -p /go/src/github.com/cortexproject/cortex
           ln -s $GITHUB_WORKSPACE/* /go/src/github.com/cortexproject/cortex
       - name: Download Website Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: website public
           path: website/public
@@ -280,7 +280,7 @@ jobs:
           mkdir -p /go/src/github.com/cortexproject/cortex
           ln -s $GITHUB_WORKSPACE/* /go/src/github.com/cortexproject/cortex
       - name: Download Docker Images Artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: Docker Images
       - name: Extract Docker Images Archive

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## master / unreleased
 
+## 1.17.2 2025-01-28
+* [BUGFIX] Fix single distributor latency #5921
+
 ## 1.17.1 2024-05-20
 
 * [CHANGE] Query Frontend/Ruler: Omit empty data, errorType and error fields in API response. #5953 #5954

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.17.1
+1.17.2
diff --git a/pkg/ring/http.go b/pkg/ring/http.go
@@ -156,6 +156,9 @@ func (r *Ring) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 	storageLastUpdate := r.KVClient.LastUpdateTime(r.key)
 	var ingesters []ingesterDesc
+	numTokens, ownedByAz := r.countTokensByAz()
+	_, owned := r.countTokens()
+
 	for _, id := range ingesterIDs {
 		ing := r.ringDesc.Ingesters[id]
 		heartbeatTimestamp := time.Unix(ing.Timestamp, 0)
@@ -174,12 +177,10 @@ func (r *Ring) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		var deltaOwnership float64
 
 		if r.cfg.ZoneAwarenessEnabled {
-			numTokens, ownedByAz := r.countTokensByAz()
 			ownership = (float64(ownedByAz[id]) / float64(math.MaxUint32+1)) * 100
 			expectedOwnership := 1 / float64(len(numTokens[ing.Zone])) * 100
 			deltaOwnership = (1 - expectedOwnership/ownership) * 100
 		} else {
-			_, owned := r.countTokens()
 			ownership = (float64(owned[id]) / float64(math.MaxUint32+1)) * 100
 			expectedOwnership := 1 / float64(len(owned)) * 100
 			deltaOwnership = (1 - expectedOwnership/ownership) * 100