Merge lp://qastaging/~doanac/uci-engine/worker-health into lp://qastaging/uci-engine

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 632
Merged at revision: 633
Proposed branch: lp://qastaging/~doanac/uci-engine/worker-health
Merge into: lp://qastaging/uci-engine
Diff against target: 316 lines (+155/-1)
11 files modified
charms/precise/rabbitmq-worker/config.yaml (+5/-0)
charms/precise/rabbitmq-worker/hooks/hooks.py (+7/-0)
charms/precise/rabbitmq-worker/metadata.yaml (+4/-0)
ci-utils/ci_utils/amqp_worker.py (+9/-0)
ci-utils/ci_utils/data_store.py (+2/-0)
ci-utils/ci_utils/image_store/__init__.py (+2/-0)
ci-utils/ci_utils/json_status.py (+67/-0)
ci-utils/ci_utils/tests/test_json_status.py (+44/-1)
image-builder/imagebuilder/run_worker.py (+5/-0)
juju-deployer/relations.yaml (+5/-0)
test_runner/tstrun/run_worker.py (+5/-0)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/worker-health
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Celso Providelo (community) Approve
Review via email: mp+224890@code.qastaging.launchpad.net

Commit message

amqpworker: add ability to provide json status

This adds a simple in-process webserver to report json status. It
then uses the hook to give all rabbit workers this support.

Each worker can override the "engine_health" method to provide
any custom checks they desire.

Description of the change

Allows our workers to report deployed revision so we can close out:

 https://app.asana.com/0/8312550429062/12909198209855

This also provides the ground work to support:

 https://app.asana.com/0/8312550429062/13431896743180

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:629
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/960/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/960/rebuild

review: Approve (continuous-integration)
630. By Andy Doan

rabbit workers: add ability to check swift/glance

This allows a worker to check its connections to swift and/or glance. Since
all workers need swift, that's been added to the base class.

I happened to notice the exception we throw isn't that great in the
image_store and data_store, so I've added logging to where we can
look up more details in the event something is failing.

631. By Andy Doan

cprov review: make sure we can create/delete an image

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:631
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/981/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/981/rebuild

review: Approve (continuous-integration)
632. By Andy Doan

support caching of json-responses

Some of these checks can take a couple of seconds. This caches things
for 60 seconds. This should be adequate since. Even in the event of
a cache-miss, the page is rendered via async javascript and doesn't
really block the user.

Revision history for this message
Andy Doan (doanac) wrote :

cprov - i've added the caching you requested

Revision history for this message
Celso Providelo (cprov) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:632
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/983/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/983/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches