stakey/vspd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vspd: Enable checkWalletConsistency interrupting.

Browse Source 
Add a Context parameter to checkWalletConsistency so it can be canceled
when a shutdown is requested.
This commit is contained in:
jholdstock 2023-09-07 15:47:28 +01:00 committed by Jamie Holdstock
parent 97e7b01afe
commit 841c8ba115
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/vspd/vspd.go
View File

@ -148,7 +148,7 @@ func (v *vspd) run() int {
// Run voting wallet consistency check now to ensure all wallets are up to // Run voting wallet consistency check now to ensure all wallets are up to
// date. // date.
v.checkWalletConsistency() v.checkWalletConsistency(ctx)
// Stop if shutdown requested. // Stop if shutdown requested.
if ctx.Err() != nil { if ctx.Err() != nil {
@ -203,7 +203,7 @@ func (v *vspd) run() int {
// Run voting wallet consistency check periodically. // Run voting wallet consistency check periodically.
case <-consistencyTicker.C: case <-consistencyTicker.C:
v.checkWalletConsistency() v.checkWalletConsistency(ctx)
// Ensure dcrd client is connected so notifications are received. // Ensure dcrd client is connected so notifications are received.
case <-dcrdTicker.C: case <-dcrdTicker.C:
@ -630,7 +630,7 @@ func (v *vspd) blockConnected(ctx context.Context) {
// checkWalletConsistency will retrieve all votable tickets from the database // checkWalletConsistency will retrieve all votable tickets from the database
// and ensure they are all added to voting wallets with the correct vote // and ensure they are all added to voting wallets with the correct vote
// choices. // choices.
func (v *vspd) checkWalletConsistency() { func (v *vspd) checkWalletConsistency(ctx context.Context) {
const funcName = "checkWalletConsistency" const funcName = "checkWalletConsistency"
v.log.Info("Checking voting wallet consistency") v.log.Info("Checking voting wallet consistency")
@ -669,6 +669,11 @@ func (v *vspd) checkWalletConsistency() {
// Iterate over each wallet and add any missing tickets. // Iterate over each wallet and add any missing tickets.
for _, walletClient := range walletClients { for _, walletClient := range walletClients {
// Exit early if context has been cancelled.
if ctx.Err() != nil {
return
}
// Get all tickets the wallet is aware of. // Get all tickets the wallet is aware of.
walletTickets, err := walletClient.TicketInfo(oldestHeight) walletTickets, err := walletClient.TicketInfo(oldestHeight)
if err != nil { if err != nil {
@ -727,6 +732,11 @@ func (v *vspd) checkWalletConsistency() {
// all wallets. // all wallets.
for _, walletClient := range walletClients { for _, walletClient := range walletClients {
// Exit early if context has been cancelled.
if ctx.Err() != nil {
return
}
// Get all tickets the wallet is aware of. // Get all tickets the wallet is aware of.
walletTickets, err := walletClient.TicketInfo(oldestHeight) walletTickets, err := walletClient.TicketInfo(oldestHeight)
if err != nil { if err != nil {
@ -736,6 +746,11 @@ func (v *vspd) checkWalletConsistency() {
} }
for _, dbTicket := range votableTickets { for _, dbTicket := range votableTickets {
// Exit early if context has been cancelled.
if ctx.Err() != nil {
return
}
// All tickets should be added to all wallets at this point, so log // All tickets should be added to all wallets at this point, so log
// a warning if any are still missing. // a warning if any are still missing.
walletTicket, exists := walletTickets[dbTicket.Hash] walletTicket, exists := walletTickets[dbTicket.Hash]