]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomgr/dashboard: Renamed `types` as it clashes with std lib
Sebastian Wagner [Mon, 26 Mar 2018 15:16:16 +0000 (17:16 +0200)]
mgr/dashboard: Renamed `types` as it clashes with std lib

This will lead to a name clash, when importing `types`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agoMerge pull request #19439 from chardan/jfw-wip-14363-normalize-rm
Nathan Cutler [Mon, 26 Mar 2018 13:35:40 +0000 (15:35 +0200)]
Merge pull request #19439 from chardan/jfw-wip-14363-normalize-rm

rgw, mon: normalize delete/remove in admin console (cleanup 22444)

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
7 years agoMerge pull request #21011 from tspmelo/wip-submit-btn
Lenz Grimmer [Mon, 26 Mar 2018 12:54:51 +0000 (14:54 +0200)]
Merge pull request #21011 from tspmelo/wip-submit-btn

mgr/dashboard: Add submit button component

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #21032 from simransinghal/fixtypo
Jos Collin [Mon, 26 Mar 2018 11:52:38 +0000 (17:22 +0530)]
Merge pull request #21032 from simransinghal/fixtypo

rgw: Fix typo in comment

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #21020 from trociny/wip-vstart-no-mon-config
Kefu Chai [Mon, 26 Mar 2018 11:33:56 +0000 (19:33 +0800)]
Merge pull request #21020 from trociny/wip-vstart-no-mon-config

stop.sh: use --no-mon-config when trying to unmap rbd devices

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21036 from xiexingguo/wip-wrong-tip
Xie Xingguo [Mon, 26 Mar 2018 10:13:51 +0000 (18:13 +0800)]
Merge pull request #21036 from xiexingguo/wip-wrong-tip

os/bluestore: s/bluefs_total/bluefs_free/

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
7 years agoMerge pull request #21007 from rjfd/wip-dashboard-fix-py3
Ricardo Dias [Mon, 26 Mar 2018 09:59:17 +0000 (10:59 +0100)]
Merge pull request #21007 from rjfd/wip-dashboard-fix-py3

mgr/dashboard: fix dashboard python 3 support

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agoMerge pull request #21006 from rjfd/wip-dashboard-fix-auth-py3
Ricardo Dias [Mon, 26 Mar 2018 09:58:27 +0000 (10:58 +0100)]
Merge pull request #21006 from rjfd/wip-dashboard-fix-auth-py3

mgr/dashboard: fixed password generation in Auth controller

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20865 from sebastian-philipp/dashboard_v2_pool-create
Ricardo Dias [Mon, 26 Mar 2018 09:07:15 +0000 (10:07 +0100)]
Merge pull request #20865 from sebastian-philipp/dashboard_v2_pool-create

mgr/dashboard: Add Pool-create to the backend

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agoos/bluestore: s/bluefs_total/bluefs_free/ 21036/head
xie xingguo [Mon, 26 Mar 2018 02:33:24 +0000 (10:33 +0800)]
os/bluestore: s/bluefs_total/bluefs_free/

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agosrc: Fix typo 21032/head
simransinghal [Sun, 25 Mar 2018 13:15:49 +0000 (18:45 +0530)]
src: Fix typo

Replace "dont" with "don't". "Dont" is not same as "Do not" or "Don't".

Signed-off-by: Simran Singhal <singhalsimran0@gmail.com>
7 years agoMerge pull request #21002 from smithfarm/wip-23437
Nathan Cutler [Fri, 23 Mar 2018 22:29:11 +0000 (23:29 +0100)]
Merge pull request #21002 from smithfarm/wip-23437

build/ops: setup-virtualenv.sh: do not hardcode python binary

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agomgr/dashboard: Add submit button component 21011/head
Tiago Melo [Fri, 23 Mar 2018 16:40:29 +0000 (16:40 +0000)]
mgr/dashboard: Add submit button component

This component is to be used inside a form.

It will render a submit button with the given label.
The button will disabled itself and show a loading icon when the user clicks it,
usually initiating a request to the server, and it will stay in that state
until the request is finished.

To indicate that the request failed, returning the button to the enable state,
you need to insert an error in the form with the 'cdSubmitButton' key.

It will also check if the form is valid, when clicking the button, and will
focus on the first invalid input.

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #21013 from dzafman/wip-remove-bc
Nathan Cutler [Fri, 23 Mar 2018 16:28:02 +0000 (17:28 +0100)]
Merge pull request #21013 from dzafman/wip-remove-bc

