Guard 2.0.1 database transactions with a mutex #589
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hikinggrass
requested review from
Pietfried,
maaikez and
marcemmers
as code owners
marcemmers
reviewed
Apr 29, 2024
lib/ocpp/v201/database_handler.cpp
Outdated
| throw std::runtime_error("Table does not exist."); | ||
| } | ||
|
|
||
| std::scoped_lock lock(this->database_transaction_mutex); |
Contributor
There was a problem hiding this comment.
I would suggest to do this more generically by putting this in the database connection somehow. Apparently you can't have more than 1 transaction per connection so that seems to be the perfect place. Lock on begin transaction and unlock on the commit or rollback.
Member
Author
There was a problem hiding this comment.
Yes that sounds like a good idea!
Contributor
There was a problem hiding this comment.
For the record, we discussed this morning I will pick this one up ;)
marcemmers
force-pushed
the
bugfix/database-transactions
branch
from
577f803 to
e72168f
Compare
Otherwise it might happen that we try to insert metervalues into the database while another transaction event is happening. In certain circumstances (for example with multiple EVSEs present) this can lead to a "Could not begin transaction" exception Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
Signed-off-by: Marc Emmers <m.emmers@alfen.com>
Signed-off-by: Marc Emmers <m.emmers@alfen.com>
marcemmers
force-pushed
the
bugfix/database-transactions
branch
from
e72168f to
024aba6
Compare
Pietfried
approved these changes
May 10, 2024
Co-authored-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com> Signed-off-by: Marc Emmers <35759328+marcemmers@users.noreply.github.com>
christopher-davis-afs
pushed a commit
to US-JOET/libocpp
that referenced
this pull request
May 30, 2024
* Guard 2.0.1 database transactions with a mutex Otherwise it might happen that we try to insert metervalues into the database while another transaction event is happening. In certain circumstances (for example with multiple EVSEs present) this can lead to a "Could not begin transaction" exception Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de> * Add transaction class handling the locking of the interface Signed-off-by: Marc Emmers <m.emmers@alfen.com> * Fix small issues Signed-off-by: Marc Emmers <m.emmers@alfen.com> * Update include/ocpp/common/database/database_connection.hpp Co-authored-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com> Signed-off-by: Marc Emmers <35759328+marcemmers@users.noreply.github.com> --------- Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de> Signed-off-by: Marc Emmers <m.emmers@alfen.com> Signed-off-by: Marc Emmers <35759328+marcemmers@users.noreply.github.com> Co-authored-by: Marc Emmers <m.emmers@alfen.com> Co-authored-by: Marc Emmers <35759328+marcemmers@users.noreply.github.com> Co-authored-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com>
drmrd
pushed a commit
to US-JOET/libocpp
that referenced
this pull request
Jun 4, 2024
* Guard 2.0.1 database transactions with a mutex Otherwise it might happen that we try to insert metervalues into the database while another transaction event is happening. In certain circumstances (for example with multiple EVSEs present) this can lead to a "Could not begin transaction" exception Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de> * Add transaction class handling the locking of the interface Signed-off-by: Marc Emmers <m.emmers@alfen.com> * Fix small issues Signed-off-by: Marc Emmers <m.emmers@alfen.com> * Update include/ocpp/common/database/database_connection.hpp Co-authored-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com> Signed-off-by: Marc Emmers <35759328+marcemmers@users.noreply.github.com> --------- Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de> Signed-off-by: Marc Emmers <m.emmers@alfen.com> Signed-off-by: Marc Emmers <35759328+marcemmers@users.noreply.github.com> Co-authored-by: Marc Emmers <m.emmers@alfen.com> Co-authored-by: Marc Emmers <35759328+marcemmers@users.noreply.github.com> Co-authored-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com> Signed-off-by: Daniel Moore <9156191+drmrd@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Otherwise it might happen that we try to insert metervalues into the database while another transaction event is happening. In certain circumstances (for example with multiple EVSEs present) this can lead to a "Could not begin transaction" exception
Describe your changes
Issue ticket number and link
Checklist before requesting a review