From 2555743a6229c99d0870e16f36e3c347e04a2d56 Mon Sep 17 00:00:00 2001 From: Elad Nachmias Date: Thu, 24 Jan 2019 23:14:18 +0700 Subject: [PATCH] cmd/swarm: fix filesize of uploaded file --- cmd/swarm/swarm-smoke/sliding_window.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/swarm/swarm-smoke/sliding_window.go b/cmd/swarm/swarm-smoke/sliding_window.go index 5d505dea96..41eedad003 100644 --- a/cmd/swarm/swarm-smoke/sliding_window.go +++ b/cmd/swarm/swarm-smoke/sliding_window.go @@ -54,7 +54,7 @@ func slidingWindow(c *cli.Context) error { nodes := to - from networkCapacity := float64(storeSize) * float64(nodes) const iterationTimeout = 30 * time.Second - log.Info("sliding window test started", "store size(kb)", int(storeSize/1000), "nodes", nodes, "filesize(kb)", int(filesize/1000), "network capacity(kb)", int(networkCapacity/1000), "timeout", timeout) + log.Info("sliding window test started", "store size(kb)", int(storeSize/1000), "nodes", nodes, "filesize(kb)", filesize, "network capacity(kb)", int(networkCapacity/1000), "timeout", timeout) uploadedBytes := 0 networkDepth := 0 errored := false @@ -64,7 +64,7 @@ outer: seed := int(time.Now().UnixNano() / 1e6) log.Info("uploading to "+endpoints[0]+" and syncing", "seed", seed) - randomBytes := testutil.RandomBytes(seed, filesize) + randomBytes := testutil.RandomBytes(seed, filesize*1000) t1 := time.Now() hash, err := upload(&randomBytes, endpoints[0]) @@ -83,7 +83,7 @@ outer: log.Info("uploaded successfully", "hash", hash, "digest", fmt.Sprintf("%x", fhash), "sleeping", syncDelay) hashes = append(hashes, uploadResult{hash: hash, digest: fhash}) time.Sleep(time.Duration(syncDelay) * time.Second) - uploadedBytes += filesize + uploadedBytes += filesize * 1000 for i, v := range hashes { rand.Seed(time.Now().UTC().UnixNano()) @@ -104,8 +104,8 @@ outer: } } - log.Info("sliding window test finished", "errored?", errored, "networkDepth", networkDepth, "networkDepth(kb)", int(networkDepth*filesize/1000)) - log.Info("stats", "uploadedFiles", len(hashes), "uploadedKb", uploadedBytes/1000, "filesizeKb", filesize/1000, "networkCapacityKb", int(networkCapacity/1000), "networkCapacityMb", int(networkCapacity/1000000)) + log.Info("sliding window test finished", "errored?", errored, "networkDepth", networkDepth, "networkDepth(kb)", int(networkDepth*filesize)) + log.Info("stats", "uploadedFiles", len(hashes), "uploadedKb", uploadedBytes/1000, "filesizeKb", filesize, "networkCapacityKb", int(networkCapacity/1000), "networkCapacityMb", int(networkCapacity/1000000)) metrics.GetOrRegisterMeter("sliding-window.network-depth", nil).Mark(int64(networkDepth)) return nil