]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoqa/tests: removed `1node` and `systemd` tests as ceph-deploy is not actively developed 28455/head
Yuri Weinstein [Fri, 7 Jun 2019 21:34:35 +0000 (14:34 -0700)]
qa/tests: removed `1node` and `systemd` tests as ceph-deploy is not actively developed

Fixes: http://tracker.ceph.com/issues/40207
Fixes: http://tracker.ceph.com/issues/40208
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #28440 from linuxbox2/wip-rgwfile-invbckt
Matt Benjamin [Fri, 7 Jun 2019 18:25:48 +0000 (14:25 -0400)]
Merge pull request #28440 from linuxbox2/wip-rgwfile-invbckt

rgw_file: permit lookup_handle to lookup root_fh

6 years agoMerge pull request #28442 from neha-ojha/wip-40120-port
Neha Ojha [Fri, 7 Jun 2019 16:36:52 +0000 (09:36 -0700)]
Merge pull request #28442 from neha-ojha/wip-40120-port

qa/tasks/cbt.py: change port to work with client_endpoints

Reviewed-by: Mark Nelson <mnelson@redhat.com>
6 years agoMerge pull request #28435 from yuriw/wip-yuriw-smoke-master
Yuri Weinstein [Fri, 7 Jun 2019 16:13:49 +0000 (09:13 -0700)]
Merge pull request #28435 from yuriw/wip-yuriw-smoke-master

qa/tests: reduced distro to run to be random

6 years agoMerge pull request #28428 from tchaikov/wip-package-crimson-osd
Kefu Chai [Fri, 7 Jun 2019 16:03:22 +0000 (00:03 +0800)]
Merge pull request #28428 from tchaikov/wip-package-crimson-osd

rpm,debian,install-deps: package crimson-osd

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
6 years agoceph.spec.in: align "Requires" of ceph-osd 28428/head
Kefu Chai [Fri, 7 Jun 2019 03:45:38 +0000 (11:45 +0800)]
ceph.spec.in: align "Requires" of ceph-osd

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoceph.spec.in: package crimson-osd
Kefu Chai [Thu, 6 Jun 2019 09:13:25 +0000 (17:13 +0800)]
ceph.spec.in: package crimson-osd

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agodebian/: add ceph-crimson-osd package
Kefu Chai [Thu, 6 Jun 2019 02:58:35 +0000 (10:58 +0800)]
debian/: add ceph-crimson-osd package

this package is commented out using `# Crimson`. and it will be enabled
only if we are building "crimson" flavor builds.

this package depends on ceph-osd, because it'll basically be a drop-in
replacement of ceph-osd. and it shares all the dependencies of ceph-osd.
so let's just reuse ceph-osd package for now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: install crimson-osd if WITH_SEASTAR
Kefu Chai [Thu, 6 Jun 2019 09:18:52 +0000 (17:18 +0800)]
cmake: install crimson-osd if WITH_SEASTAR

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoinstall-deps.sh: populate WITH_SEASTAR in the same way as for_make_check
Kefu Chai [Thu, 6 Jun 2019 03:10:41 +0000 (11:10 +0800)]
install-deps.sh: populate WITH_SEASTAR in the same way as for_make_check

because `install-deps.sh` is executed using `source`, we have to pass
these options using env variables. but before this change, `WITH_SEASTAR` is used directly,
while `FOR_MAKE_CHECK` is checked and translated to a local variable
`for_make_check`. which, in my opinion, has better readability.

so, in this change, `WITH_SEASTAR` is translated to `with_seastar`
variable in `install-deps.sh`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoqa/tasks/cbt.py: change port to work with client_endpoints 28442/head
Neha Ojha [Fri, 7 Jun 2019 00:21:38 +0000 (17:21 -0700)]
qa/tasks/cbt.py: change port to work with client_endpoints

hack to work with https://github.com/ceph/cbt/pull/160/

Signed-off-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #28439 from yuriw/wip-yuriw-crontab-master
Yuri Weinstein [Thu, 6 Jun 2019 23:24:19 +0000 (16:24 -0700)]
Merge pull request #28439 from yuriw/wip-yuriw-crontab-master

qa/tests:  filtered in only "trusty"

