Skip to content

Commit

Permalink
Merge pull request OpenDroneMap#1443 from pierotofy/workercpu
Browse files Browse the repository at this point in the history
Add --worker-cpus option
  • Loading branch information
pierotofy authored Dec 5, 2023
2 parents 24f3b38 + ae08c10 commit 448a2cb
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 10 deletions.
4 changes: 4 additions & 0 deletions docker-compose.worker-cpu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
version: '2.2'
services:
worker:
cpus: ${WO_WORKER_CPUS}
32 changes: 22 additions & 10 deletions webodm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ case $key in
shift # past argument
shift # past value
;;
--media-dir)
--media-dir)
WO_MEDIA_DIR=$(realpath "$2")
export WO_MEDIA_DIR
shift # past argument
shift # past value
;;
--db-dir)
--db-dir)
WO_DB_DIR=$(realpath "$2")
export WO_DB_DIR
shift # past argument
Expand All @@ -72,19 +72,19 @@ case $key in
export WO_SSL=YES
shift # past argument
;;
--ssl-key)
--ssl-key)
WO_SSL_KEY=$(realpath "$2")
export WO_SSL_KEY
shift # past argument
shift # past value
;;
--ssl-cert)
WO_SSL_CERT=$(realpath "$2")
export WO_SSL_CERT
--ssl-cert)
WO_SSL_CERT=$(realpath "$2")
export WO_SSL_CERT
shift # past argument
shift # past value
;;
--ssl-insecure-port-redirect)
--ssl-insecure-port-redirect)
export WO_SSL_INSECURE_PORT_REDIRECT="$2"
shift # past argument
shift # past value
Expand All @@ -103,11 +103,11 @@ case $key in
dev_mode=true
shift # past argument
;;
--gpu)
--gpu)
gpu=true
shift # past argument
;;
--broker)
--broker)
export WO_BROKER="$2"
shift # past argument
shift # past value
Expand Down Expand Up @@ -136,11 +136,17 @@ case $key in
shift # past argument
shift # past value
;;
--worker-memory)
--worker-memory)
WO_WORKER_MEMORY="$2"
export WO_WORKER_MEMORY
shift # past argument
shift # past value
;;
--worker-cpus)
WO_WORKER_CPUS="$2"
export WO_WORKER_CPUS
shift # past argument
shift # past value
;;
*) # unknown option
POSITIONAL+=("$1") # save it in an array for later
Expand Down Expand Up @@ -185,6 +191,7 @@ usage(){
echo " --gpu Use GPU NodeODM nodes (Linux only) (default: disabled)"
echo " --settings Path to a settings.py file to enable modifications of system settings (default: None)"
echo " --worker-memory Maximum amount of memory allocated for the worker process (default: unlimited)"
echo " --worker-cpus Maximum number of CPUs allocated for the worker process (default: all)"

exit
}
Expand Down Expand Up @@ -371,6 +378,7 @@ start(){
echo "Default Nodes: $WO_DEFAULT_NODES"
echo "Settings: $WO_SETTINGS"
echo "Worker memory limit: $WO_WORKER_MEMORY"
echo "Worker cpus limit: $WO_WORKER_CPUS"
echo "================================"
echo "Make sure to issue a $0 down if you decide to change the environment."
echo ""
Expand Down Expand Up @@ -445,6 +453,10 @@ start(){
command+=" -f docker-compose.worker-memory.yml"
fi

if [ ! -z "$WO_WORKER_CPUS" ]; then
command+=" -f docker-compose.worker-cpu.yml"
fi

command="$command up"

if [[ $detached = true ]]; then
Expand Down

0 comments on commit 448a2cb

Please sign in to comment.