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

fix panic at startup

Browse Source 
genesis is written (!) before starting the splitstore, so curTs is nil
This commit is contained in:
vyzo 2021-07-02 12:30:43 +03:00
parent 2faa4aa993
commit b3ddaa5f02
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
blockstore/splitstore/debug.go
View File

@ -112,12 +112,17 @@ func (d *debugLog) LogWrite(curTs *types.TipSet, c cid.Cid, writeEpoch abi.Chain
stack = " " + d.getStack() stack = " " + d.getStack()
} }
var curEpoch abi.ChainEpoch
if curTs != nil {
curEpoch = curTs.Height()
}
d.writeMx.Lock() d.writeMx.Lock()
defer d.writeMx.Unlock() defer d.writeMx.Unlock()
d.writeCnt++ d.writeCnt++
_, err := fmt.Fprintf(d.writeLog, "%s %d %s %d%s\n", d.timestamp(), curTs.Height(), c, writeEpoch, stack) _, err := fmt.Fprintf(d.writeLog, "%s %d %s %d%s\n", d.timestamp(), curEpoch, c, writeEpoch, stack)
if err != nil { if err != nil {
log.Warnf("error writing write log: %s", err) log.Warnf("error writing write log: %s", err)
} }
@ -133,6 +138,11 @@ func (d *debugLog) LogWriteMany(curTs *types.TipSet, cids []cid.Cid, writeEpoch
stack = " " + d.getStack() stack = " " + d.getStack()
} }
var curEpoch abi.ChainEpoch
if curTs != nil {
curEpoch = curTs.Height()
}
d.writeMx.Lock() d.writeMx.Lock()
defer d.writeMx.Unlock() defer d.writeMx.Unlock()
@ -140,7 +150,7 @@ func (d *debugLog) LogWriteMany(curTs *types.TipSet, cids []cid.Cid, writeEpoch
now := d.timestamp() now := d.timestamp()
for _, c := range cids { for _, c := range cids {
_, err := fmt.Fprintf(d.writeLog, "%s %d %s %d%s\n", now, curTs.Height(), c, writeEpoch, stack) _, err := fmt.Fprintf(d.writeLog, "%s %d %s %d%s\n", now, curEpoch, c, writeEpoch, stack)
if err != nil { if err != nil {
log.Warnf("error writing write log: %s", err) log.Warnf("error writing write log: %s", err)
break break