Repository: incubator-zeppelin Updated Branches: refs/heads/master 3de8da3c0 -> ecc2fc623
[ZEPPELIN-751]Log an error and continue reading the remaining notebooks ### What is this PR for? Log an Amazon Service Exception. Continue reading the remaining notebooks into S3ObjectSummary. ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-751 ### Questions: * Do you have a plan using Guava? (Sometimes Optional is good stuff) Author: Minwoo Kang <[email protected]> This patch had conflicts when merged, resolved by Committer: Lee moon soo <[email protected]> Closes #787 from mwkang/master and squashes the following commits: d9d74bf [Minwoo Kang] [ZEPPELIN-751]Change a log level f9f18ee [Minwoo Kang] [ZEPPELIN-751]Log an error and continue reading the remaining notebooks 23bb71c [Minwoo Kang] [ZEPPELIN-751]Log an error and continue reading the remaining notebooks Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/ecc2fc62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/ecc2fc62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/ecc2fc62 Branch: refs/heads/master Commit: ecc2fc6230a0d5958e3824d99aedad9d3deb8085 Parents: 3de8da3 Author: Minwoo Kang <[email protected]> Authored: Wed Mar 23 13:44:46 2016 +0900 Committer: Lee moon soo <[email protected]> Committed: Thu Mar 24 07:58:50 2016 -0700 ---------------------------------------------------------------------- .../apache/zeppelin/notebook/repo/S3NotebookRepo.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ecc2fc62/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/S3NotebookRepo.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/S3NotebookRepo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/S3NotebookRepo.java index e0df65f..f178179 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/S3NotebookRepo.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/S3NotebookRepo.java @@ -102,6 +102,16 @@ public class S3NotebookRepo implements NotebookRepo { if (info != null) { infos.add(info); } + } catch (AmazonServiceException ase) { + LOG.warn("Caught an AmazonServiceException for some reason.\n" + + "Error Message: {}", ase.getMessage()); + } catch (AmazonClientException ace) { + LOG.info("Caught an AmazonClientException, " + + "which means the client encountered " + + "an internal error while trying to communicate" + + " with S3, " + + "such as not being able to access the network."); + LOG.info("Error Message: " + ace.getMessage()); } catch (Exception e) { LOG.error("Can't read note ", e); } @@ -110,7 +120,8 @@ public class S3NotebookRepo implements NotebookRepo { listObjectsRequest.setMarker(objectListing.getNextMarker()); } while (objectListing.isTruncated()); } catch (AmazonServiceException ase) { - + LOG.warn("Caught an AmazonServiceException for some reason.\n" + + "Error Message: {}", ase.getMessage()); } catch (AmazonClientException ace) { LOG.info("Caught an AmazonClientException, " + "which means the client encountered " +
