From: Gorka Eguileor <geguileo@redhat.com>
Date: Tue, 16 Feb 2016 18:09:16 +0000 (+0100)
Subject: Remove unused kill method from Service
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=010df28d76a2ec02d348da45db2f822b21bedc79;p=openstack-build%2Fcinder-build.git

Remove unused kill method from Service

In Service class we have a kill method that must have been inherited
from Nova code and that is not currently being used anywhere.

This patch removes this method instead of making it execute on SIGKILL
to preserve current behavior.

Change-Id: I50138d815ac93b171f246f4ecee9d1da1799e00d
---

diff --git a/cinder/service.py b/cinder/service.py
index 8ab77544c..6054da6c5 100644
--- a/cinder/service.py
+++ b/cinder/service.py
@@ -263,16 +263,6 @@ class Service(service.Service):
 
         return service_obj
 
-    def kill(self):
-        """Destroy the service object in the datastore."""
-        self.stop()
-        try:
-            service_ref = objects.Service.get_by_id(
-                context.get_admin_context(), self.service_id)
-            service_ref.destroy()
-        except exception.NotFound:
-            LOG.warning(_LW('Service killed that has no database entry'))
-
     def stop(self):
         # Try to shut the connection down, but if we get any sort of
         # errors, go ahead and ignore them.. as we're shutting down anyway