Merge remote-tracking branch 'origin/dev-1.2'

Author: anhefti

pom.xml

@@ -16,7 +16,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <seb-sps-version>1.2.1</seb-sps-version>
+        <seb-sps-version>1.2.3_SNAPSHOT</seb-sps-version>
         <build-version>${seb-sps-version}</build-version>
         <revision>${seb-sps-version}</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/ProctoringServiceImpl.java

@@ -112,7 +112,22 @@ public void checkMonitoringSessionAccess(final String sessionUUID) {
     public synchronized Result<ScreenshotViewData> getRecordedImageDataAt(final String sessionUUID, final Long timestamp) {
         return Result.tryCatch(() -> {
 
-            boolean sessionActive = this.proctoringCacheService.getSession(sessionUUID).isActive();
+            Session session = this.proctoringCacheService.getSession(sessionUUID);
+            if (session == null) {
+                log.warn("Failed to get Session for: {}", sessionUUID);
+                throw new NoResourceFoundException(EntityType.SCREENSHOT_DATA, sessionUUID);
+            }
+
+            // NOTE: if we have a distributed setup, refresh the cache to be sure we have the actual session from DB
+            // TODO  This is patch fix for SEBSP-217 and should be handled by overall session cache update for
+            //       distributed setup within the next release version
+            if (isDistributedSetup) {
+                proctoringCacheService.evictSession(sessionUUID);
+                session = this.proctoringCacheService.getSession(sessionUUID);
+            }
+
+            boolean sessionActive = session.isActive();
+
 
             if (timestamp == null) {
                 // this means last timestamp and only should be called on live recording views

src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/ScreenshotStore_S3.java

@@ -165,17 +165,21 @@ public void storeScreenshot(
     }
 
     private void processStore(final Collection<ScreenshotQueueData> batch) {
-        batch.clear();
-        this.screenshotDataQueue.drainTo(batch);
+        try {
+            batch.clear();
+            this.screenshotDataQueue.drainTo(batch);
 
-        if (batch.isEmpty()) {
-            return;
-        }
+            if (batch.isEmpty()) {
+                return;
+            }
 
-        if (batchStore) {
-            applyBatchStore(batch);
-        } else {
-            applySingleStore(batch);
+            if (batchStore) {
+                applyBatchStore(batch);
+            } else {
+                applySingleStore(batch);
+            }
+        } catch (Exception e) {
+            log.error("Failed to drain and process batch - should never happen: ", e);
         }
     }