Merge pull request #678 from kmala/healthz

fix(readinessprobe): container shouldn't be restarted if the database is unavailable

Author: kmala

rootfs/api/views.py

@@ -26,10 +26,9 @@
 logger = logging.getLogger(__name__)
 
 
-class HealthCheckView(View):
+class ReadinessCheckView(View):
     """
-    Simple health check view to determine if the server
-    is responding to HTTP requests and DB connection / query.
+    Simple readiness check view to determine DB connection / query.
     """
 
     def get(self, request):
@@ -51,6 +50,17 @@ def get(self, request):
     head = get
 
 
+class LivenessCheckView(View):
+    """
+    Simple liveness check view to determine if the server
+    is responding to HTTP requests.
+    """
+
+    def get(self, request):
+        return HttpResponse("OK")
+    head = get
+
+
 class UserRegistrationViewSet(GenericViewSet,
                               mixins.CreateModelMixin):
     """ViewSet to handle registering new users. The logic is in the serializer."""

rootfs/deis/urls.py

@@ -7,9 +7,11 @@
 
 
 from django.conf.urls import include, url
-from api.views import HealthCheckView
+from api.views import LivenessCheckView
+from api.views import ReadinessCheckView
 
 urlpatterns = [
-    url(r'^healthz$', HealthCheckView.as_view()),
+    url(r'^healthz$', LivenessCheckView.as_view()),
+    url(r'^readiness$', ReadinessCheckView.as_view()),
     url(r'^v2/', include('api.urls')),
 ]