diff options
| author | Drew Blessing <drew@blessing.io> | 2016-01-29 20:03:15 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-01 03:26:59 +0300 |
| commit | 106722fa39b4e2e225fb8e9427af369a9cbe849c (patch) | |
| tree | cca9849e0f899b082ea861919623e08a50d5d738 | |
| parent | f2faa0078fcd1788943ca80bd2a1dca95461a0db (diff) | |
Merge branch 'increase_lfs_size_column' into 'master'
Increase LFS objects size column
Fixes #12745
Increases the `size` column integer limit to an 8-byte integer. This allows for a max value of `9223372036854775807` which is 9,223,372,036 GB. That should do it :smiley:
I tested this by first reproducing the error (push a file larger than 2.1 GB). The error was:
```
RangeError (3145728000 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4):
lib/gitlab/lfs/response.rb:232:in `store_file'
lib/gitlab/lfs/response.rb:170:in `render_lfs_upload_ok'
lib/gitlab/lfs/response.rb:51:in `block in render_storage_upload_store_response'
lib/gitlab/lfs/response.rb:204:in `render_response_to_push'
lib/gitlab/lfs/response.rb:50:in `render_storage_upload_store_response'
lib/gitlab/lfs/router.rb:76:in `put_response'
lib/gitlab/lfs/router.rb:20:in `try_call'
lib/gitlab/backend/grack_auth.rb:41:in `call'
lib/gitlab/backend/grack_auth.rb:18:in `call_with_kerberos_support'
lib/gitlab/backend/grack_auth.rb:8:in `call'
```
Then I ran this migration and pushed the file again. It uploaded successfully.
See merge request !2644
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | db/migrate/20160128233227_change_lfs_objects_size_column.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 602af29deb9..d5fe79b7e27 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.4.3 + - Increase lfs_objects size column to 8-byte integer to allow files larger + than 2.1GB - Correctly highlight MR diff when MR has merge conflicts - Fix highlighting in blame view - Update sentry-raven gem to prevent "Not a git repository" console output diff --git a/db/migrate/20160128233227_change_lfs_objects_size_column.rb b/db/migrate/20160128233227_change_lfs_objects_size_column.rb new file mode 100644 index 00000000000..e7fd1f71777 --- /dev/null +++ b/db/migrate/20160128233227_change_lfs_objects_size_column.rb @@ -0,0 +1,5 @@ +class ChangeLfsObjectsSizeColumn < ActiveRecord::Migration + def change + change_column :lfs_objects, :size, :integer, limit: 8 + end +end diff --git a/db/schema.rb b/db/schema.rb index 67bfc775a1e..258366fcd01 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160120172143) do +ActiveRecord::Schema.define(version: 20160128233227) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -447,8 +447,8 @@ ActiveRecord::Schema.define(version: 20160120172143) do add_index "labels", ["project_id"], name: "index_labels_on_project_id", using: :btree create_table "lfs_objects", force: :cascade do |t| - t.string "oid", null: false - t.integer "size", null: false + t.string "oid", null: false + t.integer "size", limit: 8, null: false t.datetime "created_at" t.datetime "updated_at" t.string "file" |