You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2020/08/19 11:10:18 UTC
[ignite] branch master updated: IGNITE-13368 Cleared checkpoint
counters when checkpoint is finished - Fixes #8163.
This is an automated email from the ASF dual-hosted git repository.
sergeychugunov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 3ee2300 IGNITE-13368 Cleared checkpoint counters when checkpoint is finished - Fixes #8163.
3ee2300 is described below
commit 3ee23000b581e00bab5da3582780c9204a6b238d
Author: Anton Kalashnikov <ka...@yandex.ru>
AuthorDate: Wed Aug 19 13:58:13 2020 +0300
IGNITE-13368 Cleared checkpoint counters when checkpoint is finished - Fixes #8163.
Signed-off-by: Sergey Chugunov <se...@gmail.com>
---
.../processors/cache/persistence/checkpoint/Checkpointer.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/Checkpointer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/Checkpointer.java
index 4186f9e..255419c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/Checkpointer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/Checkpointer.java
@@ -436,13 +436,13 @@ public class Checkpointer extends GridWorker {
long nextNanos = System.nanoTime() + U.millisToNanos(delayFromNow);
- if (sched.nextCpNanos() - nextNanos <= 0)
+ if (sched.nextCpNanos() <= nextNanos)
return sched;
synchronized (this) {
sched = scheduledCp;
- if (sched.nextCpNanos() - nextNanos > 0) {
+ if (sched.nextCpNanos() > nextNanos) {
sched.reason(reason);
sched.nextCpNanos(nextNanos);
@@ -1458,6 +1458,8 @@ public class Checkpointer extends GridWorker {
*/
private void markCheckpointEnd(Checkpoint chp) throws IgniteCheckedException {
synchronized (this) {
+ chp.progress.clearCounters();
+
for (DataRegion memPlc : dataRegions.get()) {
if (!memPlc.config().isPersistenceEnabled())
continue;