chore(deps): bumped celery to 5.3.6 and kombu to latest version

requirements.txt

@@ -1,295 +1,295 b''
 # deps, generated via pipdeptree --exclude setuptools,wheel,pipdeptree,pip -f | tr '[:upper:]' '[:lower:]'
 
 alembic==1.12.1
   mako==1.2.4
     markupsafe==2.1.2
   sqlalchemy==1.4.51
     greenlet==3.0.3
   typing_extensions==4.9.0
 async-timeout==4.0.3
 babel==2.12.1
 beaker==1.12.1
-celery==5.3.4
-  billiard==4.1.0
+celery==5.3.6
+  billiard==4.2.0
   click==8.1.3
   click-didyoumean==0.3.0
     click==8.1.3
   click-plugins==1.1.1
     click==8.1.3
   click-repl==0.2.0
     click==8.1.3
     prompt-toolkit==3.0.38
       wcwidth==0.2.6
     six==1.16.0
-  kombu==5.3.2
-    amqp==5.1.1
+  kombu==5.3.5
+    amqp==5.2.0
       vine==5.1.0
     vine==5.1.0
   python-dateutil==2.8.2
     six==1.16.0
   tzdata==2023.4
   vine==5.1.0
 channelstream==0.7.1
   gevent==23.9.1
     greenlet==3.0.3
     zope.event==5.0.0
     zope.interface==6.1.0
   itsdangerous==1.1.0
   marshmallow==2.18.0
   pyramid==2.0.2
     hupper==1.12
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==5.0.0
     zope.interface==6.1.0
   pyramid-apispec==0.3.3
     apispec==1.3.3
   pyramid-jinja2==2.10
     jinja2==3.1.2
       markupsafe==2.1.2
     markupsafe==2.1.2
     pyramid==2.0.2
       hupper==1.12
       plaster==1.1.2
       plaster-pastedeploy==1.0.1
         pastedeploy==3.1.0
         plaster==1.1.2
       translationstring==1.4
       venusian==3.0.0
       webob==1.8.7
       zope.deprecation==5.0.0
       zope.interface==6.1.0
     zope.deprecation==5.0.0
   python-dateutil==2.8.2
     six==1.16.0
   requests==2.28.2
     certifi==2022.12.7
     charset-normalizer==3.1.0
     idna==3.4
     urllib3==1.26.14
   ws4py==0.5.1
 deform==2.0.15
   chameleon==3.10.2
   colander==2.0
     iso8601==1.1.0
     translationstring==1.4
   iso8601==1.1.0
   peppercorn==0.6
   translationstring==1.4
   zope.deprecation==5.0.0
 diskcache==5.6.3
 docutils==0.19
 dogpile.cache==1.3.0
   decorator==5.1.1
   stevedore==5.1.0
     pbr==5.11.1
 formencode==2.1.0
   six==1.16.0
 gunicorn==21.2.0
   packaging==23.1
 gevent==23.9.1
   greenlet==3.0.3
   zope.event==5.0.0
   zope.interface==6.1.0
 ipython==8.14.0
   backcall==0.2.0
   decorator==5.1.1
   jedi==0.19.0
     parso==0.8.3
   matplotlib-inline==0.1.6
     traitlets==5.9.0
   pexpect==4.8.0
     ptyprocess==0.7.0
   pickleshare==0.7.5
   prompt-toolkit==3.0.38
     wcwidth==0.2.6
   pygments==2.15.1
   stack-data==0.6.2
     asttokens==2.2.1
       six==1.16.0
     executing==1.2.0
     pure-eval==0.2.2
   traitlets==5.9.0
 markdown==3.4.3
 msgpack==1.0.7
 mysqlclient==2.1.1
 nbconvert==7.7.3
   beautifulsoup4==4.11.2
     soupsieve==2.4
   bleach==6.1.0
     six==1.16.0
     webencodings==0.5.1
   defusedxml==0.7.1
   jinja2==3.1.2
     markupsafe==2.1.2
   jupyter_core==5.3.1
     platformdirs==3.10.0
     traitlets==5.9.0
   jupyterlab-pygments==0.2.2
   markupsafe==2.1.2
   mistune==2.0.5
   nbclient==0.8.0
     jupyter_client==8.3.0
       jupyter_core==5.3.1
         platformdirs==3.10.0
         traitlets==5.9.0
       python-dateutil==2.8.2
         six==1.16.0
       pyzmq==25.0.0
       tornado==6.2
       traitlets==5.9.0
     jupyter_core==5.3.1
       platformdirs==3.10.0
       traitlets==5.9.0
     nbformat==5.9.2
       fastjsonschema==2.18.0
       jsonschema==4.18.6
         attrs==22.2.0
         pyrsistent==0.19.3
       jupyter_core==5.3.1
         platformdirs==3.10.0
         traitlets==5.9.0
       traitlets==5.9.0
     traitlets==5.9.0
   nbformat==5.9.2
     fastjsonschema==2.18.0
     jsonschema==4.18.6
       attrs==22.2.0
       pyrsistent==0.19.3
     jupyter_core==5.3.1
       platformdirs==3.10.0
       traitlets==5.9.0
     traitlets==5.9.0
   packaging==23.1
   pandocfilters==1.5.0
   pygments==2.15.1
   tinycss2==1.2.1
     webencodings==0.5.1
   traitlets==5.9.0
 orjson==3.9.13
 pastescript==3.4.0
   paste==3.7.1
     six==1.16.0
   pastedeploy==3.1.0
   six==1.16.0
 premailer==3.10.0
   cachetools==5.3.2
   cssselect==1.2.0
   cssutils==2.6.0
   lxml==4.9.3
   requests==2.28.2
     certifi==2022.12.7
     charset-normalizer==3.1.0
     idna==3.4
     urllib3==1.26.14
 psutil==5.9.8
 psycopg2==2.9.9
 py-bcrypt==0.4
 pycmarkgfm==1.2.0
   cffi==1.16.0
     pycparser==2.21
 pycryptodome==3.17
 pycurl==7.45.2
 pymysql==1.0.3
 pyotp==2.8.0
 pyparsing==3.1.1
 pyramid-debugtoolbar==4.11
   pygments==2.15.1
   pyramid==2.0.2
     hupper==1.12
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==5.0.0
     zope.interface==6.1.0
   pyramid-mako==1.1.0
     mako==1.2.4
       markupsafe==2.1.2
     pyramid==2.0.2
       hupper==1.12
       plaster==1.1.2
       plaster-pastedeploy==1.0.1
         pastedeploy==3.1.0
         plaster==1.1.2
       translationstring==1.4
       venusian==3.0.0
       webob==1.8.7
       zope.deprecation==5.0.0
       zope.interface==6.1.0
 pyramid-mailer==0.15.1
   pyramid==2.0.2
     hupper==1.12
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==5.0.0
     zope.interface==6.1.0
   repoze.sendmail==4.4.1
     transaction==3.1.0
       zope.interface==6.1.0
     zope.interface==6.1.0
   transaction==3.1.0
     zope.interface==6.1.0
 python-ldap==3.4.3
   pyasn1==0.4.8
   pyasn1-modules==0.2.8
     pyasn1==0.4.8
 python-memcached==1.59
   six==1.16.0
 python-pam==2.0.2
 python3-saml==1.15.0
   isodate==0.6.1
     six==1.16.0
   lxml==4.9.3
   xmlsec==1.3.13
     lxml==4.9.3
 pyyaml==6.0.1
 redis==5.0.1
 regex==2022.10.31
 routes==2.5.1
   repoze.lru==0.7
   six==1.16.0
 simplejson==3.19.1
 sshpubkeys==3.3.1
   cryptography==40.0.2
     cffi==1.16.0
       pycparser==2.21
   ecdsa==0.18.0
     six==1.16.0
 sqlalchemy==1.4.51
   greenlet==3.0.3
   typing_extensions==4.9.0
 supervisor==4.2.5
 tzlocal==4.3
   pytz-deprecation-shim==0.1.0.post0
     tzdata==2023.4
 unidecode==1.3.6
 urlobject==2.4.3
 waitress==3.0.0
 weberror==0.13.1
   paste==3.7.1
     six==1.16.0
   pygments==2.15.1
   tempita==0.5.2
   webob==1.8.7
 webhelpers2==2.0
   markupsafe==2.1.2
   six==1.16.0
 whoosh==2.7.4
 zope.cachedescriptors==5.0.0
 
 ## uncomment to add the debug libraries
 #-r requirements_debug.txt

