From 9d9630dc1c288d18cbcf858a0a944b812c987ddc Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Tue, 9 Apr 2024 17:09:18 +0200
Subject: [PATCH] Replace sample Celery result_backend in config

---
 doc/source/admin/galaxy_options.rst         | 6 ++++--
 lib/galaxy/config/sample/galaxy.yml.sample  | 6 ++++--
 lib/galaxy/config/schemas/config_schema.yml | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index 441d5d2d85a..5cd5d4d2649 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -5154,7 +5154,9 @@
     only if you have setup a Celery worker for Galaxy and you have
     configured the `celery_conf` option below. Specifically, you need
     to set the `result_backend` option in the `celery_conf` option to
-    a valid Celery result backend URL. For details, see
+    a valid Celery result backend URL. By default a SQLite database is
+    used for storing task results, please use a more robust backend
+    for production setups like Redis. For details, see
     https://docs.galaxyproject.org/en/master/admin/production.html#use-celery-for-asynchronous-tasks
 :Default: ``false``
 :Type: bool
@@ -5177,7 +5179,7 @@
     disabled on a per-task basis at this time.)
     For details, see Celery documentation at
     https://docs.celeryq.dev/en/stable/userguide/configuration.html.
-:Default: ``{'result_backend': 'redis://127.0.0.1:6379/0', 'task_routes': {'galaxy.fetch_data': 'galaxy.external', 'galaxy.set_job_metadata': 'galaxy.external'}}``
+:Default: ``{'result_backend': 'db+sqlite:///./database/results.sqlite?isolation_level=IMMEDIATE', 'task_routes': {'galaxy.fetch_data': 'galaxy.external', 'galaxy.set_job_metadata': 'galaxy.external'}}``
 :Type: any
 
 
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index fffe8446af4..b379fa67e83 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -2761,7 +2761,9 @@ galaxy:
   # only if you have setup a Celery worker for Galaxy and you have
   # configured the `celery_conf` option below. Specifically, you need to
   # set the `result_backend` option in the `celery_conf` option to a
-  # valid Celery result backend URL. For details, see
+  # valid Celery result backend URL. By default a SQLite database is
+  # used for storing task results, please use a more robust backend for
+  # production setups like Redis. For details, see
   # https://docs.galaxyproject.org/en/master/admin/production.html#use-celery-for-asynchronous-tasks
   #enable_celery_tasks: false
 
@@ -2778,7 +2780,7 @@ galaxy:
   # For details, see Celery documentation at
   # https://docs.celeryq.dev/en/stable/userguide/configuration.html.
   #celery_conf:
-  #  result_backend: redis://127.0.0.1:6379/0
+  #  result_backend: db+sqlite:///./database/results.sqlite?isolation_level=IMMEDIATE
   #  task_routes:
   #    galaxy.fetch_data: galaxy.external
   #    galaxy.set_job_metadata: galaxy.external
diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml
index 8178826bbbf..1f742f86933 100644
--- a/lib/galaxy/config/schemas/config_schema.yml
+++ b/lib/galaxy/config/schemas/config_schema.yml
@@ -3764,14 +3764,15 @@ mapping:
           Activate this only if you have setup a Celery worker for Galaxy and you have
           configured the `celery_conf` option below. Specifically, you need to set the
           `result_backend` option in the `celery_conf` option to a valid Celery result
-          backend URL.
+          backend URL. By default a SQLite database is used for storing task results, please
+          use a more robust backend for production setups like Redis.
           For details, see https://docs.galaxyproject.org/en/master/admin/production.html#use-celery-for-asynchronous-tasks
           
       celery_conf:
         type: any
         required: false
         default:
-          result_backend: redis://127.0.0.1:6379/0
+          result_backend: db+sqlite:///./database/results.sqlite?isolation_level=IMMEDIATE
           task_routes:
             'galaxy.fetch_data': 'galaxy.external'
             'galaxy.set_job_metadata': 'galaxy.external'