6 years agoMerge PR #27731 into master
Patrick Donnelly [Thu, 6 Jun 2019 21:48:44 +0000 (14:48 -0700)]
Merge PR #27731 into master

* refs/pull/27731/head:
qa: use mimic-O upgrade process

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoqa/tests: filtered in only "trusty" 28439/head
Yuri Weinstein [Thu, 6 Jun 2019 20:14:56 +0000 (13:14 -0700)]
qa/tests:  filtered in only "trusty"

Fixes: http://tracker.ceph.com/issues/40195
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agorgw_file: permit lookup_handle to lookup root_fh 28440/head
Matt Benjamin [Thu, 6 Jun 2019 20:54:43 +0000 (16:54 -0400)]
rgw_file: permit lookup_handle to lookup root_fh

Originally, root_fh was reachable from RGWLibFS::fh_cache, but
this was problematic as it has infinite lifetime and so is not
present in RGWLibFS::fs_lru.

To fix the above, RGWLibFS::root_fh came to live unhooked from the
handle caches which works because nfs-ganesha/the application
always has an instance handle.  However, this silently breaks
READDIR event invalidation.

Fixes: https://tracker.ceph.com/issues/40196
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoqa: use mimic-O upgrade process 27731/head
Patrick Donnelly [Tue, 23 Apr 2019 20:15:49 +0000 (13:15 -0700)]
qa: use mimic-O upgrade process

Fixes: https://tracker.ceph.com/issues/39436
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #27015 into master
Sage Weil [Thu, 6 Jun 2019 17:15:50 +0000 (12:15 -0500)]
Merge PR #27015 into master

* refs/pull/27015/head:
OSD: rollforward may need to mark pglog dirty

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge PR #28242 into master
Sage Weil [Thu, 6 Jun 2019 17:15:06 +0000 (12:15 -0500)]
Merge PR #28242 into master

* refs/pull/28242/head:
osdc/Objecter: fix OSDMap leak in handle_osd_map

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge PR #28363 into master
Sage Weil [Thu, 6 Jun 2019 17:14:49 +0000 (12:14 -0500)]
Merge PR #28363 into master

* refs/pull/28363/head:
osd/ClassHandler: use std::variant for storing func
osd/ClassHandler: no need to add `struct` before struct type
osd/ClassHandler: use ceph::mutex instead of Mutex
osd/ClassHandler: remove unused function
osd/ClassHandler: s/string/std::string/ in header

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoqa/tests: reduced distro to run to be random 28435/head
Yuri Weinstein [Thu, 6 Jun 2019 16:46:03 +0000 (09:46 -0700)]
qa/tests: reduced distro to run to be random

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #28313 from Songweibin/wip-fix-get-args
Jason Dillaman [Thu, 6 Jun 2019 15:19:35 +0000 (11:19 -0400)]
Merge pull request #28313 from Songweibin/wip-fix-get-args

rbd/action: fix error getting positional argument

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #28253 from Songweibin/wip-39973-rbd
Jason Dillaman [Thu, 6 Jun 2019 15:18:43 +0000 (11:18 -0400)]
Merge pull request #28253 from Songweibin/wip-39973-rbd

osd/OSDCap: rbd profile permits use of rbd_info

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #27902 from mikechristie/rbd-nbd-netlink-support
Jason Dillaman [Thu, 6 Jun 2019 14:36:48 +0000 (10:36 -0400)]
Merge pull request #27902 from mikechristie/rbd-nbd-netlink-support

rbd-nbd: add netlink map/unmap support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #28370 from linuxbox2/wip-rgw-tntbucket
Matt Benjamin [Thu, 6 Jun 2019 12:58:29 +0000 (08:58 -0400)]
Merge pull request #28370 from linuxbox2/wip-rgw-tntbucket

rgw_file: include tenant when hashing bucket names

6 years agod/control,install-deps: use d/control for installing seastar deps
Kefu Chai [Thu, 6 Jun 2019 02:57:53 +0000 (10:57 +0800)]
d/control,install-deps: use d/control for installing seastar deps

