]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomds: fix check of underwater dentries 20468/head
Yan, Zheng [Sat, 17 Feb 2018 01:37:48 +0000 (09:37 +0800)]
mds: fix check of underwater dentries

Underwater dentry is dentry that is dirty in our cache from journal
replay, but had already been flushed to disk before the mds failed.
To decide if an dentry is underwater, original code compares dirty
dentry's version to on-disk dirfrag's version. This method is racy
because CDir::log_mark_dirty() can increase dirfrag's version without
adding log event. After mds failover, version of dirfrag from journal
replay can be less than on-disk dirfrag's version. So newly dirtied
dentry can be equal to or less than the on-disk dirfrag's version.

The race can cause incorrect fragstat/rstat

Fixes: http://tracker.ceph.com/issues/23032
Signed-off-by: Yan, Zheng <zyan@redhat.com>
7 years agoMerge pull request #20274 from adamemerson/wip-socket-to-me!
Kefu Chai [Sat, 17 Feb 2018 02:05:08 +0000 (10:05 +0800)]
Merge pull request #20274 from adamemerson/wip-socket-to-me!

common/admin_socket: various cleanups

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agocommon/admin_socket: Use unique_ptr instead of new/delete 20274/head
Adam C. Emerson [Tue, 30 Jan 2018 21:44:00 +0000 (16:44 -0500)]
common/admin_socket: Use unique_ptr instead of new/delete

Mostly for the default hooks, plus one Formatter.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon/admin_socket: Cleanup path cleanup
Adam C. Emerson [Tue, 30 Jan 2018 21:14:02 +0000 (16:14 -0500)]
common/admin_socket: Cleanup path cleanup

Don't use strdup/free explicitly.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoconfig/admin_socket: Remove PFL_* stuff since nobody's using it
Adam C. Emerson [Tue, 30 Jan 2018 20:33:35 +0000 (15:33 -0500)]
config/admin_socket: Remove PFL_* stuff since nobody's using it

If we want to, we have other ways of getting data out of a thread.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon/admin_socket: Use one map instead of three
Adam C. Emerson [Tue, 30 Jan 2018 19:57:42 +0000 (14:57 -0500)]
common/admin_socket: Use one map instead of three

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon/admin_socket: Use std::mutex/condition_variable/thread
Adam C. Emerson [Tue, 30 Jan 2018 05:05:49 +0000 (00:05 -0500)]
common/admin_socket: Use std::mutex/condition_variable/thread

And fix a bug where we exit in one code-path without releasing the
lock.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon: Add make_named_thread
Adam C. Emerson [Tue, 16 Feb 2016 19:43:51 +0000 (14:43 -0500)]
common: Add make_named_thread

To allow us to make a std::thread with a name.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agocommon/admin_socket: Copy fewer strings
Adam C. Emerson [Tue, 30 Jan 2018 04:27:33 +0000 (23:27 -0500)]
common/admin_socket: Copy fewer strings

Pass std::string_view to call, rather than passing strings by value.

Change cmdmap_t and the maps in admin_socket to use the std::less<>
transparent comparator, so we can compare string_views to strings. (Or
anything else with an equality operator with strings.)

Pass the cmdmap_t in to call by const reference, not reference.

The change to cmdmap_t requires changing some of the users of
cmdmap_t. (That is, make them actually use cmdmap_t explicitly, not
the open-coed map type.)

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #17020 from theanalyst/lc-time-disable
Casey Bodley [Fri, 16 Feb 2018 17:01:18 +0000 (12:01 -0500)]
Merge pull request #17020 from theanalyst/lc-time-disable

qa: re enable LC tests

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #16757 from rzarzynski/wip-rgw-20883
Casey Bodley [Fri, 16 Feb 2018 16:59:12 +0000 (11:59 -0500)]
Merge pull request #16757 from rzarzynski/wip-rgw-20883

rgw: dump Last-Modified in Swift's responses for GET/HEAD on container.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge pull request #15054 from rzarzynski/wip-rgw-fix-browser-upload-error-handling
Casey Bodley [Fri, 16 Feb 2018 16:42:14 +0000 (11:42 -0500)]
Merge pull request #15054 from rzarzynski/wip-rgw-fix-browser-upload-error-handling

