Merge branch 'pks-gitaly-determenistic-rpcs' into 'master'

Explicitly put timestamp into Gitaly requests

See merge request gitlab-org/gitlab!52674

Gemfile

@@ -464,7 +464,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.8.0.pre.rc3'
+gem 'gitaly', '~> 13.9.0.pre.rc1'
 
 gem 'grpc', '~> 1.30.2'
 

Gemfile.lock

@@ -420,7 +420,7 @@ GEM
       rails (>= 3.2.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitaly (13.8.0.pre.rc3)
+    gitaly (13.9.0.pre.rc1)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-chronic (0.10.5)
@@ -1368,7 +1368,7 @@ DEPENDENCIES
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 13.8.0.pre.rc3)
+  gitaly (~> 13.9.0.pre.rc1)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-experiment (~> 0.4.9)

lib/gitlab/gitaly_client/conflicts_service.rb

@@ -67,7 +67,8 @@ module Gitlab
           source_branch: encode_binary(source_branch),
           target_branch: encode_binary(target_branch),
           commit_message: encode_binary(resolution.commit_message),
-          user: Gitlab::Git::User.from_gitlab(resolution.user).to_gitaly
+          user: Gitlab::Git::User.from_gitlab(resolution.user).to_gitaly,
+          timestamp: Google::Protobuf::Timestamp.new(seconds: Time.now.utc.to_i)
         )
       end
     end

lib/gitlab/gitaly_client/operation_service.rb

@@ -32,7 +32,8 @@ module Gitlab
           user: Gitlab::Git::User.from_gitlab(user).to_gitaly,
           tag_name: encode_binary(tag_name),
           target_revision: encode_binary(target),
-          message: encode_binary(message.to_s)
+          message: encode_binary(message.to_s),
+          timestamp: Google::Protobuf::Timestamp.new(seconds: Time.now.utc.to_i)
         )
 
         response = GitalyClient.call(@repository.storage, :operation_service, :user_create_tag, request, timeout: GitalyClient.long_timeout)
@@ -111,7 +112,8 @@ module Gitlab
           user: Gitlab::Git::User.from_gitlab(user).to_gitaly,
           message: encode_binary(message),
           first_parent_ref: encode_binary(first_parent_ref),
-          allow_conflicts: allow_conflicts
+          allow_conflicts: allow_conflicts,
+          timestamp: Google::Protobuf::Timestamp.new(seconds: Time.now.utc.to_i)
         )
 
         response = GitalyClient.call(@repository.storage, :operation_service,
@@ -140,7 +142,8 @@ module Gitlab
             user: Gitlab::Git::User.from_gitlab(user).to_gitaly,
             commit_id: source_sha,
             branch: encode_binary(target_branch),
-            message: encode_binary(message)
+            message: encode_binary(message),
+            timestamp: Google::Protobuf::Timestamp.new(seconds: Time.now.utc.to_i)
           )
         )
 
@@ -234,7 +237,8 @@ module Gitlab
               branch_sha: branch_sha,
               remote_repository: remote_repository.gitaly_repository,
               remote_branch: encode_binary(remote_branch),
-              git_push_options: push_options
+              git_push_options: push_options,
+              timestamp: Google::Protobuf::Timestamp.new(seconds: Time.now.utc.to_i)
             )
           )
         )
@@ -255,7 +259,7 @@ module Gitlab
         request_enum.close
       end
 
-      def user_squash(user, squash_id, start_sha, end_sha, author, message)
+      def user_squash(user, squash_id, start_sha, end_sha, author, message, time = Time.now.utc)
         request = Gitaly::UserSquashRequest.new(
           repository: @gitaly_repo,
           user: Gitlab::Git::User.from_gitlab(user).to_gitaly,
@@ -263,7 +267,8 @@ module Gitlab
           start_sha: start_sha,
           end_sha: end_sha,
           author: Gitlab::Git::User.from_gitlab(author).to_gitaly,
-          commit_message: encode_binary(message)
+          commit_message: encode_binary(message),
+          timestamp: Google::Protobuf::Timestamp.new(seconds: time.to_i)
         )
 
         response = GitalyClient.call(
@@ -288,7 +293,8 @@ module Gitlab
           commit_sha: commit_sha,
           branch: encode_binary(branch),
           submodule: encode_binary(submodule),
-          commit_message: encode_binary(message)
+          commit_message: encode_binary(message),
+          timestamp: Google::Protobuf::Timestamp.new(seconds: Time.now.utc.to_i)
         )
 
         response = GitalyClient.call(
@@ -357,7 +363,8 @@ module Gitlab
         header = Gitaly::UserApplyPatchRequest::Header.new(
           repository: @gitaly_repo,
           user: Gitlab::Git::User.from_gitlab(user).to_gitaly,
-          target_branch: encode_binary(branch_name)
+          target_branch: encode_binary(branch_name),
+          timestamp: Google::Protobuf::Timestamp.new(seconds: Time.now.utc.to_i)
         )
         reader = binary_io(patches)
 
@@ -446,7 +453,8 @@ module Gitlab
           start_branch_name: encode_binary(start_branch_name),
           start_repository: start_repository.gitaly_repository,
           force: force,
-          start_sha: encode_binary(start_sha)
+          start_sha: encode_binary(start_sha),
+          timestamp: Google::Protobuf::Timestamp.new(seconds: Time.now.utc.to_i)
         )
       end
       # rubocop:enable Metrics/ParameterLists

