You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2016/10/26 08:06:33 UTC

svn commit: r1766644 - /jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java

Author: amitj
Date: Wed Oct 26 08:06:33 2016
New Revision: 1766644

URL: http://svn.apache.org/viewvc?rev=1766644&view=rev
Log:
OAK-5005: S3 async upload fails to catch and log exceptions other than DataStoreException

Log warning with details and add to the retry mechanism to upload again

Modified:
    jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java

Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java?rev=1766644&r1=1766643&r2=1766644&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/S3Backend.java Wed Oct 26 08:06:33 2016
@@ -1225,9 +1225,12 @@ public class S3Backend implements Shared
         public void run() {
             try {
                 write(identifier, file, true, callback);
-            } catch (DataStoreException e) {
-                LOG.error("Could not upload [" + identifier + "], file[" + file
+            } catch (Exception e) {
+                LOG.warn("Could not upload [" + identifier + "], file[" + file
                     + "]", e);
+                AsyncUploadResult result = new AsyncUploadResult(identifier, file);
+                result.setException(e);
+                callback.onFailure(result);
             }
 
         }