1. Remove log and resolve issue

AElfProject · Dec 19, 2024 · 692c6b2 · 692c6b2
1 parent c522ab9
commit 692c6b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...rnel.Consensus.AEDPoS/Application/IrreversibleBlockHeightUnacceptableLogEventProcessor.cs b/...rnel.Consensus.AEDPoS/Application/IrreversibleBlockHeightUnacceptableLogEventProcessor.cs
@@ -53,12 +53,16 @@ protected override async Task ProcessLogEventAsync(Block block, LogEvent logEven
 
         if (distanceToLib.DistanceToIrreversibleBlockHeight > 0)
         {
+            var chain = await _blockchainService.GetChainAsync();
             Logger.LogDebug($"Distance to lib height: {distanceToLib.DistanceToIrreversibleBlockHeight}");
+            if ( block.Height - chain.LastIrreversibleBlockHeight < distanceToLib.DistanceToIrreversibleBlockHeight/2)
+            {
+                return;
+            }
             Logger.LogDebug("Will rollback to lib height.");
             _taskQueueManager.Enqueue(
                 async () =>
                 {
-                    var chain = await _blockchainService.GetChainAsync();
                     await _blockchainService.ResetChainToLibAsync(chain);
                 }, KernelConstants.UpdateChainQueueName);
         }

diff --git a/src/AElf.Kernel/ConsensusRequestMiningEventHandler.cs b/src/AElf.Kernel/ConsensusRequestMiningEventHandler.cs
@@ -44,9 +44,7 @@ public Task HandleEventAsync(ConsensusRequestMiningEventData eventData)
             var chain = await _blockchainService.GetChainAsync();
             if (eventData.PreviousBlockHash != chain.BestChainHash)
             {
-                Logger.LogDebug($"PreviousBlockHash:{eventData.PreviousBlockHash},BestChainHash：{chain.BestChainHash},BestChainHeight:{chain.BestChainHeight},preHeight:{eventData.PreviousBlockHeight}");
-                await TriggerConsensusEventAsync(chain.BestChainHash, chain.BestChainHeight);
-                Logger.LogDebug("Mining canceled because best chain already updated 1");
+                Logger.LogDebug("Mining canceled because best chain already updated");
                 return;
             }