From c13c7e6709bf4748bbe411e9fd35a2436dcde421 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 11 Sep 2019 23:16:40 -0700
Subject: [PATCH] Fix member expiration not always working

The Sidekiq job `RemoveExpiredMembersWorker` was failing to run in
production because it was hitting statement timeouts because it was
scanning all rows in order. On staging, where it used to scan 4 million
rows, adding an index brought this down to only a few hundred rows.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67286
---
 .../unreleased/sh-add-index-members-expires.yml |  5 +++++
 ...061145_add_index_to_members_on_expires_at.rb | 17 +++++++++++++++++
 db/schema.rb                                    |  3 ++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/sh-add-index-members-expires.yml
 create mode 100644 db/migrate/20190912061145_add_index_to_members_on_expires_at.rb

diff --git a/changelogs/unreleased/sh-add-index-members-expires.yml b/changelogs/unreleased/sh-add-index-members-expires.yml
new file mode 100644
index 00000000000..9b18dfa2420
--- /dev/null
+++ b/changelogs/unreleased/sh-add-index-members-expires.yml
@@ -0,0 +1,5 @@
+---
+title: Fix member expiration not always working
+merge_request: 32951
+author:
+type: performance
diff --git a/db/migrate/20190912061145_add_index_to_members_on_expires_at.rb b/db/migrate/20190912061145_add_index_to_members_on_expires_at.rb
new file mode 100644
index 00000000000..e961977747b
--- /dev/null
+++ b/db/migrate/20190912061145_add_index_to_members_on_expires_at.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddIndexToMembersOnExpiresAt < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :members, :expires_at
+  end
+
+  def down
+    remove_concurrent_index :members, :expires_at
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3906976d296..39faf1e651e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_09_10_000130) do
+ActiveRecord::Schema.define(version: 2019_09_12_061145) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -1997,6 +1997,7 @@ ActiveRecord::Schema.define(version: 2019_09_10_000130) do
     t.boolean "ldap", default: false, null: false
     t.boolean "override", default: false, null: false
     t.index ["access_level"], name: "index_members_on_access_level"
+    t.index ["expires_at"], name: "index_members_on_expires_at"
     t.index ["invite_email"], name: "index_members_on_invite_email"
     t.index ["invite_token"], name: "index_members_on_invite_token", unique: true
     t.index ["requested_at"], name: "index_members_on_requested_at"