]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoos/bluestore: warn on no per-pool omap 29292/head
Sage Weil [Thu, 8 Aug 2019 21:57:22 +0000 (16:57 -0500)]
os/bluestore: warn on no per-pool omap

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: fsck: warning (not error) by default on no per-pool omap
Sage Weil [Thu, 8 Aug 2019 21:56:07 +0000 (16:56 -0500)]
os/bluestore: fsck: warning (not error) by default on no per-pool omap

Unconditionally error if the global per_pool_omap was set, though!

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: fsck: int64_t for error count
Sage Weil [Thu, 8 Aug 2019 21:31:01 +0000 (16:31 -0500)]
os/bluestore: fsck: int64_t for error count

Just to be on the safe side.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: default size of 1 TB for testing
Sage Weil [Tue, 6 Aug 2019 14:07:35 +0000 (09:07 -0500)]
os/bluestore: default size of 1 TB for testing

Less ENOSPC from vstart.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: behave if we *do* set PGMETA and PERPOOL flags
Sage Weil [Mon, 5 Aug 2019 17:53:29 +0000 (12:53 -0500)]
os/bluestore: behave if we *do* set PGMETA and PERPOOL flags

pgmeta trumps perpool.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: do not set both PGMETA_OMAP and PERPOOL_OMAP
Sage Weil [Mon, 5 Aug 2019 17:52:56 +0000 (12:52 -0500)]
os/bluestore: do not set both PGMETA_OMAP and PERPOOL_OMAP

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: fsck: only generate 1 error per omap_head
Sage Weil [Mon, 5 Aug 2019 17:08:17 +0000 (12:08 -0500)]
os/bluestore: fsck: only generate 1 error per omap_head

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: make fsck repair convert to per-pool omap
Sage Weil [Tue, 30 Jul 2019 00:43:53 +0000 (19:43 -0500)]
os/bluestore: make fsck repair convert to per-pool omap

- error if objects not per-pool
- error if per_pool_omap not set
- convert as we go, and set the flag at the end

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: teach fsck to tolerate per-pool omap
Sage Weil [Mon, 29 Jul 2019 19:44:15 +0000 (14:44 -0500)]
os/bluestore: teach fsck to tolerate per-pool omap

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: ondisk format change to 3 for per-pool omap
Sage Weil [Thu, 25 Jul 2019 14:02:04 +0000 (09:02 -0500)]
os/bluestore: ondisk format change to 3 for per-pool omap

Move to ondisk format v3.  This means that per-pool omap keys may exist,
but does not imply that *all* objects use the new form until the
per_pool_omap=1 super key is also set.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/PGMap: add data/omap breakouts for 'df detail' view
Sage Weil [Wed, 24 Jul 2019 19:28:18 +0000 (14:28 -0500)]
mon/PGMap: add data/omap breakouts for 'df detail' view

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/osd_types: separate get_{user,allocated}_bytes() into data and omap variants
Sage Weil [Wed, 24 Jul 2019 15:03:24 +0000 (10:03 -0500)]
osd/osd_types: separate get_{user,allocated}_bytes() into data and omap variants

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/PGMap: fix stored_raw calculation
Sage Weil [Wed, 24 Jul 2019 14:43:59 +0000 (09:43 -0500)]
mon/PGMap: fix stored_raw calculation

The get_user_bytes() helper is a bit weird because it uses the
raw_used_rate (replication/EC factor) so that it can work *backwards*
from raw usage to normalized user usage.  However, the legacy case that
works from PG stats does not use this factor... and the stored_raw value
(in the JSON output only) was incorrectly passing in a factor of 1.0,
which meant that for legacy mode it was a bogus value.

Fix by calculating stored_raw as stored_normalized * raw_used_rate.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/PGMap: add in actual omap usage into per-pool stats
Sage Weil [Tue, 23 Jul 2019 22:46:11 +0000 (17:46 -0500)]
mon/PGMap: add in actual omap usage into per-pool stats

