GG-23420 Properly handled exceptions in paralleled restore.

gridgain · Aug 29, 2019 · 8a72cee · 8a72cee
1 parent 81a9b09
commit 8a72cee
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...es/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/...es/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -5319,11 +5319,16 @@ private void restorePartitionStates(
 
                         totalProcessed.addAndGet(processed);
                     }
-                    catch (IgniteCheckedException e) {
+                    catch (IgniteCheckedException | RuntimeException | Error e) {
                         U.error(log, "Failed to restore partition state for " +
                             "groupName=" + grp.name() + " groupId=" + grp.groupId(), e);
 
-                        restoreStateError.compareAndSet(null, e);
+                        restoreStateError.compareAndSet(
+                            null,
+                            e instanceof IgniteCheckedException
+                                ? ((IgniteCheckedException)e)
+                                : new IgniteCheckedException(e)
+                        );
                     }
                 });