-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* instead of uploading large files through fcrepo, upload them stright to s3. then create an external file in fcrepo, keeping the data consistant and making sure hyrax uses the right file all the time * additional fixes
- Loading branch information
1 parent
8c0e31f
commit 0c50471
Showing
6 changed files
with
63 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
module Hyrax | ||
module Actors | ||
# Actions for a file identified by file_set and relation (maps to use predicate) | ||
# @note Spawns asynchronous jobs | ||
module FileActorDecorator | ||
|
||
def perform_ingest_file_through_active_fedora(io) | ||
# Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer. | ||
# these are files too big to send to S3 w/o Streaming | ||
Rails.logger.error("[FileActor] starting write for #{file_set.id}") | ||
if io.size.to_i >= 3.gigabytes | ||
Rails.logger.error("[FileActor] Uploading directly to S3 for file_set #{file_set.id}") | ||
digest = `sha1sum #{io.path}`.split.first | ||
file_set.s3_only = digest | ||
s3_object = Aws::S3::Object.new(ENV['AWS_BUCKET'], digest) | ||
s3_object.upload_file(io.path) unless s3_object.exists? | ||
Hydra::Works::AddExternalFileToFileSet.call(file_set, s3_object.public_url, relation) | ||
# how do we make sure the sha gets indexed? | ||
else | ||
Rails.logger.error("[FileActor] writing to fcrepo #{file_set.id}") | ||
# Skip versioning because versions will be minted by VersionCommitter as necessary during save_characterize_and_record_committer. | ||
Hydra::Works::AddFileToFileSet.call(file_set, | ||
io, | ||
relation, | ||
versioning: false) | ||
end | ||
return false unless file_set.save | ||
repository_file = related_file | ||
create_version(repository_file, user) | ||
CharacterizeJob.perform_later(file_set, repository_file.id, pathhint(io)) | ||
end | ||
|
||
end | ||
end | ||
end | ||
|
||
Hyrax::Actors::FileActor.prepend(Hyrax::Actors::FileActorDecorator) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
lib/hydra/works/services/add_external_file_to_file_set_decorator.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# OVERRIDE Hydra-works 2.0.0 to deal with fcrepo + s3s inability to upload empty files | ||
|
||
module Hydra | ||
module Works | ||
module UpdaterDecorator | ||
def attach_attributes(external_file_url, filename = nil) | ||
current_file.content = StringIO.new('-') # anything but blank | ||
current_file.original_name = filename | ||
current_file.mime_type = "message/external-body; access-type=URL; URL=\"#{external_file_url}\"" | ||
end | ||
end | ||
end | ||
end | ||
|
||
Hydra::Works::AddExternalFileToFileSet::Updater.prepend(Hydra::Works::UpdaterDecorator) |