fix: catchpoint pending hashes locking

algorand · Jul 10, 2023 · 3a254c3 · 3a254c3
1 parent e215f6d
commit 3a254c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/ledger/catchupaccessor.go b/ledger/catchupaccessor.go
@@ -754,7 +754,8 @@ func (c *catchpointCatchupAccessorImpl) BuildMerkleTrie(ctx context.Context, pro
 		defer wg.Done()
 		defer close(writerQueue)
 
-		dbErr := dbs.Transaction(func(transactionCtx context.Context, tx trackerdb.TransactionScope) (err error) {
+		// Note: this needs to be accessed on a snapshot to guarantee a concurrent read-only access to the sqlite db
+		dbErr := dbs.Snapshot(func(transactionCtx context.Context, tx trackerdb.SnapshotScope) (err error) {
 			it := tx.MakeCatchpointPendingHashesIterator(trieRebuildAccountChunkSize)
 			var hashes [][]byte
 			for {

diff --git a/ledger/store/trackerdb/sqlitedriver/sqlitedriver.go b/ledger/store/trackerdb/sqlitedriver/sqlitedriver.go
@@ -178,6 +178,11 @@ func (r *sqlReader) MakeSpVerificationCtxReader() trackerdb.SpVerificationCtxRea
 	return makeStateProofVerificationReader(r.q)
 }
 
+// MakeCatchpointPendingHashesIterator implements trackerdb.Reader
+func (r *sqlReader) MakeCatchpointPendingHashesIterator(hashCount int) trackerdb.CatchpointPendingHashesIter {
+	return MakeCatchpointPendingHashesIterator(hashCount, r.q)
+}
+
 type sqlWriter struct {
 	e db.Executable
 }
@@ -231,11 +236,6 @@ type sqlCatchpoint struct {
 	e db.Executable
 }
 
-// MakeCatchpointPendingHashesIterator implements trackerdb.Catchpoint
-func (c *sqlCatchpoint) MakeCatchpointPendingHashesIterator(hashCount int) trackerdb.CatchpointPendingHashesIter {
-	return MakeCatchpointPendingHashesIterator(hashCount, c.e)
-}
-
 // MakeCatchpointReader implements trackerdb.Catchpoint
 func (c *sqlCatchpoint) MakeCatchpointReader() (trackerdb.CatchpointReader, error) {
 	return NewCatchpointSQLReaderWriter(c.e), nil

diff --git a/ledger/store/trackerdb/store.go b/ledger/store/trackerdb/store.go
@@ -56,6 +56,9 @@ type Reader interface {
 	MakeAccountsOptimizedReader() (AccountsReader, error)
 	MakeOnlineAccountsOptimizedReader() (OnlineAccountsReader, error)
 	MakeSpVerificationCtxReader() SpVerificationCtxReader
+	// catchpoint
+	// Note: BuildMerkleTrie() needs this on the reader handle in sqlite to not get locked by write txns
+	MakeCatchpointPendingHashesIterator(hashCount int) CatchpointPendingHashesIter
 }
 
 // Writer is the interface for the trackerdb write operations.
@@ -80,7 +83,6 @@ type Writer interface {
 type Catchpoint interface {
 	// reader
 	MakeCatchpointReader() (CatchpointReader, error)
-	MakeCatchpointPendingHashesIterator(hashCount int) CatchpointPendingHashesIter
 	MakeOrderedAccountsIter(accountCount int) OrderedAccountsIter
 	MakeKVsIter(ctx context.Context) (KVsIter, error)
 	MakeEncodedAccoutsBatchIter() EncodedAccountsBatchIter