Move job timeout information to new ci_builds_metadata table

3 files changed, 28 insertions, 10 deletions

diff --git a/db/migrate/20180221022556_add_used_timeout_and_timeout_source_columns_to_ci_builds.rb b/db/migrate/20180221022556_add_used_timeout_and_timeout_source_columns_to_ci_builds.rb
deleted file mode 100644
index 18c4fd5bae4..00000000000
--- a/db/migrate/20180221022556_add_used_timeout_and_timeout_source_columns_to_ci_builds.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class AddUsedTimeoutAndTimeoutSourceColumnsToCiBuilds < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  def change
-    add_column :ci_builds, :used_timeout, :integer
-    add_column :ci_builds, :timeout_source, :integer
-  end
-end
diff --git a/db/migrate/20180301010859_create_ci_builds_metadata_table.rb b/db/migrate/20180301010859_create_ci_builds_metadata_table.rb
new file mode 100644
index 00000000000..9d5e9c1779b
--- /dev/null
+++ b/db/migrate/20180301010859_create_ci_builds_metadata_table.rb
@@ -0,0 +1,13 @@
+class CreateCiBuildsMetadataTable < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :ci_builds_metadata do |t|
+      t.integer :build_id, null: false
+      t.integer :used_timeout
+      t.integer :timeout_source
+    end
+  end
+end
diff --git a/db/migrate/20180301011323_add_build_foreign_key_to_ci_builds_metadata.rb b/db/migrate/20180301011323_add_build_foreign_key_to_ci_builds_metadata.rb
new file mode 100644
index 00000000000..feda2d6e9c9
--- /dev/null
+++ b/db/migrate/20180301011323_add_build_foreign_key_to_ci_builds_metadata.rb
@@ -0,0 +1,15 @@
+class AddBuildForeignKeyToCiBuildsMetadata < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key(:ci_builds_metadata, :ci_builds, column: :build_id)
+  end
+
+  def down
+    remove_foreign_key(:ci_builds_metadata, column: :build_id)
+  end
+end