Merge lp:~allenap/maas/oops-did-it-again--1.7 into lp:maas/1.7

[Gavin Panella]

Remove all OOPS reporting.

[Gavin Panella (allenap)]

This is a back-port from trunk, so self-reviewing.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~allenap/maas/oops-did-it-again--1.7 into lp:maas/1.7 failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates Release [62.0 kB]
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [181 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [105 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [446 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [254 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,049 kB in 2s (353 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bson python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplejson python...

[Gavin Panella (allenap)]

Landed this direct (after running tests locally).

=== modified file 'docs/development/cluster-bootstrap.rst'
--- docs/development/cluster-bootstrap.rst	2014-10-09 21:53:36 +0000
+++ docs/development/cluster-bootstrap.rst	2015-03-02 14:13:04 +0000
@@ -29,7 +29,7 @@
 
 #. ``ClusterClientService`` starts.
 
-#. Services other than log and oops are **not** started.
+#. Services other than ``log`` are **not** started.
 
 #. Wait for a connection to the region to become available.
 

=== modified file 'etc/maas/pserv.yaml'
--- etc/maas/pserv.yaml	2014-08-13 21:49:35 +0000
+++ etc/maas/pserv.yaml	2015-03-02 14:13:04 +0000
@@ -8,17 +8,6 @@
 # logfile: "pserv.log"
 logfile: "/dev/null"
 
-## OOPS configuration (optional).
-#
-oops:
-  ## Directory in which to place OOPS reports.  Must not contain any files
-  # or directories other than what the oops machinery creates there.
-  #
-  # directory:
-  directory: "logs/oops"
-  # reporter:
-  reporter: "maas-pserv"
-
 ## TFTP configuration.
 #
 tftp:

=== modified file 'required-packages/base'
--- required-packages/base	2014-09-24 13:05:22 +0000
+++ required-packages/base	2015-03-02 14:13:04 +0000
@@ -12,6 +12,7 @@
 libpq-dev
 postgresql
 python-amqplib
+python-bson
 python-bzrlib
 python-celery
 python-convoy
@@ -32,11 +33,6 @@
 python-netaddr
 python-netifaces
 python-oauth
-python-oops
-python-oops-amqp
-python-oops-datedir-repo
-python-oops-twisted
-python-oops-wsgi
 python-openssl
 python-paramiko
 python-pexpect

=== modified file 'setup.py'
--- setup.py	2014-09-29 15:26:08 +0000
+++ setup.py	2015-03-02 14:13:04 +0000
@@ -125,9 +125,6 @@
         'django-piston',
         'FormEncode',
         'oauth',
-        'oops',
-        'oops-datedir-repo',
-        'oops-twisted',
         'PyYAML',
         'South',
         'Twisted',

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2014-12-02 15:55:34 +0000
+++ src/maas/settings.py	2015-03-02 14:13:04 +0000
@@ -47,9 +47,6 @@
 
 MANAGERS = ADMINS
 
-# Location where python-oops should store errors.
-OOPS_REPOSITORY = 'logs/oops'
-
 LOGOUT_URL = '/'
 LOGIN_REDIRECT_URL = '/'
 LOGIN_URL = '/accounts/login/'

=== modified file 'src/maasserver/management/commands/runserver.py'
--- src/maasserver/management/commands/runserver.py	2013-10-18 16:57:37 +0000
+++ src/maasserver/management/commands/runserver.py	2015-03-02 14:13:04 +0000
@@ -17,39 +17,10 @@
 from optparse import make_option
 from SocketServer import ThreadingMixIn
 
-from django.conf import settings
 from django.core.management.commands.runserver import BaseRunserverCommand
 from django.core.servers import basehttp
 from django.core.servers.basehttp import WSGIServer
 from maasserver.start_up import start_up
-import oops
-from oops_datedir_repo import DateDirRepo
-from oops_wsgi import (
-    install_hooks,
-    make_app,
-    )
-
-
-error_template = """
-<html>
-<head><title>Oops! - %(id)s</title></head>
-<body>
-<h1>Oops!</h1>
-<p>
-  Something broke while generating this page.
-</p>
-<p>
-  If the problem persists, please
-  <a href="https://bugs.launchpad.net/maas/">file a bug</a>.  Make a note of
-  the "oops id": <strong>%(id)s</strong>
-</p>
-</html>
-""".lstrip()
-
-
-def render_error(report):
-    """Produce an HTML error report, in raw bytes (not unicode)."""
-    return (error_template % report).encode('ascii')
 
 
 class Command(BaseRunserverCommand):
@@ -73,19 +44,3 @@
 
         start_up()
         return super(Command, self).run(*args, **options)
-
-    def get_handler(self, *args, **kwargs):
-        """Overridable from `BaseRunserverCommand`: Obtain a WSGI handler."""
-        wsgi_handler = super(Command, self).get_handler(self, *args, **kwargs)
-
-        # Wrap the WSGI handler in an oops handler.  This catches (most)
-        # exceptions bubbling up out of the app, and stores them as
-        # oopses in the directory specified by the OOPS_REPOSITORY
-        # configuration setting.
-        # Django's debug mode causes it to handle exceptions itself, so
-        # don't expect oopses when DEBUG is set to True.
-        oops_config = oops.Config()
-        oops_repository = DateDirRepo(settings.OOPS_REPOSITORY)
-        oops_config.publishers.append(oops_repository.publish)
-        install_hooks(oops_config)
-        return make_app(wsgi_handler, oops_config, error_render=render_error)

=== removed file 'src/maasserver/tests/test_runserver.py'
--- src/maasserver/tests/test_runserver.py	2013-10-07 09:12:40 +0000
+++ src/maasserver/tests/test_runserver.py	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-# Copyright 2012, 2013 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for the "runserver" command module."""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
-__all__ = []
-
-from maasserver.management.commands.runserver import render_error
-from maasserver.testing.testcase import MAASServerTestCase
-
-
-class TestRunServer(MAASServerTestCase):
-
-    def test_render_error_mentions_oops_id(self):
-        fake_oops = {'id': 'EHOVERCRAFTFULL999'}
-        self.assertIn(fake_oops['id'], render_error(fake_oops))
-
-    def test_render_error_returns_bytes(self):
-        # wsgi_oops produces oops pages as unicode strings, but django
-        # expects raw bytes.  Our own error renderer returns bytes.
-        fake_oops = {'id': 'abc123'}
-        self.assertIsInstance(render_error(fake_oops), bytes)
-
-    def test_render_error_blows_up_if_oops_id_is_not_ascii(self):
-        # Oopses mean that things aren't working as they should.  We
-        # won't make things worse by including non-ASCII characters in
-        # the oops page.
-        fake_oops = {'id': '\u2322'}
-        self.assertRaises(Exception, render_error, fake_oops)

=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2014-09-23 20:20:16 +0000
+++ src/provisioningserver/config.py	2015-03-02 14:13:04 +0000
@@ -87,7 +87,12 @@
 
 
 class ConfigOops(Schema):
-    """Configuration validator for OOPS options."""
+    """Configuration validator for OOPS options.
+
+    Deprecated: MAAS no longer records OOPS reports. This remains here to
+    avoid validation failures when using old versions of the cluster's
+    configuration file.
+    """
 
     if_key_missing = None
 

=== modified file 'src/provisioningserver/plugin.py'
--- src/provisioningserver/plugin.py	2014-10-03 22:46:34 +0000
+++ src/provisioningserver/plugin.py	2015-03-02 14:13:04 +0000
@@ -14,20 +14,12 @@
 __metaclass__ = type
 __all__ = [
     "LogService",
-    "OOPSService",
     "ProvisioningServiceMaker",
 ]
 
 import signal
 import sys
 
-import oops
-from oops_datedir_repo import DateDirRepo
-from oops_twisted import (
-    Config as oops_config,
-    defer_publisher,
-    OOPSObserver,
-    )
 import provisioningserver
 from provisioningserver.cluster_config import get_cluster_uuid
 from provisioningserver.config import Config
@@ -61,11 +53,7 @@
     )
 from twisted.plugin import IPlugin
 from twisted.python import usage
-from twisted.python.log import (
-    addObserver,
-    FileLogObserver,
-    removeObserver,
-    )
+from twisted.python.log import FileLogObserver
 from twisted.python.logfile import LogFile
 from twisted.web.resource import (
     IResource,
@@ -153,38 +141,6 @@
             self.logfile = None
 
 
-class OOPSService(Service):
-
-    name = "oops"
-
-    def __init__(self, log_service, oops_dir, oops_reporter):
-        self.config = None
-        self.log_service = log_service
-        self.oops_dir = oops_dir
-        self.oops_reporter = oops_reporter
-
-    def startService(self):
-        Service.startService(self)
-        self.config = oops_config()
-        # Add the oops publisher that writes files in the configured place if
-        # the command line option was set.
-        if self.oops_dir:
-            repo = DateDirRepo(self.oops_dir)
-            self.config.publishers.append(
-                defer_publisher(oops.publish_new_only(repo.publish)))
-        if self.oops_reporter:
-            self.config.template['reporter'] = self.oops_reporter
-        self.observer = OOPSObserver(
-            self.config, self.log_service.observer.emit)
-        addObserver(self.observer.emit)
-
-    def stopService(self):
-        Service.stopService(self)
-        removeObserver(self.observer.emit)
-        self.observer = None
-        self.config = None
-
-
 class Options(usage.Options):
     """Command line options for the provisioning server."""
 
@@ -207,12 +163,6 @@
         """Create the log service."""
         return LogService(config["logfile"])
 
-    def _makeOopsService(self, log_service, oops_config):
-        """Create the oops service."""
-        oops_dir = oops_config["directory"]
-        oops_reporter = oops_config["reporter"]
-        return OOPSService(log_service, oops_dir, oops_reporter)
-
     def _makeSiteService(self, papi_xmlrpc, config):
         """Create the site service."""
         site_root = Resource()
@@ -268,9 +218,6 @@
         log_service = self._makeLogService(config)
         log_service.setServiceParent(services)
 
-        oops_service = self._makeOopsService(log_service, config["oops"])
-        oops_service.setServiceParent(services)
-
         tftp_service = self._makeTFTPService(config["tftp"])
         tftp_service.setServiceParent(services)
 

=== modified file 'src/provisioningserver/tests/test_config.py'
--- src/provisioningserver/tests/test_config.py	2014-08-20 19:04:17 +0000
+++ src/provisioningserver/tests/test_config.py	2015-03-02 14:13:04 +0000
@@ -367,8 +367,6 @@
 
     default_development_config = deepcopy(default_production_config)
     default_development_config.update(logfile="/dev/null")
-    default_development_config["oops"].update(
-        directory="logs/oops", reporter="maas-pserv")
     default_development_config["tftp"].update(
         port=5244, generator="http://localhost:5243/api/1.0/pxeconfig/")
 

=== modified file 'src/provisioningserver/tests/test_plugin.py'
--- src/provisioningserver/tests/test_plugin.py	2014-10-02 11:53:59 +0000
+++ src/provisioningserver/tests/test_plugin.py	2015-03-02 14:13:04 +0000
@@ -118,7 +118,7 @@
         self.assertIsInstance(service, MultiService)
         expected_services = [
             "dhcp_probe", "image_download", "lease_upload", "log",
-            "node_monitor", "oops", "rpc", "tftp",
+            "node_monitor", "rpc", "tftp",
             ]
         self.assertItemsEqual(expected_services, service.namedServices)
         self.assertEqual(

=== modified file 'src/provisioningserver/tests/test_plugin_services.py'
--- src/provisioningserver/tests/test_plugin_services.py	2014-09-01 08:40:13 +0000
+++ src/provisioningserver/tests/test_plugin_services.py	2015-03-02 14:13:04 +0000
@@ -14,20 +14,14 @@
 __metaclass__ = type
 __all__ = []
 
-import os
 import signal
 import sys
 
-from maastesting.factory import factory
 from maastesting.testcase import (
     MAASTestCase,
     MAASTwistedRunTest,
     )
-from oops_twisted import OOPSObserver
-from provisioningserver.plugin import (
-    LogService,
-    OOPSService,
-    )
+from provisioningserver.plugin import LogService
 from testtools.content import content_from_file
 from twisted.application.service import MultiService
 from twisted.python.log import (
@@ -91,33 +85,3 @@
         self.assertEqual(
             signal.getsignal(signal.SIGUSR1),
             log_service._signal_handler)
-
-
-class TestOOPSService(TestServicesBase, MAASTestCase):
-    """Tests for `provisioningserver.services.OOPSService`."""
-
-    def setUp(self):
-        super(TestOOPSService, self).setUp()
-        # OOPSService relies upon LogService.
-        self.tempdir = self.make_dir()
-        self.log_filename = factory.make_file(
-            location=self.tempdir, name="test.log")
-        self.log_service = LogService(self.log_filename)
-        self.log_service.setServiceParent(self.services)
-
-    def test_minimal(self):
-        oops_service = OOPSService(self.log_service, None, None)
-        oops_service.setServiceParent(self.services)
-        observer = oops_service.observer
-        self.assertIsInstance(observer, OOPSObserver)
-        self.assertEqual([], observer.config.publishers)
-        self.assertEqual({}, observer.config.template)
-
-    def test_with_all_params(self):
-        oops_dir = os.path.join(self.tempdir, "oops")
-        oops_service = OOPSService(self.log_service, oops_dir, "Sidebottom")
-        oops_service.setServiceParent(self.services)
-        observer = oops_service.observer
-        self.assertIsInstance(observer, OOPSObserver)
-        self.assertEqual(1, len(observer.config.publishers))
-        self.assertEqual({"reporter": "Sidebottom"}, observer.config.template)