From eea79ad9e02d2d25b2ae310852ef2a6e009c1cb7 Mon Sep 17 00:00:00 2001
From: Floreal Cabanettes <floreal.cabanettes@inra.fr>
Date: Mon, 5 Feb 2018 17:07:45 +0100
Subject: [PATCH] Check file size in ava mode
---
application.properties | 2 ++
src/dgenies/config_reader.py | 16 ++++++++++++++++
src/dgenies/lib/job_manager.py | 9 ++++++---
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/application.properties b/application.properties
index 2f03f88..01fdec8 100644
--- a/application.properties
+++ b/application.properties
@@ -12,6 +12,8 @@ web_url = http://localhost:5000
# Max size of uploaded files (also for files from URL, size uncompressed):
# Please set the unit: M for Megabyte or G for Gigabyte (-1 without unit to don't set a limit)
max_upload_size = 3G
+# Max upload file size for all-vs-all (only target):
+max_upload_size_ava = 1G
# Max upload file size (compressed or not, only for uploaded files, not from URL):
# Please set the unit: M for Megabyte or G for Gigabyte (-1 without unit to don't set a limit)
max_upload_file_size = 1G
diff --git a/src/dgenies/config_reader.py b/src/dgenies/config_reader.py
index a5c54a8..c19be2f 100644
--- a/src/dgenies/config_reader.py
+++ b/src/dgenies/config_reader.py
@@ -102,6 +102,22 @@ class AppConfigReader:
except NoOptionError:
return -1
+ def _get_max_upload_size_ava(self):
+ try:
+ max_size_b = self._replace_vars(self.reader.get("global", "max_upload_size_ava"))
+ if max_size_b == "-1":
+ return -1
+ size_v = float(max_size_b[:-1])
+ size_unit = max_size_b[-1].upper()
+ if size_unit not in ["M", "G"]:
+ raise ValueError("Max size unit must be M or G")
+ max_size = int(size_v * 1024 * 1024)
+ if size_unit == "G":
+ max_size *= 1024
+ return max_size
+ except NoOptionError:
+ return -1
+
def _get_max_upload_file_size(self):
try:
max_size_b = self._replace_vars(self.reader.get("global", "max_upload_file_size"))
diff --git a/src/dgenies/lib/job_manager.py b/src/dgenies/lib/job_manager.py
index f0d9808..32546fb 100644
--- a/src/dgenies/lib/job_manager.py
+++ b/src/dgenies/lib/job_manager.py
@@ -433,22 +433,25 @@ class JobManager:
:param max_upload_size_readable: max upload size human readable
:return: (True if correct, True if error set [for fail], True if should be local)
"""
+ if input_type == "target" and self.query is None:
+ max_upload_size_readable = self.config.max_upload_size_ava / 1024 / 1024
with Job.connect():
my_input = getattr(self, input_type)
if my_input.get_path().endswith(".gz") and not self.is_gz_file(my_input.get_path()):
# Check file is correctly gzipped
job = Job.get(Job.id_job == self.id_job)
job.status = "fail"
- job.error = "Query file is not a correct gzip file"
+ job.error = input_type + " file is not a correct gzip file"
job.save()
self.clear()
return False, True, None
# Check size:
file_size = self.get_file_size(my_input.get_path())
- if -1 < self.config.max_upload_size < file_size:
+ if -1 < (self.config.max_upload_size if (input_type == "query" or self.query is not None)
+ else self.config.max_upload_size_ava) < file_size:
job = Job.get(Job.id_job == self.id_job)
job.status = "fail"
- job.error = "Query file exceed size limit of %d Mb (uncompressed)" % max_upload_size_readable
+ job.error = input_type + " file exceed size limit of %d Mb (uncompressed)" % max_upload_size_readable
job.save()
self.clear()
return False, True, None
--
GitLab