This is a minimal change: we aren't separately reporting data vs omap
usage (like we do in 'osd df' output for individual osds).

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd: report per-pool omap support via store_statfs_t
Sage Weil [Tue, 23 Jul 2019 22:45:08 +0000 (17:45 -0500)]
osd: report per-pool omap support via store_statfs_t

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: set per_pool_omap key on mkfs
Sage Weil [Tue, 23 Jul 2019 22:44:40 +0000 (17:44 -0500)]
os/bluestore: set per_pool_omap key on mkfs

This key indicates that *all* objects put omap in the per-pool prefix and
key format.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/osd_types: count per-pool omap capable OSDs
Sage Weil [Tue, 23 Jul 2019 22:38:14 +0000 (17:38 -0500)]
osd/osd_types: count per-pool omap capable OSDs

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: report omap_allocated per-pool
Sage Weil [Tue, 23 Jul 2019 22:15:49 +0000 (17:15 -0500)]
os/bluestore: report omap_allocated per-pool

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: add pool prefix to omap keys
Sage Weil [Tue, 23 Jul 2019 22:12:22 +0000 (17:12 -0500)]
os/bluestore: add pool prefix to omap keys

Set per-onode flag to indicate whether the object has per-pool keys or
not.  This will allow us to incrementally transition objects later.

Put the new keys under a different prefix.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agokv/KeyValueDB: take key_prefix for estimate_prefix_size()
Sage Weil [Tue, 23 Jul 2019 22:11:04 +0000 (17:11 -0500)]
kv/KeyValueDB: take key_prefix for estimate_prefix_size()

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: fix manual omap key manipulation to use Onode::get_omap_key()
Sage Weil [Tue, 23 Jul 2019 21:48:12 +0000 (16:48 -0500)]
os/bluestore: fix manual omap key manipulation to use Onode::get_omap_key()

Make this code more general and robust.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: make omap key helpers Onode methods
Sage Weil [Tue, 23 Jul 2019 21:45:56 +0000 (16:45 -0500)]
os/bluestore: make omap key helpers Onode methods

This makes it easier for them to depend on Onode (Onode::onode) state.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: add Onode::get_omap_prefix() helper
Sage Weil [Tue, 23 Jul 2019 21:37:38 +0000 (16:37 -0500)]
os/bluestore: add Onode::get_omap_prefix() helper

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: change _do_omap_clear() args
Sage Weil [Tue, 23 Jul 2019 21:23:08 +0000 (16:23 -0500)]
os/bluestore: change _do_omap_clear() args

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #29374 into master
Patrick Donnelly [Mon, 29 Jul 2019 17:37:15 +0000 (10:37 -0700)]
Merge PR #29374 into master

* refs/pull/29374/head:
cephfs-shell: Fix flake8 line too long error
cephfs-shell: Fix flake8 line break after binary operator error
cephfs-shell: Fix flake8 continuation line over-indented for hanging indent error
cephfs-shell: Fix flake8 missing whitespace around arithmetic operator error
cephfs-shell: Fix multiple spaces after ':' flake8 error

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #27780 from theanalyst/cls-timeindex-denc
Casey Bodley [Mon, 29 Jul 2019 15:37:15 +0000 (11:37 -0400)]
Merge pull request #27780 from theanalyst/cls-timeindex-denc

cls: add timeindex types to ceph-dencoder

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #29182 from dcasier/mgr-dashboard-ganesha-fix-cephfs-name
Ricardo Dias [Mon, 29 Jul 2019 15:03:06 +0000 (16:03 +0100)]
Merge pull request #29182 from dcasier/mgr-dashboard-ganesha-fix-cephfs-name

mgr/dashboard: ganesha: Specify the name of the filesystem (create_path)

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #29138 from Reperator/dashboard-pw-hash
Ricardo Marques [Mon, 29 Jul 2019 14:29:41 +0000 (15:29 +0100)]
Merge pull request #29138 from Reperator/dashboard-pw-hash

mgr/dashboard: support setting password hashes

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agocephfs-shell: Fix flake8 line too long error 29374/head
Varsha Rao [Mon, 29 Jul 2019 11:41:37 +0000 (17:11 +0530)]
cephfs-shell: Fix flake8 line too long error

