From 15569be3cb3b1e7328a9415a45a194f4d340d68d Mon Sep 17 00:00:00 2001
From: Denisas <hynixas@gmail.com>
Date: Fri, 22 Jul 2022 10:58:08 +0300
Subject: [PATCH] spark 3.3.0

---
 Dockerfile                                                | 8 ++++----
 .../exacaster/lighter/application/batch/BatchHandler.java | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dd90c3a8..5373a279 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:11-jre-slim-stretch as server
 
-ARG SPARK_VERSION=3.2.1
+ARG SPARK_VERSION=3.3.0
 
 WORKDIR /home/app/
 COPY server/ ./server/
@@ -10,20 +10,20 @@ RUN ./gradlew build -PSPARK_VERSION=${SPARK_VERSION}
 
 FROM node:lts-alpine3.14 as frontend
 
-ARG SPARK_VERSION=3.2.1
+ARG SPARK_VERSION=3.3.0
 
 ENV REACT_APP_API_BASE_URL='/lighter'
 
 WORKDIR /home/app/
 COPY frontend/ ./frontend/
-RUN wget "https://downloads.apache.org/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.2.tgz" -O - | tar -xz
+RUN wget "https://downloads.apache.org/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.tgz" -O - | tar -xz
 
 WORKDIR /home/app/frontend/
 RUN yarn install && yarn build
 
 FROM openjdk:11-jre-slim-stretch
 
-ARG SPARK_VERSION=3.2.1
+ARG SPARK_VERSION=3.3.0
 
 ENV FRONTEND_PATH=/home/app/frontend/
 ENV SPARK_HOME=/home/app/spark/
diff --git a/server/src/main/java/com/exacaster/lighter/application/batch/BatchHandler.java b/server/src/main/java/com/exacaster/lighter/application/batch/BatchHandler.java
index 1c426ab4..802a0bd8 100644
--- a/server/src/main/java/com/exacaster/lighter/application/batch/BatchHandler.java
+++ b/server/src/main/java/com/exacaster/lighter/application/batch/BatchHandler.java
@@ -50,7 +50,7 @@ public Waitable launch(Application application, Consumer<Throwable> errorHandler
     }
 
     @SchedulerLock(name = "processScheduledBatches")
-    @Scheduled(fixedRate = "1m")
+    @Scheduled(fixedDelay = "30s")
     public void processScheduledBatches() throws InterruptedException {
         assertLocked();
         var emptySlots = countEmptySlots();
@@ -75,7 +75,7 @@ private Integer countEmptySlots() {
     }
 
     @SchedulerLock(name = "trackRunning")
-    @Scheduled(fixedRate = "1m")
+    @Scheduled(fixedDelay = "30s")
     public void trackRunning() throws InterruptedException {
         assertLocked();
         var completedCount = batchService.fetchRunning().stream()