Merge lp:~cprov/snappy-proposed-selftest-agent/rescue into lp:snappy-proposed-selftest-agent

[Celso Providelo]

Improving logging, specially errors.

Improving logging, specially errors.

Missing keys (source_binaries and distribution) added to lp:~cprov/+junk/snappy-proposed-testing.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~cprov/snappy-proposed-selftest-agent/rescue into lp:snappy-proposed-selftest-agent failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-snappy-proposed-selftest-agentbil21h3f/bin/python3
Also creating executable in /tmp/venv-snappy-proposed-selftest-agentbil21h3f/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-snappy-proposed-selftest-agentbil21h3f/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking uservice-utils==1.0.2.1 (from -r requirements.txt (line 3))
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-selftest-agentbil21h3f/build/anyjson/setup.py) egg_info for package anyjson

Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-selftest-agentbil21h3f/build/amqp/setup.py) egg_info for package amqp

Installing collected packages: kombu, python-logstash, uservice-utils, anyjson, amqp
  Running setup.py install for python-logstash

  Running setup.py install for anyjson
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma

  Running setup.py install for amqp

Successfully installed kombu python-logstash uservice-utils anyjson amqp
Cleaning up...
Downloading/unpacking flake8==2.4.0 (from -r test_requirements.txt (line 1))
  Downloading flake8-2.4.0-py2.py3-none-any.whl
Downloading/unpacking testtools==1.7.1 (from -r test_requirements.txt (line 2))
Downloading/unpacking mock==1.0.1 (from -r test_requirements.txt (line 3))
  Running setup.py (path:/tmp/venv-snappy-proposed-selftest-agentbil21h3f/build/mock/setup.py) egg_info for package mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
Downloading/unpacking pep8>=1.5.7,<1.6 (from flake8==2.4.0->-r test_requirements.txt (line 1))
  Downloading pep8-1.5.7-py2.py3-none-any.whl
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.0->-r test_requirements.txt (line 1))
  Downloading mccabe-0.3-py2.py3-none-any.whl
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.0->-r test_requirements.txt (line 1))
  Downloading pyflakes-0.8.1-py2.py3-none-any.whl
Downloading/unpacking unittest2>=1.0.0 (from testtools==1.7.1->-r test_requirem...

[lp:~cprov/snappy-proposed-selftest-agent/rescue]

17. By Celso Providelo on 2015-06-12

Fix flake8 issue.

=== modified file 'snappy_proposed_selftest_agent/worker.py'
--- snappy_proposed_selftest_agent/worker.py	2015-06-04 18:36:00 +0000
+++ snappy_proposed_selftest_agent/worker.py	2015-06-12 11:17:02 +0000
@@ -72,10 +72,15 @@
 
     def process(self, body, message):
         """ Process incoming messages about candidate packages """
+        extra = constants.LOGGING_EXTRA.copy()
+        extra.update(body)
+        logger.info('Got %r', body, extra=extra)
         try:
             series = body['series']
             source_binaries = body['source_binaries']
         except KeyError:
+            logger.error(
+                'Unable to unpack payload!', extra=extra, exc_info=True)
             retry_count = int(body.get('candidates_retry_count', '0'))
             if retry_count < self.max_retries:
                 body['candidates_retry_count'] = retry_count + 1
@@ -85,7 +90,7 @@
                 logger.error(
                     "Rejecting message due to retry count exceeding maximum. "
                     "Message will reside on the dead letter queue",
-                )
+                    extra=extra)
                 with self.connection.SimpleQueue(
                         constants.DEAD_LETTER_QUEUE) as q:
                     q.put(body)
@@ -95,6 +100,7 @@
         # this agent cares about.
         context_series = constants.RELEASE_MAP[constants.RELEASE]
         if context_series != series:
+            logger.info('Series not considered: %s', series, extra=extra)
             message.ack()
             return
 
@@ -106,6 +112,7 @@
         )
 
         if not image_binaries:
+            logger.info('Binaries not part of the core image.', extra=extra)
             message.ack()
             return
 
@@ -132,3 +139,7 @@
         self.result_worker(payload)
 
         message.ack()
+
+        extra.update(payload)
+        logger.info('Image build requested for: %r',
+                    image_binaries, extra=extra)