https://tracker.ceph.com/issues/40992
Signed-off-by: Varsha Rao <varao@redhat.com>
6 years agocephfs-shell: Fix flake8 line break after binary operator error
Varsha Rao [Mon, 29 Jul 2019 06:28:47 +0000 (11:58 +0530)]
cephfs-shell: Fix flake8 line break after binary operator error

Fixes: https://tracker.ceph.com/issues/40992
Signed-off-by: Varsha Rao <varao@redhat.com>
6 years agocephfs-shell: Fix flake8 continuation line over-indented for hanging indent error
Varsha Rao [Mon, 29 Jul 2019 06:20:31 +0000 (11:50 +0530)]
cephfs-shell: Fix flake8 continuation line over-indented for hanging indent error

Fixes: https://tracker.ceph.com/issues/40992
Signed-off-by: Varsha Rao <varao@redhat.com>
6 years agocephfs-shell: Fix flake8 missing whitespace around arithmetic operator error
Varsha Rao [Mon, 29 Jul 2019 06:13:51 +0000 (11:43 +0530)]
cephfs-shell: Fix flake8 missing whitespace around arithmetic operator error

Fixes: https://tracker.ceph.com/issues/40992
Signed-off-by: Varsha Rao <varao@redhat.com>
6 years agocephfs-shell: Fix multiple spaces after ':' flake8 error
Varsha Rao [Mon, 29 Jul 2019 06:07:29 +0000 (11:37 +0530)]
cephfs-shell: Fix multiple spaces after ':' flake8 error

Fixes: https://tracker.ceph.com/issues/40992
Signed-off-by: Varsha Rao <varao@redhat.com>
6 years agoMerge pull request #29272 from votdev/issue_40925
Ricardo Marques [Mon, 29 Jul 2019 10:24:11 +0000 (11:24 +0100)]
Merge pull request #29272 from votdev/issue_40925

mgr/dashboard: Various UI issues related to CephFS

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #29216 from rafaelquint/configtest
Ricardo Marques [Mon, 29 Jul 2019 10:09:04 +0000 (11:09 +0100)]
Merge pull request #29216 from rafaelquint/configtest

mgr/dashboard: E2E test to verify Configuration editing functionality

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #29324 from adk3798/typepages
Ricardo Marques [Mon, 29 Jul 2019 10:01:16 +0000 (11:01 +0100)]
Merge pull request #29324 from adk3798/typepages

mgr/dashboard: Explicitly type page variables

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
6 years agoMerge pull request #29371 from bk201/wip-40971
Ricardo Dias [Mon, 29 Jul 2019 09:52:56 +0000 (10:52 +0100)]
Merge pull request #29371 from bk201/wip-40971

mgr/dashboard: fix MDS counter chart is not displayed

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #29341 from zhangbingyi1/master
Kefu Chai [Mon, 29 Jul 2019 03:54:39 +0000 (11:54 +0800)]
Merge pull request #29341 from zhangbingyi1/master

test/librados: avoid residual crush rule after test case execution

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/dashboard: fix MDS counter chart is not displayed 29371/head
Kiefer Chang [Fri, 26 Jul 2019 10:05:52 +0000 (18:05 +0800)]
mgr/dashboard: fix MDS counter chart is not displayed

Unit of timetamp for performance counters is changed to nanoseconds [1].
Adapt this for CephFS MDS performance counters in backend.

[1]: https://github.com/ceph/ceph/pull/28882

Fixes: https://tracker.ceph.com/issues/40971
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
6 years agotest/librados: avoid residual crush rule after test case execution 29341/head
root [Fri, 26 Jul 2019 03:43:54 +0000 (11:43 +0800)]
test/librados: avoid residual crush rule after test case execution
Fixes: http://tracker.ceph.com/issues/40970
Signed-off-by: Bingyi Zhang <zhangbingyi@umcloud.com>
6 years agoMerge pull request #29348 from myoungwon/fix-wrong-class
Kefu Chai [Sun, 28 Jul 2019 14:52:40 +0000 (22:52 +0800)]
Merge pull request #29348 from myoungwon/fix-wrong-class

