Merge pull request #626 from helgi/views_delete

fix(views): use Exception instead of RuntimeError in view around rollbacks

Author: helgi

rootfs/api/models/app.py

@@ -213,7 +213,7 @@ def restart(self, **kwargs):  # noqa
             while True:
                 # timed out
                 if elapsed >= timeout:
-                    raise RuntimeError('timeout - 5 minutes have passed and pods are not up')
+                    raise KubeException('timeout - 5 minutes have passed and pods are not up')
 
                 # restarting a single pod behaves differently, fetch the *newest* pod
                 # and hope it is the right one. Comes back sorted

rootfs/api/views.py

@@ -18,6 +18,7 @@
 
 from api import authentication, models, permissions, serializers, viewsets
 from api.models import AlreadyExists
+from scheduler import KubeException
 
 import requests
 import logging
@@ -152,7 +153,7 @@ def create(self, request, *args, **kwargs):
         try:
             return super(BaseDeisViewSet, self).create(request, *args, **kwargs)
         # If the scheduler oopsie'd
-        except RuntimeError as e:
+        except KubeException as e:
             return Response({'detail': str(e)}, status=status.HTTP_503_SERVICE_UNAVAILABLE)
 
 
@@ -230,7 +231,7 @@ def scale(self, request, **kwargs):
                             status=status.HTTP_400_BAD_REQUEST)
         except (EnvironmentError, ValidationError) as e:
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
-        except RuntimeError as e:
+        except KubeException as e:
             return Response({'detail': str(e)}, status=status.HTTP_503_SERVICE_UNAVAILABLE)
         return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -260,7 +261,7 @@ def run(self, request, **kwargs):
             rc, output = app.run(self.request.user, request.data['command'])
         except EnvironmentError as e:
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
-        except RuntimeError as e:
+        except KubeException as e:
             return Response({'detail': str(e)}, status=status.HTTP_503_SERVICE_UNAVAILABLE)
         return Response({'rc': rc, 'output': str(output)})
 
@@ -322,7 +323,7 @@ def list(self, *args, **kwargs):
             # fake out pagination for now
             pagination = {'results': data, 'count': len(data)}
             return Response(pagination, status=status.HTTP_200_OK)
-        except Exception as e:
+        except KubeException as e:
             return Response({'detail': str(e)}, status=status.HTTP_503_SERVICE_UNAVAILABLE)
 
     def restart(self, *args, **kwargs):
@@ -335,7 +336,7 @@ def restart(self, *args, **kwargs):
             # pagination = {'results': data, 'count': len(data)}
             pagination = data
             return Response(pagination, status=status.HTTP_200_OK)
-        except Exception as e:
+        except KubeException as e:
             return Response({'detail': str(e)}, status=status.HTTP_503_SERVICE_UNAVAILABLE)
 
 
@@ -368,7 +369,7 @@ def attach(self, request, *args, **kwargs):
             raise
         except AlreadyExists as e:
             return Response({'detail': str(e)}, status=status.HTTP_409_CONFLICT)
-        except Exception as e:
+        except KubeException as e:
             return Response({'detail': str(e)}, status=status.HTTP_503_SERVICE_UNAVAILABLE)
 
         return Response(status=status.HTTP_201_CREATED)
@@ -378,7 +379,7 @@ def detach(self, request, *args, **kwargs):
             self.get_object().detach(*args, **kwargs)
         except Http404:
             raise
-        except Exception as e:
+        except KubeException as e:
             return Response({'detail': str(e)}, status=status.HTTP_503_SERVICE_UNAVAILABLE)
 
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -417,7 +418,7 @@ def rollback(self, request, **kwargs):
             return Response(response, status=status.HTTP_201_CREATED)
         except EnvironmentError as e:
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
-        except RuntimeError:
+        except Exception:
             if 'new_release' in locals():
                 new_release.delete()
             raise

rootfs/scheduler/__init__.py

@@ -394,7 +394,7 @@ def deploy(self, namespace, name, image, command, **kwargs):
             if old_rc:
                 self._scale_rc(namespace, old_rc["metadata"]["name"], desired)
 
-            raise RuntimeError('{} (scheduler::deploy): {}'.format(name, e))
+            raise KubeException('{} (scheduler::deploy): {}'.format(name, e))
 
         # New release is live and kicking. Clean up old release
         if old_rc:
@@ -438,7 +438,7 @@ def _update_application_service(self, namespace, name, app_type, image, routable
         except Exception as e:
             # Fix service to old port and app type
             self._update_service(namespace, namespace, data=old_service)
-            raise RuntimeError('{} (scheduler::deploy::service_update): {}'.format(name, e))
+            raise KubeException('{} (scheduler::deploy::service_update): {}'.format(name, e))
 
     def scale(self, namespace, name, image, command, **kwargs):
         logger.debug('scale {}, img {}, params {}, cmd "{}"'.format(name, image, kwargs, command))
@@ -451,15 +451,15 @@ def scale(self, namespace, name, image, command, **kwargs):
                 self._create_rc(namespace, name, image, command, **kwargs)
             except KubeException as e:
                 logger.debug("Creating RC failed because of: {}".format(str(e)))
-                raise RuntimeError('{} (RC): {}'.format(name, e))
+                raise KubeException('{} (RC): {}'.format(name, e))
 
         try:
             self._scale_rc(namespace, name, replicas)
         except KubeException as e:
             logger.debug("Scaling failed because of: {}".format(str(e)))
             old = self._get_rc(namespace, name).json()
             self._scale_rc(namespace, name, old['spec']['replicas'])
-            raise RuntimeError('{} (Scale): {}'.format(name, e))
+            raise KubeException('{} (Scale): {}'.format(name, e))
 
     def create(self, namespace, **kwargs):
         """Create a basic structure for an application in k8s"""