Skip to content

[Fixes #594] Alignment of geonode-project 5.0.x to GeoNode 5.0.x #595

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.

Sign up for GitHub

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

Merged
giohappy merged 2 commits into from
Dec 3, 2025
Merged

[Fixes #594] Alignment of geonode-project 5.0.x to GeoNode 5.0.x #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe94414
alignment of geonode-project 5 to GeoNode 5
Gpetrak Dec 1, 2025
2be82bd
adding harvesting monitoring setting
Gpetrak Dec 1, 2025
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
12 changes: 8 additions & 4 deletions .env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ DOCKER_ENV=production
DOCKER_API_VERSION="1.24"
BACKUPS_VOLUME_DRIVER=local

GEONODE_BASE_IMAGE_VERSION=master
NGINX_BASE_IMAGE_VERSION=1.26.3-latest
GEONODE_BASE_IMAGE_VERSION=5.0.x
NGINX_BASE_IMAGE_VERSION=1.28.0-v1
LETSENCRYPT_BASE_IMAGE_VERSION=2.6.0-latest
GEOSERVER_BASE_IMAGE_VERSION=2.24.4-latest
GEOSERVER_DATA_BASE_IMAGE_VERSION=2.24.4-latest
GEOSERVER_BASE_IMAGE_VERSION=2.27.3-latest
GEOSERVER_DATA_BASE_IMAGE_VERSION=2.27.3-latest
POSTGRES_BASE_IMAGE_VERSION=15-3.5-latest

C_FORCE_ROOT=1
Expand Down Expand Up @@ -249,6 +249,10 @@ LDAP_GROUP_PROFILE_MEMBER_ATTR=uniqueMember
# CELERY__LOG_FILE="/var/log/celery.log"
# CELERY__WORKER_NAME="worker1@%h"

# Monitoring configuration
HARVESTING_MONITOR_ENABLED=True
HARVESTING_MONITOR_DELAY=60

# PostgreSQL
POSTGRESQL_MAX_CONNECTIONS=200

Expand Down
60 changes: 54 additions & 6 deletions src/celery-cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,65 @@ CELERY_APP=${CELERY_APP:-"geonode.celery_app:app"}
CELERY__STATE_DB=${CELERY__STATE_DB:-"/mnt/volumes/statics/worker@%h.state"}
# expressed in KB
CELERY__MAX_MEMORY_PER_CHILD=${CELERY__MAX_MEMORY_PER_CHILD:-"200000"}
CELERY__AUTOSCALE_VALUES=${CELERY__AUTOSCALE_VALUES:-"15,10"}
CELERY__AUTOSCALE_VALUES=${CELERY__AUTOSCALE_VALUES:-"10,5"}
CELERY__MAX_TASKS_PER_CHILD=${CELERY__MAX_TASKS_PER_CHILD:-"10"}
CELERY__OPTS=${CELERY__OPTS:-"--without-gossip --without-mingle -Ofair -B -E"}
CELERY__BEAT_SCHEDULE=${CELERY__BEAT_SCHEDULE:-"celery.beat:PersistentScheduler"}
CELERY__LOG_LEVEL=${CELERY__LOG_LEVEL:-"INFO"}
CELERY__OPTS=${CELERY__OPTS:-"--without-gossip --without-mingle -Ofair -E"}
CELERY__LOG_LEVEL=${CELERY__LOG_LEVEL:-"ERROR"}
CELERY__LOG_FILE=${CELERY__LOG_FILE:-"/var/log/celery.log"}
CELERY__WORKER_NAME=${CELERY__WORKER_NAME:-"worker1@%h"}
CELERY__WORKER_CONCURRENCY=${CELERY__WORKER_CONCURRENCY:-"4"}

# Celery beat settings
CELERY__BEAT_SCHEDULE=${CELERY__BEAT_SCHEDULE:-"celery.beat:PersistentScheduler"}
CELERY__BEAT_LOG=${CELERY__BEAT_LOG:-"/var/log/celery_beat.log"}

# Harvester settings
CELERY__HARVESTER_WORKER_NAME=${CELERY__HARVESTER_WORKER_NAME:-"harvesting_worker@%h"}
CELERY__HARVESTER_CONCURRENCY=${CELERY__HARVESTER_CONCURRENCY:-"10"}
CELERY__HARVESTER_AUTOSCALE_VALUES=${CELERY__HARVESTER_AUTOSCALE_VALUES:-"15,10"}
CELERY__HARVESTER_MAX_MEMORY_PER_CHILD=${CELERY__MAX_MEMORY_PER_CHILD:-"500000"}

# --- FIX: Remove stale Beat pidfile before starting beat ---
BEAT_PIDFILE="/tmp/celerybeat.pid"

if [ -f "$BEAT_PIDFILE" ]; then
PID=$(cat "$BEAT_PIDFILE" 2>/dev/null)

# If PID exists and is running → warn but continue (avoid killing)
if kill -0 "$PID" 2>/dev/null; then
echo "WARNING: Celery Beat seems to be running already (PID $PID). Removing stale pidfile anyway."
else
echo "Removing stale Celery Beat pidfile: $BEAT_PIDFILE"
fi

rm -f "$BEAT_PIDFILE"
fi
# --- END FIX ---

echo "Starting Celery Beat..."
$CELERY_BIN -A $CELERY_APP beat --scheduler=$CELERY__BEAT_SCHEDULE \
--loglevel=$CELERY__LOG_LEVEL -f $CELERY__BEAT_LOG --pidfile=/tmp/celerybeat.pid &

echo "Starting Default Celery Worker..."
$CELERY_BIN -A $CELERY_APP worker --autoscale=$CELERY__AUTOSCALE_VALUES \
--max-memory-per-child=$CELERY__MAX_MEMORY_PER_CHILD $CELERY__OPTS \
--statedb=$CELERY__STATE_DB --scheduler=$CELERY__BEAT_SCHEDULE \
--statedb=$CELERY__STATE_DB \
--loglevel=$CELERY__LOG_LEVEL -n $CELERY__WORKER_NAME -f $CELERY__LOG_FILE \
--concurrency=$CELERY__WORKER_CONCURRENCY --max-tasks-per-child=$CELERY__MAX_TASKS_PER_CHILD
--concurrency=$CELERY__WORKER_CONCURRENCY --max-tasks-per-child=$CELERY__MAX_TASKS_PER_CHILD \
-X harvesting &

echo "Starting Harvester Celery Worker..."
$CELERY_BIN -A $CELERY_APP worker -Q harvesting \
--autoscale=$CELERY__HARVESTER_AUTOSCALE_VALUES \
--max-memory-per-child=$CELERY__HARVESTER_MAX_MEMORY_PER_CHILD \
--loglevel=$CELERY__LOG_LEVEL \
-n $CELERY__HARVESTER_WORKER_NAME \
--concurrency=$CELERY__HARVESTER_CONCURRENCY \
-f $CELERY__LOG_FILE &

# Wait for any process to exit
wait -n

# Exit with the status of the process that exited first
# Docker will restart the container if this is non-zero (i.e., a failure)
exit $?
4 changes: 2 additions & 2 deletions src/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-e git+https://github.com/GeoNode/geonode-mapstore-client.git@master#egg=django_geonode_mapstore_client # Commented otherwise we get conflicts with the git deps from geonode master
-e git+https://github.com/GeoNode/geonode.git@master#egg=GeoNode
-e git+https://github.com/GeoNode/geonode-mapstore-client.git@5.0.x#egg=django_geonode_mapstore_client
-e git+https://github.com/GeoNode/geonode.git@5.0.x#egg=GeoNode