Ref #29447: add more tests

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/proxysharing/IDelegateProxyStore.java

@@ -21,13 +21,19 @@
 package eu.openanalytics.containerproxy.backend.dispatcher.proxysharing;
 
 import eu.openanalytics.containerproxy.backend.dispatcher.proxysharing.store.DelegateProxy;
+import eu.openanalytics.containerproxy.backend.dispatcher.proxysharing.store.DelegateProxyStatus;
 
 import java.util.Collection;
+import java.util.stream.Stream;
 
 public interface IDelegateProxyStore {
 
     Collection<DelegateProxy> getAllDelegateProxies();
 
+    default Stream<DelegateProxy> getAllDelegateProxies(DelegateProxyStatus delegateProxyStatus) {
+        return getAllDelegateProxies().stream().filter(it -> it.getDelegateProxyStatus().equals(delegateProxyStatus));
+    }
+
     void addDelegateProxy(DelegateProxy delegateProxy);
 
     void removeDelegateProxy(String delegateProxyId);

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/proxysharing/ProxySharingScaler.java

@@ -93,7 +93,7 @@ public class ProxySharingScaler {
     private final Logger logger = LoggerFactory.getLogger(getClass());
     private final ProxySpec proxySpec;
     private final String proxySpecHash;
-    private ReconcileStatus lastReconcileStatus = ReconcileStatus.Stable;
+    protected ReconcileStatus lastReconcileStatus = ReconcileStatus.Stable;
     private Instant lastScaleUp = null;
 
     @Inject
@@ -640,7 +640,7 @@ private void log(Seat seat, String message) {
         logger.info("[{} {} {}] " + message, kv("specId", proxySpec.getId()), kv("delegateProxyId", seat.getDelegateProxyId()), kv("seatId", seat.getId()));
     }
 
-    private enum ReconcileStatus {
+    public enum ReconcileStatus {
         Stable,
         ScaleUp,
         ScaleDown

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/proxysharing/store/redis/RedisDelegateProxyStore.java

@@ -22,6 +22,7 @@
 
 import eu.openanalytics.containerproxy.backend.dispatcher.proxysharing.IDelegateProxyStore;
 import eu.openanalytics.containerproxy.backend.dispatcher.proxysharing.store.DelegateProxy;
+import eu.openanalytics.containerproxy.backend.dispatcher.proxysharing.store.DelegateProxyStatus;
 import org.springframework.data.redis.core.BoundHashOperations;
 
 import java.util.Collection;

src/main/java/eu/openanalytics/containerproxy/service/session/redis/RedisSessionService.java

@@ -30,6 +30,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.session.Session;
@@ -41,8 +42,6 @@
 import java.time.Instant;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -71,12 +70,6 @@ public class RedisSessionService extends AbstractSessionService {
     public void init() {
         keyPattern = redisSessionConfig.getRedisNamespace() + ":sessions:*";
         redisTemplate = (RedisTemplate<String, Object>) redisIndexedSessionRepository.getSessionRedisOperations();
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                updateCachedUsersLoggedInCount();
-            }
-        }, 0, CACHE_UPDATE_INTERVAL);
     }
 
     @Override
@@ -112,6 +105,7 @@ public String extractSessionIdFromExchange(HttpServerExchange exchange) {
      * using an HTTP request.
      * See the warning at https://redis.io/commands/keys .
      */
+    @Scheduled(fixedDelay = CACHE_UPDATE_INTERVAL)
     private void updateCachedUsersLoggedInCount() {
         Set<String> keys = redisTemplate.keys(keyPattern);
 

src/main/java/eu/openanalytics/containerproxy/service/session/undertow/UndertowSessionService.java

@@ -30,17 +30,15 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.time.Instant;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
 
 @Component
 @ConditionalOnProperty(name = "spring.session.store-type", havingValue = "none")
@@ -58,16 +56,6 @@ public class UndertowSessionService extends AbstractSessionService {
 
     private Integer cachedActiveUsersCount = null;
 
-    @PostConstruct
-    public void init() {
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                updateCachedUsersLoggedInCount();
-            }
-        }, 0, CACHE_UPDATE_INTERVAL);
-    }
-
     @Override
     public Integer getLoggedInUsersCount() {
         return cachedUsersLoggedInCount;
@@ -111,6 +99,7 @@ public String extractSessionIdFromExchange(HttpServerExchange exchange) {
      * {@link eu.openanalytics.containerproxy.service.session.redis.RedisSessionService}, but still it needs to loop
      * over all sessions in the Servlet).
      */
+    @Scheduled(fixedDelay = CACHE_UPDATE_INTERVAL)
     private void updateCachedUsersLoggedInCount() {
         InMemorySessionManager instance = this.customInMemorySessionManagerFactory.getInstance();
         if (instance == null) {

src/test/java/eu/openanalytics/containerproxy/test/helpers/NotInternalOnlyTestStrategy.java

@@ -53,7 +53,6 @@ public boolean testProxy(Proxy proxy) {
                 }
                 log.warn(proxy, "Error during test strategy test: status code: " + responseCode);
             } catch (Exception e) {
-                log.warn(proxy, e, "Exception during test strategy");
                 return false;
             }
             return false;

src/test/java/eu/openanalytics/containerproxy/test/helpers/ShinyProxyClient.java

@@ -59,10 +59,14 @@ public ShinyProxyClient(String usernameAndPassword, int port) {
     }
 
     public String startProxy(String specId) {
-        return startProxy(specId, null);
+        return startProxy(specId, null, true);
     }
 
     public String startProxy(String specId, Map<String, String> parameters) {
+        return startProxy(specId, parameters, true);
+    }
+
+    public String startProxy(String specId, Map<String, String> parameters, boolean wait) {
         RequestBody body = RequestBody.create("", null);
         if (parameters != null) {
             ObjectMapper objectMapper = new ObjectMapper();
@@ -82,9 +86,11 @@ public String startProxy(String specId, Map<String, String> parameters) {
 
         JsonObject response = call(request, 201);
         String id = response.getJsonObject("data").getString("id");
-        ProxyStatus proxyStatus = waitForProxyStatus(id);
-        if (proxyStatus != ProxyStatus.Up) {
-            throw new TestHelperException(String.format("Proxy with id %s failed to reach Up status", id));
+        if (wait) {
+            ProxyStatus proxyStatus = waitForProxyStatus(id);
+            if (proxyStatus != ProxyStatus.Up) {
+                throw new TestHelperException(String.format("Proxy with id %s failed to reach Up status", id));
+            }
         }
         return id;
     }

src/test/java/eu/openanalytics/containerproxy/test/helpers/TestProxySharingScaler.java

@@ -56,4 +56,8 @@ public ISeatStore getSeatStore() {
         return seatStore;
     }
 
+    public ProxySharingScaler.ReconcileStatus getLastReconcileStatus() {
+        return lastReconcileStatus;
+    }
+
 }