test: Replace bc command with printf command

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agomgr/dashboard: Add Teuthology test for `/api/pool/_info` 20865/head
Sebastian Wagner [Thu, 22 Mar 2018 11:08:18 +0000 (12:08 +0100)]
mgr/dashboard: Add Teuthology test for `/api/pool/_info`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agomgr/dashboard: Minor tweak to `DashboardTestCase._request`
Sebastian Wagner [Tue, 20 Mar 2018 16:13:11 +0000 (17:13 +0100)]
mgr/dashboard: Minor tweak to `DashboardTestCase._request`

Don't fall through silently.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agomgr/dashboard: Change `crush_rule` serialization of Pools from id to name
Sebastian Wagner [Wed, 21 Mar 2018 13:53:28 +0000 (14:53 +0100)]
mgr/dashboard: Change `crush_rule` serialization of Pools from id to name

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agomgr/dashboard: Add `pool/_info` api endpoint to fill the create-pool dialog
Sebastian Wagner [Wed, 21 Mar 2018 13:52:14 +0000 (14:52 +0100)]
mgr/dashboard: Add `pool/_info` api endpoint to fill the create-pool dialog

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agomgr/dashboard: Add create() to Pool controller
Sebastian Wagner [Wed, 21 Mar 2018 16:15:29 +0000 (17:15 +0100)]
mgr/dashboard: Add create() to Pool controller

Also:

* Added tests.
* Renamed `DashboardTest` to `PoolTest`.
* Added `delete()`.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agomgr/dashboard: Changed `@RESTController.args_from_json`
Sebastian Wagner [Wed, 21 Mar 2018 16:13:51 +0000 (17:13 +0100)]
mgr/dashboard: Changed `@RESTController.args_from_json`

It now allows any keyword arguments. This is needed for ECP
and Pool creation.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agomgr/dashboard: Refactor `send_command` into CephService
Sebastian Wagner [Tue, 13 Mar 2018 15:40:26 +0000 (16:40 +0100)]
mgr/dashboard: Refactor `send_command` into CephService

* `CephService.send_command` is much easier to use.
* Refactored `CephFSClients.get` and `Dashboard.load_bufer`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agoMerge pull request #21008 from trociny/wip-23430
Ricardo Dias [Fri, 23 Mar 2018 14:59:58 +0000 (14:59 +0000)]
Merge pull request #21008 from trociny/wip-23430

vstart: set osd_pool_default_erasure_code_profile in initial ceph.conf

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
7 years agoMerge pull request #20981 from cbodley/wip-qa-fix-ssl
Yuri Weinstein [Fri, 23 Mar 2018 13:55:10 +0000 (06:55 -0700)]
Merge pull request #20981 from cbodley/wip-qa-fix-ssl

qa: fix overrides for openssl_keys task

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoMerge pull request #20841 from oritwas/wip-rgw-metadata
Casey Bodley [Fri, 23 Mar 2018 13:53:28 +0000 (09:53 -0400)]
Merge pull request #20841 from oritwas/wip-rgw-metadata

rgw: trim all spaces inside a metadata value

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge pull request #20842 from mkogan1/wip-rgw-23147
Casey Bodley [Fri, 23 Mar 2018 13:53:03 +0000 (09:53 -0400)]
Merge pull request #20842 from mkogan1/wip-rgw-23147

rgw: enable 'qlen' & 'qactive' performance counters

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #20846 from theanalyst/rgw/fix-empty-stats
Casey Bodley [Fri, 23 Mar 2018 13:52:38 +0000 (09:52 -0400)]
Merge pull request #20846 from theanalyst/rgw/fix-empty-stats

rgw: radosgw-admin abort early for user stats for empty uids

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #21021 from sebastian-philipp/dashboard-auth-qa-fix
Ricardo Dias [Fri, 23 Mar 2018 13:48:03 +0000 (13:48 +0000)]
Merge pull request #21021 from sebastian-philipp/dashboard-auth-qa-fix

qa/tasks/mgr/dashboard: Fix login expires too soon

Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20972 from ricardoasmarques/wip-dimless-binary-directive
Ricardo Dias [Fri, 23 Mar 2018 12:38:53 +0000 (12:38 +0000)]
Merge pull request #20972 from ricardoasmarques/wip-dimless-binary-directive

