Juju Charms Collection
ceph package

Merge lp://staging/~aluria/charms/trusty/ceph/ceph-multijournal-support into lp://staging/~openstack-charmers-archive/charms/trusty/ceph/next

  1. Trusty Tahr (14.04)
  2. ceph-multijournal-support
  3. Merge into next
Proposed by James Page
Status: Rejected
Rejected by: Haw Loeung
Proposed branch: lp://staging/~aluria/charms/trusty/ceph/ceph-multijournal-support
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 1498 lines (+1328/-12) (has conflicts)
18 files modified
charm-helpers-hooks.yaml (+1/-1)
charm-helpers-tests.yaml (+1/-1)
config.yaml (+4/-1)
hooks/ceph.py (+46/-8)
hooks/ceph_broker.py (+100/-0)
hooks/ceph_hooks.py (+481/-0)
hooks/charmhelpers/cli/__init__.py (+191/-0)
hooks/charmhelpers/cli/benchmark.py (+36/-0)
hooks/charmhelpers/cli/commands.py (+32/-0)
hooks/charmhelpers/cli/hookenv.py (+23/-0)
hooks/charmhelpers/cli/host.py (+31/-0)
hooks/charmhelpers/cli/unitdata.py (+39/-0)
hooks/charmhelpers/core/files.py (+45/-0)
hooks/charmhelpers/core/hugepage.py (+62/-0)
tests/basic_deployment.py (+1/-1)
tests/tests.yaml (+20/-0)
unit_tests/test_status.py (+94/-0)
unit_tests/test_utils.py (+121/-0)
Text conflict in hooks/ceph.py
Conflict adding file hooks/ceph_broker.py.  Moved existing file to hooks/ceph_broker.py.moved.
Path conflict: hooks/ceph_hooks.py / <deleted>
Conflict adding file hooks/ceph_hooks.py.  Moved existing file to hooks/ceph_hooks.py.moved.
Conflict adding file hooks/charmhelpers/cli.  Moved existing file to hooks/charmhelpers/cli.moved.
Conflict adding file hooks/charmhelpers/core/files.py.  Moved existing file to hooks/charmhelpers/core/files.py.moved.
Conflict adding file hooks/charmhelpers/core/hugepage.py.  Moved existing file to hooks/charmhelpers/core/hugepage.py.moved.
Conflict adding file hooks/install.real.  Moved existing file to hooks/install.real.moved.
Conflict adding file hooks/update-status.  Moved existing file to hooks/update-status.moved.
Conflict adding file tests/tests.yaml.  Moved existing file to tests/tests.yaml.moved.
Conflict adding file unit_tests/test_status.py.  Moved existing file to unit_tests/test_status.py.moved.
Conflict adding file unit_tests/test_utils.py.  Moved existing file to unit_tests/test_utils.py.moved.
To merge this branch: bzr merge lp://staging/~aluria/charms/trusty/ceph/ceph-multijournal-support
Reviewer Review Type Date Requested Status
Edward Hope-Morley Needs Fixing
Review via email: mp+276637@code.staging.launchpad.net

Description of the change

Support for multiple osd-journal devices (ie: '/dev/sdb /dev/sdc'). Device with less number of partitions will be chosen each time a new OSD device is about to be configured.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #13103 ceph-next for james-page mp276637
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #12215 ceph-next for james-page mp276637
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #7720 ceph-next for james-page mp276637
    AMULET OK: passed

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

Revision history for this message
Edward Hope-Morley (hopem) wrote :

@aluria Thanks for submitting this proposal. There are a couple of things that need to be resolved before this proposal can be considered for landing. Firstly, it appears that you have based this patch on the stable version of the charm i.e. lp:charms/trusty/ceph (or lp:~openstack-charmers/charms/trusty/ceph/trunk) when it should be based on lp:~openstack-charmers/charms/trusty/ceph/next. If you fix this i suspect that most of your conflicts will go away.

Second, it is helpful if only one of the commits contains the proposed commit message. That way we know which one you want us to use and we have an informative description of the the patch is intending to do. If there is too much to put into the commit message then you can always raise a bug and reference it in the commit message e.g.

[myname,r=]

Description of my awesome patch.
Closes-Bug: #<bug>

Lastly, please always check that all tests run successfully prior to submission e.g.

make functional_test (this requires a Juju env to run against)

make lint test
...
Ran 15 tests in 0.195s

OK

review: Needs Fixing

Unmerged revisions

117. By Alvaro Uria

[aluria,r=] adding multi osd-journal support on mon-relation-changed hook

116. By Alvaro Uria

[aluria,r=] config.yaml description indicates osd-journal allows multiple devices

115. By Alvaro Uria

[aluria,r=] DEBUG variable imported from charmhelpers

114. By Alvaro Uria

[aluria,r=] port multijournal device support by chrome0 (from ceph-osd to ceph charm)

113. By Corey Bryant

[beisner,r=corey.bryant] Enable stable amulet tests and stable charm-helper syncs.

112. By James Page

15.10 Charm release

111. By Liam Young

Charmhelper sync

110. By Chris Glass

Merge lp:~gnuoy/charms/trusty/ceph/1453940-stable [a=gnuoy] [r=tribaal]

Hook the ceph broker mechanism introduced in charm-helpers to the ceph charm.

109. By Corey Bryant

[beisner,r=corey.bryant] Point charmhelper sync and amulet tests at stable branches.

108. By James Page

[gnuoy] 15.07 Charm release

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