Merge pull request #58 from hynix/master

spark 3.3.0
exacaster · Jul 22, 2022 · fbc1db2 · fbc1db2
2 parents 9204f6e + 15569be
commit fbc1db2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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()