IGNITE-7175 Throttling is not applied to page allocation - Fixes #3209. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9ca3c096 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9ca3c096 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9ca3c096 Branch: refs/heads/ignite-zk Commit: 9ca3c0964273920dcf3b122cff09a60614e9f6e7 Parents: cd19564 Author: dpavlov <dpav...@gridgain.com> Authored: Thu Dec 14 11:59:58 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Thu Dec 14 11:59:58 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/persistence/pagemem/PageMemoryImpl.java | 2 +- .../processors/cache/persistence/pagemem/PagesWriteThrottle.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9ca3c096/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java index 41de7f0..601f848 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryImpl.java @@ -1296,7 +1296,7 @@ public class PageMemoryImpl implements PageMemoryEx { try { rwLock.writeUnlock(page + PAGE_LOCK_OFFSET, PageIdUtils.tag(pageId)); - if (throttleEnabled && !restore && markDirty && !dirty) + if (throttleEnabled && !restore && markDirty) writeThrottle.onMarkDirty(isInCheckpoint(fullId)); } catch (AssertionError ex) { http://git-wip-us.apache.org/repos/asf/ignite/blob/9ca3c096/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java index d0c67c7..a890442 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottle.java @@ -49,7 +49,8 @@ public class PagesWriteThrottle { } /** - * + * Callback to apply throttling delay. + * @param isInCheckpoint flag indicating if checkpoint is running. */ public void onMarkDirty(boolean isInCheckpoint) { assert dbSharedMgr.checkpointLockIsHeldByThread();