spec/features/projects/branches_spec.rb

@@ -21,11 +21,11 @@ RSpec.describe 'Branches' do
       before do
         # Add 4 stale branches
         (1..4).reverse_each do |i|
-          travel_to((threshold + i).ago) { create_file(message: "a commit in stale-#{i}", branch_name: "stale-#{i}") }
+          travel_to((threshold + i.hours).ago) { create_file(message: "a commit in stale-#{i}", branch_name: "stale-#{i}") }
         end
         # Add 6 active branches
         (1..6).each do |i|
-          travel_to((threshold - i).ago) { create_file(message: "a commit in active-#{i}", branch_name: "active-#{i}") }
+          travel_to((threshold - i.hours).ago) { create_file(message: "a commit in active-#{i}", branch_name: "active-#{i}") }
         end
       end
 
@@ -34,7 +34,7 @@ RSpec.describe 'Branches' do
           visit project_branches_path(project)
 
           expect(page).to have_content(sorted_branches(repository, count: 5, sort_by: :updated_desc, state: 'active'))
-          expect(page).to have_content(sorted_branches(repository, count: 4, sort_by: :updated_desc, state: 'stale'))
+          expect(page).to have_content(sorted_branches(repository, count: 4, sort_by: :updated_asc, state: 'stale'))
 
           expect(page).to have_link('Show more active branches', href: project_branches_filtered_path(project, state: 'active'))
           expect(page).not_to have_content('Show more stale branches')
@@ -50,10 +50,10 @@ RSpec.describe 'Branches' do
       end
 
       describe 'Stale branches page' do
-        it 'shows 4 active branches sorted by last updated' do
+        it 'shows 4 stale branches sorted by last updated' do
           visit project_branches_filtered_path(project, state: 'stale')
 
-          expect(page).to have_content(sorted_branches(repository, count: 4, sort_by: :updated_desc, state: 'stale'))
+          expect(page).to have_content(sorted_branches(repository, count: 4, sort_by: :updated_asc, state: 'stale'))
         end
       end
 

spec/lib/gitlab/gitaly_client/operation_service_spec.rb

@@ -299,6 +299,11 @@ RSpec.describe Gitlab::GitalyClient::OperationService do
     let(:start_sha) { 'b83d6e391c22777fca1ed3012fce84f633d7fed0' }
     let(:end_sha) { '54cec5282aa9f21856362fe321c800c236a61615' }
     let(:commit_message) { 'Squash message' }
+
+    let(:time) do
+      Time.now.utc
+    end
+
     let(:request) do
       Gitaly::UserSquashRequest.new(
         repository: repository.gitaly_repository,
@@ -307,7 +312,8 @@ RSpec.describe Gitlab::GitalyClient::OperationService do
         start_sha: start_sha,
         end_sha: end_sha,
         author: gitaly_user,
-        commit_message: commit_message
+        commit_message: commit_message,
+        timestamp: Google::Protobuf::Timestamp.new(seconds: time.to_i)
       )
     end
 
@@ -315,7 +321,7 @@ RSpec.describe Gitlab::GitalyClient::OperationService do
     let(:response) { Gitaly::UserSquashResponse.new(squash_sha: squash_sha) }
 
     subject do
-      client.user_squash(user, squash_id, start_sha, end_sha, user, commit_message)
+      client.user_squash(user, squash_id, start_sha, end_sha, user, commit_message, time)
     end
 
     it 'sends a user_squash message and returns the squash sha' do