rhodecode/lib/celerylib/__init__.py

@@ -1,93 +1,92 b''
 # Copyright (C) 2010-2023 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import socket
 import logging
 
 import rhodecode
 from zope.cachedescriptors.property import Lazy as LazyProperty
 from rhodecode.lib.celerylib.loader import (
     celery_app, RequestContextTask, get_logger)
 from rhodecode.lib.statsd_client import StatsdClient
 
 async_task = celery_app.task
 
 
 log = logging.getLogger(__name__)
 
 
 class ResultWrapper(object):
     def __init__(self, task):
         self.task = task
 
     @LazyProperty
     def result(self):
         return self.task
 
 
 def run_task(task, *args, **kwargs):
     import celery
     log.debug('Got task `%s` for execution, celery mode enabled:%s', task, rhodecode.CELERY_ENABLED)
     if task is None:
         raise ValueError(f'Got non-existing task: {task} for execution')
 
-    exec_mode = 'sync'
     allow_async = True
 
     # if we're already in a celery task, don't allow async execution again
     # e.g task within task
     in_task = celery.current_task
     if in_task:
         log.debug('This task in in context of another task: %s, not allowing another async execution', in_task)
         allow_async = False
         if kwargs.pop('allow_subtask', False):
             log.debug('Forced async by allow_async=True flag')
             allow_async = True
 
     t = None
     if rhodecode.CELERY_ENABLED and allow_async:
 
         try:
             t = task.apply_async(args=args, kwargs=kwargs)
             log.debug('executing task %s:%s in async mode', t.task_id, task)
         except socket.error as e:
             if isinstance(e, IOError) and e.errno == 111:
                 log.error('Unable to connect to celeryd `%s`. Sync execution', e)
             else:
                 log.exception("Exception while connecting to celeryd.")
         except KeyError as e:
             log.error('Unable to connect to celeryd `%s`. Sync execution', e)
         except Exception as e:
             log.exception(
                 "Exception while trying to run task asynchronous. "
                 "Fallback to sync execution.")
 
     else:
         log.debug('executing task %s:%s in sync mode', 'TASK', task)
         statsd = StatsdClient.statsd
         if statsd:
             task_repr = getattr(task, 'name', task)
             statsd.incr('rhodecode_celery_task_total', tags=[
                 f'task:{task_repr}',
                 'mode:sync'
             ])
 
     # we got async task, return it after statsd call
     if t:
         return t
     return ResultWrapper(task(*args, **kwargs))