[07/50] [abbrv] ignite git commit: IGNITE-8166 PME hangs when error occurs during checkpoint

2018-04-23 Thread agoncharuk 
IGNITE-8166 PME hangs when error occurs during checkpoint

Signed-off-by: Andrey Gura 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e254e658
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e254e658
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e254e658

Branch: refs/heads/ignite-6083
Commit: e254e6588b7983ed8c13832a5512e662fb8c4215
Parents: b810bd4
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 15:56:36 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 15:56:36 2018 +0300

--
 .../cache/persistence/GridCacheDatabaseSharedManager.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e254e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index caf27b7..a371aa8 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -3667,7 +3667,14 @@ public class GridCacheDatabaseSharedManager extends 
IgniteCacheDatabaseSharedMan
 private GridFutureAdapter cpBeginFut = new GridFutureAdapter<>();
 
 /** */
-private GridFutureAdapter cpFinishFut = new GridFutureAdapter<>();
+private GridFutureAdapter cpFinishFut = new GridFutureAdapter() {
+@Override protected boolean onDone(@Nullable Void res, @Nullable 
Throwable err, boolean cancel) {
+if (err != null && !cpBeginFut.isDone())
+cpBeginFut.onDone(err);
+
+return super.onDone(res, err, cancel);
+}
+};
 
 /** */
 private volatile boolean nextSnapshot;

[18/23] ignite git commit: IGNITE-8166 PME hangs when error occurs during checkpoint

2018-04-17 Thread agoncharuk 
IGNITE-8166 PME hangs when error occurs during checkpoint

Signed-off-by: Andrey Gura 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e254e658
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e254e658
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e254e658

Branch: refs/heads/ignite-7708
Commit: e254e6588b7983ed8c13832a5512e662fb8c4215
Parents: b810bd4
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 15:56:36 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 15:56:36 2018 +0300

--
 .../cache/persistence/GridCacheDatabaseSharedManager.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e254e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index caf27b7..a371aa8 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -3667,7 +3667,14 @@ public class GridCacheDatabaseSharedManager extends 
IgniteCacheDatabaseSharedMan
 private GridFutureAdapter cpBeginFut = new GridFutureAdapter<>();
 
 /** */
-private GridFutureAdapter cpFinishFut = new GridFutureAdapter<>();
+private GridFutureAdapter cpFinishFut = new GridFutureAdapter() {
+@Override protected boolean onDone(@Nullable Void res, @Nullable 
Throwable err, boolean cancel) {
+if (err != null && !cpBeginFut.isDone())
+cpBeginFut.onDone(err);
+
+return super.onDone(res, err, cancel);
+}
+};
 
 /** */
 private volatile boolean nextSnapshot;

ignite git commit: IGNITE-8166 PME hangs when error occurs during checkpoint

2018-04-17 Thread agura 
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.5 a7dbea160 -> b762d681b


IGNITE-8166 PME hangs when error occurs during checkpoint

Signed-off-by: Andrey Gura 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b762d681
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b762d681
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b762d681

Branch: refs/heads/ignite-2.5
Commit: b762d681b97ea121a8321eb66bf02f89a1d177cd
Parents: a7dbea1
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 15:56:36 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 16:00:29 2018 +0300

--
 .../cache/persistence/GridCacheDatabaseSharedManager.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b762d681/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index 5beaafc..16d3292 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -3606,7 +3606,14 @@ public class GridCacheDatabaseSharedManager extends 
IgniteCacheDatabaseSharedMan
 private GridFutureAdapter cpBeginFut = new GridFutureAdapter<>();
 
 /** */
-private GridFutureAdapter cpFinishFut = new GridFutureAdapter<>();
+private GridFutureAdapter cpFinishFut = new GridFutureAdapter() {
+@Override protected boolean onDone(@Nullable Void res, @Nullable 
Throwable err, boolean cancel) {
+if (err != null && !cpBeginFut.isDone())
+cpBeginFut.onDone(err);
+
+return super.onDone(res, err, cancel);
+}
+};
 
 /** */
 private volatile boolean nextSnapshot;

ignite git commit: IGNITE-8166 PME hangs when error occurs during checkpoint

2018-04-17 Thread agura 
Repository: ignite
Updated Branches:
  refs/heads/master b810bd448 -> e254e6588


IGNITE-8166 PME hangs when error occurs during checkpoint

Signed-off-by: Andrey Gura 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e254e658
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e254e658
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e254e658

Branch: refs/heads/master
Commit: e254e6588b7983ed8c13832a5512e662fb8c4215
Parents: b810bd4
Author: Aleksey Plekhanov 
Authored: Tue Apr 17 15:56:36 2018 +0300
Committer: Andrey Gura 
Committed: Tue Apr 17 15:56:36 2018 +0300

--
 .../cache/persistence/GridCacheDatabaseSharedManager.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e254e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index caf27b7..a371aa8 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -3667,7 +3667,14 @@ public class GridCacheDatabaseSharedManager extends 
IgniteCacheDatabaseSharedMan
 private GridFutureAdapter cpBeginFut = new GridFutureAdapter<>();
 
 /** */
-private GridFutureAdapter cpFinishFut = new GridFutureAdapter<>();
+private GridFutureAdapter cpFinishFut = new GridFutureAdapter() {
+@Override protected boolean onDone(@Nullable Void res, @Nullable 
Throwable err, boolean cancel) {
+if (err != null && !cpBeginFut.isDone())
+cpBeginFut.onDone(err);
+
+return super.onDone(res, err, cancel);
+}
+};
 
 /** */
 private volatile boolean nextSnapshot;