Added an admin task-manager.
This commit is contained in:
parent
71f223e60b
commit
cb827ccac2
@ -12,9 +12,12 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import logging
|
||||
import routes
|
||||
|
||||
from reddwarf.openstack.common import rpc
|
||||
from reddwarf.common import config
|
||||
from reddwarf.common import exception
|
||||
from reddwarf.common import wsgi
|
||||
from reddwarf.versions import VersionsController
|
||||
from reddwarf.flavor.service import FlavorController
|
||||
|
48
reddwarf/common/manager.py
Normal file
48
reddwarf/common/manager.py
Normal file
@ -0,0 +1,48 @@
|
||||
# Copyright 2012 OpenStack LLC
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import logging
|
||||
|
||||
from reddwarf import rpc
|
||||
from reddwarf.common import config
|
||||
from reddwarf.common import exception
|
||||
|
||||
|
||||
CONFIG = config.Config
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ManagerAPI(object):
|
||||
"""Extend this API for interacting with the common methods of managers"""
|
||||
|
||||
def __init__(self, context):
|
||||
self.context = context
|
||||
|
||||
def _cast(self, method_name, **kwargs):
|
||||
if CONFIG.get("remote_implementation", "real") == "fake":
|
||||
self._fake_cast(method_name, **kwargs)
|
||||
else:
|
||||
self._real_cast(method_name, **kwargs)
|
||||
|
||||
def _real_cast(self, method_name, **kwargs):
|
||||
try:
|
||||
rpc.cast(self.context, self._get_routing_key(),
|
||||
{"method": method_name, "args": kwargs})
|
||||
except Exception as e:
|
||||
LOG.error(e)
|
||||
raise exception.TaskManagerError(original_message=str(e))
|
||||
|
||||
def _fake_cast(self, method_name, **kwargs):
|
||||
pass
|
||||
|
@ -23,28 +23,17 @@ import logging
|
||||
import traceback
|
||||
import sys
|
||||
|
||||
from reddwarf import rpc
|
||||
from reddwarf.common import config
|
||||
from reddwarf.common import exception
|
||||
from reddwarf.common import utils
|
||||
from reddwarf.common.manager import ManagerAPI
|
||||
|
||||
|
||||
CONFIG = config.Config
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class API(object):
|
||||
class API(ManagerAPI):
|
||||
"""API for interacting with the task manager."""
|
||||
|
||||
def __init__(self, context):
|
||||
self.context = context
|
||||
|
||||
def _cast(self, method_name, **kwargs):
|
||||
if CONFIG.get("remote_implementation", "real") == "fake":
|
||||
self._fake_cast(method_name, **kwargs)
|
||||
else:
|
||||
self._real_cast(method_name, **kwargs)
|
||||
|
||||
def _fake_cast(self, method_name, **kwargs):
|
||||
import eventlet
|
||||
from reddwarf.taskmanager.manager import TaskManager
|
||||
@ -66,14 +55,6 @@ class API(object):
|
||||
"""Create the routing key for the taskmanager"""
|
||||
return CONFIG.get('taskmanager_queue', 'taskmanager')
|
||||
|
||||
def _real_cast(self, method_name, **kwargs):
|
||||
try:
|
||||
rpc.cast(self.context, self._get_routing_key(),
|
||||
{"method": method_name, "args": kwargs})
|
||||
except Exception as e:
|
||||
LOG.error(e)
|
||||
raise exception.TaskManagerError(original_message=str(e))
|
||||
|
||||
def resize_volume(self, new_size, instance_id):
|
||||
LOG.debug("Making async call to resize volume for instance: %s"
|
||||
% instance_id)
|
||||
|
@ -299,6 +299,15 @@ class BuiltInstanceTasks(BuiltInstance):
|
||||
|
||||
poll_until(server_is_finished, sleep_time=2,
|
||||
time_out=int(config.Config.get('server_delete_time_out')))
|
||||
# If time out occurs, the instance task is stuck in DELETING.
|
||||
LOG.debug("Setting instance %s to deleted..." % self.id)
|
||||
# Delete guest queue.
|
||||
guest = self.get_guest()
|
||||
guest.delete_queue()
|
||||
self.update_db(task_status=InstanceTasks.NONE)
|
||||
time_now = datetime.now()
|
||||
self.update_db(deleted=True, deleted_at=time_now)
|
||||
|
||||
|
||||
def resize_volume(self, new_size):
|
||||
LOG.debug("%s: Resizing volume for instance: %s to %r GB"
|
||||
|
Loading…
Reference in New Issue
Block a user