rgw: fix error handling in Browser Uploads.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #12427 from linuxbox2/wip-rgw-ldap-shutdown
Yuri Weinstein [Fri, 16 Feb 2018 16:36:58 +0000 (08:36 -0800)]
Merge pull request #12427 from linuxbox2/wip-rgw-ldap-shutdown

rgw: don't leak S3 LDAPHelper

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #19065 from tianshan/fix_nfs_init
Yuri Weinstein [Fri, 16 Feb 2018 16:34:45 +0000 (08:34 -0800)]
Merge pull request #19065 from tianshan/fix_nfs_init

rgw: fix RGWLibIO did not init RGWEnv

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agoMerge pull request #17094 from theanalyst/rgw-policy-tagging-2
Yuri Weinstein [Fri, 16 Feb 2018 16:33:50 +0000 (08:33 -0800)]
Merge pull request #17094 from theanalyst/rgw-policy-tagging-2

rgw: add support for tagging and other conditionals in policy

Reviewed-by: Jesse Williamson <jwilliamson@suse.de>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #20226 from fangyuxiangGL/offset
Yuri Weinstein [Fri, 16 Feb 2018 16:31:47 +0000 (08:31 -0800)]
Merge pull request #20226 from fangyuxiangGL/offset

rgw: can't download object with range when compression enabled

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
7 years agoMerge pull request #20332 from pritha-srivastava/wip-rgw-role-admin-only
Yuri Weinstein [Fri, 16 Feb 2018 16:31:08 +0000 (08:31 -0800)]
Merge pull request #20332 from pritha-srivastava/wip-rgw-role-admin-only

rgw: Correct permission evaluation to allow only admin users to work with Roles.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #20396 from tianshan/cancel_op_miss_update_header
Yuri Weinstein [Fri, 16 Feb 2018 16:30:37 +0000 (08:30 -0800)]
Merge pull request #20396 from tianshan/cancel_op_miss_update_header

rgw: fix index cancel op miss update header

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20459 from ceph/wip-cv-lint-fix
Alfredo Deza [Fri, 16 Feb 2018 12:03:14 +0000 (07:03 -0500)]
Merge pull request #20459 from ceph/wip-cv-lint-fix

ceph-volume tests remove unused import

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
7 years agoceph-volume tests remove unused import 20459/head
Alfredo Deza [Fri, 16 Feb 2018 11:51:12 +0000 (06:51 -0500)]
ceph-volume tests remove unused import

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agobuffer: Append from std::string_view
Adam C. Emerson [Tue, 30 Jan 2018 04:23:14 +0000 (23:23 -0500)]
buffer: Append from std::string_view

Now that we have std::string_view.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #20426 from batrick/i22991
Kefu Chai [Fri, 16 Feb 2018 03:27:10 +0000 (11:27 +0800)]
Merge pull request #20426 from batrick/i22991

mon/MgrStatMonitor: fix formatting of pending_digest

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20409 from badone/wip-better-error-reporting-ceph_test_admin_sock...
Kefu Chai [Fri, 16 Feb 2018 03:26:21 +0000 (11:26 +0800)]
Merge pull request #20409 from badone/wip-better-error-reporting-ceph_test_admin_socket_output

test/admin_socket_output: better error reporting

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20370 from ovh/bp-no-normalizing-of-normalized
Kefu Chai [Fri, 16 Feb 2018 03:25:43 +0000 (11:25 +0800)]
Merge pull request #20370 from ovh/bp-no-normalizing-of-normalized

common/ConfUtils: check key before actually normalizing

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20437 from tchaikov/wip-admin-socket
Kefu Chai [Fri, 16 Feb 2018 03:01:46 +0000 (11:01 +0800)]
Merge pull request #20437 from tchaikov/wip-admin-socket

common/admin_socket: validate command json before feeding it to hook

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #20408 from ceph/wip-rm22785
Andrew Schoen [Thu, 15 Feb 2018 20:08:38 +0000 (21:08 +0100)]
Merge pull request #20408 from ceph/wip-rm22785

