From d7631fb997028efea91c7733cbe5ae608d8b8a76 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 14:09:58 +0200 Subject: [PATCH 01/12] basic timers and counters --- lotus-soup/baseline.go | 10 ++++++++++ lotus-soup/common_roles.go | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/lotus-soup/baseline.go b/lotus-soup/baseline.go index df0e195b2..6349c79e5 100644 --- a/lotus-soup/baseline.go +++ b/lotus-soup/baseline.go @@ -98,6 +98,7 @@ func runBaselineClient(t *TestEnvironment) error { t.RecordMessage("file cid: %s", fcid) // start deal + t1 := time.Now() deal := startDeal(ctx, minerAddr.ActorAddr, client, fcid) t.RecordMessage("started deal: %s", deal) @@ -106,11 +107,13 @@ func runBaselineClient(t *TestEnvironment) error { t.RecordMessage("waiting for deal to be sealed") waitDealSealed(t, ctx, client, deal) + t.D().ResettingHistogram("deal.sealed").Update(int64(time.Since(t1))) carExport := true t.RecordMessage("trying to retrieve %s", fcid) retrieveData(t, ctx, err, client, fcid, carExport, data) + t.D().ResettingHistogram("deal.retrieved").Update(int64(time.Since(t1))) t.SyncClient.MustSignalEntry(ctx, stateStopMining) @@ -164,10 +167,15 @@ loop: } func retrieveData(t *TestEnvironment, ctx context.Context, err error, client api.FullNode, fcid cid.Cid, carExport bool, data []byte) { + t1 := time.Now() offers, err := client.ClientFindData(ctx, fcid) if err != nil { panic(err) } + for _, o := range offers { + t.D().Counter(fmt.Sprintf("find-data.offer.%s", o.Miner)).Inc(1) + } + t.D().ResettingHistogram("find-data").Update(int64(time.Since(t1))) if len(offers) < 1 { panic("no offers") @@ -188,10 +196,12 @@ func retrieveData(t *TestEnvironment, ctx context.Context, err error, client api Path: filepath.Join(rpath, "ret"), IsCAR: carExport, } + t1 = time.Now() err = client.ClientRetrieve(ctx, offers[0].Order(caddr), ref) if err != nil { panic(err) } + t.D().ResettingHistogram("retrieve-data").Update(int64(time.Since(t1))) rdata, err := ioutil.ReadFile(filepath.Join(rpath, "ret")) if err != nil { diff --git a/lotus-soup/common_roles.go b/lotus-soup/common_roles.go index ee1a4d4df..df47f3aee 100644 --- a/lotus-soup/common_roles.go +++ b/lotus-soup/common_roles.go @@ -6,6 +6,7 @@ import ( "math/rand" "time" + "github.com/filecoin-project/lotus/build" "github.com/testground/sdk-go/sync" ) @@ -28,6 +29,9 @@ func runMiner(t *TestEnvironment) error { return err } + t.RecordMessage("block delay: %v", build.BlockDelay) + t.D().Gauge("miner.block-delay").Update(build.BlockDelay) + ctx := context.Background() clients := t.IntParam("clients") @@ -50,6 +54,8 @@ func runMiner(t *TestEnvironment) error { time.Sleep(time.Duration(100 + rand.Intn(int(100*time.Millisecond)))) err := miner.MineOne(ctx, func(bool) { + + t.D().Counter("miner.mine").Inc(1) // after a block is mined }) if err != nil { From 3ff084b72097b253d2bdfafc3997d3f5f350db59 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 14:10:37 +0200 Subject: [PATCH 02/12] baseline test dashboard --- .../project-oni-baseline-dashboard.json | 944 ++++++++++++++++++ 1 file changed, 944 insertions(+) create mode 100644 dashboards/project-oni-baseline-dashboard.json diff --git a/dashboards/project-oni-baseline-dashboard.json b/dashboards/project-oni-baseline-dashboard.json new file mode 100644 index 000000000..8d3c9e8dc --- /dev/null +++ b/dashboards/project-oni-baseline-dashboard.json @@ -0,0 +1,944 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "editable": true, + "gnetId": null, + "graphTooltip": 0, + "id": 1, + "iteration": 1593173338180, + "links": [], + "panels": [ + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 10, + "panels": [], + "title": "Params", + "type": "row" + }, + { + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 1 + }, + "id": 11, + "options": { + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "fields": "", + "values": false + } + }, + "pluginVersion": "7.0.3", + "targets": [ + { + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.miner.block-delay.gauge", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "distinct" + } + ] + ], + "tags": [] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "block delay", + "type": "stat" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 1 + }, + "hiddenSeries": false, + "id": 13, + "legend": { + "alignAsTable": true, + "avg": false, + "current": false, + "max": true, + "min": false, + "show": true, + "total": true, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "none" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.miner.mine.counter", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "count" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "mined blocks", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "collapsed": true, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 9 + }, + "id": 8, + "panels": [], + "title": "Data", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 10 + }, + "hiddenSeries": false, + "id": 2, + "legend": { + "alignAsTable": true, + "avg": false, + "current": false, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.find-data.histogram", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "p95" + ], + "type": "field" + }, + { + "params": [], + "type": "max" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "find data", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "ns", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 10 + }, + "hiddenSeries": false, + "id": 14, + "legend": { + "alignAsTable": true, + "avg": false, + "current": false, + "max": true, + "min": false, + "rightSide": true, + "show": true, + "total": true, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.find-data.offer.t0100.counter", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "count" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + } + ] + ], + "tags": [] + }, + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.find-data.offer.t0102.counter", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "count" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + } + ] + ], + "tags": [] + }, + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.find-data.offer.t0103.counter", + "orderByTime": "ASC", + "policy": "default", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "count" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + } + ] + ], + "tags": [] + }, + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.find-data.offer.t0104.counter", + "orderByTime": "ASC", + "policy": "default", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "count" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "data offers", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "collapsed": false, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 19 + }, + "id": 6, + "panels": [], + "title": "Deals", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 20 + }, + "hiddenSeries": false, + "id": 3, + "legend": { + "alignAsTable": true, + "avg": false, + "current": false, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.deal.sealed.histogram", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "p95" + ], + "type": "field" + }, + { + "params": [], + "type": "max" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "started -> sealed", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "ns", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 20 + }, + "hiddenSeries": false, + "id": 4, + "legend": { + "alignAsTable": true, + "avg": false, + "current": false, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.deal.retrieved.histogram", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "p95" + ], + "type": "field" + }, + { + "params": [], + "type": "max" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "started -> retrieved", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "ns", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "refresh": "5s", + "schemaVersion": 25, + "style": "dark", + "tags": [], + "templating": { + "list": [ + { + "auto": false, + "auto_count": 30, + "auto_min": "10s", + "current": { + "selected": false, + "text": "10s", + "value": "10s" + }, + "hide": 0, + "label": null, + "name": "myinterval", + "options": [ + { + "selected": true, + "text": "10s", + "value": "10s" + }, + { + "selected": false, + "text": "100s", + "value": "100s" + } + ], + "query": "10s,100s", + "queryValue": "", + "refresh": 2, + "skipUrlSync": false, + "type": "interval" + } + ] + }, + "time": { + "from": "now-30m", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, + "timezone": "", + "title": "Project Oni - Baseline test", + "uid": "8em8RXWMz", + "version": 1 +} From 943d9a27ecc6a2bba410d5a2e9a81932acda3b78 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 14:50:17 +0200 Subject: [PATCH 03/12] update dashboard data source --- dashboards/project-oni-baseline-dashboard.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dashboards/project-oni-baseline-dashboard.json b/dashboards/project-oni-baseline-dashboard.json index 8d3c9e8dc..67fde000a 100644 --- a/dashboards/project-oni-baseline-dashboard.json +++ b/dashboards/project-oni-baseline-dashboard.json @@ -16,7 +16,7 @@ "gnetId": null, "graphTooltip": 0, "id": 1, - "iteration": 1593173338180, + "iteration": 1593175740897, "links": [], "panels": [ { @@ -34,7 +34,7 @@ "type": "row" }, { - "datasource": null, + "datasource": "influxdb", "fieldConfig": { "defaults": { "custom": {}, @@ -124,7 +124,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": "influxdb", "fieldConfig": { "defaults": { "custom": {} @@ -263,7 +263,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": "influxdb", "fieldConfig": { "defaults": { "custom": {} @@ -388,7 +388,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": "influxdb", "fieldConfig": { "defaults": { "custom": {} @@ -636,7 +636,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": "influxdb", "fieldConfig": { "defaults": { "custom": {} @@ -761,7 +761,7 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": null, + "datasource": "influxdb", "fieldConfig": { "defaults": { "custom": {} @@ -940,5 +940,5 @@ "timezone": "", "title": "Project Oni - Baseline test", "uid": "8em8RXWMz", - "version": 1 + "version": 2 } From f91364fb3e319c05c1a2bda1f05fbb1f07709c7d Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 15:24:01 +0200 Subject: [PATCH 04/12] extract common vars --- lotus-soup/baseline.go | 2 + .../compositions/composition-k8s-3-1.toml | 59 +++++++++++++++++++ .../compositions/composition-k8s-3-2.toml | 59 +++++++++++++++++++ lotus-soup/compositions/composition-k8s.toml | 19 +++--- lotus-soup/manifest.toml | 2 + lotus-soup/node.go | 4 +- 6 files changed, 131 insertions(+), 14 deletions(-) create mode 100644 lotus-soup/compositions/composition-k8s-3-1.toml create mode 100644 lotus-soup/compositions/composition-k8s-3-2.toml diff --git a/lotus-soup/baseline.go b/lotus-soup/baseline.go index 6349c79e5..3893a7f88 100644 --- a/lotus-soup/baseline.go +++ b/lotus-soup/baseline.go @@ -117,6 +117,8 @@ func runBaselineClient(t *TestEnvironment) error { t.SyncClient.MustSignalEntry(ctx, stateStopMining) + time.Sleep(10 * time.Second) // wait for metrics to be emitted + // TODO broadcast published content CIDs to other clients // TODO select a random piece of content published by some other client and retrieve it diff --git a/lotus-soup/compositions/composition-k8s-3-1.toml b/lotus-soup/compositions/composition-k8s-3-1.toml new file mode 100644 index 000000000..a4fb82ce2 --- /dev/null +++ b/lotus-soup/compositions/composition-k8s-3-1.toml @@ -0,0 +1,59 @@ +[metadata] + name = "lotus-soup" + author = "" + +[global] + plan = "lotus-soup" + case = "lotus-baseline" + total_instances = 5 + builder = "docker:go" + runner = "cluster:k8s" + +[global.build_config] + push_registry=true + go_proxy_mode="remote" + go_proxy_url="http://localhost:8081" + registry_type="aws" + +[global.run.test_params] + clients = "3" + miners = "1" + genesis_timestamp_offset = "100000" + balance = "2000" + sectors = "10" + +[[groups]] + id = "bootstrapper" + [groups.resources] + memory = "512Mi" + cpu = "1000m" + [groups.instances] + count = 1 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "bootstrapper" + +[[groups]] + id = "miners" + [groups.resources] + memory = "4096Mi" + cpu = "1000m" + [groups.instances] + count = 1 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "miner" + +[[groups]] + id = "clients" + [groups.resources] + memory = "1024Mi" + cpu = "1000m" + [groups.instances] + count = 3 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "client" diff --git a/lotus-soup/compositions/composition-k8s-3-2.toml b/lotus-soup/compositions/composition-k8s-3-2.toml new file mode 100644 index 000000000..b0c7f3c74 --- /dev/null +++ b/lotus-soup/compositions/composition-k8s-3-2.toml @@ -0,0 +1,59 @@ +[metadata] + name = "lotus-soup" + author = "" + +[global] + plan = "lotus-soup" + case = "lotus-baseline" + total_instances = 6 + builder = "docker:go" + runner = "cluster:k8s" + +[global.build_config] + push_registry=true + go_proxy_mode="remote" + go_proxy_url="http://localhost:8081" + registry_type="aws" + +[global.run.test_params] + clients = "3" + miners = "2" + genesis_timestamp_offset = "100000" + balance = "2000" + sectors = "10" + +[[groups]] + id = "bootstrapper" + [groups.resources] + memory = "512Mi" + cpu = "1000m" + [groups.instances] + count = 1 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "bootstrapper" + +[[groups]] + id = "miners" + [groups.resources] + memory = "4096Mi" + cpu = "1000m" + [groups.instances] + count = 2 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "miner" + +[[groups]] + id = "clients" + [groups.resources] + memory = "1024Mi" + cpu = "1000m" + [groups.instances] + count = 3 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "client" diff --git a/lotus-soup/compositions/composition-k8s.toml b/lotus-soup/compositions/composition-k8s.toml index a9ff7d0f5..b4e2d563e 100644 --- a/lotus-soup/compositions/composition-k8s.toml +++ b/lotus-soup/compositions/composition-k8s.toml @@ -15,6 +15,13 @@ go_proxy_url="http://localhost:8081" registry_type="aws" +[global.run.test_params] + clients = "1" + miners = "1" + genesis_timestamp_offset = "100000" + balance = "2000" + sectors = "10" + [[groups]] id = "bootstrapper" [groups.resources] @@ -26,10 +33,6 @@ [groups.run] [groups.run.test_params] role = "bootstrapper" - clients = "1" - miners = "1" - balance = "2000" - sectors = "10" [[groups]] id = "miners" @@ -42,10 +45,6 @@ [groups.run] [groups.run.test_params] role = "miner" - clients = "1" - miners = "1" - balance = "2000" - sectors = "10" [[groups]] id = "clients" @@ -58,7 +57,3 @@ [groups.run] [groups.run.test_params] role = "client" - clients = "1" - miners = "1" - balance = "2000" - sectors = "10" diff --git a/lotus-soup/manifest.toml b/lotus-soup/manifest.toml index f33fdd645..2ee118523 100644 --- a/lotus-soup/manifest.toml +++ b/lotus-soup/manifest.toml @@ -27,6 +27,8 @@ instances = { min = 1, max = 100, default = 5 } sectors = { type = "int", default = 1 } role = { type = "string" } + genesis_timestamp_offset = { type = "int", default = 0 } + random_beacon_type = { type = "enum", default = "mock", options = ["mock", "local-drand", "external-drand"] } # Params relevant to drand nodes. drand nodes should have role="drand", and must all be diff --git a/lotus-soup/node.go b/lotus-soup/node.go index 6bdd30ebc..0375d545b 100644 --- a/lotus-soup/node.go +++ b/lotus-soup/node.go @@ -51,7 +51,7 @@ import ( ) func init() { - logging.SetLogLevel("*", "WARN") + logging.SetLogLevel("*", "ERROR") os.Setenv("BELLMAN_NO_GPU", "1") @@ -176,7 +176,7 @@ func prepareBootstrapper(t *TestEnvironment) (*Node, error) { genesisTemplate := genesis.Template{ Accounts: genesisActors, Miners: genesisMiners, - Timestamp: uint64(time.Now().Unix() - 100000), // this needs to be in the past + Timestamp: uint64(time.Now().Unix()) - uint64(t.IntParam("genesis_timestamp_offset")), // this needs to be in the past } // dump the genesis block From 5fa2c1c4105678ceb2568e64ef57dfd13ceb1b39 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 18:18:44 +0200 Subject: [PATCH 05/12] more compositions --- .../compositions/composition-k8s-10-3.toml | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 lotus-soup/compositions/composition-k8s-10-3.toml diff --git a/lotus-soup/compositions/composition-k8s-10-3.toml b/lotus-soup/compositions/composition-k8s-10-3.toml new file mode 100644 index 000000000..7110e8114 --- /dev/null +++ b/lotus-soup/compositions/composition-k8s-10-3.toml @@ -0,0 +1,59 @@ +[metadata] + name = "lotus-soup" + author = "" + +[global] + plan = "lotus-soup" + case = "lotus-baseline" + total_instances = 14 + builder = "docker:go" + runner = "cluster:k8s" + +[global.build_config] + push_registry=true + go_proxy_mode="remote" + go_proxy_url="http://localhost:8081" + registry_type="aws" + +[global.run.test_params] + clients = "10" + miners = "3" + genesis_timestamp_offset = "100000" + balance = "2000" + sectors = "10" + +[[groups]] + id = "bootstrapper" + [groups.resources] + memory = "512Mi" + cpu = "1000m" + [groups.instances] + count = 1 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "bootstrapper" + +[[groups]] + id = "miners" + [groups.resources] + memory = "8192Mi" + cpu = "1000m" + [groups.instances] + count = 3 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "miner" + +[[groups]] + id = "clients" + [groups.resources] + memory = "1024Mi" + cpu = "1000m" + [groups.instances] + count = 10 + percentage = 0.0 + [groups.run] + [groups.run.test_params] + role = "client" From e388d9607372fdcba42b5717a8a65584ee374947 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 18:19:40 +0200 Subject: [PATCH 06/12] metric for offer --- lotus-soup/baseline.go | 1 + 1 file changed, 1 insertion(+) diff --git a/lotus-soup/baseline.go b/lotus-soup/baseline.go index 3893a7f88..18cb3770e 100644 --- a/lotus-soup/baseline.go +++ b/lotus-soup/baseline.go @@ -176,6 +176,7 @@ func retrieveData(t *TestEnvironment, ctx context.Context, err error, client api } for _, o := range offers { t.D().Counter(fmt.Sprintf("find-data.offer.%s", o.Miner)).Inc(1) + t.D().Counter("find-data.offer").Inc(1) } t.D().ResettingHistogram("find-data").Update(int64(time.Since(t1))) From 018406b50c8141803fc5b1b2e5563829222697b1 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 18:27:23 +0200 Subject: [PATCH 07/12] better dashboard --- .../project-oni-baseline-dashboard.json | 80 +++++++++++++++++-- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/dashboards/project-oni-baseline-dashboard.json b/dashboards/project-oni-baseline-dashboard.json index 67fde000a..30652dedd 100644 --- a/dashboards/project-oni-baseline-dashboard.json +++ b/dashboards/project-oni-baseline-dashboard.json @@ -15,8 +15,8 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "id": 1, - "iteration": 1593175740897, + "id": 16, + "iteration": 1593188697650, "links": [], "panels": [ { @@ -176,7 +176,13 @@ }, { "params": [ - "none" + "run" + ], + "type": "tag" + }, + { + "params": [ + "0" ], "type": "fill" } @@ -313,6 +319,12 @@ ], "type": "time" }, + { + "params": [ + "run" + ], + "type": "tag" + }, { "params": [ "0" @@ -446,7 +458,7 @@ "type": "fill" } ], - "measurement": "diagnostics.find-data.offer.t0100.counter", + "measurement": "diagnostics.find-data.offer.t0101.counter", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -574,6 +586,48 @@ ] ], "tags": [] + }, + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "run" + ], + "type": "tag" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.find-data.offer.counter", + "orderByTime": "ASC", + "policy": "default", + "refId": "E", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "count" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + } + ] + ], + "tags": [] } ], "thresholds": [], @@ -686,6 +740,12 @@ ], "type": "time" }, + { + "params": [ + "run" + ], + "type": "tag" + }, { "params": [ "0" @@ -811,6 +871,12 @@ ], "type": "time" }, + { + "params": [ + "run" + ], + "type": "tag" + }, { "params": [ "0" @@ -882,7 +948,7 @@ } } ], - "refresh": "5s", + "refresh": "10s", "schemaVersion": 25, "style": "dark", "tags": [], @@ -921,7 +987,7 @@ ] }, "time": { - "from": "now-30m", + "from": "now-10m", "to": "now" }, "timepicker": { @@ -940,5 +1006,5 @@ "timezone": "", "title": "Project Oni - Baseline test", "uid": "8em8RXWMz", - "version": 2 + "version": 3 } From 0487d60d0e6381db017c1f06b8689fbb6a9a734c Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 18:56:09 +0200 Subject: [PATCH 08/12] better metrics --- .../project-oni-baseline-dashboard.json | 136 ++++-------------- lotus-soup/baseline.go | 4 +- lotus-soup/go.mod | 2 +- lotus-soup/go.sum | 2 + 4 files changed, 29 insertions(+), 115 deletions(-) diff --git a/dashboards/project-oni-baseline-dashboard.json b/dashboards/project-oni-baseline-dashboard.json index 30652dedd..03140e9fa 100644 --- a/dashboards/project-oni-baseline-dashboard.json +++ b/dashboards/project-oni-baseline-dashboard.json @@ -16,7 +16,7 @@ "gnetId": null, "graphTooltip": 0, "id": 16, - "iteration": 1593188697650, + "iteration": 1593188264284, "links": [], "panels": [ { @@ -145,7 +145,7 @@ "alignAsTable": true, "avg": false, "current": false, - "max": true, + "max": false, "min": false, "show": true, "total": true, @@ -421,7 +421,7 @@ "alignAsTable": true, "avg": false, "current": false, - "max": true, + "max": false, "min": false, "rightSide": true, "show": true, @@ -444,6 +444,7 @@ "steppedLine": false, "targets": [ { + "alias": "send-data-to - $tag_miner ($tag_run)", "groupBy": [ { "params": [ @@ -451,6 +452,18 @@ ], "type": "time" }, + { + "params": [ + "miner" + ], + "type": "tag" + }, + { + "params": [ + "run" + ], + "type": "tag" + }, { "params": [ "0" @@ -458,7 +471,7 @@ "type": "fill" } ], - "measurement": "diagnostics.find-data.offer.t0101.counter", + "measurement": "diagnostics.send-data-to.counter", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -480,6 +493,7 @@ "tags": [] }, { + "alias": "find-data.offer - $tag_miner ($tag_run)", "groupBy": [ { "params": [ @@ -489,111 +503,9 @@ }, { "params": [ - "0" + "miner" ], - "type": "fill" - } - ], - "measurement": "diagnostics.find-data.offer.t0102.counter", - "orderByTime": "ASC", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "count" - ], - "type": "field" - }, - { - "params": [], - "type": "sum" - } - ] - ], - "tags": [] - }, - { - "groupBy": [ - { - "params": [ - "$myinterval" - ], - "type": "time" - }, - { - "params": [ - "0" - ], - "type": "fill" - } - ], - "measurement": "diagnostics.find-data.offer.t0103.counter", - "orderByTime": "ASC", - "policy": "default", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "count" - ], - "type": "field" - }, - { - "params": [], - "type": "sum" - } - ] - ], - "tags": [] - }, - { - "groupBy": [ - { - "params": [ - "$myinterval" - ], - "type": "time" - }, - { - "params": [ - "0" - ], - "type": "fill" - } - ], - "measurement": "diagnostics.find-data.offer.t0104.counter", - "orderByTime": "ASC", - "policy": "default", - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "count" - ], - "type": "field" - }, - { - "params": [], - "type": "sum" - } - ] - ], - "tags": [] - }, - { - "groupBy": [ - { - "params": [ - "$myinterval" - ], - "type": "time" + "type": "tag" }, { "params": [ @@ -611,7 +523,7 @@ "measurement": "diagnostics.find-data.offer.counter", "orderByTime": "ASC", "policy": "default", - "refId": "E", + "refId": "D", "resultFormat": "time_series", "select": [ [ @@ -634,7 +546,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "data offers", + "title": "send data to ; got retrieve offers from", "tooltip": { "shared": true, "sort": 0, @@ -987,7 +899,7 @@ ] }, "time": { - "from": "now-10m", + "from": "now-15m", "to": "now" }, "timepicker": { @@ -1006,5 +918,5 @@ "timezone": "", "title": "Project Oni - Baseline test", "uid": "8em8RXWMz", - "version": 3 + "version": 4 } diff --git a/lotus-soup/baseline.go b/lotus-soup/baseline.go index 18cb3770e..134d42fec 100644 --- a/lotus-soup/baseline.go +++ b/lotus-soup/baseline.go @@ -71,6 +71,7 @@ func runBaselineClient(t *TestEnvironment) error { if err := client.NetConnect(ctx, minerAddr.PeerAddr); err != nil { return err } + t.D().Counter(fmt.Sprintf("send-data-to,miner=%s", minerAddr.ActorAddr)).Inc(1) t.RecordMessage("selected %s as the miner", minerAddr.ActorAddr) @@ -175,8 +176,7 @@ func retrieveData(t *TestEnvironment, ctx context.Context, err error, client api panic(err) } for _, o := range offers { - t.D().Counter(fmt.Sprintf("find-data.offer.%s", o.Miner)).Inc(1) - t.D().Counter("find-data.offer").Inc(1) + t.D().Counter(fmt.Sprintf("find-data.offer,miner=%s", o.Miner)).Inc(1) } t.D().ResettingHistogram("find-data").Update(int64(time.Since(t1))) diff --git a/lotus-soup/go.mod b/lotus-soup/go.mod index 018902235..33fb85fe5 100644 --- a/lotus-soup/go.mod +++ b/lotus-soup/go.mod @@ -21,7 +21,7 @@ require ( github.com/libp2p/go-libp2p-core v0.6.0 github.com/libp2p/go-libp2p-pubsub-tracer v0.0.0-20200626141350-e730b32bf1e6 github.com/multiformats/go-multiaddr v0.2.2 - github.com/testground/sdk-go v0.2.3-0.20200617132925-2e4d69f9ba38 + github.com/testground/sdk-go v0.2.3-0.20200626163933-5221c19734d9 ) // This will work in all build modes: docker:go, exec:go, and local go build. diff --git a/lotus-soup/go.sum b/lotus-soup/go.sum index 8116e54d0..cb952ab1f 100644 --- a/lotus-soup/go.sum +++ b/lotus-soup/go.sum @@ -1343,6 +1343,8 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/testground/sdk-go v0.2.3-0.20200617132925-2e4d69f9ba38 h1:6s2/aFZVGJKX5V/eID4Zlt0F1AVEgllZOtPjzJVR6yQ= github.com/testground/sdk-go v0.2.3-0.20200617132925-2e4d69f9ba38/go.mod h1:3auzMDXaoK7NQ+CLQS3pqp4hmREECWO9V+TJi/IWmms= +github.com/testground/sdk-go v0.2.3-0.20200626163933-5221c19734d9 h1:DxXPiWxnLo3TJftdfylbuJaYRrSUJUOd/b5TfFqCxJg= +github.com/testground/sdk-go v0.2.3-0.20200626163933-5221c19734d9/go.mod h1:3auzMDXaoK7NQ+CLQS3pqp4hmREECWO9V+TJi/IWmms= github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= From 0d908c18b4bde49d4539eedacbaed78408082fcd Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 22:07:49 +0200 Subject: [PATCH 09/12] who mined block --- .../project-oni-baseline-dashboard.json | 54 +++++++++++++++++-- lotus-soup/common_roles.go | 12 +++-- 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/dashboards/project-oni-baseline-dashboard.json b/dashboards/project-oni-baseline-dashboard.json index 03140e9fa..ad7219878 100644 --- a/dashboards/project-oni-baseline-dashboard.json +++ b/dashboards/project-oni-baseline-dashboard.json @@ -16,7 +16,7 @@ "gnetId": null, "graphTooltip": 0, "id": 16, - "iteration": 1593188264284, + "iteration": 1593201827692, "links": [], "panels": [ { @@ -180,6 +180,12 @@ ], "type": "tag" }, + { + "params": [ + "miner" + ], + "type": "tag" + }, { "params": [ "0" @@ -187,7 +193,7 @@ "type": "fill" } ], - "measurement": "diagnostics.miner.mine.counter", + "measurement": "diagnostics.block.mine.counter", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -207,6 +213,48 @@ ] ], "tags": [] + }, + { + "groupBy": [ + { + "params": [ + "$myinterval" + ], + "type": "time" + }, + { + "params": [ + "run" + ], + "type": "tag" + }, + { + "params": [ + "0" + ], + "type": "fill" + } + ], + "measurement": "diagnostics.block.mine.counter", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "count" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + } + ] + ], + "tags": [] } ], "thresholds": [], @@ -918,5 +966,5 @@ "timezone": "", "title": "Project Oni - Baseline test", "uid": "8em8RXWMz", - "version": 4 + "version": 6 } diff --git a/lotus-soup/common_roles.go b/lotus-soup/common_roles.go index df47f3aee..9d5c1d1b7 100644 --- a/lotus-soup/common_roles.go +++ b/lotus-soup/common_roles.go @@ -37,6 +37,11 @@ func runMiner(t *TestEnvironment) error { clients := t.IntParam("clients") miners := t.IntParam("miners") + myActorAddr, err := miner.minerApi.ActorAddress(ctx) + if err != nil { + return err + } + // mine / stop mining mine := true done := make(chan struct{}) @@ -44,7 +49,6 @@ func runMiner(t *TestEnvironment) error { defer close(done) var i int for i = 0; mine; i++ { - // synchronize all miners to mine the next block t.RecordMessage("synchronizing all miners to mine next block [%d]", i) stateMineNext := sync.State(fmt.Sprintf("mine-block-%d", i)) @@ -53,10 +57,8 @@ func runMiner(t *TestEnvironment) error { // add some random delay to encourage a different miner winning each round time.Sleep(time.Duration(100 + rand.Intn(int(100*time.Millisecond)))) - err := miner.MineOne(ctx, func(bool) { - - t.D().Counter("miner.mine").Inc(1) - // after a block is mined + err := miner.MineOne(ctx, func(mined bool) { + t.D().Counter(fmt.Sprintf("block.mine,miner=%s", myActorAddr)).Inc(1) }) if err != nil { panic(err) From 2b9a6d8574abd9d24c085da732d74e0f1f16a1c2 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 22:56:43 +0200 Subject: [PATCH 10/12] better dashboard --- dashboards/project-oni-baseline-dashboard.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dashboards/project-oni-baseline-dashboard.json b/dashboards/project-oni-baseline-dashboard.json index ad7219878..c561ec5d3 100644 --- a/dashboards/project-oni-baseline-dashboard.json +++ b/dashboards/project-oni-baseline-dashboard.json @@ -16,7 +16,7 @@ "gnetId": null, "graphTooltip": 0, "id": 16, - "iteration": 1593201827692, + "iteration": 1593204217741, "links": [], "panels": [ { @@ -147,7 +147,10 @@ "current": false, "max": false, "min": false, + "rightSide": true, "show": true, + "sort": "total", + "sortDesc": true, "total": true, "values": true }, @@ -167,6 +170,7 @@ "steppedLine": false, "targets": [ { + "alias": "$tag_miner ($tag_run)", "groupBy": [ { "params": [ @@ -215,6 +219,7 @@ "tags": [] }, { + "alias": "all ($tag_run)", "groupBy": [ { "params": [ @@ -473,6 +478,8 @@ "min": false, "rightSide": true, "show": true, + "sort": "total", + "sortDesc": true, "total": true, "values": true }, @@ -947,7 +954,7 @@ ] }, "time": { - "from": "now-15m", + "from": "now-8m", "to": "now" }, "timepicker": { @@ -966,5 +973,5 @@ "timezone": "", "title": "Project Oni - Baseline test", "uid": "8em8RXWMz", - "version": 6 + "version": 7 } From ba645cfbeafde96294c05506e34a063d24e7396b Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 23:12:03 +0200 Subject: [PATCH 11/12] better dashboard --- dashboards/project-oni-baseline-dashboard.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dashboards/project-oni-baseline-dashboard.json b/dashboards/project-oni-baseline-dashboard.json index c561ec5d3..2db88c585 100644 --- a/dashboards/project-oni-baseline-dashboard.json +++ b/dashboards/project-oni-baseline-dashboard.json @@ -150,7 +150,7 @@ "rightSide": true, "show": true, "sort": "total", - "sortDesc": true, + "sortDesc": false, "total": true, "values": true }, @@ -345,6 +345,7 @@ "current": false, "max": true, "min": false, + "rightSide": true, "show": true, "total": false, "values": true @@ -365,6 +366,7 @@ "steppedLine": false, "targets": [ { + "alias": "find-data - 95% max", "groupBy": [ { "params": [ @@ -680,6 +682,7 @@ "current": false, "max": true, "min": false, + "rightSide": true, "show": true, "total": false, "values": true @@ -700,6 +703,7 @@ "steppedLine": false, "targets": [ { + "alias": "deal.sealed - 95% max", "groupBy": [ { "params": [ @@ -811,6 +815,7 @@ "current": false, "max": true, "min": false, + "rightSide": true, "show": true, "total": false, "values": true @@ -831,6 +836,7 @@ "steppedLine": false, "targets": [ { + "alias": "deal.retrieved - 95% max", "groupBy": [ { "params": [ @@ -973,5 +979,5 @@ "timezone": "", "title": "Project Oni - Baseline test", "uid": "8em8RXWMz", - "version": 7 + "version": 8 } From 38132cdb942747a9ae1e798e5c5f6fc7bfaded26 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Fri, 26 Jun 2020 23:44:04 +0200 Subject: [PATCH 12/12] go-sdk from master --- lotus-soup/go.mod | 2 +- lotus-soup/go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lotus-soup/go.mod b/lotus-soup/go.mod index 33fb85fe5..7941e310c 100644 --- a/lotus-soup/go.mod +++ b/lotus-soup/go.mod @@ -21,7 +21,7 @@ require ( github.com/libp2p/go-libp2p-core v0.6.0 github.com/libp2p/go-libp2p-pubsub-tracer v0.0.0-20200626141350-e730b32bf1e6 github.com/multiformats/go-multiaddr v0.2.2 - github.com/testground/sdk-go v0.2.3-0.20200626163933-5221c19734d9 + github.com/testground/sdk-go v0.2.3-0.20200626214218-7a87893cf56c ) // This will work in all build modes: docker:go, exec:go, and local go build. diff --git a/lotus-soup/go.sum b/lotus-soup/go.sum index cb952ab1f..d6cb1893c 100644 --- a/lotus-soup/go.sum +++ b/lotus-soup/go.sum @@ -1341,10 +1341,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/testground/sdk-go v0.2.3-0.20200617132925-2e4d69f9ba38 h1:6s2/aFZVGJKX5V/eID4Zlt0F1AVEgllZOtPjzJVR6yQ= -github.com/testground/sdk-go v0.2.3-0.20200617132925-2e4d69f9ba38/go.mod h1:3auzMDXaoK7NQ+CLQS3pqp4hmREECWO9V+TJi/IWmms= -github.com/testground/sdk-go v0.2.3-0.20200626163933-5221c19734d9 h1:DxXPiWxnLo3TJftdfylbuJaYRrSUJUOd/b5TfFqCxJg= -github.com/testground/sdk-go v0.2.3-0.20200626163933-5221c19734d9/go.mod h1:3auzMDXaoK7NQ+CLQS3pqp4hmREECWO9V+TJi/IWmms= +github.com/testground/sdk-go v0.2.3-0.20200626214218-7a87893cf56c h1:fZXuBXPwBL2Z4UdH1YVkWs7rqNCaVwSmpu3SmVeayZ0= +github.com/testground/sdk-go v0.2.3-0.20200626214218-7a87893cf56c/go.mod h1:3auzMDXaoK7NQ+CLQS3pqp4hmREECWO9V+TJi/IWmms= github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=