osd: fix wrong arguments when dropping refcount

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #29345 from majianpeng/bluestore-flush-waiter
Kefu Chai [Sun, 28 Jul 2019 14:51:00 +0000 (22:51 +0800)]
Merge pull request #29345 from majianpeng/bluestore-flush-waiter

os/bluestore: avoid unnecessary notify.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agoMerge pull request #29126 from xiexingguo/wip-clamp-ratio-to-0
Kefu Chai [Sun, 28 Jul 2019 14:49:54 +0000 (22:49 +0800)]
Merge pull request #29126 from xiexingguo/wip-clamp-ratio-to-0

mgr/progress: clamp pg recovery ratio to 0

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #28012 from rouming/bootstrap-after-setuid
Kefu Chai [Sun, 28 Jul 2019 14:36:45 +0000 (22:36 +0800)]
Merge pull request #28012 from rouming/bootstrap-after-setuid

global/global_init: do first transport connection after setuid()

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27985 from ifed01/wip-ifed-slow-omaps
Kefu Chai [Sun, 28 Jul 2019 14:35:56 +0000 (22:35 +0800)]
Merge pull request #27985 from ifed01/wip-ifed-slow-omaps

tools/ceph-objectstore-tool: introduce list-slow-omap command.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #29238 into master
Sage Weil [Sat, 27 Jul 2019 13:00:38 +0000 (08:00 -0500)]
Merge PR #29238 into master

* refs/pull/29238/head:
os/bluestore: it's better to erase spanning blob only once

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agoMerge PR #29239 into master
Sage Weil [Sat, 27 Jul 2019 13:00:16 +0000 (08:00 -0500)]
Merge PR #29239 into master

* refs/pull/29239/head:
qa/tasks/ceph_manager.py: always use self.logger

Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agoMerge PR #29305 into master
Sage Weil [Sat, 27 Jul 2019 12:59:58 +0000 (07:59 -0500)]
Merge PR #29305 into master

* refs/pull/29305/head:
mgr: Reduce logging noise when handling commands

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #29307 into master
Sage Weil [Sat, 27 Jul 2019 12:59:45 +0000 (07:59 -0500)]
Merge PR #29307 into master

* refs/pull/29307/head:
monmaptool: added --addv option to usage description

Reviewed-by: João Eduardo Luís <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #29316 into master
Sage Weil [Sat, 27 Jul 2019 12:59:30 +0000 (07:59 -0500)]
Merge PR #29316 into master

* refs/pull/29316/head:
common,tools: make sure the destination buffer can handle the size of the string
src/tools: initialize variables before the goto statement
src/mount: check before dereference buf
src/crush: check before dereference out2
src/test: s/strcpy/strncpy

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #29358 into master
Sage Weil [Sat, 27 Jul 2019 12:59:17 +0000 (07:59 -0500)]
Merge PR #29358 into master

* refs/pull/29358/head:
mgr/telemetry: salt osd ids too

Reviewed-by: Dan Mick <dmick@redhat.com>
6 years agoMerge pull request #29054 from dillaman/wip-40621
Mykola Golub [Sat, 27 Jul 2019 06:32:35 +0000 (09:32 +0300)]
Merge pull request #29054 from dillaman/wip-40621

mgr/rbd_support: support scheduling long-running background operations

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #29361 from tchaikov/wip-qa-osd-pause
Kefu Chai [Sat, 27 Jul 2019 02:26:43 +0000 (10:26 +0800)]
Merge pull request #29361 from tchaikov/wip-qa-osd-pause

qa: fixes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #28685 into master
Patrick Donnelly [Fri, 26 Jul 2019 22:18:13 +0000 (15:18 -0700)]
Merge PR #28685 into master

