Skip to content

IGNITE-28242 Move cp readlock up in call stack to ensure correct lock acquisition ordering #12972

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
sergey-chugunov-1985 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

IGNITE-28242 Move cp readlock up in call stack to ensure correct lock acquisition ordering #12972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a8bab1c
IGNITE-28242 Move cp readlock up in call stack to ensure correct lock…
sergey-chugunov-1985 Apr 2, 2026
b3c8d4e
IGNITE-28242 Add cp readlock to other places after test report analysis
sergey-chugunov-1985 Apr 3, 2026
a44645e
IGNITE-28242 Fix checkstyle
sergey-chugunov-1985 Apr 7, 2026
0acd545
Merge branch 'master' into ignite-28242
sergey-chugunov-1985 Apr 14, 2026
aeaf9d6
Merge branch 'master' into ignite-28242
sergey-chugunov-1985 May 4, 2026
340d06b
IGNITE-28242 Add reproducer, add assertion for cp read lock
sergey-chugunov-1985 May 4, 2026
7f04096
IGNITE-28242 Add missing readlock in LockFuture
sergey-chugunov-1985 May 5, 2026
9fa617f
IGNITE-28242 Add missing readlock to DhtTxPrepareFuture
sergey-chugunov-1985 May 5, 2026
788f890
IGNITE-28242 Add missing readlock to DhtGetFuture
sergey-chugunov-1985 May 5, 2026
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
4 changes: 1 addition & 3 deletions ...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ protected GridDhtLocalPartition localPartition() {
boolean deferred = false;
GridCacheVersion ver0 = null;

cctx.shared().database().checkpointReadLock();
Copy link
Copy Markdown
Contributor

@alex-plekhanov alex-plekhanov Apr 15, 2026

Choose a reason for hiding this comment

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

Are you sure that all calls to unswap are covered with checkpoint read lock?
Maybe it's finally worth to add assert? Something like:

assert !checkExpire || cctx.shared().database().checkpointLockIsHeldByThread();

assert !checkExpire || cctx.shared().database().checkpointLockIsHeldByThread();

lockEntry();

Expand Down Expand Up @@ -494,8 +494,6 @@ protected GridDhtLocalPartition localPartition() {
}
finally {
unlockEntry();

cctx.shared().database().checkpointReadUnlock();
}

if (obsolete) {
Expand Down
9 changes: 8 additions & 1 deletion ...in/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,14 @@ private IgniteInternalFuture<Collection<GridCacheEntryInfo>> getAsync(
boolean addReader = !e.deleted();

if (addReader) {
e.unswap(false);
cctx.shared().database().checkpointReadLock();

try {
e.unswap(false);
}
finally {
cctx.shared().database().checkpointReadUnlock();
}

// Entry will be removed on touch() if no data in cache,
// but they could be loaded from store,
Expand Down
10 changes: 8 additions & 2 deletions ...n/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,14 @@ private void map(Iterable<GridDhtCacheEntry> entries) {
boolean needVal;

try {
// Must unswap entry so that isNewLocked returns correct value.
e.unswap(false);
cctx.shared().database().checkpointReadLock();
try {
// Must unswap entry so that isNewLocked returns correct value.
e.unswap(false);
}
finally {
cctx.shared().database().checkpointReadUnlock();
}

needVal = e.isNewLocked();

Expand Down
25 changes: 16 additions & 9 deletions ...va/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,19 +620,26 @@ IgniteInternalFuture<GridCacheReturn> lockAllAsync(
if (txEntry == null) {
GridDhtCacheEntry cached;

while (true) {
try {
cached = dhtCache.entryExx(key, topVer);
cctx.database().checkpointReadLock();

cached.unswap(read);
try {
while (true) {
try {
cached = dhtCache.entryExx(key, topVer);

break;
}
catch (GridCacheEntryRemovedException ignore) {
if (log.isDebugEnabled())
log.debug("Get removed entry: " + key);
cached.unswap(read);

break;
}
catch (GridCacheEntryRemovedException ignore) {
if (log.isDebugEnabled())
log.debug("Get removed entry: " + key);
}
}
}
finally {
cctx.database().checkpointReadUnlock();
}

addActiveCache(dhtCache.context(), false);

Expand Down
15 changes: 11 additions & 4 deletions ...a/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,11 +1212,18 @@ private IgniteInternalFuture<Object> forceRebalanceKeys(Map<Integer, Collection<
for (IgniteTxEntry entry : entries) {
GridCacheVersion serReadVer = entry.entryReadVersion();

if (serReadVer != null) {
entry.cached().unswap();
cctx.database().checkpointReadLock();

if (!entry.cached().checkSerializableReadVersion(serReadVer))
return versionCheckError(entry);
try {
if (serReadVer != null) {
entry.cached().unswap();

if (!entry.cached().checkSerializableReadVersion(serReadVer))
return versionCheckError(entry);
}
}
finally {
cctx.database().checkpointReadUnlock();
}
}
}
Expand Down
100 changes: 50 additions & 50 deletions ...in/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,29 +1259,29 @@ private boolean enlistWriteEntry(GridCacheContext cacheCtx,
GridCacheEntryEx entry = entryEx(cacheCtx, txKey, entryTopVer != null ? entryTopVer : topologyVersion());

try {
entry.unswap(false);

// Check if lock is being explicitly acquired by the same thread.
if (!implicit && cctx.kernalContext().config().isCacheSanityCheckEnabled() &&
entry.lockedByThread(threadId, xidVer)) {
throw new IgniteCheckedException("Cannot access key within transaction if lock is " +
"externally held [key=" + CU.value(cacheKey, cacheCtx, false) +
", entry=" + entry +
", xidVer=" + xidVer +
", threadId=" + threadId +
", locNodeId=" + cctx.localNodeId() + ']');
}

CacheObject old = null;
GridCacheVersion readVer = null;

if (optimistic() && !implicit()) {
try {
if (needReadVer) {
if (primaryLocal(entry)) {
cctx.database().checkpointReadLock();
cctx.database().checkpointReadLock();

try {
try {
entry.unswap(false);

// Check if lock is being explicitly acquired by the same thread.
if (!implicit && cctx.kernalContext().config().isCacheSanityCheckEnabled() &&
entry.lockedByThread(threadId, xidVer)) {
throw new IgniteCheckedException("Cannot access key within transaction if lock is " +
"externally held [key=" + CU.value(cacheKey, cacheCtx, false) +
", entry=" + entry +
", xidVer=" + xidVer +
", threadId=" + threadId +
", locNodeId=" + cctx.localNodeId() + ']');
}

if (optimistic() && !implicit()) {
try {
if (needReadVer) {
if (primaryLocal(entry)) {
EntryGetResult res = entry.innerGetVersioned(
null,
this,
Expand All @@ -1298,15 +1298,8 @@ private boolean enlistWriteEntry(GridCacheContext cacheCtx,
readVer = res.version();
}
}
finally {
cctx.database().checkpointReadUnlock();
}
}
}
else {
cctx.database().checkpointReadLock();

try {
else {
old = entry.innerGet(
null,
this,
Expand All @@ -1318,19 +1311,19 @@ private boolean enlistWriteEntry(GridCacheContext cacheCtx,
null,
keepBinary);
}
finally {
cctx.database().checkpointReadUnlock();
}
}
}
catch (ClusterTopologyCheckedException e) {
entry.touch();
catch (ClusterTopologyCheckedException e) {
entry.touch();

throw e;
throw e;
}
}
else
old = entry.rawGet();
}
finally {
cctx.database().checkpointReadUnlock();
}
else
old = entry.rawGet();

final GridCacheOperation op = rmv ? DELETE :
entryProc != null ? TRANSFORM : old != null ? UPDATE : CREATE;
Expand Down Expand Up @@ -2399,21 +2392,28 @@ private <K, V> Collection<KeyCacheObject> enlistRead(
optimistic() ? accessPolicy(cacheCtx, txKey, expiryPlc) : null;

if (needReadVer) {
getRes = primaryLocal(entry) ?
entry.innerGetVersioned(
null,
this,
/*metrics*/true,
/*event*/true,
null,
resolveTaskName(),
accessPlc,
!deserializeBinary,
null) : null;
cctx.database().checkpointReadLock();

if (getRes != null) {
val = getRes.value();
readVer = getRes.version();
try {
getRes = primaryLocal(entry) ?
entry.innerGetVersioned(
null,
this,
/*metrics*/true,
/*event*/true,
null,
resolveTaskName(),
accessPlc,
!deserializeBinary,
null) : null;

if (getRes != null) {
val = getRes.value();
readVer = getRes.version();
}
}
finally {
cctx.database().checkpointReadUnlock();
}
}
else {
Expand Down
Loading
Loading