From 221d1a0e3cddf813d7f1d693e9d40259f663b79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Kripalani?= Date: Thu, 5 Aug 2021 19:40:02 +0100 Subject: [PATCH] fix minor issues in migration. - aborting the initialization cancels the AcquireShard context, but the DAG store would not release the shard (fixed in filecoin-project/dagstore) - off by one error in console output. --- go.mod | 2 +- go.sum | 4 ++-- node/impl/storminer.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 2fff35a77..23df37029 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/elastic/gosigar v0.12.0 github.com/etclabscore/go-openrpc-reflect v0.0.36 github.com/fatih/color v1.9.0 - github.com/filecoin-project/dagstore v0.4.1 + github.com/filecoin-project/dagstore v0.4.2-0.20210805183556-d41a6e0e6478 github.com/filecoin-project/filecoin-ffi v0.30.4-0.20200910194244-f640612a1a1f github.com/filecoin-project/go-address v0.0.5 github.com/filecoin-project/go-bitfield v0.2.4 diff --git a/go.sum b/go.sum index 86d308788..da66c3767 100644 --- a/go.sum +++ b/go.sum @@ -257,8 +257,8 @@ github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fd/go-nat v1.0.0/go.mod h1:BTBu/CKvMmOMUPkKVef1pngt2WFH/lg7E6yQnulfp6E= github.com/filecoin-project/dagstore v0.3.1/go.mod h1:WY5OoLfnwISCk6eASSF927KKPqLPIlTwmG1qHpA08KY= -github.com/filecoin-project/dagstore v0.4.1 h1:4Prv5GQN12soVXhYCJ/XFGG75FrKdr2OBCO+4YjL/y0= -github.com/filecoin-project/dagstore v0.4.1/go.mod h1:WY5OoLfnwISCk6eASSF927KKPqLPIlTwmG1qHpA08KY= +github.com/filecoin-project/dagstore v0.4.2-0.20210805183556-d41a6e0e6478 h1:18c6WWu3xzuGjnxw8gOdu/TDFql2xKqRdd5RYWmktWI= +github.com/filecoin-project/dagstore v0.4.2-0.20210805183556-d41a6e0e6478/go.mod h1:WY5OoLfnwISCk6eASSF927KKPqLPIlTwmG1qHpA08KY= github.com/filecoin-project/go-address v0.0.3/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+cGQ59wMIps/8YW/lDj8= github.com/filecoin-project/go-address v0.0.5 h1:SSaFT/5aLfPXycUlFyemoHYhRgdyXClXCyDdNJKPlDM= github.com/filecoin-project/go-address v0.0.5/go.mod h1:jr8JxKsYx+lQlQZmF5i2U0Z+cGQ59wMIps/8YW/lDj8= diff --git a/node/impl/storminer.go b/node/impl/storminer.go index ea8906248..81db01989 100644 --- a/node/impl/storminer.go +++ b/node/impl/storminer.go @@ -575,6 +575,7 @@ func (sm *StorageMinerAPI) DagstoreListShards(ctx context.Context) ([]api.Dagsto }) } + // order by key. sort.SliceStable(ret, func(i, j int) bool { return ret[i].Key < ret[j].Key }) @@ -687,7 +688,7 @@ func (sm *StorageMinerAPI) DagstoreInitializeAll(ctx context.Context, params api Key: k, Event: "start", Total: total, - Current: i, + Current: i + 1, // start with 1 } select { case out <- r: