crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added more granularity to logging, to differentiate between signature validation and general processing/importing, as well as showing counts of the transactions being processed in each round.

Browse Source
This commit is contained in:
CalDescent 2022-03-04 11:12:23 +00:00
parent f9576d8afb
commit 7c181379b4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/qortal/controller/Controller.java
View File

@ -855,7 +855,9 @@ public class Controller extends Thread {
// Take a snapshot of incomingTransactions, so we don't need to lock it while processing // Take a snapshot of incomingTransactions, so we don't need to lock it while processing
Map<TransactionData, Boolean> incomingTransactionsCopy = Map.copyOf(this.incomingTransactions); Map<TransactionData, Boolean> incomingTransactionsCopy = Map.copyOf(this.incomingTransactions);
LOGGER.debug("Processing incoming transactions queue (size {})...", incomingTransactionsCopy.size()); int unvalidatedCount = Collections.frequency(incomingTransactionsCopy.values(), Boolean.FALSE);
int validatedCount = 0;
LOGGER.debug("Validating signatures in incoming transactions queue (size {})...", unvalidatedCount);
List<Transaction> sigValidTransactions = new ArrayList<>(); List<Transaction> sigValidTransactions = new ArrayList<>();
@ -889,6 +891,10 @@ public class Controller extends Thread {
continue; continue;
} }
else {
// Count the number that were validated in this round, for logging purposes
validatedCount++;
}
// Add mark signature as valid if transaction still exists in import queue // Add mark signature as valid if transaction still exists in import queue
incomingTransactions.computeIfPresent(transactionData, (k, v) -> Boolean.TRUE); incomingTransactions.computeIfPresent(transactionData, (k, v) -> Boolean.TRUE);
@ -900,6 +906,8 @@ public class Controller extends Thread {
sigValidTransactions.add(transaction); sigValidTransactions.add(transaction);
} }
LOGGER.debug("Finished validating signatures in incoming transactions queue (valid this round: {}, total pending import: {})...", validatedCount, sigValidTransactions.size());
if (sigValidTransactions.isEmpty()) { if (sigValidTransactions.isEmpty()) {
// Don't bother locking if there are no new transactions to process // Don't bother locking if there are no new transactions to process
return; return;
@ -923,6 +931,8 @@ public class Controller extends Thread {
return; return;
} }
LOGGER.debug("Processing incoming transactions queue (size {})...", sigValidTransactions.size());
// Import transactions with valid signatures // Import transactions with valid signatures
try { try {
for (int i = 0; i < sigValidTransactions.size(); ++i) { for (int i = 0; i < sigValidTransactions.size(); ++i) {