From bbde253fabc7ffb8754d6261e3787a1d6455d654 Mon Sep 17 00:00:00 2001
From: Kenzo-Hugo Hillion <kenzo-hugo.hillion1@pasteur.fr>
Date: Fri, 7 Aug 2020 10:50:21 +0200
Subject: [PATCH] update README and try to restore celery worker on kubernetes
---
README.md | 2 +-
backend/metagenedb/api/catalog/urls.py | 5 ++---
backend/metagenedb/api/catalog/views/celery_test.py | 10 +---------
.../catalog/management/commands/create_light_db.py | 2 --
backend/metagenedb/celery_app.py | 5 -----
ci/deploy/deploy.sh | 2 +-
6 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
index 0ee7e9c..5c55f76 100644
--- a/README.md
+++ b/README.md
@@ -14,4 +14,4 @@ It is composed of both an API and a client side for visualization and interactio
## Wiki & Documentation
-For more information, please have a look at our [Wiki](https://gitlab.pasteur.fr/metagenomics/metagenedb/-/wikis/MetageneDB)
+For more information, please have a look at our [Wiki](https://gitlab.pasteur.fr/metagenomics/metagenedb/-/wikis/home)
diff --git a/backend/metagenedb/api/catalog/urls.py b/backend/metagenedb/api/catalog/urls.py
index fa35c70..1d920ce 100644
--- a/backend/metagenedb/api/catalog/urls.py
+++ b/backend/metagenedb/api/catalog/urls.py
@@ -4,7 +4,7 @@ from rest_framework.routers import DefaultRouter, DynamicRoute, Route
from metagenedb.api.catalog import views
-# from metagenedb.api.catalog.views.celery_test import celery_test_view, test_task_view
+from metagenedb.api.catalog.views.celery_test import test_task_view
class CustomRouter(DefaultRouter):
@@ -66,6 +66,5 @@ api_router.register(r'statistics', views.StatisticsViewSet, basename='statistics
urlpatterns = [
url(r'v1/', include((api_router.urls, 'v1'))),
path('admin/', include(('metagenedb.api.catalog.admin_urls', 'admin'))),
- # path('celery-test/', celery_test_view, name='celery-test'),
- # path('celery-task-test/', test_task_view, name='celery-task-test'),
+ path('celery-task-test/', test_task_view, name='celery-task-test'),
]
diff --git a/backend/metagenedb/api/catalog/views/celery_test.py b/backend/metagenedb/api/catalog/views/celery_test.py
index 0e67054..23ce728 100644
--- a/backend/metagenedb/api/catalog/views/celery_test.py
+++ b/backend/metagenedb/api/catalog/views/celery_test.py
@@ -4,17 +4,9 @@ from celery.decorators import task
from rest_framework.decorators import api_view
from rest_framework.response import Response
-from metagenedb.celery_app import debug_task
-
logger = logging.getLogger(__name__)
-@api_view()
-def celery_test_view(request):
- debug_task.delay()
- return Response({"message": "Your task is being processed!"})
-
-
@task(name="test_celery_task")
def test_task(msg):
logger.info("Test Celery Task")
@@ -28,6 +20,6 @@ def mul(x, y):
@api_view()
def test_task_view(request):
- msg = test_task.delay("poooouet")
+ msg = test_task.delay("pirooooouettee")
muli = mul.delay(2, 4)
return Response({"message": f"Tested celery task: {msg.get(timeout=1)} {muli.get(timeout=1)}"})
diff --git a/backend/metagenedb/apps/catalog/management/commands/create_light_db.py b/backend/metagenedb/apps/catalog/management/commands/create_light_db.py
index 16bf6fa..11fbcd9 100644
--- a/backend/metagenedb/apps/catalog/management/commands/create_light_db.py
+++ b/backend/metagenedb/apps/catalog/management/commands/create_light_db.py
@@ -23,12 +23,10 @@ def empty_db():
def create_taxonomy_db():
- Taxonomy.objects.all().delete()
gen_tax_db()
def create_genes_db():
- Gene.objects.all().delete()
GeneFactory.create_batch(50)
GeneWithEggNOGFactory.create_batch(15)
GeneWithKeggFactory.create_batch(12)
diff --git a/backend/metagenedb/celery_app.py b/backend/metagenedb/celery_app.py
index 0632df0..d514fc2 100644
--- a/backend/metagenedb/celery_app.py
+++ b/backend/metagenedb/celery_app.py
@@ -12,8 +12,3 @@ app.conf.beat_schedule = {
'schedule': 20.0
},
}
-
-
-@app.task(bind=True)
-def debug_task(self):
- print('Request: {0!r}'.format(self.request))
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 990438b..8a72649 100644
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -27,7 +27,7 @@ kubectl -n ${NAMESPACE} wait --for=condition=available --timeout=600s deployment
envsubst < ci/kubernetes/backend.yaml | kubectl apply -n ${NAMESPACE} -f -
kubectl -n ${NAMESPACE} patch deployment backend -p "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"date\":\"`date +'%s'`\"}}}}}"
## Celery worker
-# envsubst < ci/kubernetes/celery-worker.yaml | kubectl apply -n ${NAMESPACE} -f -
+envsubst < ci/kubernetes/celery-worker.yaml | kubectl apply -n ${NAMESPACE} -f -
## Frontend
envsubst < ci/kubernetes/frontend.yaml | kubectl apply -n ${NAMESPACE} -f -
kubectl -n ${NAMESPACE} patch deployment frontend -p "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"date\":\"`date +'%s'`\"}}}}}"
--
GitLab