Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

Signal content length to upstream components when present #42

Merged
merged 2 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/actions/go-check-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ runs:
- name: Install filecoin-ffi dependencies
shell: bash
if: ${{ runner.os == 'Linux' }}
run: sudo apt-get install -y libhwloc-dev ocl-icd-opencl-dev
run: |
sudo apt-get update
sudo apt-get install -y libhwloc-dev ocl-icd-opencl-dev
- name: Install filecoin-ffi
shell: bash
run: |
Expand Down
4 changes: 3 additions & 1 deletion .github/actions/go-test-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ runs:
- name: Install filecoin-ffi dependencies
shell: bash
if: ${{ runner.os == 'Linux' }}
run: sudo apt-get install -y libhwloc-dev ocl-icd-opencl-dev
run: |
sudo apt-get update
sudo apt-get install -y libhwloc-dev ocl-icd-opencl-dev
- name: Install filecoin-ffi
shell: bash
if: ${{ runner.os == 'Linux' }}
Expand Down
10 changes: 8 additions & 2 deletions api/server/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func (m *HttpServer) handlePostBlob(w http.ResponseWriter, r *http.Request) {
respondWithJson(w, errResponseNotStreamContentType, http.StatusBadRequest)
return
}
body := r.Body
var contentLength uint64
if value := r.Header.Get("Content-Length"); value != "" {
var err error
Expand All @@ -38,9 +39,14 @@ func (m *HttpServer) handlePostBlob(w http.ResponseWriter, r *http.Request) {
respondWithJson(w, errResponseContentLengthTooLarge(m.maxBlobLength), http.StatusBadRequest)
return
}
// Wrap body reader to signal content length to upstream components.
body = sizerReadCloser{
ReadCloser: r.Body,
size: int64(contentLength),
}
}
defer r.Body.Close()
desc, err := m.store.Put(r.Context(), r.Body)
defer body.Close()
desc, err := m.store.Put(r.Context(), body)
switch err {
case nil:
case blob.ErrBlobTooLarge:
Expand Down
14 changes: 14 additions & 0 deletions api/server/sizer_reader.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package server

import "io"

var _ interface{ Size() int64 } = (*sizerReadCloser)(nil)

type sizerReadCloser struct {
io.ReadCloser
size int64
}

func (s sizerReadCloser) Size() int64 {
return s.size
}