ceph-volume consume mount/format options from ceph.conf

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agocommon/admin_socket: consolidate dump_cmd_to_json() and validate_cmd() 20437/head
Kefu Chai [Wed, 14 Feb 2018 15:26:28 +0000 (23:26 +0800)]
common/admin_socket: consolidate dump_cmd_to_json() and validate_cmd()

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocommon/admin_socket: validate command json before feeding it to hook
Kefu Chai [Wed, 14 Feb 2018 11:45:51 +0000 (19:45 +0800)]
common/admin_socket: validate command json before feeding it to hook

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20158 from liaoxin01/fix-list-multi-upload
Orit Wasserman [Thu, 15 Feb 2018 19:28:32 +0000 (21:28 +0200)]
Merge pull request #20158 from liaoxin01/fix-list-multi-upload

rgw: fix the max-uploads parameter not work
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #20362 from tchaikov/wip-mgr-py3
Kefu Chai [Thu, 15 Feb 2018 18:32:04 +0000 (02:32 +0800)]
Merge pull request #20362 from tchaikov/wip-mgr-py3

mgr: fix py3 support

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #20430 from tchaikov/wip-bluefs-demotion
Kefu Chai [Thu, 15 Feb 2018 18:26:09 +0000 (02:26 +0800)]
Merge pull request #20430 from tchaikov/wip-bluefs-demotion

os/bluestore: fix the demotion in StupidAllocator::init_rm_free

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #20410 from dzafman/wip-21218
David Zafman [Thu, 15 Feb 2018 18:25:44 +0000 (10:25 -0800)]
Merge pull request #20410 from dzafman/wip-21218

osd: Fix assert when checking missing version

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19322 from theanalyst/usage-trim-2
Yuri Weinstein [Thu, 15 Feb 2018 17:26:06 +0000 (09:26 -0800)]
Merge pull request #19322 from theanalyst/usage-trim-2

rgw: add an option to clear all usage entries

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19573 from Leeshine/wip-rgw-sync-status
Yuri Weinstein [Thu, 15 Feb 2018 17:25:36 +0000 (09:25 -0800)]
Merge pull request #19573 from Leeshine/wip-rgw-sync-status

rgw: improve sync status

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19606 from cfanz/wip-rgw-fix-collect-return
Yuri Weinstein [Thu, 15 Feb 2018 17:25:05 +0000 (09:25 -0800)]
Merge pull request #19606 from cfanz/wip-rgw-fix-collect-return

rgw: fix collect()'s return in coroutine

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #19815 from qrGitHub/wip-rgw-memory-optimize2
Yuri Weinstein [Thu, 15 Feb 2018 17:24:35 +0000 (09:24 -0800)]
Merge pull request #19815 from qrGitHub/wip-rgw-memory-optimize2

rgw: drop unused vector elements

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19921 from fangyuxiangGL/lc-ret
Yuri Weinstein [Thu, 15 Feb 2018 17:07:57 +0000 (09:07 -0800)]
Merge pull request #19921 from fangyuxiangGL/lc-ret

rgw: lifecycle omap entry was removed in abnormal situation

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
7 years agoMerge pull request #20006 from jcsp/wip-rgw-perfcounters
Yuri Weinstein [Thu, 15 Feb 2018 17:07:00 +0000 (09:07 -0800)]
Merge pull request #20006 from jcsp/wip-rgw-perfcounters

rgw: set priority on perf counters

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agoMerge pull request #20021 from tianshan/fix_bilog_list
Yuri Weinstein [Thu, 15 Feb 2018 17:05:10 +0000 (09:05 -0800)]
Merge pull request #20021 from tianshan/fix_bilog_list

cls/rgw: fix bi_log_iterate_entries return wrong truncated

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20023 from badone/wip-rgw-better-ERANGE-error
Yuri Weinstein [Thu, 15 Feb 2018 17:04:48 +0000 (09:04 -0800)]
Merge pull request #20023 from badone/wip-rgw-better-ERANGE-error

rgw: Better ERANGE error message

Reviewed-by: <mkogan@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
7 years agoMerge pull request #20024 from luomuyao/dev
Yuri Weinstein [Thu, 15 Feb 2018 17:04:19 +0000 (09:04 -0800)]
Merge pull request #20024 from luomuyao/dev

rgw: fix a typo in rgw_perms[]

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20191 from yehudasa/wip-22833
Yuri Weinstein [Thu, 15 Feb 2018 17:02:19 +0000 (09:02 -0800)]
Merge pull request #20191 from yehudasa/wip-22833

