diff --git a/cmd/swarm/upload-speed/main.go b/cmd/swarm/upload-speed/main.go
deleted file mode 100644
index 68212e118e..0000000000
--- a/cmd/swarm/upload-speed/main.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// 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 .
-
-package main
-
-import (
- "fmt"
- "os"
- "sort"
-
- "github.com/ethereum/go-ethereum/cmd/utils"
- gethmetrics "github.com/ethereum/go-ethereum/metrics"
- "github.com/ethereum/go-ethereum/metrics/influxdb"
- swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics"
- "github.com/ethereum/go-ethereum/swarm/tracing"
-
- "github.com/ethereum/go-ethereum/log"
-
- cli "gopkg.in/urfave/cli.v1"
-)
-
-var (
- gitCommit string // Git SHA1 commit hash of the release (set via linker flags)
-)
-
-var (
- endpoint string
- cluster string
- appName string
- scheme string
- filesize int
- verbosity int
- timeout int
-)
-
-func main() {
-
- app := cli.NewApp()
- app.Name = "upload-speed"
- app.Usage = ""
-
- app.Flags = []cli.Flag{
- cli.StringFlag{
- Name: "cluster-endpoint",
- Value: "prod",
- Usage: "cluster to point to (prod or a given namespace)",
- Destination: &cluster,
- },
- cli.StringFlag{
- Name: "app",
- Value: "swarm",
- Usage: "application to point to (swarm or swarm-private)",
- Destination: &appName,
- },
- cli.StringFlag{
- Name: "cluster-scheme",
- Value: "http",
- Usage: "http or https",
- Destination: &scheme,
- },
- cli.IntFlag{
- Name: "filesize",
- Value: 1024,
- Usage: "file size for generated random file in KB",
- Destination: &filesize,
- },
- cli.IntFlag{
- Name: "verbosity",
- Value: 1,
- Usage: "verbosity",
- Destination: &verbosity,
- },
- cli.IntFlag{
- Name: "timeout",
- Value: 120,
- Usage: "timeout in seconds after which kill the process",
- Destination: &timeout,
- },
- }
-
- app.Flags = append(app.Flags, []cli.Flag{
- utils.MetricsEnabledFlag,
- swarmmetrics.MetricsInfluxDBEndpointFlag,
- swarmmetrics.MetricsInfluxDBDatabaseFlag,
- swarmmetrics.MetricsInfluxDBUsernameFlag,
- swarmmetrics.MetricsInfluxDBPasswordFlag,
- swarmmetrics.MetricsInfluxDBHostTagFlag,
- }...)
-
- app.Flags = append(app.Flags, tracing.Flags...)
-
- app.Commands = []cli.Command{
- {
- Name: "upload_speed",
- //Aliases: []string{"c"},
- Usage: "upload speed",
- Action: cliUploadSpeed,
- },
- }
-
- sort.Sort(cli.FlagsByName(app.Flags))
- sort.Sort(cli.CommandsByName(app.Commands))
-
- app.Before = func(ctx *cli.Context) error {
- tracing.Setup(ctx)
- return nil
- }
-
- app.After = func(ctx *cli.Context) error {
- return emitMetrics(ctx)
- }
-
- err := app.Run(os.Args)
- if err != nil {
- log.Error(err.Error())
-
- os.Exit(1)
- }
-}
-
-func emitMetrics(ctx *cli.Context) error {
- if gethmetrics.Enabled {
- var (
- endpoint = ctx.GlobalString(swarmmetrics.MetricsInfluxDBEndpointFlag.Name)
- database = ctx.GlobalString(swarmmetrics.MetricsInfluxDBDatabaseFlag.Name)
- username = ctx.GlobalString(swarmmetrics.MetricsInfluxDBUsernameFlag.Name)
- password = ctx.GlobalString(swarmmetrics.MetricsInfluxDBPasswordFlag.Name)
- hosttag = ctx.GlobalString(swarmmetrics.MetricsInfluxDBHostTagFlag.Name)
- )
- return influxdb.InfluxDBWithTagsOnce(gethmetrics.DefaultRegistry, endpoint, database, username, password, "upload-speed", map[string]string{
- "host": hosttag,
- "version": gitCommit,
- "filesize": fmt.Sprintf("%v", filesize),
- })
- }
-
- return nil
-}
diff --git a/cmd/swarm/upload-speed/upload_speed.go b/cmd/swarm/upload-speed/upload_speed.go
deleted file mode 100644
index 121b3cb8ce..0000000000
--- a/cmd/swarm/upload-speed/upload_speed.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// 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 .
-
-package main
-
-import (
- "bytes"
- "context"
- "crypto/md5"
- crand "crypto/rand"
- "errors"
- "fmt"
- "io"
- "io/ioutil"
- "math/rand"
- "net/http"
- "net/http/httptrace"
- "os"
- "sync"
- "time"
-
- "github.com/ethereum/go-ethereum/log"
- "github.com/ethereum/go-ethereum/metrics"
- "github.com/ethereum/go-ethereum/swarm/api"
- "github.com/ethereum/go-ethereum/swarm/api/client"
- "github.com/ethereum/go-ethereum/swarm/spancontext"
- "github.com/ethereum/go-ethereum/swarm/testutil"
- opentracing "github.com/opentracing/opentracing-go"
- "github.com/pborman/uuid"
-
- cli "gopkg.in/urfave/cli.v1"
-)
-
-func generateEndpoint(scheme string, cluster string, app string, endpoint string) {
- if cluster == "prod" {
- endpoint = fmt.Sprintf("%s://%v.swarm-gateways.net", scheme)
- } else {
- endpoint = fmt.Sprintf("%s://%s-%v-%s.stg.swarm-gateways.net", scheme, app, 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())
-
- generateEndpoints(scheme, cluster, appName, endpoint)
- seed := int(time.Now().UnixNano() / 1e6)
- log.Info("uploading to "+endpoints[0]+" and syncing", "seed", seed)
-
- randomBytes := testutil.RandomBytes(seed, filesize*1000)
-
- t1 := time.Now()
- hash, err := upload(&randomBytes, endpoints[0])
- 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))
-
- time.Sleep(time.Duration(syncDelay) * time.Second)
-
- wg := sync.WaitGroup{}
- if single {
- rand.Seed(time.Now().UTC().UnixNano())
- randIndex := 1 + rand.Intn(len(endpoints)-1)
- ruid := uuid.New()[:8]
- wg.Add(1)
- go func(endpoint string, ruid string) {
- for {
- start := time.Now()
- err := fetch(hash, endpoint, fhash, ruid)
- fetchTime := time.Since(start)
- if err != nil {
- continue
- }
-
- metrics.GetOrRegisterMeter("upload-speed.single.fetch-time", nil).Mark(int64(fetchTime))
- wg.Done()
- return
- }
- }(endpoints[randIndex], ruid)
- } else {
- for _, endpoint := range endpoints {
- ruid := uuid.New()[:8]
- wg.Add(1)
- go func(endpoint string, ruid string) {
- for {
- start := time.Now()
- err := fetch(hash, endpoint, fhash, ruid)
- fetchTime := time.Since(start)
- if err != nil {
- continue
- }
-
- metrics.GetOrRegisterMeter("upload-speed.each.fetch-time", nil).Mark(int64(fetchTime))
- wg.Done()
- return
- }
- }(endpoint, ruid)
- }
- }
- wg.Wait()
- log.Info("all endpoints synced random file successfully")
-
- return nil
-}
-
-// fetch is getting the requested `hash` from the `endpoint` and compares it with the `original` file
-func fetch(hash string, endpoint string, original []byte, ruid string) error {
- ctx, sp := spancontext.StartSpan(context.Background(), "upload-speed.fetch")
- defer sp.Finish()
-
- log.Trace("sleeping", "ruid", ruid)
- time.Sleep(3 * time.Second)
- log.Trace("http get request", "ruid", ruid, "api", endpoint, "hash", hash)
-
- var tn time.Time
- reqUri := endpoint + "/bzz:/" + hash + "/"
- req, _ := http.NewRequest("GET", reqUri, nil)
-
- opentracing.GlobalTracer().Inject(
- sp.Context(),
- opentracing.HTTPHeaders,
- opentracing.HTTPHeadersCarrier(req.Header))
-
- trace := client.GetClientTrace("upload-speed - http get", "upload-speed", ruid, &tn)
-
- req = req.WithContext(httptrace.WithClientTrace(ctx, trace))
- transport := http.DefaultTransport
-
- //transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-
- tn = time.Now()
- res, err := transport.RoundTrip(req)
- if err != nil {
- log.Error(err.Error(), "ruid", ruid)
- return err
- }
- log.Trace("http get response", "ruid", ruid, "api", endpoint, "hash", hash, "code", res.StatusCode, "len", res.ContentLength)
-
- if res.StatusCode != 200 {
- err := fmt.Errorf("expected status code %d, got %v", 200, res.StatusCode)
- log.Warn(err.Error(), "ruid", ruid)
- return err
- }
-
- defer res.Body.Close()
-
- rdigest, err := digest(res.Body)
- if err != nil {
- log.Warn(err.Error(), "ruid", ruid)
- return err
- }
-
- if !bytes.Equal(rdigest, original) {
- err := fmt.Errorf("downloaded imported file md5=%x is not the same as the generated one=%x", rdigest, original)
- log.Warn(err.Error(), "ruid", ruid)
- return err
- }
-
- log.Trace("downloaded file matches random file", "ruid", ruid, "len", res.ContentLength)
-
- return nil
-}
-
-// upload is uploading a file `f` to `endpoint` via the `swarm up` cmd
-func upload(dataBytes *[]byte, endpoint string) (string, error) {
- swarm := client.NewClient(endpoint)
- f := &client.File{
- ReadCloser: ioutil.NopCloser(bytes.NewReader(*dataBytes)),
- ManifestEntry: api.ManifestEntry{
- ContentType: "text/plain",
- Mode: 0660,
- Size: int64(len(*dataBytes)),
- },
- }
-
- // upload data to bzz:// and retrieve the content-addressed manifest hash, hex-encoded.
- return swarm.Upload(f, "", false)
-}
-
-func digest(r io.Reader) ([]byte, error) {
- h := md5.New()
- _, err := io.Copy(h, r)
- if err != nil {
- return nil, err
- }
- return h.Sum(nil), nil
-}
-
-// generates random data in heap buffer
-func generateRandomData(datasize int) ([]byte, error) {
- b := make([]byte, datasize)
- c, err := crand.Read(b)
- if err != nil {
- return nil, err
- } else if c != datasize {
- return nil, errors.New("short read")
- }
- return b, nil
-}