Merge lp:~gnuoy/charms/trusty/ceph/fix-1409698 into lp:~openstack-charmers-archive/charms/trusty/ceph/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #711 ceph-next for gnuoy mp246170
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/711/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #682 ceph-next for gnuoy mp246170
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/682/

[Edward Hope-Morley (hopem)]

review: Needs Fixing

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #868 ceph-next for gnuoy mp246170
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/868/

[lp:~gnuoy/charms/trusty/ceph/fix-1409698]

94. By Liam Young on 2015-01-12

Fix bug by removing superfluous call to client_relation_changed in light of mp feedback

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #713 ceph-next for gnuoy mp246170
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/713/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #684 ceph-next for gnuoy mp246170
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/hooks.py:310:42: F821 undefined name 'relid'
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9719313/
Build: http://10.245.162.77:8080/job/charm_lint_check/684/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #870 ceph-next for gnuoy mp246170
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/9719369/
Build: http://10.245.162.77:8080/job/charm_amulet_test/870/

[lp:~gnuoy/charms/trusty/ceph/fix-1409698]

95. By Liam Young on 2015-01-13

Remove reference to relid since it is no longer used in client_relation_changed()

96. By Liam Young on 2015-01-13

Remove another reference to relid since it is no longer used in client_relation_changed()

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #744 ceph-next for gnuoy mp246170
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/744/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #715 ceph-next for gnuoy mp246170
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/715/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #900 ceph-next for gnuoy mp246170
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/900/

[Edward Hope-Morley (hopem)]

LGTM +1

review: Approve

[Ryan Beisner (1chb1n)]

P, T, U & J deploy tests fail with:

http://10.245.162.77:8080/view/Dashboard%3A%20Deploy/job/deploy_with_deployer/1213/artifact/

02:07:59 2015-01-13 02:07:59 [DEBUG] deployer.import: Waiting for relation convergence 60s
02:08:59 2015-01-13 02:09:00 [ERROR] deployer.env: The following units had errors:
02:08:59 unit: ceph/2: machine: 4 agent-state: error details: hook failed: "client-relation-changed"
02:08:59 unit: ceph/1: machine: 3 agent-state: error details: hook failed: "client-relation-changed"
02:08:59 unit: ceph/0: machine: 2 agent-state: error details: hook failed: "client-relation-changed"
02:08:59 2015-01-13 02:09:00 [INFO] deployer.cli: Deployment stopped. run time: 560.19

2015-01-13 02:07:56 INFO juju.worker.uniter uniter.go:480 running "client-relation-changed" hook
2015-01-13 02:07:56 INFO client-relation-changed Traceback (most recent call last):
2015-01-13 02:07:56 INFO client-relation-changed File "/var/lib/juju/agents/unit-ceph-0/charm/hooks/client-relation-changed", line 337, in <module>
2015-01-13 02:07:56 INFO client-relation-changed hooks.execute(sys.argv)
2015-01-13 02:07:56 INFO client-relation-changed File "/var/lib/juju/agents/unit-ceph-0/charm/hooks/charmhelpers/core/hookenv.py", line 528, in execute
2015-01-13 02:07:56 INFO client-relation-changed self._hooks[hook_name]()
2015-01-13 02:07:56 INFO client-relation-changed File "/var/lib/juju/agents/unit-ceph-0/charm/hooks/client-relation-changed", line 304, in client_relation_changed
2015-01-13 02:07:56 INFO client-relation-changed settings = relation_get(rid=relid)
2015-01-13 02:07:56 INFO client-relation-changed NameError: global name 'relid' is not defined
2015-01-13 02:07:56 ERROR juju.worker.uniter uniter.go:486 hook failed: exit status 1

review: Needs Fixing

[Liam Young (gnuoy)]

I think those errors are fixed by r96

[Liam Young (gnuoy)]

http://10.245.162.77:8080/view/Dashboard:%20Deploy/job/deploy_with_deployer/1333/console

[Ryan Beisner (1chb1n)]

P, T & U deploy tests are all happy!

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-01-12 12:03:58 +0000
+++ hooks/hooks.py	2015-01-13 10:32:17 +0000
@@ -306,24 +306,21 @@
                     'ceph-public-address': get_public_addr()}
             relation_set(relation_id=relid,
                          relation_settings=data)
-
-        client_relation_changed(relid=relid)
     else:
         log('mon cluster not in quorum - deferring key provision')
 
 
 @hooks.hook('client-relation-changed')
-def client_relation_changed(relid=None):
+def client_relation_changed():
     """Process broker requests from ceph client relations."""
     if ceph.is_quorum():
-        settings = relation_get(rid=relid)
+        settings = relation_get()
         if 'broker_req' in settings:
             if not ceph.is_leader():
                 log("Not leader - ignoring broker request", level=DEBUG)
             else:
                 rsp = process_requests(settings['broker_req'])
-                relation_set(relation_id=relid,
-                             relation_settings={'broker_rsp': rsp})
+                relation_set(relation_settings={'broker_rsp': rsp})
     else:
         log('mon cluster not in quorum', level=DEBUG)