rgw: sync tracing fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: <mkogan@redhat.com>
7 years agoMerge pull request #20063 from cethikdata/rgw_quota
Yuri Weinstein [Thu, 15 Feb 2018 16:59:00 +0000 (08:59 -0800)]
Merge pull request #20063 from cethikdata/rgw_quota

rgw: upldate the max-buckets when the quota is uploaded

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20095 from tianshan/fix_reload
Yuri Weinstein [Thu, 15 Feb 2018 16:58:39 +0000 (08:58 -0800)]
Merge pull request #20095 from tianshan/fix_reload

rgw: fix RGWCompletionManager get_next stuck after going down

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoceph-volume util.prepare extend flags when found 20408/head
Alfredo Deza [Mon, 12 Feb 2018 21:47:36 +0000 (16:47 -0500)]
ceph-volume util.prepare extend flags when found

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume util.constants update mount flags to include rw, normalize on list
Alfredo Deza [Mon, 12 Feb 2018 21:47:17 +0000 (16:47 -0500)]
ceph-volume util.constants update mount flags to include rw, normalize on list

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume configuration normalize underscore vs. whitespace named options
Alfredo Deza [Mon, 12 Feb 2018 21:46:47 +0000 (16:46 -0500)]
ceph-volume configuration normalize underscore vs. whitespace named options

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests check for mount/format usage from ceph.conf
Alfredo Deza [Mon, 12 Feb 2018 21:46:06 +0000 (16:46 -0500)]
ceph-volume tests check for mount/format usage from ceph.conf

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests add ceph.conf stub for custom conf files
Alfredo Deza [Mon, 12 Feb 2018 21:44:45 +0000 (16:44 -0500)]
ceph-volume tests add ceph.conf stub for custom conf files

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #20423 from dillaman/wip-22945
Mykola Golub [Thu, 15 Feb 2018 12:13:45 +0000 (14:13 +0200)]
Merge pull request #20423 from dillaman/wip-22945

librbd: new tag should use on-disk committed position

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20442 from JordanHus/master
John Wilkins [Wed, 14 Feb 2018 23:15:27 +0000 (15:15 -0800)]
Merge pull request #20442 from JordanHus/master

doc: Fixes a spelling error and a broken hyperlink.

Reviewed-by: John Wilkins
7 years agodoc: Fixes a spelling error and a broken hyperlink. 20442/head
Jordan Hus [Wed, 14 Feb 2018 19:23:59 +0000 (14:23 -0500)]
doc: Fixes a spelling error and a broken hyperlink.

Signed-off-by: Jordan Hus <jordan.hus@dicecorp.com>
7 years agojournal: flush commit positions should wait for refresh 20423/head
Jason Dillaman [Tue, 13 Feb 2018 15:05:01 +0000 (10:05 -0500)]
journal: flush commit positions should wait for refresh

Fixes: http://tracker.ceph.com/issues/22945
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agojournal: support concurrent refresh requests
Jason Dillaman [Tue, 13 Feb 2018 15:18:25 +0000 (10:18 -0500)]
journal: support concurrent refresh requests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19859 from yaozongyou/rgw-remove-register-warning
Kefu Chai [Wed, 14 Feb 2018 16:13:37 +0000 (00:13 +0800)]
Merge pull request #19859 from yaozongyou/rgw-remove-register-warning

rgw: silence not allow register storage class specifier warning

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20187 from wido/influxdb-connection-error
John Spray [Wed, 14 Feb 2018 15:18:31 +0000 (15:18 +0000)]
Merge pull request #20187 from wido/influxdb-connection-error

mgr/influx: Various fixes and improvements

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20265 from ceph/wip-rm22876
Alfredo Deza [Wed, 14 Feb 2018 12:07:16 +0000 (07:07 -0500)]
Merge pull request #20265 from ceph/wip-rm22876

ceph-volume: lvm zap will unmount osd paths used by zapped devices

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agorgw: fix index cancel op miss update header 20396/head
Tianshan Qu [Sun, 11 Feb 2018 08:38:21 +0000 (16:38 +0800)]
rgw: fix index cancel op miss update header

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
7 years agoMerge pull request #20406 from dillaman/wip-22979
Mykola Golub [Wed, 14 Feb 2018 07:36:02 +0000 (09:36 +0200)]
Merge pull request #20406 from dillaman/wip-22979