mgr/dashboard: Add DimlessBinaryDirective

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20971 from ricardoasmarques/wip-helper-component
Ricardo Dias [Fri, 23 Mar 2018 12:38:31 +0000 (12:38 +0000)]
Merge pull request #20971 from ricardoasmarques/wip-helper-component

mgr/dashboard: Add helper component

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agomgr/dashboard: Add helper component 20971/head
Ricardo Marques [Wed, 28 Feb 2018 13:46:21 +0000 (13:46 +0000)]
mgr/dashboard: Add helper component

Signed-off-by: Ricardo Marques <rimarques@suse.com>
7 years agotools: setup-virtualenv.sh: improve error message 21002/head
Nathan Cutler [Fri, 23 Mar 2018 10:34:53 +0000 (11:34 +0100)]
tools: setup-virtualenv.sh: improve error message

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agotools: setup-virtualenv.sh: add usage function and --help option
Nathan Cutler [Fri, 23 Mar 2018 10:34:04 +0000 (11:34 +0100)]
tools: setup-virtualenv.sh: add usage function and --help option

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoqa/tasks/mgr/dashboard: Fix login expires too soon 21021/head
Ricardo Dias [Fri, 23 Mar 2018 10:25:48 +0000 (11:25 +0100)]
qa/tasks/mgr/dashboard: Fix login expires too soon

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agotools: setup-virtualenv.sh: check for mandatory argument
Nathan Cutler [Fri, 23 Mar 2018 10:20:45 +0000 (11:20 +0100)]
tools: setup-virtualenv.sh: check for mandatory argument

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agobuild/ops: declare python version when calling setup-virtualenv.sh
Nathan Cutler [Thu, 22 Mar 2018 06:27:45 +0000 (07:27 +0100)]
build/ops: declare python version when calling setup-virtualenv.sh

This just makes the current Python 2.7 dependency explicit. Making
these statements optionally use Python 3 is left for later.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agotools: setup-virtualenv.sh: do not hardcode python binary
Nathan Cutler [Thu, 22 Mar 2018 06:24:07 +0000 (07:24 +0100)]
tools: setup-virtualenv.sh: do not hardcode python binary

. . . instead, take a command-line option that defaults to
"python2.7"

Fixes: http://tracker.ceph.com/issues/23437
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agomgr/dashboard: Add DimlessBinaryDirective 20972/head
Ricardo Marques [Tue, 27 Feb 2018 09:51:54 +0000 (09:51 +0000)]
mgr/dashboard: Add DimlessBinaryDirective

Signed-off-by: Ricardo Marques <rimarques@suse.com>
7 years agostop.sh: use --no-mon-config when trying to unmap rbd devices 21020/head
Mykola Golub [Fri, 23 Mar 2018 09:10:14 +0000 (11:10 +0200)]
stop.sh: use --no-mon-config when trying to unmap rbd devices

Otherwise if stop.sh is run for already stopped cluster it will get
stuck trying to get mon config.

Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #21019 from majianpeng/fix-vstart
Mykola Golub [Fri, 23 Mar 2018 09:08:47 +0000 (11:08 +0200)]
Merge pull request #21019 from majianpeng/fix-vstart

vstart: fix initial start when there is no ceph.conf

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agovstart.sh: Avoiding ceph-conf error when create a new cluster. 21019/head
Jianpeng Ma [Fri, 23 Mar 2018 15:30:44 +0000 (23:30 +0800)]
vstart.sh: Avoiding ceph-conf error when create a new cluster.

This partly revert commit:f437598cfcabbd66c372bc8.
Before firstly creating a ceph cluster, there is no ceph.conf.
If specify a non-exist ceph.conf, ceph-conf will meet error.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agotest: Replace bc command with printf command 21013/head
David Zafman [Fri, 23 Mar 2018 00:19:56 +0000 (17:19 -0700)]
test: Replace bc command with printf command

Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agovstart: set osd_pool_default_erasure_code_profile in initial ceph.conf 21008/head
Mykola Golub [Thu, 22 Mar 2018 18:04:30 +0000 (20:04 +0200)]
vstart: set osd_pool_default_erasure_code_profile in initial ceph.conf

Setting it via `ceph config`, when the cluster is already built and
started is too late, because it is used when building the initial osd
map.

Fixes: https://tracker.ceph.com/issues/23430
Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20986 from jecluis/wip-vstart
Ricardo Dias [Thu, 22 Mar 2018 16:26:23 +0000 (16:26 +0000)]
Merge pull request #20986 from jecluis/wip-vstart

