Automatic merge of gitlab-org/gitlab-ce master

app/services/users/activity_service.rb

@@ -26,12 +26,15 @@ module Users
     def record_activity
       return if Gitlab::Database.read_only?
 
+      today = Date.today
+
+      return if @user.last_activity_on == today
+
       lease = Gitlab::ExclusiveLease.new("acitvity_service:#{@user.id}",
                                          timeout: LEASE_TIMEOUT)
       return unless lease.try_obtain
 
-      @user.update_attribute(:last_activity_on, Date.today)
-      Rails.logger.debug("Recorded activity: #{@activity} for User ID: #{@user.id} (username: #{@user.username})")
+      @user.update_attribute(:last_activity_on, today)
     end
   end
 end

changelogs/unreleased/24642-activity_service_optimization.yml

+---
+title: Optimize Redis usage in User::ActivityService
+merge_request: 25005
+author:
+type: performance

spec/services/users/activity_service_spec.rb

@@ -26,6 +26,12 @@ describe Users::ActivityService do
                 .from(last_activity_on)
                 .to(Date.today)
       end
+
+      it 'tries to obtain ExclusiveLease' do
+        expect(Gitlab::ExclusiveLease).to receive(:new).and_call_original
+
+        subject.execute
+      end
     end
 
     context 'when a bad object is passed' do
@@ -46,6 +52,12 @@ describe Users::ActivityService do
       it 'does not update last_activity_on' do
         expect { subject.execute }.not_to change(user, :last_activity_on)
       end
+
+      it 'does not try to obtain ExclusiveLease' do
+        expect(Gitlab::ExclusiveLease).not_to receive(:new)
+
+        subject.execute
+      end
     end
 
     context 'when in GitLab read-only instance' do