From 736d6a3c19825f08c35cfcb2f22905fd6b48be28 Mon Sep 17 00:00:00 2001 From: vyzo Date: Sat, 3 Jul 2021 11:02:10 +0300 Subject: [PATCH] only treat Has as an implicit write within vm.Copy context --- blockstore/splitstore/splitstore.go | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/blockstore/splitstore/splitstore.go b/blockstore/splitstore/splitstore.go index 6cff953b8..421bc9ba0 100644 --- a/blockstore/splitstore/splitstore.go +++ b/blockstore/splitstore/splitstore.go @@ -5,6 +5,8 @@ import ( "context" "encoding/binary" "errors" + "runtime/debug" + "strings" "sync" "sync/atomic" "time" @@ -235,16 +237,21 @@ func (s *SplitStore) Has(c cid.Cid) (bool, error) { } if has { - // treat it as an implicit (recursive) Write, absence options -- the vm uses this check to avoid - // duplicate writes on Copy. - // When we have options in the API, the vm can explicitly signal that this is an implicit Write. - s.trackWrite(c, true) + // treat it as an implicit (recursive) Write, when it is within vm.Copy context. + // -- the vm uses this check to avoid duplicate writes on Copy. + // When we have options in the API (or something better), the vm can explicitly signal + // that this is an implicit Write. + vmCtx := s.isVMCopyContext() + if vmCtx { + s.trackWrite(c, true) + } // also make sure the object is considered live during compaction in case we have already // flushed pending writes and started compaction. + // when within vm copy context, dags will be recursively referenced. // in case of a race with purge, this will return a track error, which we can use to // signal to the vm that the object is not fully present. - trackErr := s.trackTxnRef(c, true) + trackErr := s.trackTxnRef(c, vmCtx) // if we failed to track the object and all its dependencies, then return false so as // to cause the vm to copy @@ -648,6 +655,11 @@ func (s *SplitStore) flushPendingWrites(locked bool) { s.debug.LogWriteMany(s.curTs, cids, epoch) } +func (s *SplitStore) isVMCopyContext() bool { + sk := string(debug.Stack()) + return strings.Contains(sk, "filecoin-project/lotus/chain/vm.Copy") +} + func (s *SplitStore) trackTxnRef(c cid.Cid, implicit bool) error { if s.txnProtect == nil { // not compacting