prepare for building ceph-crimson-osd deb package

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/dashboard: show degraded/misplaced/unfound objects. (#28104)
Lenz Grimmer [Thu, 6 Jun 2019 09:46:36 +0000 (11:46 +0200)]
mgr/dashboard: show degraded/misplaced/unfound objects. (#28104)

mgr/dashboard: show degraded/misplaced/unfound objects.

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #28039 from majianpeng/make-tcmalloc/jemalloc-work-well
Kefu Chai [Thu, 6 Jun 2019 09:38:58 +0000 (17:38 +0800)]
Merge pull request #28039 from majianpeng/make-tcmalloc/jemalloc-work-well

make perf_async_msgr link jemalloc/tcmalloc

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28373 from xiexingguo/wip-40104
Xie Xingguo [Thu, 6 Jun 2019 09:37:15 +0000 (17:37 +0800)]
Merge pull request #28373 from xiexingguo/wip-40104

mon, osd: parallel clean_pg_upmaps

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agotest/crimson: make perf_async_msgr link tcmalloc/jemalloc. 28039/head
Jianpeng Ma [Thu, 6 Jun 2019 03:13:13 +0000 (11:13 +0800)]
test/crimson: make perf_async_msgr link tcmalloc/jemalloc.

For 1M performance, perf_async_msgr w/ tcmalloc/jemalloc is better than
libc.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
6 years agocmake: add crimson-osd as a dependency of "tests" target
Kefu Chai [Thu, 6 Jun 2019 02:18:21 +0000 (10:18 +0800)]
cmake: add crimson-osd as a dependency of "tests" target

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agotest: add parallel clean_pg_upmaps test 28373/head
xie xingguo [Mon, 3 Jun 2019 08:43:25 +0000 (16:43 +0800)]
test: add parallel clean_pg_upmaps test

With parallel clean_pg_upmaps feature on, the total time cost
of the performance test which now can utilize up to 8 threads for
parallel upmap validating decreased from:

maybe_remove_pg_upmaps (~10000 pg_upmap_items) latency:104s

to:

clean_pg_upmaps (~10000 pg_upmap_items) latency:7s

Note that by default the mon uses only 4 worker threads for
CPU intensive background work, you could further increase
the "mon_cpu_threads" option value if you decided the
time-consuming of clean_pg_upmaps still matters.

Fixes: http://tracker.ceph.com/issues/40104
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agomon/OSDMonitor: do clean_pg_upmaps the parallel way if necessary
xie xingguo [Mon, 3 Jun 2019 08:10:22 +0000 (16:10 +0800)]
mon/OSDMonitor: do clean_pg_upmaps the parallel way if necessary

There could definitely be some certain cases we could reliably
skip this kind of checking, but there is no easy way to separate
those out.
However, this is clearly the general way to do the massive pg
upmap clean-up job more efficiently and hence should make sense
in all cases.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoosd/OSDMap: split clean_pg_upmaps into smaller helpers
xie xingguo [Sat, 1 Jun 2019 11:46:25 +0000 (19:46 +0800)]
osd/OSDMap: split clean_pg_upmaps into smaller helpers

- it's good to read.
- the updating pending_inc part should be made independent
  since it is going to be racy while running in parallel.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #28402 from tchaikov/wip-crimson-cleanup
Kefu Chai [Thu, 6 Jun 2019 01:52:34 +0000 (09:52 +0800)]
Merge pull request #28402 from tchaikov/wip-crimson-cleanup

crimson/osd: some cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agoMerge pull request #28302 from dzafman/wip-40078
David Zafman [Wed, 5 Jun 2019 21:43:30 +0000 (14:43 -0700)]
Merge pull request #28302 from dzafman/wip-40078

test: Make sure that extra scheduled scrubs don't confuse test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agorgw_file: pretty-print fh_key 28370/head
Matt Benjamin [Wed, 5 Jun 2019 14:40:08 +0000 (10:40 -0400)]
rgw_file: pretty-print fh_key

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agorgw_file: include tenant in hashes of object
Matt Benjamin [Wed, 5 Jun 2019 11:25:35 +0000 (07:25 -0400)]
rgw_file: include tenant in hashes of object

Because bucket names are taken as object names in the top
of an export.  Make hashing by tenant general to avoid disjoint
hashing of bucket.

Fixes: http://tracker.ceph.com/issues/40118
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agorgw_file: include tenant when hashing bucket names
Matt Benjamin [Wed, 15 May 2019 19:53:32 +0000 (15:53 -0400)]
rgw_file: include tenant when hashing bucket names

Prevent identical paths from distinct tenants from colliding in
RGW NFS handle cache.

Fixes: http://tracker.ceph.com/issues/40118
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoMerge PR #28353 into master
Sage Weil [Wed, 5 Jun 2019 15:22:26 +0000 (10:22 -0500)]
Merge PR #28353 into master

* refs/pull/28353/head:
qa/suites/rados/multimon: skew clocks 2s (< paxos lease)
qa/suites/rados/multimon: create_rbd_pool: false
qa/suites/rados/multimon: no osds when skewing clock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge PR #28365 into master
Sage Weil [Wed, 5 Jun 2019 15:21:19 +0000 (10:21 -0500)]
Merge PR #28365 into master

* refs/pull/28365/head:
global/global_context: always add '\0' after strncpy()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #28391 from cbodley/wip-39984
Casey Bodley [Wed, 5 Jun 2019 13:06:06 +0000 (09:06 -0400)]
Merge pull request #28391 from cbodley/wip-39984

cls/rgw: test before accessing pkeys->rbegin()

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agocrimson/osd/osd.cc: add editor variables/options 28402/head
Kefu Chai [Wed, 5 Jun 2019 07:18:07 +0000 (15:18 +0800)]
crimson/osd/osd.cc: add editor variables/options

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: s/ostream/std::ostream/
Kefu Chai [Wed, 5 Jun 2019 07:04:15 +0000 (15:04 +0800)]
crimson/osd: s/ostream/std::ostream/

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: mark one of PG::do_peering_event()s private
Kefu Chai [Wed, 5 Jun 2019 07:00:28 +0000 (15:00 +0800)]
crimson/osd: mark one of PG::do_peering_event()s private

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27995 from richael02/fix_indent
Kefu Chai [Wed, 5 Jun 2019 07:11:43 +0000 (15:11 +0800)]
Merge pull request #27995 from richael02/fix_indent

vstart.sh: unify the indent

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28358 from liu-chunmei/ceph_seastar_futurized_store
Kefu Chai [Wed, 5 Jun 2019 06:33:57 +0000 (14:33 +0800)]
Merge pull request #28358 from liu-chunmei/ceph_seastar_futurized_store

crimson: add FuturizedStore to encapsulate CyanStore

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27735 from xiexingguo/wip-device-class-noout
Xie Xingguo [Wed, 5 Jun 2019 06:17:06 +0000 (14:17 +0800)]
Merge pull request #27735 from xiexingguo/wip-device-class-noout

osd: revamp {noup,nodown,noin,noout} related commands

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agorbd nbd: always try to load module on map 27902/head
Mike Christie [Tue, 14 May 2019 03:58:41 +0000 (22:58 -0500)]
rbd nbd: always try to load module on map

nl and ioctl both need the module loaded so just always load it during
mapping.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agorbd nbd: add support for netlink interface
Mike Christie [Tue, 14 May 2019 03:57:41 +0000 (22:57 -0500)]
rbd nbd: add support for netlink interface

This adds support for mapping and unmapping using the netlink
interface. If the user passes in --try-netlink during mapping then we
will try to use the netlink interface and if that is not supported use
the ioctl interface. For unmap we will always try netlink and if that is
not supported drop down to the ioctl.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agocmake and build: add netlink lib requirement detection
Mike Christie [Wed, 5 Jun 2019 04:42:40 +0000 (23:42 -0500)]
cmake and build: add netlink lib requirement detection

The next patch adds netlink support to rbd-nbd. This patch just adds the
build related changes to bring in the netlink lib and test and build
against it.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agocmake: Move WITH_RBD option earlier
Mike Christie [Tue, 4 Jun 2019 18:32:09 +0000 (13:32 -0500)]
cmake: Move WITH_RBD option earlier

The next patch will add a WITH_RBD check to the LINUX check block so we
only check for the netlink libs when those 2 conditions are met, so this
moves the WIT_RBD option setup to before the LINUX check.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agorbd nbd: Add cond to signal nbd disconnection
Mike Christie [Tue, 30 Apr 2019 22:24:07 +0000 (17:24 -0500)]
rbd nbd: Add cond to signal nbd disconnection

With the ioctl interface we know when a disconnect has been executed
because the NBD_DO_IO ioctl will return. The netlink interface returns
after the nl connect cmd call has completed, so this patch adds a cond
that signals when a nl disconnect/NBD_DISCONNECT has been executed and
the server thread has handled the resulting NBD_CMD_DISC.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agorbd nbd: just move signal handler
Mike Christie [Wed, 1 May 2019 01:26:08 +0000 (20:26 -0500)]
rbd nbd: just move signal handler

This just moves the signal handler to make it easier to call the netlink
disconnect helpers in the next patches.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agorbd nbd: move nbd index parsing to function
Mike Christie [Wed, 1 May 2019 00:27:09 +0000 (19:27 -0500)]
rbd nbd: move nbd index parsing to function

Make the nbd index parsing into a functio so we can use in the ioctl and
netlink paths.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agorbd nbd: move server startup code to function
Mike Christie [Wed, 1 May 2019 01:14:31 +0000 (20:14 -0500)]
rbd nbd: move server startup code to function

The netlink connect cmd interface requires the server to be running when
the connect call completes or commands will timeout/fail. This breaks the
server code to 2 functions so we can control when it starts and runs.

Right now it looks odd in that start_server will allocate and return
the server only for it be freed after run, and it is not touched. The
netlink enablement patch at the end will use the returned server.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agorbd nbd: move nbd map ioctls to new function
Mike Christie [Tue, 30 Apr 2019 06:54:49 +0000 (01:54 -0500)]
rbd nbd: move nbd map ioctls to new function

The next patches will add nbd map netlink support so this moves the ioctl
code to a new function to keep things cleaner and not overloading do_map.

Signed-off-by: Mike Christie <mchristi@redhat.com>
6 years agoMerge pull request #28366 from albert-github/feature/bug_docu_formula_invocation
Kefu Chai [Wed, 5 Jun 2019 04:52:03 +0000 (12:52 +0800)]
Merge pull request #28366 from albert-github/feature/bug_docu_formula_invocation

common/hobject: Error invocation of formula in documentation

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27994 from xiexingguo/wip-balancer-fudge
Kefu Chai [Wed, 5 Jun 2019 04:13:44 +0000 (12:13 +0800)]
Merge pull request #27994 from xiexingguo/wip-balancer-fudge

mgr/balancer: fix fudge

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #28342 from rzarzynski/wip-messages-std-for-pgcreate2
Kefu Chai [Wed, 5 Jun 2019 04:07:36 +0000 (12:07 +0800)]
Merge pull request #28342 from rzarzynski/wip-messages-std-for-pgcreate2

messages: MOSDPGCreate2 doesn't assume using namespace std.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28340 from elliswuuuuuuuu/remove_unused_variable
Kefu Chai [Wed, 5 Jun 2019 04:06:04 +0000 (12:06 +0800)]
Merge pull request #28340 from elliswuuuuuuuu/remove_unused_variable

mgr: remove unused variable pool_name

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28268 from liewegas/wip-progress-bar
Kefu Chai [Wed, 5 Jun 2019 04:03:08 +0000 (12:03 +0800)]
Merge pull request #28268 from liewegas/wip-progress-bar

mon: fix off-by-one rendering progress bar

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
6 years agovstart.sh: add editor variables/options 27995/head
Kefu Chai [Wed, 5 Jun 2019 03:45:08 +0000 (11:45 +0800)]
vstart.sh: add editor variables/options

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agovstart.sh: add an extra param when "run 'mds'"
Kefu Chai [Wed, 5 Jun 2019 03:29:25 +0000 (11:29 +0800)]
vstart.sh: add an extra param when "run 'mds'"

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agovstart.sh: unify the indent
Richael Zhuang [Tue, 7 May 2019 10:47:24 +0000 (18:47 +0800)]
vstart.sh: unify the indent

Change-Id: Ie1dbe25f81609e5b2f6751da9e87e191a2f78bc2
Signed-off-by: Richael Zhuang <richael.zhuang@arm.com>
6 years agoosd/OSDMapMapping: make ParallelPGMapper can accept input pgs
xie xingguo [Wed, 5 Jun 2019 02:41:52 +0000 (10:41 +0800)]
osd/OSDMapMapping: make ParallelPGMapper can accept input pgs

The existing "prime temp" machinism is a good inspiration
for cluster with a large number of pgs that need to do various
calculations quickly.
I am planning to do the upmap tidy-up work the same way, hence
the need for an alternate way of specifying pgs to process other
than taking directly from the map.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #28324 into master
Patrick Donnelly [Wed, 5 Jun 2019 00:37:26 +0000 (17:37 -0700)]
Merge PR #28324 into master

* refs/pull/28324/head:
client: clean up error checking and return of _lookup_parent
client: drop Client::lookup_parent

Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge PR #28116 into master
Patrick Donnelly [Wed, 5 Jun 2019 00:36:04 +0000 (17:36 -0700)]
Merge PR #28116 into master

* refs/pull/28116/head:
client: fix "ceph.snap.btime" vxattr value
client: fix "ceph.dir.rctime" vxattr value

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #28371 into master
Patrick Donnelly [Tue, 4 Jun 2019 23:22:26 +0000 (16:22 -0700)]
Merge PR #28371 into master

* refs/pull/28371/head:
qa: fix kclient symlink to use latest rhel7
qa: fix latest distros and add helper symlinks

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge PR #28148 into master
Patrick Donnelly [Tue, 4 Jun 2019 23:21:22 +0000 (16:21 -0700)]
Merge PR #28148 into master

* refs/pull/28148/head:
common/secret.c: fix key parsing when doing a remount

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agocrimson: add FuturizedStore to encapsulate cyanstore 28358/head
chunmei Liu [Tue, 4 Jun 2019 03:18:20 +0000 (20:18 -0700)]
crimson: add FuturizedStore to encapsulate cyanstore

only add encapsulation. alien store will be implement later.
exception handling will be implement later.

Signed-off-by: chunmei Liu <chunmei.liu@intel.com>
6 years agoMerge pull request #26415 from zmc/wip-populate-grafana
Boris Ranto [Tue, 4 Jun 2019 21:31:24 +0000 (23:31 +0200)]
Merge pull request #26415 from zmc/wip-populate-grafana

mgr/dashboard: Push Grafana dashboards on startup

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agoMerge pull request #28294 from alfredodeza/wip-rm40063
Andrew Schoen [Tue, 4 Jun 2019 21:24:17 +0000 (16:24 -0500)]
Merge pull request #28294 from alfredodeza/wip-rm40063

ceph-volume: pass --ssh-config to pytest to resolve hosts when connecting

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #28228 from jan--f/spec-grafana-dashboards-require-grafana
Boris Ranto [Tue, 4 Jun 2019 20:52:54 +0000 (22:52 +0200)]
Merge pull request #28228 from jan--f/spec-grafana-dashboards-require-grafana

ceph.spec.in: grafana-dashboards package depends on grafana

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agocls/rgw: test before accessing pkeys->rbegin() 28391/head
Casey Bodley [Tue, 4 Jun 2019 20:40:36 +0000 (16:40 -0400)]
cls/rgw: test before accessing pkeys->rbegin()

if pkeys is empty here, dereferencing rbegin() will crash

Fixes: http://tracker.ceph.com/issues/39984
Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agomgr/dashboard: Push Grafana dashboards on startup 26415/head
Zack Cerza [Tue, 22 Jan 2019 00:30:44 +0000 (17:30 -0700)]
mgr/dashboard: Push Grafana dashboards on startup

Because we didn't have viable way to populate Grafana dashboards in a
fully containerized context, we needed a different method. This will
work in packaged and containerized deployments.

We provide three methods to push the dashboard JSON files to the Grafana
instance: a command (ceph dashboard update-grafana-dashboards); an API
endpoint (/api/grafana/update_dashboards); and an automatic on-startup
feature that is disabled by default (ceph dashboard
set-grafana-update-dashboards true). The on-startup method will also
retry periodically to avoid racing with the startup of Grafana itself.

Signed-off-by: Zack Cerza <zack@redhat.com>
6 years agoMerge pull request #28385 from theanalyst/doc/releases/13.2.6
Abhishek L [Tue, 4 Jun 2019 19:22:50 +0000 (21:22 +0200)]
Merge pull request #28385 from theanalyst/doc/releases/13.2.6

doc: add release notes for v13.2.6 mimic

Reviewed-By: Sage Weil <sage@redhat.com>
6 years agoMerge PR #28236 into master
Patrick Donnelly [Tue, 4 Jun 2019 19:11:23 +0000 (12:11 -0700)]
Merge PR #28236 into master

* refs/pull/28236/head:
doc: Fix incorrect indentations in cephfs-shell
doc: Add usage for stat command in cephfs-shell

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #28386 from cbodley/wip-vstart-rgw-run
Casey Bodley [Tue, 4 Jun 2019 19:06:51 +0000 (15:06 -0400)]
Merge pull request #28386 from cbodley/wip-vstart-rgw-run

vstart: fix run() invocation for rgw

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agovstart: fix run() invocation for rgw 28386/head
Casey Bodley [Tue, 4 Jun 2019 18:26:16 +0000 (14:26 -0400)]
vstart: fix run() invocation for rgw

add an extra argument to run() for rgw so that --redirect-output
sends stdout to rgw.{port}.stdout

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge PR #28384 into master
Patrick Donnelly [Tue, 4 Jun 2019 17:46:26 +0000 (10:46 -0700)]
Merge PR #28384 into master

* refs/pull/28384/head:
mgr/volumes: fix subvolume creation with quota

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomgr/volumes: fix subvolume creation with quota 28384/head
Ramana Raja [Mon, 3 Jun 2019 09:46:18 +0000 (15:16 +0530)]
mgr/volumes: fix subvolume creation with quota

A quota is set on a subvolume by setting a quota virtual
xattr on a fs subdirectory. The value of the quota xattr
should be a bytes object. The quota value wasn't correctly
converted to a bytes object. Fix this.

Fixes: http://tracker.ceph.com/issues/40152
Signed-off-by: Ramana Raja <rraja@redhat.com>
6 years agoMerge pull request #28252 from tchaikov/wip-cmake-cleanup
Kefu Chai [Tue, 4 Jun 2019 16:50:02 +0000 (00:50 +0800)]
Merge pull request #28252 from tchaikov/wip-cmake-cleanup

cmake: cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge PR #28380 into master
Patrick Donnelly [Tue, 4 Jun 2019 16:08:55 +0000 (09:08 -0700)]
Merge PR #28380 into master

* refs/pull/28380/head:
mgr/volumes: convert string to bytes object

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
6 years agodoc: add release notes for v13.2.6 mimic 28385/head
Abhishek Lekshmanan [Tue, 4 Jun 2019 15:20:33 +0000 (17:20 +0200)]
doc: add release notes for v13.2.6 mimic

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agocommon/hobject.h: fix syntax in doxygen comment 28366/head
albert-github [Mon, 3 Jun 2019 14:35:54 +0000 (16:35 +0200)]
common/hobject.h: fix syntax in doxygen comment

fix the error invocation of formula in documentation

Error invocation of formula in documentation, the second formula was
started with $f instead of the correct \f$

see also http://www.doxygen.nl/manual/formulas.html

Signed-off-by: Albert <albert.tests@gmail.com>
6 years agomgr/volumes: convert string to bytes object 28380/head
Rishabh Dave [Tue, 4 Jun 2019 12:26:11 +0000 (17:56 +0530)]
mgr/volumes: convert string to bytes object

mount method in libcephfs's cython modules expects filesystem_name to
be a bytes object. Therefore, convert string to bytes object
beforehand.

Fixes: http://tracker.ceph.com/issues/39750
Signed-off-by: Rishabh Dave <ridave@redhat.com>
6 years agocmake: extract rgw_*_scheduler.cc into rgw_schedulers 28252/head
Kefu Chai [Tue, 4 Jun 2019 12:59:24 +0000 (20:59 +0800)]
cmake: extract rgw_*_scheduler.cc into rgw_schedulers

i was running into following issue:

../../../lib/libradosgw_a.a(rgw_loadgen_process.cc.o): In function
`RGWLoadGenProcess::run()':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_loadgen_process.cc:102:
undefined reference to `signal_shutdown()'
collect2: error: ld returned 1 exit status

signal_shutdown() is only used by rgw_main.cc to notify the main thread,
but we don't need this facility in unit test exercising the schedulers,
so, in this change, rgw schedulers are extracted into librgw_schedulers,
so this library can be consumed by the unit test.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28243 from cbodley/wip-40022
Casey Bodley [Tue, 4 Jun 2019 12:07:17 +0000 (08:07 -0400)]
Merge pull request #28243 from cbodley/wip-40022

radosgw-admin: fix syncs_from in 'bucket sync status'

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
6 years agoMerge pull request #28156 from cbodley/wip-rgw-realm-list-api
Casey Bodley [Tue, 4 Jun 2019 12:04:54 +0000 (08:04 -0400)]
Merge pull request #28156 from cbodley/wip-rgw-realm-list-api

rgw: add 'GET /admin/realm?list' api to list realms

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge pull request #28345 from tianshan/fix_http_return_check
Casey Bodley [Tue, 4 Jun 2019 12:03:28 +0000 (08:03 -0400)]
Merge pull request #28345 from tianshan/fix_http_return_check

rgw: fix miss handle curl error return

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #28303 from cbodley/wip-39992
Casey Bodley [Tue, 4 Jun 2019 12:03:00 +0000 (08:03 -0400)]
Merge pull request #28303 from cbodley/wip-39992

rgw: fetch_remote_obj() compares expected object size

Reviewed-by: Xiaoxi Chen <xiaoxchen@ebay.com>
6 years agoMerge pull request #28188 from tianshan/fix_39984
Casey Bodley [Tue, 4 Jun 2019 12:00:27 +0000 (08:00 -0400)]
Merge pull request #28188 from tianshan/fix_39984

rgw: fix bucket may redundantly list keys after BI_PREFIX_CHAR

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27993 from liuchang0812/rgw-bucket-tagging
Casey Bodley [Tue, 4 Jun 2019 11:53:43 +0000 (07:53 -0400)]
Merge pull request #27993 from liuchang0812/rgw-bucket-tagging

rgw: bucket tagging

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: cleanup bucket tags code 27993/head
Chang Liu [Fri, 17 May 2019 02:53:32 +0000 (10:53 +0800)]
rgw: cleanup bucket tags code

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
6 years agorgw: show bucket tagging when user stats bucket
Chang Liu [Tue, 14 May 2019 14:11:40 +0000 (22:11 +0800)]
rgw: show bucket tagging when user stats bucket

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
6 years agotest/rgw: test truncated reads in RGWHTTPManager 28345/head
Casey Bodley [Mon, 3 Jun 2019 14:59:00 +0000 (10:59 -0400)]
test/rgw: test truncated reads in RGWHTTPManager

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: fix miss handle curl error return
Tianshan Qu [Fri, 31 May 2019 10:37:44 +0000 (18:37 +0800)]
rgw: fix miss handle curl error return

if meet tcp packet loss, curl return will be result=18(CURLE_PARTIAL_FILE)
and http_status=200, so sync will continue and cause content miss match.

Fixes: https://tracker.ceph.com/issues/39992
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
6 years agoMerge pull request #28362 from cyx1231st/wip-seastar-fix-random-failure
Kefu Chai [Tue, 4 Jun 2019 02:57:12 +0000 (10:57 +0800)]
Merge pull request #28362 from cyx1231st/wip-seastar-fix-random-failure

test/crimson: fix msgr test of ref counter racing

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agotest/crimson: fix msgr test of ref counter racing 28362/head
Yingxin Cheng [Mon, 3 Jun 2019 13:15:42 +0000 (21:15 +0800)]
test/crimson: fix msgr test of ref counter racing

Foreign-dispatch in crimson-messenger is not implemented yet, and no
need to test this feature now.

Fixes: http://tracker.ceph.com/issues/36405
Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agorgw: simplify RGWObjTags dump
Chang Liu [Tue, 14 May 2019 14:11:05 +0000 (22:11 +0800)]
rgw: simplify RGWObjTags dump

Signed-off-by: Chang Liu <liuchang0812@gmail.com>