Remove timeouts from disk adapters #7022
Open
Conversation
This file contains hidden or 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
tpendragon
requested changes
Jan 22, 2026
Contributor
tpendragon
left a comment
tpendragon
left a comment
There was a problem hiding this comment.
I think I was wrong that we should do this, #6950 wasn't about downtime
Contributor
|
@hackartisan To expand - I think this test needs to stick around and we have to handle it, but not with Timeout: So I think we can, in fact, remove Timeout. |
tpendragon
requested changes
Jan 29, 2026
Comment on lines
-41
to
-65
| context "when reading from the primary adapter fails" do | ||
| it "falls back to the fallback adapter" do | ||
| allow(Rails.logger).to receive(:warn) | ||
| resource = ScannedResource.new(id: SecureRandom.uuid) | ||
| # Put the file in both places. | ||
| uploaded_file = primary_adapter.upload(file: file, original_filename: "foo.jpg", resource: resource) | ||
| new_path = Pathname.new(uploaded_file.disk_path.to_s.gsub(Figgy.config["repository_path"], Figgy.config["fallback_repository_path"])) | ||
| FileUtils.mkdir_p(new_path.parent) | ||
| FileUtils.cp(uploaded_file.disk_path, new_path) | ||
|
|
||
| file_double = instance_double(File) | ||
| allow(file_double).to receive(:read) do | ||
| # This is what happens when Tigerdata has a database entry, but can't | ||
| # connect to the Isilon. It can get File.size and File.stat, but | ||
| # reading any bytes errors. | ||
| raise Errno::EIO | ||
| end | ||
| allow(File).to receive(:open).and_call_original | ||
| allow(File).to receive(:open).with(uploaded_file.disk_path, "rb").and_yield(file_double) | ||
|
|
||
| reloaded_uploaded_file = storage_adapter.find_by(id: uploaded_file.id) | ||
| expect(reloaded_uploaded_file.id).to eq uploaded_file.id | ||
| expect(Rails.logger).to have_received(:warn).with(/Disk adapter used fallback for /) | ||
| end | ||
| end |
Contributor
There was a problem hiding this comment.
We need to keep this test.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Takes code functionality back to before #6952 and #6942
closes #7014