Add latest changes from gitlab-org/gitlab@master

[skip secret push protection]

Author: GitLab Bot

lib/gitlab/database/load_balancing/sticking.rb

@@ -10,6 +10,19 @@ class Sticking
         # the primary.
         EXPIRATION = 30
 
+        UNSTICK_IF_CAUGHT_UP_SCRIPT = <<~LUA
+          local key = KEYS[1]
+          local expected_location = ARGV[1]
+          local current_location = redis.call('GET', key)
+
+          if current_location == expected_location then
+            redis.call('DEL', key)
+            return 1
+          else
+            return 0
+          end
+        LUA
+
         attr_reader :load_balancer
 
         def initialize(load_balancer)
@@ -35,7 +48,7 @@ def find_caught_up_replica(
           result = if location
                      up_to_date_result = @load_balancer.select_up_to_date_host(location)
 
-                     unstick(namespace, id) if up_to_date_result == LoadBalancer::ALL_CAUGHT_UP
+                     unstick_if_caught_up(namespace, id, location) if up_to_date_result == LoadBalancer::ALL_CAUGHT_UP
 
                      up_to_date_result != LoadBalancer::NONE_CAUGHT_UP
                    else
@@ -100,6 +113,17 @@ def unstick(namespace, id)
           end
         end
 
+        # Atomically unstick only if the sticking point hasn't changed since we read it.
+        # This prevents a race condition where a concurrent request sets a new sticking point
+        # after we've verified all replicas are caught up but before we unstick.
+        #
+        # Returns 1 if unstick was performed, 0 if the value changed (indicating a new write).
+        def unstick_if_caught_up(namespace, id, expected_location)
+          with_redis do |redis|
+            redis.eval(UNSTICK_IF_CAUGHT_UP_SCRIPT, keys: [redis_key_for(namespace, id)], argv: [expected_location])
+          end
+        end
+
         def set_write_location_for(namespace, id, location)
           with_redis do |redis|
             redis.set(redis_key_for(namespace, id), location, ex: EXPIRATION)

package.json

@@ -237,7 +237,7 @@
     "url-loader": "^4.1.1",
     "uuid": "8.1.0",
     "visibilityjs": "^1.2.4",
-    "vite": "7.2.2",
+    "vite": "7.2.7",
     "vite-plugin-ruby": "^5.1.1",
     "vue-loader-vue3": "npm:vue-loader@17.4.2",
     "vue": "2.7.16",

spec/lib/gitlab/database/load_balancing/sticking_spec.rb

@@ -57,16 +57,39 @@
     end
 
     context 'when all replicas have caught up' do
-      it 'returns true and unsticks' do
+      it 'returns true and attempts to unstick if location matches' do
         expect(load_balancer).to receive(:select_up_to_date_host).with(last_write_location)
           .and_return(::Gitlab::Database::LoadBalancing::LoadBalancer::ALL_CAUGHT_UP)
 
         expect(redis)
-          .to receive(:del)
-          .with("database-load-balancing/write-location/#{load_balancer.name}/user/42")
+          .to receive(:eval)
+          .with(
+            described_class::UNSTICK_IF_CAUGHT_UP_SCRIPT,
+            keys: ["database-load-balancing/write-location/#{load_balancer.name}/user/42"],
+            argv: [last_write_location]
+          )
+          .and_return(1)
 
         expect(sticking.find_caught_up_replica(:user, 42)).to eq(true)
       end
+
+      context 'when the sticking point has changed (concurrent write)' do
+        it 'returns true but does not unstick' do
+          expect(load_balancer).to receive(:select_up_to_date_host).with(last_write_location)
+            .and_return(::Gitlab::Database::LoadBalancing::LoadBalancer::ALL_CAUGHT_UP)
+
+          expect(redis)
+            .to receive(:eval)
+            .with(
+              described_class::UNSTICK_IF_CAUGHT_UP_SCRIPT,
+              keys: ["database-load-balancing/write-location/#{load_balancer.name}/user/42"],
+              argv: [last_write_location]
+            )
+            .and_return(0)
+
+          expect(sticking.find_caught_up_replica(:user, 42)).to eq(true)
+        end
+      end
     end
 
     context 'when only some of the replicas have caught up' do

yarn.lock

@@ -15477,10 +15477,10 @@ vite-plugin-ruby@^5.1.1:
     debug "^4.3.4"
     fast-glob "^3.3.2"
 
-vite@7.2.2, "vite@^6.0.0 || ^7.0.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-7.2.2.tgz#17dd62eac2d0ca0fa90131c5f56e4fefb8845362"
-  integrity sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==
+vite@7.2.7, "vite@^6.0.0 || ^7.0.0":
+  version "7.2.7"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-7.2.7.tgz#0789a4c3206081699f34a9ecca2dda594a07478e"
+  integrity sha512-ITcnkFeR3+fI8P1wMgItjGrR10170d8auB4EpMLPqmx6uxElH3a/hHGQabSHKdqd4FXWO1nFIp9rRn7JQ34ACQ==
   dependencies:
     esbuild "^0.25.0"
     fdir "^6.5.0"