Merge pull request #854 from iotaledger/debug/scheduler-inconsistency

Fix accounts ledger rollback and force commitment deadlock

pkg/protocol/commitment.go

@@ -315,7 +315,8 @@ func (c *Commitment) deriveChain(parent *Commitment) func() {
 		// We will spawn a new one if we ever change back to not being the main child.
 		// Here we basically move commitments to the parent chain.
 		if currentChain != nil && currentChain != parentChain {
-			currentChain.IsEvicted.Trigger()
+			// TODO: refactor it to use a dedicated WorkerPool
+			go currentChain.IsEvicted.Trigger()
 		}
 
 		return parentChain

pkg/protocol/engine/accounts/accountsledger/manager.go

@@ -268,12 +268,18 @@ func (m *Manager) PastAccounts(accountIDs iotago.AccountIDs, targetSlot iotago.S
 }
 
 func (m *Manager) Rollback(targetSlot iotago.SlotIndex) error {
+	processedAccounts := ds.NewSet[iotago.AccountID]()
 	for slot := m.latestCommittedSlot; slot > targetSlot; slot-- {
 		slotDiff := lo.PanicOnErr(m.slotDiff(slot))
 		var internalErr error
 
 		//nolint:revive
 		if err := slotDiff.Stream(func(accountID iotago.AccountID, accountDiff *model.AccountDiff, destroyed bool) bool {
+			// We rollback each account directly to targetSlot, therefore, we should rollback each account only once.
+			if processedAccounts.Has(accountID) {
+				return true
+			}
+
 			accountData, exists, err := m.accountsTree.Get(accountID)
 			if err != nil {
 				internalErr = ierrors.Wrapf(err, "unable to retrieve account %s to rollback in slot %d", accountID, slot)
@@ -297,6 +303,8 @@ func (m *Manager) Rollback(targetSlot iotago.SlotIndex) error {
 				return false
 			}
 
+			processedAccounts.Add(accountID)
+
 			return true
 		}); err != nil {
 			return ierrors.Wrapf(err, "error in streaming account diffs for slot %s", slot)

pkg/protocol/engine/notarization/slotnotarization/manager.go

@@ -42,7 +42,7 @@ type Manager struct {
 	acceptedTimeFunc func() time.Time
 	apiProvider      iotago.APIProvider
 
-	commitmentMutex syncutils.RWMutex
+	commitmentMutex syncutils.Mutex
 
 	module.Module
 }
@@ -170,9 +170,6 @@ func (m *Manager) IsBootstrapped() bool {
 }
 
 func (m *Manager) notarizeAcceptedBlock(block *blocks.Block) (err error) {
-	m.commitmentMutex.RLock()
-	defer m.commitmentMutex.RUnlock()
-
 	if err = m.slotMutations.AddAcceptedBlock(block); err != nil {
 		return ierrors.Wrap(err, "failed to add accepted block to slot mutations")
 	}