librbd: fix issues discovered in clone v2 during upgrade tests

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoos/bluestore: fix the demotion in StupidAllocator::init_rm_free 20430/head
Kefu Chai [Wed, 14 Feb 2018 04:17:06 +0000 (12:17 +0800)]
os/bluestore: fix the demotion in StupidAllocator::init_rm_free

* we should update the _size field when demotion kicks in, otherwise the
  interval_set::m and interval_set::_size won't be consistent.
* also rename post_process to claim, as it "steals" the leftover(s) of
chopped segment.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoceph-volume: use terminal.MultiLogger in `lvm zap` 20265/head
Andrew Schoen [Mon, 12 Feb 2018 21:23:08 +0000 (15:23 -0600)]
ceph-volume: use terminal.MultiLogger in `lvm zap`

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: use api helper methods for pvs and lvs in lvm zap
Andrew Schoen [Wed, 7 Feb 2018 15:06:45 +0000 (09:06 -0600)]
ceph-volume: use api helper methods for pvs and lvs in lvm zap

This is just a cleaner way of doing this instead of using PVolumes
and Volumes directly.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: fix documentation typos for lvm zap
Andrew Schoen [Wed, 7 Feb 2018 14:35:47 +0000 (08:35 -0600)]
ceph-volume: fix documentation typos for lvm zap

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: when zapping unmount osd directories
Andrew Schoen [Thu, 1 Feb 2018 20:52:46 +0000 (14:52 -0600)]
ceph-volume: when zapping unmount osd directories

If you zap an lv, device or partition and it's currently mounted as a
ceph osd directory then it will be unmounted so the zap can complete.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: adds a util.system.unmount function
Andrew Schoen [Thu, 1 Feb 2018 20:29:30 +0000 (14:29 -0600)]
ceph-volume: adds a util.system.unmount function

This function will unmount the given path

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20427 from ceph/wip-rm22988
Andrew Schoen [Tue, 13 Feb 2018 22:57:04 +0000 (23:57 +0100)]
Merge pull request #20427 from ceph/wip-rm22988

ceph-volume use realpath when checking mounts

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge PR #19263 into master
Patrick Donnelly [Tue, 13 Feb 2018 22:43:32 +0000 (14:43 -0800)]
Merge PR #19263 into master

* refs/pull/19263/head:
qa: ignore bad backtrace cluster wrn
qa/cephfs: Add tests to validate scrub functionality
cephfs: Add option to load invalid metadata from disk
cephfs: Reset scrub data when inodes move

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: ignore bad backtrace cluster wrn 19263/head
Patrick Donnelly [Tue, 13 Feb 2018 22:12:53 +0000 (14:12 -0800)]
qa: ignore bad backtrace cluster wrn

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoceph-volume tests verify realpath usage in mounts 20427/head
Alfredo Deza [Tue, 13 Feb 2018 18:22:41 +0000 (13:22 -0500)]
ceph-volume tests verify realpath usage in mounts

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume util.system optionally use realpath on devices
Alfredo Deza [Tue, 13 Feb 2018 17:59:48 +0000 (12:59 -0500)]
ceph-volume util.system optionally use realpath on devices

To check a mounted device it is needed to verify on a combination of
realpath and plain devices against realpath and plain paths. In LVM, two
different paths might refer to the same devices

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge PR #19957 into master
Patrick Donnelly [Tue, 13 Feb 2018 19:36:18 +0000 (11:36 -0800)]
Merge PR #19957 into master

* refs/pull/19957/head:
client: fixup parallel calls to ceph_ll_lookup_inode() in NFS FASL

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
7 years agoMerge PR #20336 into master
Patrick Donnelly [Tue, 13 Feb 2018 19:36:11 +0000 (11:36 -0800)]
Merge PR #20336 into master

* refs/pull/20336/head:
client: re-use free snap tag

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #20373 into master
Patrick Donnelly [Tue, 13 Feb 2018 19:36:04 +0000 (11:36 -0800)]
Merge PR #20373 into master

