Merge pull request #16619 from iterate-ch/bugfix/GH-16618

Review scheduled operations for OpenStack Swift

Author: ylangisc

core/src/main/java/ch/cyberduck/core/features/Scheduler.java

@@ -17,6 +17,8 @@
 
 import ch.cyberduck.core.PasswordCallback;
 
+import org.apache.commons.lang3.concurrent.ConcurrentUtils;
+
 import java.util.concurrent.Future;
 
 @Optional
@@ -35,4 +37,21 @@ public interface Scheduler<R> {
      * Shutdown thread pool
      */
     void shutdown(boolean gracefully);
+
+    Scheduler noop = new Scheduler() {
+        @Override
+        public Future repeat(final PasswordCallback callback) {
+            return ConcurrentUtils.constantFuture(null);
+        }
+
+        @Override
+        public Future execute(final PasswordCallback callback) {
+            return ConcurrentUtils.constantFuture(null);
+        }
+
+        @Override
+        public void shutdown(final boolean gracefully) {
+        //
+        }
+    };
 }

defaults/src/main/resources/default.properties

@@ -407,6 +407,7 @@ openstack.authentication.context=/v2.0/tokens
 openstack.metadata.default=
 openstack.list.container.limit=100
 openstack.list.object.limit=10000
+# Preload account info after connect and create X-Account-Meta-Temp-URL-Key if missing in account metadata
 openstack.account.preload=true
 openstack.cdn.preload=true
 openstack.container.size.preload=true
@@ -426,8 +427,6 @@ openstack.upload.largeobject.size.minimum=1048576
 openstack.upload.largeobject.cleanup=true
 openstack.delete.multiple.partition=10000
 openstack.delete.largeobject.segments=true
-# Preload account info after connect and create X-Account-Meta-Temp-URL-Key if missing in account metadata
-openstack.accounts.preload=true
 
 googledrive.list.limit=1000
 googledrive.teamdrive.enable=true

openstack/src/main/java/ch/cyberduck/core/openstack/SwiftAccountLoader.java

@@ -28,8 +28,8 @@
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import ch.iterate.openstack.swift.exception.GenericException;
 import ch.iterate.openstack.swift.model.AccountInfo;
@@ -46,7 +46,7 @@ public SwiftAccountLoader(final SwiftSession session) {
 
     @Override
     protected Map<Region, AccountInfo> operate(final PasswordCallback callback) throws BackgroundException {
-        final Map<Region, AccountInfo> accounts = new ConcurrentHashMap<>();
+        final Map<Region, AccountInfo> accounts = new HashMap<>();
         for(Region region : session.getClient().getRegions()) {
             try {
                 final AccountInfo info = session.getClient().getAccountInfo(region);

openstack/src/main/java/ch/cyberduck/core/openstack/SwiftDistributionConfigurationLoader.java

@@ -30,13 +30,15 @@
 import org.apache.logging.log4j.Logger;
 
 import java.util.Collections;
-import java.util.LinkedHashSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
  * Preload CDN configuration
  */
-public class SwiftDistributionConfigurationLoader extends OneTimeSchedulerFeature<Set<Distribution>> {
+public class SwiftDistributionConfigurationLoader extends OneTimeSchedulerFeature<Map<Path, Set<Distribution>>> {
     private static final Logger log = LogManager.getLogger(SwiftDistributionConfigurationLoader.class);
 
     private final SwiftSession session;
@@ -46,19 +48,19 @@ public SwiftDistributionConfigurationLoader(final SwiftSession session) {
     }
 
     @Override
-    protected Set<Distribution> operate(final PasswordCallback callback) throws BackgroundException {
+    protected Map<Path, Set<Distribution>> operate(final PasswordCallback callback) throws BackgroundException {
         final DistributionConfiguration feature = session.getFeature(DistributionConfiguration.class);
         if(null == feature) {
-            return Collections.emptySet();
+            return Collections.emptyMap();
         }
         final AttributedList<Path> containers = new SwiftContainerListService(session,
                 new SwiftLocationFeature.SwiftRegion(session.getHost().getRegion())).list(Home.ROOT, new DisabledListProgressListener());
-        final Set<Distribution> distributions = new LinkedHashSet<>();
+        final Map<Path, Set<Distribution>> distributions = new HashMap<>();
         for(Path container : containers) {
             for(Distribution.Method method : feature.getMethods(container)) {
                 final Distribution distribution = feature.read(container, method, new DisabledLoginCallback());
                 log.info("Cache distribution {}", distribution);
-                distributions.add(distribution);
+                distributions.getOrDefault(container, new HashSet<>()).add(distribution);
             }
         }
         return distributions;

openstack/src/main/java/ch/cyberduck/core/openstack/SwiftSession.java

@@ -66,19 +66,28 @@ public class SwiftSession extends HttpSession<Client> {
             = new SwiftRegionService(this);
 
     private final Map<Region, AccountInfo> accounts = new ConcurrentHashMap<>();
+    private final Map<Path, Set<Distribution>> distributions = new ConcurrentHashMap<>();
 
     private final DelegatingSchedulerFeature scheduler = new DelegatingSchedulerFeature(
-            new SwiftAccountLoader(this) {
+            new HostPreferences(host).getBoolean("openstack.account.preload") ? new SwiftAccountLoader(this) {
                 @Override
                 protected Map<Region, AccountInfo> operate(final PasswordCallback callback) throws BackgroundException {
                     final Map<Region, AccountInfo> result = super.operate(callback);
                     // Only executed single time
                     accounts.putAll(result);
                     return result;
                 }
-            }, new SwiftDistributionConfigurationLoader(this)
+            } : Scheduler.noop,
+            new HostPreferences(host).getBoolean("openstack.cdn.preload") ? new SwiftDistributionConfigurationLoader(this) {
+                @Override
+                protected Map<Path, Set<Distribution>> operate(final PasswordCallback callback) throws BackgroundException {
+                    final Map<Path, Set<Distribution>> result = super.operate(callback);
+                    // Only executed single time
+                    distributions.putAll(result);
+                    return result;
+                }
+            } : Scheduler.noop
     );
-    private final Map<Path, Set<Distribution>> distributions = new ConcurrentHashMap<>();
 
     public SwiftSession(final Host host, final X509TrustManager trust, final X509KeyManager key) {
         super(host, trust, key);
@@ -210,10 +219,7 @@ public Distribution read(final Path container, final Distribution.Method method,
             return (T) new SwiftAttributesFinderFeature(this, regionService);
         }
         if(type == Scheduler.class) {
-            if(new HostPreferences(host).getBoolean("openstack.accounts.preload")) {
-                return (T) scheduler;
-            }
-            return null;
+            return (T) scheduler;
         }
         return super._getFeature(type);
     }