vstart: fix option (due to quotes) and allow disabling dashboard

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: fix dashboard python 3 support 21007/head
Ricardo Dias [Thu, 22 Mar 2018 12:22:41 +0000 (12:22 +0000)]
mgr/dashboard: fix dashboard python 3 support

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20933 from dzafman/wip-22902
David Zafman [Thu, 22 Mar 2018 15:44:26 +0000 (08:44 -0700)]
Merge pull request #20933 from dzafman/wip-22902

src/osd/PG.cc: 6455: FAILED assert(0 == "we got a bad state machine event")

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoqa: fix overrides for openssl_keys task 20981/head
Casey Bodley [Tue, 20 Mar 2018 20:38:40 +0000 (16:38 -0400)]
qa: fix overrides for openssl_keys task

teuthology looks for overrides by the class name, so overrides weren't
working after the task was renamed

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agomgr/dashboard: fixed password generation in Auth controller 21006/head
Ricardo Dias [Thu, 22 Mar 2018 12:18:56 +0000 (12:18 +0000)]
mgr/dashboard: fixed password generation in Auth controller

Fixes: http://tracker.ceph.com/issues/23404
Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20989 from ricardoasmarques/wip-npm-start
Ricardo Dias [Thu, 22 Mar 2018 11:27:29 +0000 (11:27 +0000)]
Merge pull request #20989 from ricardoasmarques/wip-npm-start

mgr/dashboard: Improve `npm start` script

Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #20847 from votdev/improve_auth_interceptor
Ricardo Dias [Thu, 22 Mar 2018 11:20:57 +0000 (11:20 +0000)]
Merge pull request #20847 from votdev/improve_auth_interceptor

mgr/dashboard: Improve auth interceptor.

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agomgr/dashboard: Improve auth interceptor. 20847/head
Volker Theile [Fri, 16 Mar 2018 10:10:01 +0000 (11:10 +0100)]
mgr/dashboard: Improve auth interceptor.

In case of an error the response must be returned.

Signed-off-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20970 from ashishkumsingh/doc-fix-resharding-formatting
Jos Collin [Thu, 22 Mar 2018 05:54:41 +0000 (11:24 +0530)]
Merge pull request #20970 from ashishkumsingh/doc-fix-resharding-formatting

doc: Fix dynamic resharding doc formatting

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agovstart: allow disabling dashboard with option 20986/head
Joao Eduardo Luis [Wed, 21 Mar 2018 09:13:47 +0000 (09:13 +0000)]
vstart: allow disabling dashboard with option

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
7 years agomgr/dashboard: Add support for EiB-YiB on dimless.pipe
Ricardo Marques [Wed, 21 Mar 2018 16:22:34 +0000 (16:22 +0000)]
mgr/dashboard: Add support for EiB-YiB on dimless.pipe

Signed-off-by: Ricardo Marques <rimarques@suse.com>
7 years agomgr/dashboard: Add support for EiB-YiB on dimless-binary.pipe
Ricardo Marques [Wed, 21 Mar 2018 16:21:02 +0000 (16:21 +0000)]
mgr/dashboard: Add support for EiB-YiB on dimless-binary.pipe

Signed-off-by: Ricardo Marques <rimarques@suse.com>
7 years agoMerge pull request #20978 from votdev/improve_formatter
Ricardo Dias [Wed, 21 Mar 2018 15:18:51 +0000 (15:18 +0000)]
Merge pull request #20978 from votdev/improve_formatter

mgr/dashboard: Add toBytes() method to FormatterService

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agoMerge pull request #20941 from dillaman/wip-dashboard-rbd
Ricardo Dias [Wed, 21 Mar 2018 15:09:26 +0000 (15:09 +0000)]
Merge pull request #20941 from dillaman/wip-dashboard-rbd

mgr/dashboard: additional fixes to block pages

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agomgr/dashboard: Implicit use of proxy.conf.json 20989/head
Ricardo Marques [Wed, 21 Mar 2018 11:29:49 +0000 (11:29 +0000)]
mgr/dashboard: Implicit use of proxy.conf.json

Signed-off-by: Ricardo Marques <rimarques@suse.com>
7 years agomgr/dashboard: ng serve should not delete fontend dist dir
Ricardo Marques [Wed, 21 Mar 2018 11:26:08 +0000 (11:26 +0000)]
mgr/dashboard: ng serve should not delete fontend dist dir

