Automatic merge of gitlab-org/gitlab master

config/feature_flags/development/load_balancing_refine_load_balancer_methods.yml

+---
+name: load_balancing_refine_load_balancer_methods
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65356
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335109
+milestone: '14.1'
+type: development
+group: group::memory
+default_enabled: false

ee/spec/frontend/compliance_dashboard/components/__snapshots__/dashboard_spec.js.snap

@@ -34,17 +34,13 @@ exports[`ComplianceDashboard component when there are merge requests and the sho
       title=""
       titlelinkclass="gl-tab-nav-item"
     >
-      <template>
-         
-        <merge-requests-grid-stub
-          mergerequests="[object Object],[object Object]"
-        />
-      </template>
-      <template>
-        <span>
-          Merge Requests
-        </span>
-      </template>
+       
+      <merge-requests-grid-stub
+        mergerequests="[object Object],[object Object]"
+      />
+      <span>
+        Merge Requests
+      </span>
     </b-tab-stub>
   </gl-tabs-stub>
    

ee/spec/frontend/on_demand_scans/components/profile_selector/__snapshots__/scanner_profile_selector_spec.js.snap

@@ -43,7 +43,7 @@ exports[`OnDemandScansScannerProfileSelector renders properly with profiles 1`]
         role="group"
         tabindex="-1"
       >
-          
+         
         <div
           class="dropdown b-dropdown gl-new-dropdown mw-460 btn-group"
           data-testid="profiles-dropdown"
@@ -287,7 +287,6 @@ exports[`OnDemandScansScannerProfileSelector renders properly with profiles 1`]
                 </li>
               </div>
             </div>
-             
           </ul>
         </div>
          

ee/spec/frontend/on_demand_scans/components/profile_selector/__snapshots__/site_profile_selector_spec.js.snap

@@ -43,7 +43,7 @@ exports[`OnDemandScansSiteProfileSelector renders properly with profiles 1`] = `
         role="group"
         tabindex="-1"
       >
-          
+         
         <div
           class="dropdown b-dropdown gl-new-dropdown mw-460 btn-group"
           data-testid="profiles-dropdown"
@@ -287,7 +287,6 @@ exports[`OnDemandScansSiteProfileSelector renders properly with profiles 1`] = `
                 </li>
               </div>
             </div>
-             
           </ul>
         </div>
          

lib/gitlab/database/load_balancing/load_balancer.rb

@@ -165,6 +165,7 @@ module Gitlab
         # while we only need a single host: https://gitlab.com/gitlab-org/gitlab/-/issues/326125#note_615271604
         # Also, shuffling the list afterwards doesn't seem to be necessary.
         # This may be improved by merging this method with `select_up_to_date_host`.
+        # Could be removed when `:load_balancing_refine_load_balancer_methods` FF is rolled out
         def select_caught_up_hosts(location)
           all_hosts = @host_list.hosts
           valid_hosts = all_hosts.select { |host| host.caught_up?(location) }
@@ -201,6 +202,7 @@ module Gitlab
           true
         end
 
+        # Could be removed when `:load_balancing_refine_load_balancer_methods` FF is rolled out
         def set_consistent_hosts_for_request(hosts)
           RequestStore[VALID_HOSTS_CACHE_KEY] = hosts
         end

lib/gitlab/database/load_balancing/sticking.rb

@@ -53,8 +53,14 @@ module Gitlab
           # write location. If no such location exists, err on the side of caution.
           return false unless location
 
-          load_balancer.select_caught_up_hosts(location).tap do |selected|
-            unstick(namespace, id) if selected
+          if ::Feature.enabled?(:load_balancing_refine_load_balancer_methods)
+            load_balancer.select_up_to_date_host(location).tap do |selected|
+              unstick(namespace, id) if selected
+            end
+          else
+            load_balancer.select_caught_up_hosts(location).tap do |selected|
+              unstick(namespace, id) if selected
+            end
           end
         end
 

package.json

@@ -59,7 +59,7 @@
     "@gitlab/favicon-overlay": "2.0.0",
     "@gitlab/svgs": "1.202.0",
     "@gitlab/tributejs": "1.0.0",
-    "@gitlab/ui": "30.2.0",
+    "@gitlab/ui": "30.2.1",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "6.1.3-2",
     "@rails/ujs": "6.1.3-2",

spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap

@@ -156,7 +156,6 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ
          
         <!---->
       </div>
-       
     </ul>
   </div>
    

spec/frontend/jira_import/components/__snapshots__/jira_import_form_spec.js.snap

@@ -176,7 +176,6 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
                
               <!---->
             </div>
-             
           </ul>
         </div>
       </td>
@@ -304,7 +303,6 @@ exports[`JiraImportForm table body shows correct information in each cell 1`] =
                
               <!---->
             </div>
-             
           </ul>
         </div>
       </td>

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

@@ -325,10 +325,22 @@ RSpec.describe Gitlab::Database::LoadBalancing::Sticking, :redis do
       end
 
       it 'returns true, selects hosts, and unsticks if any secondary has caught up' do
-        expect(lb).to receive(:select_caught_up_hosts).and_return(true)
+        expect(lb).to receive(:select_up_to_date_host).and_return(true)
         expect(described_class).to receive(:unstick).with(:project, 42)
         expect(described_class.select_caught_up_replicas(:project, 42)).to be true
       end
+
+      context 'when :load_balancing_refine_load_balancer_methods FF is disabled' do
+        before do
+          stub_feature_flags(load_balancing_refine_load_balancer_methods: false)
+        end
+
+        it 'returns true, selects hosts, and unsticks if any secondary has caught up' do
+          expect(lb).to receive(:select_caught_up_hosts).and_return(true)
+          expect(described_class).to receive(:unstick).with(:project, 42)
+          expect(described_class.select_caught_up_replicas(:project, 42)).to be true
+        end
+      end
     end
   end
 end

yarn.lock

@@ -908,10 +908,10 @@
   resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
   integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
 
-"@gitlab/ui@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-30.2.0.tgz#eceec947f901cca9507a1ac8b3bd0031a5dcacf9"
-  integrity sha512-rYG3HyUHZQyum9+6OKvp45r9b9E/wzAl8rpFyIIZMg6a14JPfsGhdjXqycWlLxf3TAsbTD6MtjQm/z/I8J6V8g==
+"@gitlab/ui@30.2.1":
+  version "30.2.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-30.2.1.tgz#be582413712cd2372ff01279e47579f5785591d4"
+  integrity sha512-Pv2w5ZSR7+G5zcaRjvf8KPs7wQRBqAXXNvKOw2pg/aZsRoK+JfN1neNmfeaqO6K/k1TJyiP6inDXAvhU8SqmOg==
   dependencies:
     "@babel/standalone" "^7.0.0"
     bootstrap-vue "2.18.1"