From bc5bf5e34c35fa09433e123ef63b66497ff883c4 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Fri, 8 Aug 2014 15:31:18 +0100 Subject: [PATCH] Remove unused openstack.common.eventlet_backdoor eventlet_backdoor was included in the original copy from Ironic and isn't used anymore. Change-Id: I392fba9688c8a1722bb5226ee8050315f3551fde --- etc/tuskar/tuskar.conf.sample | 8 -- openstack-common.conf | 1 - tuskar/openstack/common/eventlet_backdoor.py | 89 -------------------- 3 files changed, 98 deletions(-) delete mode 100644 tuskar/openstack/common/eventlet_backdoor.py diff --git a/etc/tuskar/tuskar.conf.sample b/etc/tuskar/tuskar.conf.sample index a4696a65..ed9d33e6 100644 --- a/etc/tuskar/tuskar.conf.sample +++ b/etc/tuskar/tuskar.conf.sample @@ -76,14 +76,6 @@ #sqlite_synchronous=true -# -# Options defined in tuskar.openstack.common.eventlet_backdoor -# - -# port for eventlet backdoor to listen (integer value) -#backdoor_port= - - # # Options defined in tuskar.openstack.common.lockutils # diff --git a/openstack-common.conf b/openstack-common.conf index 0eef05ff..756293de 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -4,7 +4,6 @@ module=config.generator module=context module=db module=db.sqlalchemy -module=eventlet_backdoor module=excutils module=fileutils module=gettextutils diff --git a/tuskar/openstack/common/eventlet_backdoor.py b/tuskar/openstack/common/eventlet_backdoor.py deleted file mode 100644 index 57b89ae9..00000000 --- a/tuskar/openstack/common/eventlet_backdoor.py +++ /dev/null @@ -1,89 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright (c) 2012 OpenStack Foundation. -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# 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. - -from __future__ import print_function - -import gc -import pprint -import sys -import traceback - -import eventlet -import eventlet.backdoor -import greenlet -from oslo.config import cfg - -eventlet_backdoor_opts = [ - cfg.IntOpt('backdoor_port', - default=None, - help='port for eventlet backdoor to listen') -] - -CONF = cfg.CONF -CONF.register_opts(eventlet_backdoor_opts) - - -def _dont_use_this(): - print("Don't use this, just disconnect instead") - - -def _find_objects(t): - return filter(lambda o: isinstance(o, t), gc.get_objects()) - - -def _print_greenthreads(): - for i, gt in enumerate(_find_objects(greenlet.greenlet)): - print(i, gt) - traceback.print_stack(gt.gr_frame) - print() - - -def _print_nativethreads(): - for threadId, stack in sys._current_frames().items(): - print(threadId) - traceback.print_stack(stack) - print() - - -def initialize_if_enabled(): - backdoor_locals = { - 'exit': _dont_use_this, # So we don't exit the entire process - 'quit': _dont_use_this, # So we don't exit the entire process - 'fo': _find_objects, - 'pgt': _print_greenthreads, - 'pnt': _print_nativethreads, - } - - if CONF.backdoor_port is None: - return None - - # NOTE(johannes): The standard sys.displayhook will print the value of - # the last expression and set it to __builtin__._, which overwrites - # the __builtin__._ that gettext sets. Let's switch to using pprint - # since it won't interact poorly with gettext, and it's easier to - # read the output too. - def displayhook(val): - if val is not None: - pprint.pprint(val) - sys.displayhook = displayhook - - sock = eventlet.listen(('localhost', CONF.backdoor_port)) - port = sock.getsockname()[1] - eventlet.spawn_n(eventlet.backdoor.backdoor_server, sock, - locals=backdoor_locals) - return port