Signed-off-by: Ricardo Marques <rimarques@suse.com>
7 years agomgr/dashboard: Add toBytes() method to FormatterService. 20978/head
Volker Theile [Tue, 20 Mar 2018 16:23:22 +0000 (17:23 +0100)]
mgr/dashboard: Add toBytes() method to FormatterService.

Signed-off-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20977 from smithfarm/wip-23424
Nathan Cutler [Wed, 21 Mar 2018 09:03:43 +0000 (10:03 +0100)]
Merge pull request #20977 from smithfarm/wip-23424

cmake: add chrono to BOOST_COMPONENTS

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20969 from smithfarm/wip-23238
Nathan Cutler [Wed, 21 Mar 2018 09:03:03 +0000 (10:03 +0100)]
Merge pull request #20969 from smithfarm/wip-23238

osd: fix s390x build failure

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agovstart: remove single-quotes from option value
Joao Eduardo Luis [Wed, 21 Mar 2018 09:01:32 +0000 (09:01 +0000)]
vstart: remove single-quotes from option value

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
7 years agoMerge pull request #20966 from dillaman/wip-23399
Mykola Golub [Wed, 21 Mar 2018 06:03:05 +0000 (08:03 +0200)]
Merge pull request #20966 from dillaman/wip-23399

rbd: children list should support snapshot id optional

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agocmake: add chrono to BOOST_COMPONENTS 20977/head
Nathan Cutler [Tue, 20 Mar 2018 14:59:59 +0000 (15:59 +0100)]
cmake: add chrono to BOOST_COMPONENTS

According to https://github.com/ceph/ceph/commit/9535165149d16a2a944a81f4888d3ab0a7358027
Boost::chrono is a dependency of Boost::context and Boost::thread,
but Boost::chrono does not get built unless it is included here.

Fixes: http://tracker.ceph.com/issues/23424
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #20958 from votdev/remove_useless_code
Lenz Grimmer [Tue, 20 Mar 2018 14:36:52 +0000 (15:36 +0100)]
Merge pull request #20958 from votdev/remove_useless_code

mgr/dashboard: Remove useless code

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agorbd: listing children now supports a snapshot id optional 20966/head
Jason Dillaman [Tue, 20 Mar 2018 04:32:00 +0000 (12:32 +0800)]
rbd: listing children now supports a snapshot id optional

Fixes: http://tracker.ceph.com/issues/23399
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd: fix s390x build failure 20969/head
Nathan Cutler [Tue, 20 Mar 2018 08:28:24 +0000 (09:28 +0100)]
osd: fix s390x build failure

46de629c3d0bfae5eba3f6b810808938b5a9af1f introduced a regression: on big-endian
machines, there was no matching function for call to 'eversion_t::encode(const
version_t&, ceph::bufferlist&) const' and 'eversion_t::decode(version_t&,
ceph::buffer::list::iterator&)'

Fixes: http://tracker.ceph.com/issues/23238
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agodoc: Fixes dynamic-resharding doc formatting 20970/head
Ashish Singh [Tue, 20 Mar 2018 08:49:32 +0000 (14:19 +0530)]
doc: Fixes dynamic-resharding doc formatting

Fixed the formatting errors in dynamicresharding.rst

Signed-off-by: Ashish Singh assingh@redhat.com
7 years agoMerge pull request #20888 from majianpeng/fix-vstop
Mykola Golub [Tue, 20 Mar 2018 08:48:52 +0000 (10:48 +0200)]
Merge pull request #20888 from majianpeng/fix-vstop

stop.sh: add ceph configure file location

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agopybind/rbd: added 'set_snap_by_id' API method
Jason Dillaman [Tue, 20 Mar 2018 04:09:46 +0000 (12:09 +0800)]
pybind/rbd: added 'set_snap_by_id' API method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: added '(rbd_)snap_set_by_id' API methods
Jason Dillaman [Tue, 20 Mar 2018 03:53:22 +0000 (11:53 +0800)]
librbd: added '(rbd_)snap_set_by_id' API methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: internally utilize snap id when setting snapshot
Jason Dillaman [Tue, 20 Mar 2018 03:13:34 +0000 (23:13 -0400)]
librbd: internally utilize snap id when setting snapshot

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agostop.sh: specify the ceph.conf path to avoid using wrong ceph.conf. 20888/head
Jianpeng Ma [Mon, 19 Mar 2018 17:14:41 +0000 (01:14 +0800)]
stop.sh: specify the ceph.conf path to avoid using wrong ceph.conf.

