Improve performance of `Ci::Build#persisted_environment`optimize-persisted-environment-in-ci-builds

1 files changed, 11 insertions, 2 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index cfdb3c0d719..7ca34251a22 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -48,13 +48,22 @@ module Ci
     delegate :trigger_short_token, to: :trigger_request, allow_nil: true
 
     ##
-    # The "environment" field for builds is a String, and is the unexpanded name!
+    # Since Gitlab 11.5, deployments records started being created right after
+    # `ci_builds` creation. We can look up a relevant `environment` through
+    # `deployment` relation today. This is much more efficient than expanding
+    # environment name with variables.
     #
+    # However, we have to still expand environment name if it's a stop action,
+    # because `deployment` persists information for start action only.
+    #
+    # We will follow up this by persisting expanded name in build metadata or
+    # persisting stop action in database.
     def persisted_environment
       return unless has_environment?
 
       strong_memoize(:persisted_environment) do
-        Environment.find_by(name: expanded_environment_name, project: project)
+        deployment&.environment ||
+          Environment.find_by(name: expanded_environment_name, project: project)
       end
     end