fix the status for easier debug (#803)

fix the status for easier debug (#803)

Author: capt4ce

common/constant/statuses.go

@@ -6,6 +6,8 @@ var (
 	BlockchainStatusReceivingBlock  = 3
 	BlockchainStatusSyncingBlock    = 4
 	// BlockchainSendingBlockTransactions needs blockchain lock because transactions are tightly coupled of what blocks the node has
-	BlockchainSendingBlockTransactions = 5
-	BlockchainSendingBlocks            = 6
+	BlockchainSendingBlockTransactions                  = 5
+	BlockchainSendingBlocks                             = 6
+	BlockchainStatusReceivingBlockScanBlockPool         = 7
+	BlockchainStatusReceivingBlockProcessCompletedBlock = 8
 )

core/blockchainsync/blockchainSync.go

@@ -138,7 +138,7 @@ func (bss *BlockchainSyncService) getMoreBlocks() {
 					errCasted.Message)
 			default:
 				monitoring.IncrementMainchainDownloadCycleDebugger(bss.ChainType, 7)
-				bss.Logger.Infof("failed to getPeerBlockchainInfo: %v", err)
+				bss.Logger.Infof("ChainSync: failed to getPeerBlockchainInfo: %v", err)
 			}
 		}
 
@@ -151,7 +151,7 @@ func (bss *BlockchainSyncService) getMoreBlocks() {
 			monitoring.IncrementMainchainDownloadCycleDebugger(bss.ChainType, 10)
 			if err != nil {
 				monitoring.IncrementMainchainDownloadCycleDebugger(bss.ChainType, 11)
-				bss.Logger.Warnf("\nfailed to DownloadFromPeer: %v\n\n", err)
+				bss.Logger.Warnf("ChainSync: failed to DownloadFromPeer: %v\n\n", err)
 				break
 			}
 

core/service/blockMainService.go

@@ -217,9 +217,9 @@ func (bs *BlockService) ChainWriteLock(actionType int) {
 
 // ChainWriteUnlock unlocks the chain
 func (bs *BlockService) ChainWriteUnlock(actionType int) {
-	monitoring.SetBlockchainStatus(bs.Chaintype, constant.BlockchainStatusIdle)
-	monitoring.DecrementStatusLockCounter(bs.Chaintype, actionType)
 	bs.Unlock()
+	monitoring.DecrementStatusLockCounter(bs.Chaintype, actionType)
+	monitoring.SetBlockchainStatus(bs.Chaintype, constant.BlockchainStatusIdle)
 }
 
 // NewGenesisBlock create new block that is fixed in the value of cumulative difficulty, smith scale, and the block signature
@@ -638,8 +638,8 @@ func (bs *BlockService) PushBlock(previousBlock, block *model.Block, broadcast,
 
 // ScanBlockPool scan the whole block pool to check if there are any block that's legal to be pushed yet
 func (bs *BlockService) ScanBlockPool() error {
-	bs.ChainWriteLock(constant.BlockchainStatusReceivingBlock)
-	defer bs.ChainWriteUnlock(constant.BlockchainStatusReceivingBlock)
+	bs.ChainWriteLock(constant.BlockchainStatusReceivingBlockScanBlockPool)
+	defer bs.ChainWriteUnlock(constant.BlockchainStatusReceivingBlockScanBlockPool)
 	previousBlock, err := bs.GetLastBlock()
 	if err != nil {
 		return err
@@ -1478,8 +1478,8 @@ func (bs *BlockService) WillSmith(
 
 // ProcessCompletedBlock to process block that already having all needed transactions
 func (bs *BlockService) ProcessCompletedBlock(block *model.Block) error {
-	bs.ChainWriteLock(constant.BlockchainStatusReceivingBlock)
-	defer bs.ChainWriteUnlock(constant.BlockchainStatusReceivingBlock)
+	bs.ChainWriteLock(constant.BlockchainStatusReceivingBlockProcessCompletedBlock)
+	defer bs.ChainWriteUnlock(constant.BlockchainStatusReceivingBlockProcessCompletedBlock)
 	lastBlock, err := bs.GetLastBlock()
 	if err != nil {
 		return err

core/service/blockSpineService.go

@@ -150,9 +150,9 @@ func (bs *BlockSpineService) ChainWriteLock(actionType int) {
 
 // ChainWriteUnlock unlocks the chain
 func (bs *BlockSpineService) ChainWriteUnlock(actionType int) {
-	monitoring.SetBlockchainStatus(bs.Chaintype, constant.BlockchainStatusIdle)
-	monitoring.DecrementStatusLockCounter(bs.Chaintype, actionType)
 	bs.Unlock()
+	monitoring.DecrementStatusLockCounter(bs.Chaintype, actionType)
+	monitoring.SetBlockchainStatus(bs.Chaintype, constant.BlockchainStatusIdle)
 }
 
 // NewGenesisBlock create new block that is fixed in the value of cumulative difficulty, smith scale, and the block signature