Merge branch '22655-deployments-don-t-always-have-keep-around-refs' into 'master'

Handle case where deployment ref no longer exists ## What does this MR do? In 8.9, we didn't create keep-around refs for deployments. So it's possible that someone created a deployment (say, for testing), and then deleted the branch and all other references to that commit. That commit could then get GCed, and trying to view MRs on 8.11+ will show a 500. See https://gitlab.com/gitlab-org/gitlab-ce/issues/22655#note_16575020 for more details. ## Why was this MR needed? If someone created a deployment on 8.9, then deleted all references to the commit for that deployment, we will throw an exception when checking if the deployment includes a commit. Closes #22655. See merge request !6855

Merge branch '22655-deployments-don-t-always-have-keep-around-refs' into 'master'
9a7afd2a · Rémy Coutable · 626d5e55 · 776cea4c · 9a7afd2a · 9a7afd2a
Commit 9a7afd2a authored Oct 13, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 1 deletion

deployment.rb app/models/deployment.rb +8 -1

deployment_spec.rb spec/models/deployment_spec.rb +9 -0

No files found.
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -40,7 +40,14 @@ class Deployment < ActiveRecord::Base
  def includes_commit?(commit)
    return false unless commit

-    project.repository.is_ancestor?(commit.id, sha)
+    # Before 8.10, deployments didn't have keep-around refs. Any deployment
+    # created before then could have a `sha` referring to a commit that no
+    # longer exists in the repository, so just ignore those.
+    begin
+      project.repository.is_ancestor?(commit.id, sha)
+    rescue Rugged::OdbError
+      false
+    end
  end

  def update_merge_request_metrics!

--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -38,5 +38,14 @@ describe Deployment, models: true do
        expect(deployment.includes_commit?(commit)).to be true
      end
    end
+
+    context 'when the SHA for the deployment does not exist in the repo' do
+      it 'returns false' do
+        deployment.update(sha: Gitlab::Git::BLANK_SHA)
+        commit = project.commit
+
+        expect(deployment.includes_commit?(commit)).to be false
+      end
+    end
  end
 end