* refs/pull/28685/head:
client: more precise CEPH_CLIENT_CAPS_PENDING_CAPSNAP
client: unify kicking cap flushes and kicking snapcap flushes
client: define helper function that sends flushsnap message
client: cleanup tracking of early kicked flushing caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #28793 into master
Patrick Donnelly [Fri, 26 Jul 2019 22:15:19 +0000 (15:15 -0700)]
Merge PR #28793 into master

* refs/pull/28793/head:
qa/cephfs: make run_shell() accept args as str too
qa/vstart_runner.py: ignores when source and destination are same
test_cephfs_shell: add a test for cd with arguments
test_cephfs_shell: add a test for cd with no arguments
test_cephfs_shell: group test methods
test_cephfs_shell: add a new method to return script output
test_cephfs_shell: allow running CephFS shell script
cephfs-shell: cd with no args shouldn't print an error message

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #29064 into master
Patrick Donnelly [Fri, 26 Jul 2019 22:13:59 +0000 (15:13 -0700)]
Merge PR #29064 into master

* refs/pull/29064/head:
mds: execute PurgeQueue on_error handler in finisher

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #29302 into master
Patrick Donnelly [Fri, 26 Jul 2019 22:13:08 +0000 (15:13 -0700)]
Merge PR #29302 into master

* refs/pull/29302/head:
cephfs: fix a memory leak

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #29066 into master
Patrick Donnelly [Fri, 26 Jul 2019 22:12:19 +0000 (15:12 -0700)]
Merge PR #29066 into master

* refs/pull/29066/head:
mds: Move inline functions with loops or switch statements to CInode.cc
mds: Reorganize class members in CInode header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #29336 into master
Patrick Donnelly [Fri, 26 Jul 2019 22:09:14 +0000 (15:09 -0700)]
Merge PR #29336 into master

* refs/pull/29336/head:
qa: wait for MDS to come back after removing it

Reviewed-by: Jos Collin <jcollin@redhat.com>
6 years agoMerge pull request #29359 from jmunhoz/wip-msite-az-tests
Casey Bodley [Fri, 26 Jul 2019 19:29:55 +0000 (15:29 -0400)]
Merge pull request #29359 from jmunhoz/wip-msite-az-tests

rgw: az: add archive zone tests

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agomgr/dashboard/qa: add more fields to report 29361/head
Kefu Chai [Fri, 26 Jul 2019 17:50:30 +0000 (01:50 +0800)]
mgr/dashboard/qa: add more fields to report

to be in sync with #28847

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoqa/suites/rados/rest/mgr-restful: whitelist OSDMAP_FLAGS
Kefu Chai [Fri, 26 Jul 2019 17:22:52 +0000 (01:22 +0800)]
qa/suites/rados/rest/mgr-restful: whitelist OSDMAP_FLAGS

`rest/test-restful.sh` calls `test_mgr_rest_api.py`, which in turn
calls

```
    ('patch',  '/config/osd', {'pause': True}),
```

and rest module translates it to `ceph osd set key=pause`

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agorgw: az: add archive zone tests 29359/head
Javier M. Mellid [Fri, 26 Jul 2019 15:33:03 +0000 (17:33 +0200)]
rgw: az: add archive zone tests

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
6 years agomgr/telemetry: salt osd ids too 29358/head
Sage Weil [Fri, 26 Jul 2019 15:17:22 +0000 (10:17 -0500)]
mgr/telemetry: salt osd ids too

Better to fully obfuscate here.

This has a nice side-effect of assigning entity names that are *globally*
unique across the full telemetry data set, since the salts are unique and
sha1 is (sufficiently) collision-free.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #29330 into master
Sage Weil [Fri, 26 Jul 2019 12:32:30 +0000 (07:32 -0500)]
Merge PR #29330 into master

* refs/pull/29330/head:
mgr/telemetry: obscure entity_name with a salt

Reviewed-by: Dan Mick <dmick@redhat.com>
6 years agomgr/dashboard: Explicitly type page variables 29324/head
Adam King [Thu, 25 Jul 2019 15:11:47 +0000 (11:11 -0400)]
mgr/dashboard: Explicitly type page variables