Also specify the ceph.conf path for ceph-conf command in vstart.sh.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoMerge pull request #20876 from smithfarm/wip-doc-license
Nathan Cutler [Mon, 19 Mar 2018 13:29:54 +0000 (14:29 +0100)]
Merge pull request #20876 from smithfarm/wip-doc-license

legal: remove doc license ambiguity

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agoMerge pull request #20898 from tspmelo/wip-nodejs-improvement
Ricardo Dias [Mon, 19 Mar 2018 12:30:45 +0000 (12:30 +0000)]
Merge pull request #20898 from tspmelo/wip-nodejs-improvement

mgr/dashboard: remove node/npm system installation

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agomgr/dashboard: Remove useless code. 20958/head
Volker Theile [Mon, 19 Mar 2018 10:28:50 +0000 (11:28 +0100)]
mgr/dashboard: Remove useless code.

Signed-off-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20784 from theanalyst/docs/release-reorg
Abhishek L [Mon, 19 Mar 2018 10:22:37 +0000 (11:22 +0100)]
Merge pull request #20784 from theanalyst/docs/release-reorg

doc: reorganize releases

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #20909 from tchaikov/wip-23370
Kefu Chai [Mon, 19 Mar 2018 08:54:41 +0000 (16:54 +0800)]
Merge pull request #20909 from tchaikov/wip-23370

mgr/MgrClient: guard send_pgstats() with lock

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20874 from sebastian-philipp/dashboard_v2-source-run-api-tests
Ricardo Dias [Mon, 19 Mar 2018 07:59:08 +0000 (07:59 +0000)]
Merge pull request #20874 from sebastian-philipp/dashboard_v2-source-run-api-tests

mgr/dashboard: Allow sourcing `run-backend-api-tests.sh`

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #20931 from ashitakasam/fix-typo
Jos Collin [Mon, 19 Mar 2018 04:56:28 +0000 (10:26 +0530)]
Merge pull request #20931 from ashitakasam/fix-typo

doc: s/deamon/daemon/

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: 'daemon' is misspelled in doc/cephfs/health-messages.rst and src/tools/rbd_recov... 20931/head
ashitakasam [Fri, 16 Mar 2018 02:51:23 +0000 (10:51 +0800)]
doc: 'daemon' is misspelled in doc/cephfs/health-messages.rst and src/tools/rbd_recover_tool/README

Signed-off-by: ashitakasam <694240887@qq.com>
7 years agoMerge remote-tracking branch 'gh/mimic-dev2'
Sage Weil [Sun, 18 Mar 2018 23:39:46 +0000 (18:39 -0500)]
Merge remote-tracking branch 'gh/mimic-dev2'

7 years agoMerge pull request #20944 from liewegas/wip-23339
Sage Weil [Sun, 18 Mar 2018 22:19:11 +0000 (17:19 -0500)]
Merge pull request #20944 from liewegas/wip-23339

osd: make scrub wait for ec read/modify/writes to apply

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoosd/ReplciatedBackend: do not op_applied on zeroed eversion_t 20944/head
Sage Weil [Sun, 18 Mar 2018 07:30:07 +0000 (02:30 -0500)]
osd/ReplciatedBackend: do not op_applied on zeroed eversion_t

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: wait for pushes and last_update_applied before requesting replica scrub
Sage Weil [Sat, 17 Mar 2018 19:50:27 +0000 (14:50 -0500)]
osd/PG: wait for pushes and last_update_applied before requesting replica scrub

Wait on the primary for the EC backend to finish r/m/w cycles before we
ask the replicas to scrub.  Otherwise we will wait on the primary but the
replicas will scrub immediately and we'll get a mismatched result!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/ECBackend: do not op_applied on zero at_version for dummy rollforward transaction
Sage Weil [Sat, 17 Mar 2018 16:20:06 +0000 (11:20 -0500)]
osd/ECBackend: do not op_applied on zero at_version for dummy rollforward transaction

The dummy rollforward transactions have at_version=0'0; do not call
op_applied on those.

This ensures that the op_applied call

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20948 from liewegas/wip-ecsubread-decode
Sage Weil [Sat, 17 Mar 2018 23:06:05 +0000 (18:06 -0500)]
Merge pull request #20948 from liewegas/wip-ecsubread-decode