* refs/pull/20373/head:
client: clamp I/O sizes to INT_MAX when we can't return larger values
test: new testcase for ceph_ll_readv and ceph_ll_writev
client: hook up ceph_ll_readv and ceph_ll_writev
client: type safety cleanup for _read and _write codepaths

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge PR #20386 into master
Patrick Donnelly [Tue, 13 Feb 2018 19:35:57 +0000 (11:35 -0800)]
Merge PR #20386 into master

* refs/pull/20386/head:
mds: optimize getattr file size

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa/cephfs: Add tests to validate scrub functionality
Douglas Fuller [Wed, 24 Jan 2018 16:11:40 +0000 (11:11 -0500)]
qa/cephfs: Add tests to validate scrub functionality

Add tests to ensure the scrub operation is not adversly affected
by certain metadata pathologies.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agoMgrStatMonitor: fix formatting of pending_digest 20426/head
Patrick Donnelly [Tue, 13 Feb 2018 18:22:01 +0000 (10:22 -0800)]
MgrStatMonitor: fix formatting of pending_digest

Fixes: http://tracker.ceph.com/issues/22991
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #20147 from smithfarm/wip-15904
Gregory Farnum [Tue, 13 Feb 2018 17:07:24 +0000 (09:07 -0800)]
Merge pull request #20147 from smithfarm/wip-15904

 tools: rados: make -f be --format for consistency with ceph tool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #20422 from cbodley/wip-check-cls-rgw
Kefu Chai [Tue, 13 Feb 2018 16:35:14 +0000 (00:35 +0800)]
Merge pull request #20422 from cbodley/wip-check-cls-rgw

cmake: 'make check' builds radosgw and its cls dependencies

Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: 'make check' builds radosgw and its cls dependencies 20422/head
Casey Bodley [Tue, 13 Feb 2018 15:32:11 +0000 (10:32 -0500)]
cmake: 'make check' builds radosgw and its cls dependencies

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agolibrbd: flush journal commit position after stopping replay
Jason Dillaman [Mon, 12 Feb 2018 22:50:01 +0000 (17:50 -0500)]
librbd: flush journal commit position after stopping replay

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd: disable clone v2 for negative test cases 20406/head
Jason Dillaman [Mon, 12 Feb 2018 20:02:42 +0000 (15:02 -0500)]
test/librbd: disable clone v2 for negative test cases

Fixes: http://tracker.ceph.com/issues/22979
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: don't clear CLONE_CHILD op feature if still a child
Jason Dillaman [Mon, 12 Feb 2018 20:01:28 +0000 (15:01 -0500)]
cls/rbd: don't clear CLONE_CHILD op feature if still a child

After removing the last snapshot linked to a parent image,
don't clear the CLONE_CHILD op feature bit if the image HEAD
is still linked to the parent.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd: Fix assert when checking missing version 20410/head
David Zafman [Tue, 13 Feb 2018 00:57:02 +0000 (16:57 -0800)]
osd: Fix assert when checking missing version

Fixes: http://tracker.ceph.com/issues/21218
Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agotest/admin_socket_output: better error reporting 20409/head
Brad Hubbard [Tue, 13 Feb 2018 00:22:53 +0000 (10:22 +1000)]
test/admin_socket_output: better error reporting

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #19939 from liewegas/wip-osd-new-class
Sage Weil [Mon, 12 Feb 2018 17:17:14 +0000 (11:17 -0600)]
Merge pull request #19939 from liewegas/wip-osd-new-class

mon,osd: do not use crush_device_class file to initalize class for new osds

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20363 from dongbula/e-rados-get-put-command
Gregory Farnum [Mon, 12 Feb 2018 16:56:56 +0000 (08:56 -0800)]
Merge pull request #20363 from dongbula/e-rados-get-put-command

make rados get/put/append command help txt clear

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoclient: clamp I/O sizes to INT_MAX when we can't return larger values 20373/head
Jeff Layton [Fri, 9 Feb 2018 12:39:56 +0000 (07:39 -0500)]
client: clamp I/O sizes to INT_MAX when we can't return larger values

We have several API functions that allow the caller to request I/Os
larger than INT_MAX bytes, but that return an int. Ensure that we don't
try to do more I/O than we can represent in the return value.

Tracker: http://tracker.ceph.com/issues/22948
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agotest: new testcase for ceph_ll_readv and ceph_ll_writev
Jeff Layton [Wed, 7 Feb 2018 20:59:47 +0000 (15:59 -0500)]
test: new testcase for ceph_ll_readv and ceph_ll_writev

