You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by bz...@apache.org on 2016/10/18 01:22:40 UTC

zeppelin git commit: [Zeppelin-1557] Graceful storage exception handling

Repository: zeppelin
Updated Branches:
  refs/heads/master 8ea16ab65 -> b6e3c8ee8


[Zeppelin-1557] Graceful storage exception handling

### What is this PR for?
Graceful handling of errors in storage sync layer

### What type of PR is it?
Bug Fix | Improvement

### Todos
* [x] - catch and continue

### What is the Jira issue?
[ZEPPELIN-1557](https://issues.apache.org/jira/browse/ZEPPELIN-1557)

### How should this be tested?
green CI

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: Khalid Huseynov <kh...@gmail.com>

Closes #1532 from khalidhuseynov/fix/storage-graceful-sync and squashes the following commits:

d036d9e [Khalid Huseynov] catch exception, log, and continue


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

Branch: refs/heads/master
Commit: b6e3c8ee8640c1d6f2bf67c6b490facadbdd3250
Parents: 8ea16ab
Author: Khalid Huseynov <kh...@gmail.com>
Authored: Mon Oct 17 23:22:42 2016 +0900
Committer: Alexander Bezzubov <bz...@apache.org>
Committed: Tue Oct 18 10:22:30 2016 +0900

----------------------------------------------------------------------
 .../org/apache/zeppelin/notebook/repo/NotebookRepoSync.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b6e3c8ee/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
index f67b71f..6ddaa33 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
@@ -226,9 +226,13 @@ public class NotebookRepoSync implements NotebookRepo {
   }
 
   private void pushNotes(AuthenticationInfo subject, List<String> ids, NotebookRepo localRepo,
-      NotebookRepo remoteRepo) throws IOException {
+      NotebookRepo remoteRepo) {
     for (String id : ids) {
-      remoteRepo.save(localRepo.get(id, subject), subject);
+      try {
+        remoteRepo.save(localRepo.get(id, subject), subject);
+      } catch (IOException e) {
+        LOG.error("Failed to push note to storage, moving onto next one", e);
+      }
     }
   }