Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes #12855] Remove parallel upload default value from env_var #12857

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ RESTART_POLICY_DELAY="5s"
RESTART_POLICY_MAX_ATTEMPTS="3"
RESTART_POLICY_WINDOW=120s

DEFAULT_MAX_UPLOAD_SIZE=5368709120
DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5

# FORCE_READ_ONLY_MODE=False Override the read-only value saved in the configuration
1 change: 0 additions & 1 deletion .env_dev
Original file line number Diff line number Diff line change
Expand Up @@ -218,5 +218,4 @@ RESTART_POLICY_DELAY="5s"
RESTART_POLICY_MAX_ATTEMPTS="3"
RESTART_POLICY_WINDOW=120s

DEFAULT_MAX_UPLOAD_SIZE=5368709120
DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5
1 change: 0 additions & 1 deletion .env_local
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,4 @@ RESTART_POLICY_DELAY="5s"
RESTART_POLICY_MAX_ATTEMPTS="3"
RESTART_POLICY_WINDOW=120s

DEFAULT_MAX_UPLOAD_SIZE=5368709120
DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=5
1 change: 0 additions & 1 deletion .env_test
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ RESTART_POLICY_DELAY="5s"
RESTART_POLICY_MAX_ATTEMPTS="3"
RESTART_POLICY_WINDOW=120s

DEFAULT_MAX_UPLOAD_SIZE=5368709120
DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=100

# Azure AD
Expand Down
2 changes: 1 addition & 1 deletion geonode/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2179,7 +2179,7 @@ def get_geonode_catalogue_service():
"django.core.files.uploadhandler.MemoryFileUploadHandler",
]

DEFAULT_MAX_UPLOAD_SIZE = int(os.getenv("DEFAULT_MAX_UPLOAD_SIZE", 104857600)) # 100 MB
DEFAULT_MAX_UPLOAD_SIZE = 104857600 # 100 MB
DEFAULT_BUFFER_CHUNK_SIZE = int(os.getenv("DEFAULT_BUFFER_CHUNK_SIZE", 64 * 1024))
DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER = int(os.getenv("DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER", 5))

Expand Down
1 change: 0 additions & 1 deletion test_csw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export ASYNC_SIGNALS=False
export DATABASE_URL=postgis://geonode:geonode@db:5432/geonode
export GEODATABASE_URL=postgis://geonode:geonode@db:5432/geonode_data
export DEFAULT_BACKEND_DATASTORE=datastore
export DEFAULT_MAX_UPLOAD_SIZE=5368709120
export DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=100

# echo "Initialize DB";
Expand Down
Loading