Explicitly gives a type to page variables.
Helps make better use of Typescript's static type checking.
Undoes mistake from #29070.

Fixes: https://tracker.ceph.com/issues/40961
Signed-off-by: Adam King <adking@redhat.com>
Signed-off-by: Rafael Quintero <rquinter@redhat.com>
6 years agomgr: Reduce logging noise when handling commands 29305/head
Sebastian Wagner [Thu, 25 Jul 2019 09:22:12 +0000 (11:22 +0200)]
mgr: Reduce logging noise when handling commands

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoMerge pull request #29237 from adk3798/usertest
Ricardo Marques [Fri, 26 Jul 2019 11:53:04 +0000 (12:53 +0100)]
Merge pull request #29237 from adk3798/usertest

mgr/dashboard: RGW user E2E Tests

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #29192 from ceph/dependabot/npm_and_yarn/src/pybind/mgr/dashboard...
Ricardo Marques [Fri, 26 Jul 2019 11:41:33 +0000 (12:41 +0100)]
Merge pull request #29192 from ceph/dependabot/npm_and_yarn/src/pybind/mgr/dashboard/frontend/lodash-4.17.13

build(deps): bump lodash from 4.17.11 to 4.17.13 in /src/pybind/mgr/dashboard/frontend

Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agopybind/mgr: don't log exception when cannot find RBD task by id 29054/head
Jason Dillaman [Fri, 26 Jul 2019 11:01:59 +0000 (07:01 -0400)]
pybind/mgr: don't log exception when cannot find RBD task by id

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agoosd: fix wrong arguments when dropping refcount 29348/head
myoungwon oh [Fri, 26 Jul 2019 10:40:31 +0000 (19:40 +0900)]
osd: fix wrong arguments when dropping refcount

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
6 years agoMerge pull request #29198 from rhcs-dashboard/e2e-ci
Ricardo Marques [Fri, 26 Jul 2019 10:22:00 +0000 (11:22 +0100)]
Merge pull request #29198 from rhcs-dashboard/e2e-ci

mgr/dashboard: run e2e tests against prod build (jenkins job)

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #29280 from rhcs-dashboard/bucket-tests
Ricardo Marques [Fri, 26 Jul 2019 09:39:14 +0000 (10:39 +0100)]
Merge pull request #29280 from rhcs-dashboard/bucket-tests

mgr/dashboard: RGW bucket creation when no placement target received

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agomgr/dashboard: Various UI issues related to CephFS 29272/head
Volker Theile [Wed, 24 Jul 2019 13:26:03 +0000 (15:26 +0200)]
mgr/dashboard: Various UI issues related to CephFS

* Check if data is accessible, otherwise set grafanaId to undefined.
* Catch errors in 'Clients' tab and stop loading spinner. Display ViewCacheStatus Exception.
* Render the 'Enabled' column using the checkIcon cell template as other lists do.

Fixes: https://tracker.ceph.com/issues/40925
Signed-off-by: Volker Theile <vtheile@suse.com>
6 years agoos/bluestore: avoid unnecessary notify. 29345/head
Jianpeng Ma [Mon, 22 Jul 2019 14:02:41 +0000 (22:02 +0800)]
os/bluestore: avoid unnecessary notify.

Add parameter count waiting list for Onode::flush to avoid unnecessary
notify.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
6 years agocommon,tools: make sure the destination buffer can handle the size of the string 29316/head
songweibin [Thu, 25 Jul 2019 11:44:08 +0000 (19:44 +0800)]
common,tools: make sure the destination buffer can handle the size of the string

fix klocwork issues:
Width is not specified for 's' conversion specifier.
This can result in an overflow of the buffer
provided in argument 3 of a call to 'sscanf'

Signed-off-by: songweibin <song.weibin@zte.com.cn>
6 years agosrc/tools: initialize variables before the goto statement
songweibin [Thu, 25 Jul 2019 11:12:05 +0000 (19:12 +0800)]
src/tools: initialize variables before the goto statement

