chore(process-file): log low memory availability

MTES-MCT · Oct 4, 2024 · 240cd45 · 240cd45
1 parent 5fadc0e
commit 240cd45
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/...rocess-file/src/main/java/fr/dossierfacile/process/file/amqp/AnalyzeDocumentReceiver.java b/...rocess-file/src/main/java/fr/dossierfacile/process/file/amqp/AnalyzeDocumentReceiver.java
@@ -3,6 +3,7 @@
 import fr.dossierfacile.common.entity.messaging.QueueName;
 import fr.dossierfacile.common.service.interfaces.QueueMessageService;
 import fr.dossierfacile.process.file.service.AnalyzeDocumentService;
+import fr.dossierfacile.process.file.util.MemoryUtils;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,10 @@ public void startConsumer() {
 
     private void receiveDocument() {
         try {
+            if (!MemoryUtils.hasEnoughAvailableMemory()) {
+                log.warn("There is not currently enough memory to perform consumption ");
+                return;
+            }
             queueMessageService.consume(QueueName.QUEUE_DOCUMENT_ANALYSIS,
                     documentAnalysisDelay,
                     documentAnalysisTimeout,
@@ -45,5 +50,4 @@ private void receiveDocument() {
         }
     }
 
-
 }
diff --git a/...le-process-file/src/main/java/fr/dossierfacile/process/file/amqp/AnalyzeFileReceiver.java b/...le-process-file/src/main/java/fr/dossierfacile/process/file/amqp/AnalyzeFileReceiver.java
@@ -3,6 +3,7 @@
 import fr.dossierfacile.common.entity.messaging.QueueName;
 import fr.dossierfacile.common.service.interfaces.QueueMessageService;
 import fr.dossierfacile.process.file.service.AnalyzeFileService;
+import fr.dossierfacile.process.file.util.MemoryUtils;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,6 +31,10 @@ public void startConsumer() {
 
     private void receiveFile() {
         try {
+            if (!MemoryUtils.hasEnoughAvailableMemory()) {
+                log.warn("There is not currently enough memory to perform consumption ");
+                return;
+            }
             queueMessageService.consume(QueueName.QUEUE_FILE_ANALYSIS,
                     0,
                     fileAnalysisTimeout,

diff --git a/...ile-process-file/src/main/java/fr/dossierfacile/process/file/amqp/MinifyFileReceiver.java b/...ile-process-file/src/main/java/fr/dossierfacile/process/file/amqp/MinifyFileReceiver.java
@@ -3,6 +3,7 @@
 import fr.dossierfacile.common.entity.messaging.QueueName;
 import fr.dossierfacile.common.service.interfaces.QueueMessageService;
 import fr.dossierfacile.process.file.service.interfaces.MinifyFileService;
+import fr.dossierfacile.process.file.util.MemoryUtils;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +33,10 @@ public void startConsumer() {
 
     private void receiveFile() {
         try {
+            if (!MemoryUtils.hasEnoughAvailableMemory()) {
+                log.warn("There is not currently enough memory to perform consumption ");
+                return;
+            }
             queueMessageService.consume(QueueName.QUEUE_FILE_MINIFY,
                     0,
                     fileMinifyTimeout,

diff --git a/dossierfacile-process-file/src/main/java/fr/dossierfacile/process/file/util/MemoryUtils.java b/dossierfacile-process-file/src/main/java/fr/dossierfacile/process/file/util/MemoryUtils.java
@@ -0,0 +1,16 @@
+package fr.dossierfacile.process.file.util;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class MemoryUtils {
+    // TODO currently we only log low availability
+    public static boolean hasEnoughAvailableMemory() {
+        Runtime runtime = Runtime.getRuntime();
+        // Arbitrary choose 250MB as minimal requirement to perform
+        if (runtime.maxMemory() - runtime.totalMemory() + runtime.freeMemory() < 262144000) {
+            log.warn("Memory usage: (Total=" + runtime.totalMemory() / 1024 + " MB , max=" + runtime.maxMemory() / 1024 + " MB , free=" + runtime.freeMemory() / 1024 + " MB , avail=" + (runtime.maxMemory() - runtime.totalMemory() + runtime.freeMemory()));
+        }
+        return true;
+    }
+}
diff --git a/dossierfacile-process-file/src/test/resources/application.properties b/dossierfacile-process-file/src/test/resources/application.properties
@@ -3,7 +3,7 @@ spring.profiles.active=test
 server.port=${port:8080}
 server.tomcat.uri-encoding=UTF-8
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-application.domain=https://api-dev.dossierfacile.fr
+application.base.url=
 
 #Liquibase Configuration
 spring.liquibase.enabled=false