Commit 106722fa authored by Drew Blessing's avatar Drew Blessing Committed by Robert Speicher

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 😃

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
parent f2faa007
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.4.3 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 - Correctly highlight MR diff when MR has merge conflicts
- Fix highlighting in blame view - Fix highlighting in blame view
- Update sentry-raven gem to prevent "Not a git repository" console output - Update sentry-raven gem to prevent "Not a git repository" console output
......
class ChangeLfsObjectsSizeColumn < ActiveRecord::Migration
def change
change_column :lfs_objects, :size, :integer, limit: 8
end
end
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # 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 # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
...@@ -448,7 +448,7 @@ ActiveRecord::Schema.define(version: 20160120172143) do ...@@ -448,7 +448,7 @@ ActiveRecord::Schema.define(version: 20160120172143) do
create_table "lfs_objects", force: :cascade do |t| create_table "lfs_objects", force: :cascade do |t|
t.string "oid", null: false t.string "oid", null: false
t.integer "size", null: false t.integer "size", limit: 8, null: false
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "file" t.string "file"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment