cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

barrier for stop mining, instead of sleep

Browse Source
This commit is contained in:
Anton Evangelatov 2020-06-25 12:00:56 +02:00
parent 801a4f79b9
commit ae3fcca543
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lotus-soup/baseline.go
View File

@ -97,9 +97,14 @@ func runBaselineMiner(t *TestEnvironment) error {
}
}()
time.Sleep(3600 * time.Second)
// wait for a signa to stop mining
err = <-t.SyncClient.MustBarrier(ctx, stateStopMining, 1).C
if err != nil {
return err
}
mine = false
fmt.Println("shutting down mining")
t.RecordMessage("shutting down mining")
<-done
t.SyncClient.MustSignalAndWait(ctx, stateDone, t.TestInstanceCount)
@ -129,7 +134,7 @@ func runBaselineClient(t *TestEnvironment) error {
t.RecordMessage("client connected to miner")
time.Sleep(10 * time.Second)
time.Sleep(2 * time.Second)
// generate random data
data := make([]byte, 1600)
@ -146,15 +151,17 @@ func runBaselineClient(t *TestEnvironment) error {
t.RecordMessage("started deal: %s", deal)
// TODO: this sleep is only necessary because deals don't immediately get logged in the dealstore, we should fix this
time.Sleep(5 * time.Second)
time.Sleep(2 * time.Second)
t.RecordMessage("wait to be sealed")
waitDealSealed(ctx, client, deal)
waitDealSealed(t, ctx, client, deal)
carExport := true
// try to retrieve fcid
testRetrieval(ctx, err, client, fcid, carExport, data)
t.RecordMessage("try to retrieve fcid")
retrieve(t, ctx, err, client, fcid, carExport, data)
t.SyncClient.MustSignalEntry(ctx, stateStopMining)
// TODO broadcast published content CIDs to other clients
// TODO select a random piece of content published by some other client and retrieve it
@ -216,7 +223,7 @@ func startDeal(ctx context.Context, minerActorAddr address.Address, client *impl
return deal
}
func waitDealSealed(ctx context.Context, client *impl.FullNodeAPI, deal *cid.Cid) {
func waitDealSealed(t *TestEnvironment, ctx context.Context, client *impl.FullNodeAPI, deal *cid.Cid) {
loop:
for {
di, err := client.ClientGetDealInfo(ctx, *deal)
@ -231,15 +238,15 @@ loop:
case storagemarket.StorageDealError:
panic(fmt.Sprintf("deal errored %s", di.Message))
case storagemarket.StorageDealActive:
fmt.Println("COMPLETE", di)
t.RecordMessage("completed deal: %s", di)
break loop
}
fmt.Println("Deal state: ", storagemarket.DealStates[di.State])
t.RecordMessage("deal state: %s", storagemarket.DealStates[di.State])
time.Sleep(2 * time.Second)
}
}
func testRetrieval(ctx context.Context, err error, client *impl.FullNodeAPI, fcid cid.Cid, carExport bool, data []byte) {
func retrieve(t *TestEnvironment, ctx context.Context, err error, client *impl.FullNodeAPI, fcid cid.Cid, carExport bool, data []byte) {
offers, err := client.ClientFindData(ctx, fcid)
if err != nil {
panic(err)
@ -281,6 +288,8 @@ func testRetrieval(ctx context.Context, err error, client *impl.FullNodeAPI, fci
if !bytes.Equal(rdata, data) {
panic("wrong data retrieved")
}
t.RecordMessage("retrieved successfully")
}
func extractCarData(ctx context.Context, rdata []byte, rpath string) []byte {

2
lotus-soup/main.go
View File

@ -21,7 +21,7 @@ var testplans = map[string]interface{}{
}
func init() {
logging.SetLogLevel("*", "INFO")
logging.SetLogLevel("*", "ERROR")
build.DisableBuiltinAssets = true

5
lotus-soup/node.go
View File

@ -57,8 +57,9 @@ var (
clientsAddrsTopic = sync.NewTopic("clientsAddrsTopic", &peer.AddrInfo{})
minersAddrsTopic = sync.NewTopic("minersAddrsTopic", &MinerAddresses{})
stateReady = sync.State("ready")
stateDone = sync.State("done")
stateReady = sync.State("ready")
stateDone = sync.State("done")
stateStopMining = sync.State("stop-mining")
)
type TestEnvironment struct {