-
Notifications
You must be signed in to change notification settings - Fork 283
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #495: Hijack proxy /add correctly. Disable keep-alives. #505
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b2914c2
Fix #495: Hijack proxy /add correctly.
hsanjuan 00a757f
Proxy/add: flush AddedOutput
hsanjuan ff8476e
Fix: TestClustersPeerRejoin was failing a lot since DHT feature.
hsanjuan 0709652
Run sharness tests verbose
hsanjuan be651da
Fix: disable KeepAlives in server
hsanjuan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
// Package adderutils provides some utilities for adding content to cluster. | ||
package adderutils | ||
|
||
import ( | ||
"context" | ||
"encoding/json" | ||
"mime/multipart" | ||
"net/http" | ||
"sync" | ||
|
||
"github.com/ipfs/ipfs-cluster/adder" | ||
"github.com/ipfs/ipfs-cluster/adder/local" | ||
"github.com/ipfs/ipfs-cluster/adder/sharding" | ||
"github.com/ipfs/ipfs-cluster/api" | ||
|
||
rpc "github.com/hsanjuan/go-libp2p-gorpc" | ||
cid "github.com/ipfs/go-cid" | ||
logging "github.com/ipfs/go-log" | ||
) | ||
|
||
var logger = logging.Logger("adder") | ||
|
||
// AddMultipartHTTPHandler is a helper function to add content | ||
// uploaded using a multipart request. | ||
func AddMultipartHTTPHandler( | ||
ctx context.Context, | ||
rpc *rpc.Client, | ||
params *api.AddParams, | ||
reader *multipart.Reader, | ||
w http.ResponseWriter, | ||
) (*cid.Cid, error) { | ||
var dags adder.ClusterDAGService | ||
output := make(chan *api.AddedOutput, 200) | ||
flusher, flush := w.(http.Flusher) | ||
if params.Shard { | ||
dags = sharding.New(rpc, params.PinOptions, output) | ||
} else { | ||
dags = local.New(rpc, params.PinOptions) | ||
} | ||
|
||
enc := json.NewEncoder(w) | ||
// This must be application/json otherwise go-ipfs client | ||
// will break. | ||
w.Header().Add("Content-Type", "application/json") | ||
// Browsers should not cache when streaming content. | ||
w.Header().Add("Cache-Control", "no-cache") | ||
w.WriteHeader(http.StatusOK) | ||
|
||
var wg sync.WaitGroup | ||
wg.Add(1) | ||
go func() { | ||
defer wg.Done() | ||
for v := range output { | ||
err := enc.Encode(v) | ||
if err != nil { | ||
logger.Error(err) | ||
} | ||
if flush { | ||
flusher.Flush() | ||
} | ||
} | ||
}() | ||
|
||
add := adder.New(dags, params, output) | ||
root, err := add.FromMultipart(ctx, reader) | ||
wg.Wait() | ||
return root, err | ||
} |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I not sure this really requires being in its own utils package... Unless I am missing an import cycle, I believe this could simply be a function in the
adder
package.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, import cycle :(. adder[utils] ->
local
->adder