svn commit: r1806896 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java

[tomekr]

Author: tomekr
Date: Fri Sep  1 08:15:55 2017
New Revision: 1806896

URL: http://svn.apache.org/viewvc?rev=1806896&view=rev
Log:
OAK-6604: Oak Blob Cloud is not used by oak-upgrade

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java?rev=1806896&r1=1806895&r2=1806896&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
 Fri Sep  1 08:15:55 2017
@@ -27,9 +27,7 @@ import java.util.regex.Pattern;
 
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.jackrabbit.core.data.CachingDataStore;
 import org.apache.jackrabbit.core.data.DataStoreException;
 import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
 import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
@@ -83,7 +81,7 @@ public class S3DataStoreFactory implemen
         } catch (RepositoryException e) {
             throw new IOException(e);
         }
-        closer.register(asCloseable(delegate, tempHomeDir));
+        closer.register(asCloseable(delegate));
         if (ignoreMissingBlobs) {
             return new SafeDataStoreBlobStore(delegate);
         } else {
@@ -91,21 +89,14 @@ public class S3DataStoreFactory implemen
         }
     }
 
-    private static Closeable asCloseable(final CachingDataStore store, final 
File tempHomeDir) {
+    private static Closeable asCloseable(final S3DataStore store) {
         return new Closeable() {
             @Override
             public void close() throws IOException {
                 try {
-                    while (!store.getPendingUploads().isEmpty()) {
-                        log.info("Waiting for following uploads to finish: " + 
store.getPendingUploads());
-                        Thread.sleep(1000);
-                    }
                     store.close();
-                    FileUtils.deleteDirectory(tempHomeDir);
                 } catch (DataStoreException e) {
                     throw new IOException(e);
-                } catch (InterruptedException e) {
-                    throw new IOException(e);
                 }
             }
         };