osd/ECMsgTypes: fix ECSubRead compat decode

Reviewed-by: Myna Vajha <mynaramana@gmail.com>
7 years agoMerge pull request #20939 from dillaman/wip-cls-rbd-group
Mykola Golub [Sat, 17 Mar 2018 20:16:03 +0000 (22:16 +0200)]
Merge pull request #20939 from dillaman/wip-cls-rbd-group

cls/rbd: group_image_list incorrectly flagged as RW

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge PR #20903 into master
Patrick Donnelly [Sat, 17 Mar 2018 18:30:23 +0000 (11:30 -0700)]
Merge PR #20903 into master

* refs/pull/20903/head:
PendingReleaseNotes: add note about upgrading MDS

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoPendingReleaseNotes: add note about upgrading MDS 20903/head
Patrick Donnelly [Wed, 14 Mar 2018 22:30:12 +0000 (15:30 -0700)]
PendingReleaseNotes: add note about upgrading MDS

Fixes: https://tracker.ceph.com/issues/23172
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoosd/ECMsgTypes: fix ECSubRead compat decode 20948/head
Sage Weil [Fri, 16 Mar 2018 22:47:55 +0000 (17:47 -0500)]
osd/ECMsgTypes: fix ECSubRead compat decode

Populate subchunks based on to_read, not attrs_to_read.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoPartial revert "osd/PG: drop scrub machinery to wait for last_updated_applied"
Sage Weil [Fri, 16 Mar 2018 19:57:35 +0000 (14:57 -0500)]
Partial revert "osd/PG: drop scrub machinery to wait for last_updated_applied"

This reverts commit c489112a1dbcbb63024ba9c8c0abff6ef0c815d8 (well,
part of it).

We want the scrub machinery that will wait on an EC read/modify/write
until it has been queued with the ObjectStore, but we don't need the
parts that used to worry about queued but unapplied writes in FileStore
not being visible.

Fixes: http://tracker.ceph.com/issues/23339
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: restore op_applied in PGBackend
Sage Weil [Fri, 16 Mar 2018 19:57:27 +0000 (14:57 -0500)]
osd/PrimaryLogPG: restore op_applied in PGBackend

Call it when we queue the submitted write.  For ReplicatedPG this is
inside submit_transaction(), and for ECBackend it's when we finally
submit the write for disk (possibly delayed by a read/modify/write).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoRevert "osd/PG: remove last_updated_applied, op_applied()"
Sage Weil [Fri, 16 Mar 2018 19:02:49 +0000 (14:02 -0500)]
Revert "osd/PG: remove last_updated_applied, op_applied()"

This reverts commit c1c495f09754986772c28c9cc7414609572a385c.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #20879 into wip-sage-testing-20180316.201311
Sage Weil [Fri, 16 Mar 2018 20:13:19 +0000 (15:13 -0500)]
Merge PR #20879 into wip-sage-testing-20180316.201311

* refs/pull/20879/head:
qa/rgw: disable s3tests for lifecycle_expiration

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
7 years agomgr/dashboard: block mirroring page should show Ceph version 20941/head
Jason Dillaman [Fri, 16 Mar 2018 16:04:11 +0000 (12:04 -0400)]
mgr/dashboard: block mirroring page should show Ceph version

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: avoid stale path data in block iSCSI status
Jason Dillaman [Fri, 16 Mar 2018 16:03:15 +0000 (12:03 -0400)]
mgr/dashboard: avoid stale path data in block iSCSI status

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: block iSCSI frontend tweaks
Jason Dillaman [Fri, 16 Mar 2018 14:53:43 +0000 (10:53 -0400)]
mgr/dashboard: block iSCSI frontend tweaks

Label rates w/ "/s" suffix and switch throughput back to the
sparkline graph from dashboard v1.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20911 from guzhongyan/ConfM-cleanup
Kefu Chai [Fri, 16 Mar 2018 16:36:10 +0000 (00:36 +0800)]
Merge pull request #20911 from guzhongyan/ConfM-cleanup

mon/ConfigMonitor: clean up prepare_command()

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20914 from ibmibmibm/patch-1
Kefu Chai [Fri, 16 Mar 2018 16:35:30 +0000 (00:35 +0800)]
Merge pull request #20914 from ibmibmibm/patch-1

os/memstore: Fix wrong use of lock_guard

Reviewed-by: Sage Weil <sage@redhat.com>