CID 172143 (#15 of 15): Branch past initialization (PW.BRANCH_PAST_INITIALIZATION)
1. branch_past_initialization:
2. name_at_decl_position: variable "oid" (declared at line 220)
3. name_at_decl_position: variable "exkeys" (declared at line 241)
4. name_at_decl_position: variable "exvals" (declared at line 242)
5. name_at_decl_position: variable "safe" (declared at line 278)

Signed-off-by: songweibin <song.weibin@zte.com.cn>
6 years agosrc/mount: check before dereference buf
songweibin [Thu, 25 Jul 2019 11:05:33 +0000 (19:05 +0800)]
src/mount: check before dereference buf

CID 180671 (#1 of 1): Dereference null return value (NULL_RETURNS)

Signed-off-by: songweibin <song.weibin@zte.com.cn>
6 years agosrc/crush: check before dereference out2
songweibin [Thu, 25 Jul 2019 10:55:39 +0000 (18:55 +0800)]
src/crush: check before dereference out2

CID 174874 (#2 of 2): Dereference after null check (FORWARD_NULL)
30. var_deref_op: Dereference null pointer out2.

Signed-off-by: songweibin <song.weibin@zte.com.cn>
6 years agoMerge pull request #29264 from rjfd/wip-dashboard-fix-qa-rbd
Kefu Chai [Fri, 26 Jul 2019 06:25:35 +0000 (14:25 +0800)]
Merge pull request #29264 from rjfd/wip-dashboard-fix-qa-rbd

mgr/dashboard: qa: fix RBD test when matching error strings

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28597 from markhpc/wip-bs-ind-cache
Mark Nelson [Fri, 26 Jul 2019 01:48:19 +0000 (20:48 -0500)]
Merge pull request #28597 from markhpc/wip-bs-ind-cache

os/bluestore: Refactor Bluestore Caches

6 years agomds: execute PurgeQueue on_error handler in finisher 29064/head
Yan, Zheng [Tue, 16 Jul 2019 07:38:28 +0000 (15:38 +0800)]
mds: execute PurgeQueue on_error handler in finisher

Fix: https://tracker.ceph.com/issues/40695
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
6 years agoMerge PR #28847 into master
Sage Weil [Fri, 26 Jul 2019 01:15:17 +0000 (20:15 -0500)]
Merge PR #28847 into master

* refs/pull/28847/head:
doc/mgr/telemetry: update
mgr/telemetry: move contact info to an 'ident' channel
mgr/telemetry: accept channel list to 'telemetry show'
mgr/telemetry: always generate new report for 'telemetry show'
mgr/telemetry: add 'device' channel and call out to devicehealth module
mgr/telemetry: add telemetry channel 'device'
mgr/telemetry: add separate channels

Reviewed-by: Dan Mick <dmick@redhat.com>
6 years agoMerge PR #29130 into master
Sage Weil [Fri, 26 Jul 2019 01:14:59 +0000 (20:14 -0500)]
Merge PR #29130 into master

* refs/pull/29130/head:
os/bluestore: Reduce unnecessary wakeups.
os/bluestore: Reduce unnecessary wakeups.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agoMerge PR #29221 into master
Sage Weil [Fri, 26 Jul 2019 01:14:46 +0000 (20:14 -0500)]
Merge PR #29221 into master

* refs/pull/29221/head:
mon/OSDMonitor: do not clobber pending xinfo during boot
osd/OSDMap: add is_dead() helper
mon/OSDMonitor: 'osd down ... --definitely-dead'
osd: send MOSDMarkMeDead when we are marked down
mon/OSDMonitor: implement MOSDMarkMeDead handling
mon/OSDMonitor: set dead_epoch for immediate failure (ECONNREFUSED)
osd/OSDMap: add dead_epoch to xinfo

Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agoMerge PR #29323 into master
Sage Weil [Fri, 26 Jul 2019 01:14:01 +0000 (20:14 -0500)]
Merge PR #29323 into master

* refs/pull/29323/head:
rocksdb: enable rocksdb_rmrange=true by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge PR #29300 into master
Patrick Donnelly [Thu, 25 Jul 2019 23:19:24 +0000 (16:19 -0700)]
Merge PR #29300 into master

* refs/pull/29300/head:
doc: fix youtube channel url
doc: fix urls in posix.rst

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #28874 into master
Patrick Donnelly [Thu, 25 Jul 2019 23:13:57 +0000 (16:13 -0700)]
Merge PR #28874 into master

* refs/pull/28874/head:
ceph-mds: dump all info of ceph_file_layout, InodeStoreBase, frag_info_t, inode_t

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #29103 into master
Patrick Donnelly [Thu, 25 Jul 2019 23:12:31 +0000 (16:12 -0700)]
Merge PR #29103 into master

* refs/pull/29103/head:
mgr/volumes: add `ceph fs subvolumegroup getpath` command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #29166 into master
Patrick Donnelly [Thu, 25 Jul 2019 23:10:51 +0000 (16:10 -0700)]
Merge PR #29166 into master

* refs/pull/29166/head:
mds: Reorganize class members in Capability header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
6 years agoMerge PR #29149 into master
Patrick Donnelly [Thu, 25 Jul 2019 23:07:48 +0000 (16:07 -0700)]
Merge PR #29149 into master

* refs/pull/29149/head:
cephfs-shell: Fix flake8 E302 blank line error
cephfs-shell: Fix flake8 indentation error

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #28860 into master
Patrick Donnelly [Thu, 25 Jul 2019 23:05:19 +0000 (16:05 -0700)]
Merge PR #28860 into master

* refs/pull/28860/head:
mds: Move scalar type initializations of CDir data members to its header
mds: Reorganize class members in CDir header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
6 years agoqa: wait for MDS to come back after removing it 29336/head
Patrick Donnelly [Thu, 25 Jul 2019 21:42:12 +0000 (14:42 -0700)]
qa: wait for MDS to come back after removing it

Fixes: http://tracker.ceph.com/issues/40967
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomon/OSDMonitor: do not clobber pending xinfo during boot 29221/head
Sage Weil [Tue, 9 Jul 2019 18:54:33 +0000 (13:54 -0500)]
mon/OSDMonitor: do not clobber pending xinfo during boot

If we have a pending xinfo change and also process a boot message, we
should not throw out the pending xinfo change.

This triggers when you mark an osd down and it sends both a MOSDMarkMeDead
and a new MOSDBoot message in quick succession: the first message sets
dead_epoch but the boot message processing clobbers it.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/OSDMap: add is_dead() helper
Sage Weil [Mon, 15 Jul 2019 19:47:11 +0000 (14:47 -0500)]
osd/OSDMap: add is_dead() helper

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: 'osd down ... --definitely-dead'
Sage Weil [Tue, 18 Jun 2019 16:47:05 +0000 (11:47 -0500)]
mon/OSDMonitor: 'osd down ... --definitely-dead'

Like 'osd down', but we also set dead_epoch.  Should only be used if we
know the process/host is already completely dead and unresponsive.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #29036 from mikechristie/rbd-nbd-add-nl-resize
Jason Dillaman [Thu, 25 Jul 2019 20:06:47 +0000 (16:06 -0400)]
Merge pull request #29036 from mikechristie/rbd-nbd-add-nl-resize

rbd-nbd: add nl resize

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #28955 into master
Patrick Donnelly [Thu, 25 Jul 2019 18:01:27 +0000 (11:01 -0700)]
Merge PR #28955 into master

* refs/pull/28955/head:
doc: Update mount CephFS index

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #29111 into master
Sage Weil [Thu, 25 Jul 2019 17:44:24 +0000 (12:44 -0500)]
Merge PR #29111 into master

* refs/pull/29111/head:
qa/mgr/progress: Update the test suite for progress module

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoosd: send MOSDMarkMeDead when we are marked down
Sage Weil [Tue, 9 Jul 2019 18:38:14 +0000 (13:38 -0500)]
osd: send MOSDMarkMeDead when we are marked down

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