Commit 13c673a2 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Ajusta límites de memoria, crea variables de vols 

Tras funcionar en producción un tiempo, se ha comprobado que las
asignaciones de memoria anteriores no eran ideales. Ahora deja más
margen entre lo que se asigna a la pila de Java y lo que queda
disponible para otras tareas del servicio.

Permite cambiar mediante variables el device de los volúmenes NFS de
entorno dev.

Actualiza nombre de variable de opciones NFS.
parent 09c6a245

deploy/.env

+9 −9
Original line number Diff line number Diff line
@@ -20,21 +20,21 @@ DISK_QUOTA_SIZE=5 
GEOSERVER_LOG_LEVEL=PRODUCTION_LOGGING



DEV_MASTER_INITIAL_MEMORY=1G

DEV_MASTER_MAXIMUM_MEMORY=1500M

DEV_MASTER_MAXIMUM_MEMORY=1G

DEV_GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY=1500M

DEV_GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY=2500M

DEV_GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY=2G

DEV_NODE_INITIAL_MEMORY=1G

DEV_NODE_MAXIMUM_MEMORY=1500M

DEV_NODE_MAXIMUM_MEMORY=1G

DEV_GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY=1500M

DEV_GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY=2500M

DEV_GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY=2G



PRO_MASTER_INITIAL_MEMORY=1G

PRO_MASTER_MAXIMUM_MEMORY=1500M

PRO_MASTER_MAXIMUM_MEMORY=1G

PRO_GEOSERVER_MASTER_RESOURCES_RESERVATIONS_MEMORY=1500M

PRO_GEOSERVER_MASTER_RESOURCES_LIMITS_MEMORY=2500M

PRO_NODE_INITIAL_MEMORY=1G

PRO_NODE_MAXIMUM_MEMORY=2G

PRO_GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY=1500M

PRO_NODE_INITIAL_MEMORY=1500M

PRO_NODE_MAXIMUM_MEMORY=1500M

PRO_GEOSERVER_NODE_RESOURCES_RESERVATIONS_MEMORY=2G

PRO_GEOSERVER_NODE_RESOURCES_LIMITS_MEMORY=3G



POSTGRES_USER=geowebcache
@@ -45,7 +45,7 @@ POSTGRES_INITDB_WALDIR=/var/lib/postgresql/wal 


VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

GEOSERVER_DATA_VOL_NAME=geoserver-data-vol

CACHE_VOL_NAME=geoserver-cache-vol

FONTS_VOL_NAME=geoserver-fonts-vol

deploy/docker-compose.dev.yml

+12 −12
Original line number Diff line number Diff line
@@ -33,45 +33,45 @@ volumes: 
    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: :/geoserver-data-vol/

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${GEOSERVER_DATA_VOL_DEVICE:-:/geoserver-data-vol/}



  cache-vol:

    name: ${CACHE_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: :/geoserver-cache-vol/

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${CACHE_VOL_DEVICE:-:/geoserver-cache-vol/}



  fonts-vol:

    name: ${FONTS_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: :/geoserver-fonts-vol/

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${FONTS_VOL_DEVICE:-:/geoserver-fonts-vol/}



  footprints-vol:

    name: ${FOOTPRINTS_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: :/geoserver-footprints-vol/

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${FOOTPRINTS_VOL_DEVICE:-:/geoserver-footprints-vol/}



  postgres-data-vol:

    name: ${POSTGRES_DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: :/postgres-gwc-data-vol/

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${POSTGRES_DATA_VOL_DEVICE:-:/postgres-gwc-data-vol/}



  wal-vol:

    name: ${WAL_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: :/postgres-gwc-wal-vol/
 
      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${WAL_VOL_DEVICE:-:/postgres-gwc-wal-vol/}