Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/gitlab/cluster/lifecycle_events.rb b/lib/gitlab/cluster/lifecycle_events.rb
index 8f796748199..3fbbccbf56e 100644
--- a/lib/gitlab/cluster/lifecycle_events.rb
+++ b/lib/gitlab/cluster/lifecycle_events.rb
@@ -40,7 +40,7 @@ module Gitlab
           (@before_fork_hooks ||= []) << block
         end
 
-        def on_master_restart(&block)
+        def on_before_master_restart(&block)
           return unless in_clustered_environment?
 
           # Defer block execution
@@ -70,12 +70,15 @@ module Gitlab
           end
         end
 
-        def do_master_restart
+        def do_before_master_restart
           @master_restart_hooks && @master_restart_hooks.each do |block|
             block.call
           end
         end
 
+        # DEPRECATED
+        alias_method :do_master_restart, :do_before_master_restart
+
         # Puma doesn't use singletons (which is good) but
         # this means we need to pass through whether the
         # puma server is running in single mode or cluster mode