From fe0de99c4e893a30029dc03df582550cf32e8b19 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 28 Nov 2016 23:38:14 -0800
Subject: [PATCH] Gracefully recover from Redis connection failures in Sidekiq
 initializer

* Closes gitlab-org/gitlab-ce#25143
* Closes gitlab-org/omnibus-gitlab#1743
---
 changelogs/unreleased/rescue-from-redis-init-errors.yml | 4 ++++
 config/initializers/sidekiq.rb                          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/rescue-from-redis-init-errors.yml

diff --git a/changelogs/unreleased/rescue-from-redis-init-errors.yml b/changelogs/unreleased/rescue-from-redis-init-errors.yml
new file mode 100644
index 00000000000..c41f49597e7
--- /dev/null
+++ b/changelogs/unreleased/rescue-from-redis-init-errors.yml
@@ -0,0 +1,4 @@
+---
+title: Gracefully recover from Redis connection failures in Sidekiq initializer
+merge_request: 
+author: 
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index b87b31d9697..1d7a3f03ace 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -61,5 +61,5 @@ begin
       end
     end
   end
-rescue Redis::BaseError, SocketError
+rescue Redis::BaseError, SocketError, Errno::ENOENT, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED
 end