Just copy the PreadvPwritev test and alter accordingly.

Tracker: http://tracker.ceph.com/issues/22948
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoclient: hook up ceph_ll_readv and ceph_ll_writev
Jeff Layton [Wed, 7 Feb 2018 14:57:47 +0000 (09:57 -0500)]
client: hook up ceph_ll_readv and ceph_ll_writev

Break the core of _preadv_pwritev out into a function that takes a Fh.
Make _preadv_pwritev into a wrapper around that.

Then add in plumbing for ceph_ll_readv and ceph_ll_writev.

Tracker: http://tracker.ceph.com/issues/22948
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoclient: type safety cleanup for _read and _write codepaths
Jeff Layton [Mon, 12 Feb 2018 12:17:51 +0000 (07:17 -0500)]
client: type safety cleanup for _read and _write codepaths

In the read codepath, bl->length() returns an unsigned value, and that
could end up looking negative when cast to int. On the write side,
totalwritten is a uint64_t, which could look negative when cast to int.

Have the underlying layers pass back an int64_t and convert them to
int at a higher level. This prepares the underlying infrastructure for
ceph_ll_readv and ceph_ll_writev support.

Tracker: http://tracker.ceph.com/issues/22948
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agotools/rados: make rados get/put/append command help txt clearer 20363/head
lvshuhua [Thu, 8 Feb 2018 11:39:18 +0000 (19:39 +0800)]
tools/rados: make rados get/put/append command help txt clearer

Fixes: http://tracker.ceph.com/issues/22958
Signed-off-by: lvshuhua <lvshuhua@cmss.chinamobile.com>
7 years agoMerge pull request #20392 from adamemerson/wip-clangtastic-voyage
Kefu Chai [Mon, 12 Feb 2018 03:19:39 +0000 (11:19 +0800)]
Merge pull request #20392 from adamemerson/wip-clangtastic-voyage

cmake, test/fs, client: fix build with clang

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20379 from tchaikov/wip-test-fix-freebsd
Kefu Chai [Mon, 12 Feb 2018 03:17:22 +0000 (11:17 +0800)]
Merge pull request #20379 from tchaikov/wip-test-fix-freebsd

test/librados: s/invoke_result_t/result_of_t/

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #20360 from ifed01/wip-ifed-extents-cleanup
Kefu Chai [Mon, 12 Feb 2018 03:16:44 +0000 (11:16 +0800)]
Merge pull request #20360 from ifed01/wip-ifed-extents-cleanup

os/bluestore: cleanup around ExtentList, AllocExtent and bluestore_extent_t classes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20320 from rzarzynski/wip-common-md_config_cacher_t
Kefu Chai [Mon, 12 Feb 2018 03:15:37 +0000 (11:15 +0800)]
Merge pull request #20320 from rzarzynski/wip-common-md_config_cacher_t

common: introduce md_config_cacher_t

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20198 from wido/zabbix-health-checks
Kefu Chai [Mon, 12 Feb 2018 03:14:41 +0000 (11:14 +0800)]
Merge pull request #20198 from wido/zabbix-health-checks

mgr/zabbix: Implement health checks

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/tasks/mgr: correct the log message 20362/head
Kefu Chai [Sun, 11 Feb 2018 05:52:53 +0000 (13:52 +0800)]
qa/tasks/mgr: correct the log message

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agopybind/mgr/dashboard: various py3 fixes
Kefu Chai [Sun, 11 Feb 2018 03:46:38 +0000 (11:46 +0800)]
pybind/mgr/dashboard: various py3 fixes

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agovstart.sh: add comma in DASH_URLS and RESTFUL_URLS
Kefu Chai [Sun, 11 Feb 2018 03:46:25 +0000 (11:46 +0800)]
vstart.sh: add comma in DASH_URLS and RESTFUL_URLS

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomgr: import absolute_import to enforce absolute_import
Kefu Chai [Fri, 9 Feb 2018 10:10:19 +0000 (18:10 +0800)]
mgr: import absolute_import to enforce absolute_import

to make sure new "import" statements in future in these files do not
assume relative import.

Signed-off-by: Kefu Chai <kchai@redhat.com>