]>
git.apps.os.sepia.ceph.com Git - ceph-ci.git/log 
Sage Weil  [Tue, 1 Aug 2017 16:00:32 +0000  (12:00 -0400)] 
doc/release-notes: clean up linksSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 1 Aug 2017 16:14:51 +0000  (12:14 -0400)] 
doc/rados/operations/crush-map: more device class docsSigned-off-by: Sage Weil <sage@redhat.com> 
Kefu Chai  [Tue, 1 Aug 2017 15:38:28 +0000  (23:38 +0800)] 
Merge pull request #16727 from jcsp/wip-doc-config-helReviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 1 Aug 2017 15:37:53 +0000  (23:37 +0800)] 
Merge pull request #16707 from ivancich/wip-more-dmclock-docsReviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Tue, 1 Aug 2017 15:21:39 +0000  (10:21 -0500)] 
Merge pull request #16730 from liewegas/wip-more-doc-linksReviewed-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Tue, 1 Aug 2017 15:06:21 +0000  (11:06 -0400)] 
doc/release-notes: fix a few doc linksSigned-off-by: Sage Weil <sage@redhat.com> 
Jos Collin  [Tue, 1 Aug 2017 14:47:54 +0000  (14:47 +0000)] 
Merge pull request #16653 from amitkumar50/Coverity-
1409697 
rgw: Use comparison instead of assignment
Reviewed-by: Adam C. Emerson <aemerson@redhat.com> 
Jason Dillaman  [Tue, 1 Aug 2017 14:14:46 +0000  (10:14 -0400)] 
Merge pull request #16656 from idryomov/wip-qa-newer-fioReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Kefu Chai  [Tue, 1 Aug 2017 13:50:52 +0000  (21:50 +0800)] 
Merge pull request #16652 from shangzhong/wip-update-quick-guideReviewed-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Tue, 1 Aug 2017 13:50:02 +0000  (08:50 -0500)] 
Merge pull request #16637 from ceph/wip-doc-linksReviewed-by: Kefu Chai <kchai@redhat.com> 
Sage Weil  [Thu, 27 Jul 2017 19:11:52 +0000  (15:11 -0400)] 
doc/release-notes: add various links to docsSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 27 Jul 2017 19:11:44 +0000  (15:11 -0400)] 
doc/rados/operations/upmap: document new upmap featureSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 1 Aug 2017 13:39:18 +0000  (08:39 -0500)] 
Merge pull request #15838 from theanalyst/doc-pool-ns-updateReviewed-by: Casey Bodley <cbodley@redhat.com> 
Sage Weil  [Tue, 1 Aug 2017 13:29:29 +0000  (08:29 -0500)] 
Merge pull request #16623 from xiexingguo/wip-weightsetReviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Tue, 1 Aug 2017 13:26:24 +0000  (08:26 -0500)] 
Merge pull request #16611 from liewegas/wip-doc-healthReviewed-by: Josh Durgin <jdurgin@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: John Spray <john.spray@redhat.com> Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn> 
Sage Weil  [Tue, 1 Aug 2017 13:25:27 +0000  (09:25 -0400)] 
doc/rados/operations/health-checks: add PG health check commentarySigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 27 Jul 2017 18:28:14 +0000  (14:28 -0400)] 
mon/PGMap: include which pgs have unfound objects in detailSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 27 Jul 2017 17:54:46 +0000  (13:54 -0400)] 
mon/PGMap: put the _toofull states under DEGRADED_FULLSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 27 Jul 2017 17:54:29 +0000  (13:54 -0400)] 
mon/PGMap: 'incomplete' means data is unavailableSigned-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Thu, 27 Jul 2017 02:05:35 +0000  (22:05 -0400)] 
doc/rados/operations/health-checks: osd sectionSigned-off-by: Sage Weil <sage@redhat.com> 
Zhu Shangzhong  [Fri, 28 Jul 2017 12:20:33 +0000  (20:20 +0800)] 
doc: change the default filesystem/pool namesSigned-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn> 
John Spray  [Tue, 1 Aug 2017 12:38:40 +0000  (13:38 +0100)] 
qa: include `config help` in admin socket testSigned-off-by: John Spray <john.spray@redhat.com> 
John Spray  [Tue, 1 Aug 2017 12:38:27 +0000  (13:38 +0100)] 
doc: document `config help` commandSigned-off-by: John Spray <john.spray@redhat.com> 
Jos Collin  [Tue, 1 Aug 2017 11:21:59 +0000  (11:21 +0000)] 
Merge pull request #16721 from joscollin/wip-config-rst-typoReviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn> 
John Spray  [Tue, 1 Aug 2017 11:06:36 +0000  (12:06 +0100)] 
Merge pull request #16723 from tchaikov/wip-doc-kill-warnings
Kefu Chai  [Tue, 1 Aug 2017 10:52:59 +0000  (18:52 +0800)] 
Merge pull request #16471 from jan--f/janf-mds-deactivate-docReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Kefu Chai  [Tue, 1 Aug 2017 09:45:06 +0000  (17:45 +0800)] 
Merge pull request #16620 from cfanz/masterReviewed-by: Jos Collin <jcollin@redhat.com> 
Kefu Chai  [Tue, 1 Aug 2017 09:40:27 +0000  (17:40 +0800)] 
Merge pull request #16526 from TsaiJin/wip-fix-msg-typoReviewed-by: Pan Liu <wanjun.lp@alibaba-inc.com> Reviewed-by: Jos Collin <jcollin@redhat.com> Reviewed-by: Haomai Wang <haomai@xsky.com> 
Kefu Chai  [Tue, 1 Aug 2017 09:38:08 +0000  (17:38 +0800)] 
Merge pull request #16666 from scienceluo/wip-luo-auth-branchReviewed-by: Jos Collin <jcollin@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Tue, 1 Aug 2017 09:16:39 +0000  (17:16 +0800)] 
doc: various fixesSigned-off-by: Kefu Chai <kchai@redhat.com> 
Jos Collin  [Tue, 1 Aug 2017 08:40:42 +0000  (14:10 +0530)] 
doc: fix typo in config.rstSigned-off-by: Jos Collin <jcollin@redhat.com> 
Josh Durgin  [Tue, 1 Aug 2017 06:52:43 +0000  (23:52 -0700)] 
Merge pull request #16622 from dillaman/wip-cmpext-dneReviewed-by: David Zafman <dzafman@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Josh Durgin <jdurgin@redhat.com> 
Kefu Chai  [Tue, 1 Aug 2017 05:12:53 +0000  (13:12 +0800)] 
Merge pull request #16677 from tchaikov/wip-20785Reviewed-by: Greg Farnum <gfarnum@redhat.com> 
David Zafman  [Tue, 1 Aug 2017 01:19:02 +0000  (18:19 -0700)] 
Merge pull request #16663 from dzafman/wip-ec-enoentReviewed-by: Greg Farnum <gfarnum@redhat.com> 
Jos Collin  [Tue, 1 Aug 2017 00:59:06 +0000  (00:59  +0000)] 
Merge pull request #16681 from shun-s/wip-doc-configReviewed-by: Jos Collin <jcollin@redhat.com> 
Gregory Farnum  [Mon, 31 Jul 2017 22:05:23 +0000  (15:05 -0700)] 
Merge pull request #16695 from tchaikov/wip-cmake-disable-vtaReviewed-by: Greg Farnum <gfarnum@redhat.com> 
Gregory Farnum  [Mon, 31 Jul 2017 21:59:43 +0000  (14:59 -0700)] 
Merge pull request #16697 from wjwithagen/wip-wjw-ENODATA-HashIndex.ccReviewed-by: Greg Farnum <gfarnum@redhat.com> 
Adam C. Emerson  [Mon, 31 Jul 2017 18:43:58 +0000  (14:43 -0400)] 
Merge pull request #16689 from pritha-srivastava:wip-rgw-policy-parse-errorReviewed-by: Adam C. Emerson <aemerson@redhat.com> 
Adam C. Emerson  [Mon, 31 Jul 2017 18:08:20 +0000  (14:08 -0400)] 
Merge pull request #16661 from adamemerson/wip-throttle-minimalReviewed-by: Kefu Chai <kchai@redhat.com> Reviewed-by: Greg Farnum <gfarnum@redhat.com> 
J. Eric Ivancich  [Mon, 31 Jul 2017 17:18:02 +0000  (13:18 -0400)] 
doc: Describe mClock's use within Ceph in great detail.Signed-off-by: J. Eric Ivancich <ivancich@redhat.com> 
Adam C. Emerson  [Fri, 28 Jul 2017 18:14:48 +0000  (14:14 -0400)] 
throttle: Minimal destructor fix for LuminousSigned-off-by: Adam C. Emerson <aemerson@redhat.com> 
Jason Dillaman  [Mon, 31 Jul 2017 14:22:21 +0000  (10:22 -0400)] 
Merge pull request #16547 from dillaman/wip-dashboard-iscsiReviewed-by: John Spray <john.spray@redhat.com> 
Song Shun  [Sun, 30 Jul 2017 10:25:01 +0000  (18:25 +0800)] 
doc: fix sevral typosSigned-off-by: Song Shun <song.shun3@zte.com.cn> 
Jason Dillaman  [Mon, 31 Jul 2017 14:07:45 +0000  (10:07 -0400)] 
Merge pull request #16670 from Yan-waller/wip-walle-0729rbdcompileReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Jason Dillaman  [Mon, 31 Jul 2017 13:49:13 +0000  (09:49 -0400)] 
Merge pull request #16583 from lxbsz/ws_macroReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Yan Jun  [Mon, 31 Jul 2017 13:26:13 +0000  (21:26 +0800)] 
cls/rbd: silence warning from -Wunused-variableSigned-off-by: Yan Jun <yan.jun8@zte.com.cn> 
Jason Dillaman  [Mon, 31 Jul 2017 13:12:27 +0000  (09:12 -0400)] 
Merge pull request #16694 from Songweibin/wip-doc-rbdReviewed-by: Jason Dillaman <dillaman@redhat.com> 
Willem Jan Withagen  [Mon, 31 Jul 2017 13:02:53 +0000  (15:02 +0200)] 
HashIndex.cc: add compat.h for ENODATASigned-off-by: Willem Jan Withagen <wjw@digiware.nl> 
Kefu Chai  [Sun, 30 Jul 2017 05:07:02 +0000  (13:07 +0800)] 
mon/OSDMonitor: assert(pg in creating_pgs.pg) in send_pg_creates()Signed-off-by: Kefu Chai <kchai@redhat.com> 
Jason Dillaman  [Mon, 31 Jul 2017 12:53:40 +0000  (08:53 -0400)] 
Merge pull request #16686 from amitkumar50/cov-
1351525 -1
rbd: fixed coverity 'Argument cannot be negative' warning
Reviewed-by: Jason Dillaman <dillaman@redhat.com> 
Kefu Chai  [Mon, 31 Jul 2017 12:32:18 +0000  (20:32 +0800)] 
cmake: disable -fvar-tracking-assignments for config.ccSigned-off-by: Kefu Chai <kchai@redhat.com> 
amitkuma  [Mon, 31 Jul 2017 12:28:32 +0000  (17:58 +0530)] 
rbd: 
1351525  Argument cannot be negative
Fixed:
** CID 
1351525  (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
7. negative_returns: sd is passed to a parameter that cannot be negative.
Signed-off-by: Amit Kumar amitkuma@redhat.com 
songweibin  [Mon, 31 Jul 2017 12:25:30 +0000  (20:25 +0800)] 
rbd: modified some commands' description into imperative sentenceSigned-off-by: songweibin <song.weibin@zte.com.cn> 
John Spray  [Mon, 31 Jul 2017 10:53:53 +0000  (11:53 +0100)] 
Merge pull request #16660 from nrdmn/patch-2Reviewed-by: John Spray <john.spray@redhat.com> 
Pritha Srivastava  [Mon, 31 Jul 2017 05:19:07 +0000  (10:49 +0530)] 
rgw: Fix for Policy Parse exception in case of multiple statements.Signed-off-by: Pritha Srivastava <prsrivas@redhat.com> 
Luo Kexue  [Sat, 29 Jul 2017 02:09:37 +0000  (10:09 +0800)] 
auth: Remove unused function in AuthSessionHandlerSigned-off-by: Luo Kexue <luo.kexue@zte.com.cn> 
Kefu Chai  [Sun, 30 Jul 2017 07:33:52 +0000  (15:33 +0800)] 
Merge pull request #16627 from liewegas/wip-objecter-eagainReviewed-by: Greg Farnum <gfarnum@redhat.com> 
Kefu Chai  [Sun, 30 Jul 2017 05:18:10 +0000  (13:18 +0800)] 
Merge pull request #16668 from Yan-waller/wip-walle-0729configoptionReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sun, 30 Jul 2017 03:16:36 +0000  (11:16 +0800)] 
mon/OSDMonitor: more verbose message for pg creationSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Sun, 30 Jul 2017 03:16:08 +0000  (11:16 +0800)] 
osd: do not send pg_created unless luminousSigned-off-by: Kefu Chai <kchai@redhat.com> 
xie xingguo  [Thu, 27 Jul 2017 00:08:41 +0000  (08:08 +0800)] 
crush: clean up get_immediate_parent_id()
This is a follow-up cleanup of 
9d908c14f606239d291cd3551e8f716943e0badf 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn> 
xie xingguo  [Thu, 27 Jul 2017 03:07:53 +0000  (11:07 +0800)] 
crush: avoid implicitly castSigned-off-by: xie xingguo <xie.xingguo@zte.com.cn> 
xie xingguo  [Thu, 27 Jul 2017 11:53:49 +0000  (19:53 +0800)] 
mon/OSDMonitor: make error output more human-readableSigned-off-by: xie xingguo <xie.xingguo@zte.com.cn> 
Xie Xingguo  [Sat, 29 Jul 2017 05:44:31 +0000  (13:44 +0800)] 
Merge pull request #16669 from Yan-waller/wip-walle-0729testpglogcompileReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> 
Yan Jun  [Sat, 29 Jul 2017 03:23:11 +0000  (11:23 +0800)] 
test/osd: kill compile warningSigned-off-by: Yan Jun <yan.jun8@zte.com.cn> 
Kefu Chai  [Sat, 29 Jul 2017 03:10:38 +0000  (11:10 +0800)] 
Merge pull request #16667 from tchaikov/wip-objclass-omapReviewed-by: Sage Weil <sage@redhat.com> 
Yan Jun  [Sat, 29 Jul 2017 02:21:43 +0000  (10:21 +0800)] 
common: fix Option set_long_descriptionSigned-off-by: Yan Jun <yan.jun8@zte.com.cn> 
Yehuda Sadeh  [Fri, 14 Jul 2017 23:57:43 +0000  (16:57 -0700)] 
librados_test_stub: use omap_get_vals2() and modify stubsSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> Signed-off-by: Casey Bodley <cbodley@redhat.com> 
Yehuda Sadeh  [Fri, 14 Jul 2017 23:19:31 +0000  (16:19 -0700)] 
cls_kvs: adjust objclass apiSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 14 Jul 2017 23:11:09 +0000  (16:11 -0700)] 
cls_{rbd, journal, lua}: adjust apiSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 14 Jul 2017 22:33:45 +0000  (15:33 -0700)] 
cls/lua: add 'more' param for cls_cxx_map_get_vals()Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 14 Jul 2017 22:28:09 +0000  (15:28 -0700)] 
cls/*: adjust use of cls_cxx_map_get_vals()Signed-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Yehuda Sadeh  [Fri, 14 Jul 2017 16:37:38 +0000  (09:37 -0700)] 
objclass: add 'more' param to omap listingSigned-off-by: Yehuda Sadeh <yehuda@redhat.com> 
Jason Dillaman  [Thu, 27 Jul 2017 11:48:59 +0000  (07:48 -0400)] 
osd: cmpext operator should ignore -ENOENT on readSigned-off-by: Jason Dillaman <dillaman@redhat.com> 
David Zafman  [Fri, 28 Jul 2017 18:48:28 +0000  (11:48 -0700)] 
osd: EC read handling: don't grab an objectstore error to use as the read errorSigned-off-by: David Zafman <dzafman@redhat.com> 
Josh Durgin  [Fri, 28 Jul 2017 22:07:17 +0000  (15:07 -0700)] 
Merge pull request #16617 from dillaman/wip-20783Reviewed-by: Kefu Chai <kchai@redhat.com> 
Yuri Weinstein  [Fri, 28 Jul 2017 22:02:13 +0000  (15:02 -0700)] 
Merge pull request #16590 from LianneWang/masterReviewed-by: Sage Weil <sage@redhat.com> 
Yuri Weinstein  [Fri, 28 Jul 2017 22:01:46 +0000  (15:01 -0700)] 
Merge pull request #16615 from tchaikov/wip-no-vla-in-cxxReviewed-by: Haomai Wang <haomai@xsky.com> Reviewed-by: Willem Jan Withagen <wjw@digiware.nl> 
Gregory Farnum  [Fri, 28 Jul 2017 19:52:39 +0000  (12:52 -0700)] 
Merge pull request #16655 from liewegas/wip-osd-warningReviewed-by: Greg Farnum <gfarnum@redhat.com> 
amitkuma  [Fri, 28 Jul 2017 18:44:29 +0000  (00:14  +0530)] 
rgw: Assign instead of compare
Fixed:
** CID 
1409697  (#1 of 1): Assign instead of compare (PW.ASSIGN_WHERE_COMPARE_MEANT)
1. assign_where_compare_meant: use of "=" where "==" may have been intended
2. primary_file: During compilation of file '/src/rgw/librgw.cc'
Signed-off-by: Amit Kumar amitkuma@redhat.com 
Nick Erdmann  [Fri, 28 Jul 2017 17:16:27 +0000  (19:16 +0200)] 
added mgr caps to manual deployment documentationSigned-off-by: Nick Erdmann <n@nirf.de> 
Patrick Donnelly  [Fri, 28 Jul 2017 16:55:29 +0000  (09:55 -0700)] 
Merge PR #16640 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Fri, 28 Jul 2017 16:55:26 +0000  (09:55 -0700)] 
Merge PR #16550 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Fri, 28 Jul 2017 16:55:23 +0000  (09:55 -0700)] 
Merge PR #16413 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Patrick Donnelly  [Fri, 28 Jul 2017 16:55:21 +0000  (09:55 -0700)] 
Merge PR #16410 into masterReviewed-by: Patrick Donnelly <pdonnell@redhat.com> 
Sage Weil  [Fri, 28 Jul 2017 14:07:23 +0000  (10:07 -0400)] 
osd/PG: fix warning
Introduced by 
4af49a886679ceb8e8afba47f04e828e5911e325 
Signed-off-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 28 Jul 2017 14:01:33 +0000  (09:01 -0500)] 
Merge pull request #16645 from tchaikov/wip-bluefs-allocator-is-dev-only-optionReviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 28 Jul 2017 14:01:16 +0000  (09:01 -0500)] 
Merge pull request #16489 from liewegas/wip-bluestore-options
Sage Weil  [Fri, 28 Jul 2017 14:01:08 +0000  (09:01 -0500)] 
Merge pull request #16520 from xiexingguo/wip-application-warnReviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 28 Jul 2017 14:00:46 +0000  (09:00 -0500)] 
Merge pull request #16568 from liewegas/wip-application-warn
Sage Weil  [Fri, 28 Jul 2017 13:59:43 +0000  (08:59 -0500)] 
Merge pull request #16634 from neha-ojha/wip-default-device-classReviewed-by: xie xingguo <xie.xingguo@zte.com.cn> Reviewed-by: Sage Weil <sage@redhat.com> 
Sage Weil  [Fri, 28 Jul 2017 13:59:06 +0000  (08:59 -0500)] 
Merge pull request #16638 from liewegas/wip-20804Reviewed-by: Greg Farnum <gfarnum@redhat.com> 
Sage Weil  [Fri, 28 Jul 2017 13:41:49 +0000  (08:41 -0500)] 
Merge pull request #16646 from tchaikov/wip-qa-run-standalone-work-with-gnu-findReviewed-by: Willem Jan Withagen <wjw@digiware.nl> 
John Spray  [Fri, 28 Jul 2017 12:24:41 +0000  (13:24 +0100)] 
Merge pull request #16487 from liewegas/wip-mgr-module-healthReviewed-by: John Spray <john.spray@redhat.com> 
John Spray  [Fri, 28 Jul 2017 12:19:57 +0000  (13:19 +0100)] 
Merge pull request #16641 from liewegas/wip-mgr-configsReviewed-by: John Spray <john.spray@redhat.com> 
Kefu Chai  [Fri, 28 Jul 2017 09:12:46 +0000  (17:12 +0800)] 
Merge pull request #16582 from liewegas/wip-20633Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Fri, 28 Jul 2017 06:18:09 +0000  (14:18 +0800)] 
qa/run-standalone.sh: fix the find option to be compatible with GNU findSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Fri, 28 Jul 2017 05:09:12 +0000  (13:09 +0800)] 
common/options: make "blue{fs,store}_allocator" LEVEL_DEVSigned-off-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Fri, 28 Jul 2017 05:18:47 +0000  (13:18 +0800)] 
Merge pull request #16599 from liewegas/wip-standalone-fixesReviewed-by: Jason Dillaman <dillaman@redhat.com> Reviewed-by: Kefu Chai <kchai@redhat.com> 
Kefu Chai  [Fri, 28 Jul 2017 05:15:33 +0000  (13:15 +0800)] 
Merge pull request #16482 from tchaikov/wip-optReviewed-by: John Spray <john.spray@redhat.com>