Skip to content
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.

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

ISPN-12725 Conflict resolution fails in transactional cache with auto-commit disabled #9051

Conversation

danberindei
Copy link
Member

@danberindei danberindei commented Feb 11, 2021

https://issues.redhat.com/browse/ISPN-12725
https://issues.redhat.com/browse/ISPN-12715
https://issues.redhat.com/browse/ISPN-12717

ISPN-12725 Conflict resolution fails in transactional cache with auto-commit disabled
ISPN-12715 Conflict resolution failure logged at debug level
ISPN-12717 DefaultConflictManager.getAllVersions fails in tx caches

@danberindei
Copy link
Member Author

@pruivo updated to include the IllegalArgumentException fix

@danberindei danberindei changed the title ISPN-12715 Conflict resolution failure logged at debug level + ISPN-12717 DefaultConflictManager.getAllVersions fails in tx caches ISPN-12725 Conflict resolution fails in transactional cache with auto-commit disabled Feb 11, 2021
@danberindei danberindei force-pushed the ISPN-12715_conflict_resolution_logging branch 3 times, most recently from caee5c5 to 9ab1f92 Compare February 17, 2021 21:24
@danberindei danberindei changed the base branch from 11.0.x to master February 17, 2021 21:27
@danberindei
Copy link
Member Author

Updated to fix the test failures (sometimes the transaction manager is null) and to rebase on master.

*
* @author Ryan Emerson
* @since 9.1
*/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs updating or removed 🙂

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

Copy link
Contributor

@ryanemerson ryanemerson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danberindei Other than the javadoc, LGTM!

* Log only one message, at error level
* Fix other ComponentRef.getName() references
The entry returned by AdvancedCache.getCacheEntry(key)
is not always an InternalCacheEntry.
@danberindei danberindei force-pushed the ISPN-12715_conflict_resolution_logging branch from 9ab1f92 to b250163 Compare February 19, 2021 14:48
@ryanemerson ryanemerson merged commit d85002d into infinispan:master Feb 22, 2021
@ryanemerson
Copy link
Contributor

Thanks @danberindei

@danberindei danberindei deleted the ISPN-12715_conflict_resolution_logging branch February 23, 2021 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants