Skip to content

Discard blank transaction placeholders on recovery #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huangkongsheng wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Discard blank transaction placeholders on recovery #459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/MicroOcpp/Model/ConnectorBase/Connector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,17 @@ std::shared_ptr<Transaction> Connector::allocateTransaction() {
txr = (txr + MAX_TX_CNT - 1) % MAX_TX_CNT; //decrement by 1

auto tx = model.getTransactionStore()->getTransaction(connectorId, txr);
//check if dangling silent tx, aborted tx, or corrupted entry (tx == null)
if (!tx || tx->isSilent() || (tx->isAborted() && MO_TX_CLEAN_ABORTED)) {
//check if dangling silent tx, aborted tx, corrupted entry (tx == null),
//or a blank placeholder: createTransaction() commits the empty tx object
//to flash before the caller fills it in (idTag, start opNr). A device
//reset in between leaves a tx that never starts and blocks the connector
//(issue #455). Such a tx has neither a start opNr nor an idTag; a real
//tx that was authorized before the reset does have an idTag.
bool isPlaceholder = tx
&& !tx->isSilent()
&& tx->getStartSync().getOpNr() == 0
&& tx->getIdTag()[0] == '\0';
if (!tx || tx->isSilent() || (tx->isAborted() && MO_TX_CLEAN_ABORTED) || isPlaceholder) {
//yes, remove
bool removed = true;
if (auto mService = model.getMeteringService()) {
Expand Down