-
Notifications
You must be signed in to change notification settings - Fork 20.2k
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
Upload speed #18442
Merged
Merged
Upload speed #18442
Changes from all commits
Commits
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,96 @@ | ||
// Copyright 2018 The go-ethereum Authors | ||
// This file is part of go-ethereum. | ||
// | ||
// go-ethereum is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// go-ethereum is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU General Public License | ||
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
package main | ||
|
||
import ( | ||
"bytes" | ||
"fmt" | ||
"os" | ||
"time" | ||
|
||
"github.com/ethereum/go-ethereum/log" | ||
"github.com/ethereum/go-ethereum/metrics" | ||
"github.com/ethereum/go-ethereum/swarm/testutil" | ||
|
||
cli "gopkg.in/urfave/cli.v1" | ||
) | ||
|
||
var endpoint string | ||
|
||
//just use the first endpoint | ||
func generateEndpoint(scheme string, cluster string, app string, from int) { | ||
if cluster == "prod" { | ||
endpoint = fmt.Sprintf("%s://%v.swarm-gateways.net", scheme, from) | ||
} else { | ||
endpoint = fmt.Sprintf("%s://%s-%v-%s.stg.swarm-gateways.net", scheme, app, from, cluster) | ||
} | ||
} | ||
|
||
func cliUploadSpeed(c *cli.Context) error { | ||
log.PrintOrigins(true) | ||
log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(os.Stdout, log.TerminalFormat(true)))) | ||
|
||
metrics.GetOrRegisterCounter("upload-speed", nil).Inc(1) | ||
|
||
errc := make(chan error) | ||
go func() { | ||
errc <- uploadSpeed(c) | ||
}() | ||
|
||
select { | ||
case err := <-errc: | ||
if err != nil { | ||
metrics.GetOrRegisterCounter("upload-speed.fail", nil).Inc(1) | ||
} | ||
return err | ||
case <-time.After(time.Duration(timeout) * time.Second): | ||
metrics.GetOrRegisterCounter("upload-speed.timeout", nil).Inc(1) | ||
return fmt.Errorf("timeout after %v sec", timeout) | ||
} | ||
} | ||
|
||
func uploadSpeed(c *cli.Context) error { | ||
defer func(now time.Time) { | ||
totalTime := time.Since(now) | ||
|
||
log.Info("total time", "time", totalTime, "kb", filesize) | ||
metrics.GetOrRegisterCounter("upload-speed.total-time", nil).Inc(int64(totalTime)) | ||
}(time.Now()) | ||
|
||
generateEndpoint(scheme, cluster, appName, from) | ||
seed := int(time.Now().UnixNano() / 1e6) | ||
log.Info("uploading to "+endpoint, "seed", seed) | ||
|
||
randomBytes := testutil.RandomBytes(seed, filesize*1000) | ||
|
||
t1 := time.Now() | ||
hash, err := upload(&randomBytes, endpoint) | ||
if err != nil { | ||
log.Error(err.Error()) | ||
return err | ||
} | ||
metrics.GetOrRegisterCounter("upload-speed.upload-time", nil).Inc(int64(time.Since(t1))) | ||
|
||
fhash, err := digest(bytes.NewReader(randomBytes)) | ||
if err != nil { | ||
log.Error(err.Error()) | ||
return err | ||
} | ||
|
||
log.Info("uploaded successfully", "hash", hash, "digest", fmt.Sprintf("%x", fhash)) | ||
return nil | ||
} |
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.
This is used at two places already. We should probably extract now or soon.
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.
Not sure what you mean here. Do you refer to the
endpoint
var or to thegenerateEndpoint()
func?If the former, I used it because there is
endpoints
used elsewhere and we only need the first for this test. There is avar endpoint
which is local toemitMetrics
, and I would say it's better to change it there.If it's the latter, then there is a
generateEndpoints()
(plural) which we use for the smoke tests, this one only needs one endpoint so it's singular.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.
Let's address this in a follow-up PR.