Commit Graph

68665 Commits

Author SHA1 Message Date
Sage Weil
1699bf7b71 common/hobject: eliminate wonky compartors
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-11 10:45:16 -05:00
Sage Weil
43244da571 common/hobject: remove cmp_* comparators; add normal operators
Fix up callers.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-11 10:45:16 -05:00
Sage Weil
e8c55fe157 os: remove nibblewise sort order support
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-11 10:45:16 -05:00
Sage Weil
ea8b17035e osd: shutdown if sortbitwise flag is ever cleared
Note we do this only in activate_map so that we can (while booting)
skip past maps that don't have it set.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-11 10:45:16 -05:00
Ilya Dryomov
eb8d3372e8 Merge pull request #13369 from idryomov/wip-doc-kernel-vers
doc: kernel client os-recommendations update

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-11 16:01:02 +01:00
Jason Dillaman
e95fe0dfad Merge pull request #13229 from trociny/wip-18335
rbd-nbd: check /sys/block/nbdX/size to ensure kernel mapped correctly

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-11 09:29:23 -05:00
Willem Jan Withagen
299b7d06ac init-ceph.in: Make init-ceph work under FreeBSD for init-system
-  FreeBSD find does not have printf option
 -  use the packaged getopt in /usr/local
 -  Only apply user-facts when user ceph is available

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-02-11 13:26:58 +01:00
Kefu Chai
54354e597e Merge pull request #13292 from tchaikov/wip-script-sepia-bt-support-xenial
script/sepia_bt.sh: support xenial

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-02-11 12:22:34 +08:00
xie xingguo
ad304a7d8e osdc/Objecter: fix possible OSDSession leak on wrong connection
This is introduced by the newly added backoff logic.
Not sure if it will really happen, but just in case.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-02-11 11:01:15 +08:00
Sage Weil
d4db8e04dd Merge pull request #12342 from liewegas/wip-backoff
osd,osdc: pg and osd-based backoff

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-02-10 19:47:49 -06:00
Willem Jan Withagen
07e0efe48d Affiliation updates
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-02-11 01:55:53 +01:00
Sage Weil
46ade145a8 doc/dev/rados-client-protocol: describe some of rados protocol, including backoffs
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 18:55:59 -05:00
Sage Weil
105e9d4234 qa/suites/rados/thrash: vary backoff settings
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 18:55:58 -05:00
Sage Weil
1d1e990b7b osd/PrimaryLogPG: backoffs on individual objects
Do these midway down do_op.  Reorder the scrub waitlist after the
degraded and unreadable waitlists.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 18:55:58 -05:00
Sage Weil
b8e1c05ed9 osdc/Objecter: respect backoffs
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 18:55:58 -05:00
Sage Weil
a3d50f87d8 osd/PrimaryLogPG: PG-wide backoffs
Issue at top of do_request.  Release on activation or peering
interval change.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 18:55:58 -05:00
Sage Weil
32afacb32f osd: dispatch OSDBackoff messages into PG workqueue
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 18:55:55 -05:00
Sage Weil
9cef8e4e4a osd: split backoffs on PG split
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 17:59:50 -05:00
Sage Weil
cefb43dd14 osd: add pg helpers for managing backoffs
Link Backoff into Session, PG.  Tear them down on session
reset.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 17:59:50 -05:00
Sage Weil
8721deae30 include/ceph_features: RADOS_BACKOFF feature bit
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 17:59:50 -05:00
Sage Weil
5ecafc395a osdc/Objecter: fix typo
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 17:59:50 -05:00
Sage Weil
304bb1fe40 common/hobject: use hash field for hash<>
No reason to waste CPU recalculating a hash value!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 17:59:50 -05:00
Sage Weil
8da82431f6 osd: add MOSDBackoff message type
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 17:59:50 -05:00
Sage Weil
a0d2011787 osd: move Session class out of OSD
Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 17:59:50 -05:00
Sage Weil
070f77cc07 osdc/Objecter: attach OSDSession to Connection
This lets us avoid an rbtree lookup.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-02-10 17:59:50 -05:00
Josh Durgin
f75e5c99b1 osd: clarify REQUIRE_LUMINOUS error message
This should be visible at the default log level, so users have some
hope of figuring out the problem.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2017-02-10 14:27:18 -08:00
John Spray
0eb0abae63 doc: ref cephfs docs from os-recommendations
...instead of having potentially conflicting kernel
version information.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-02-10 21:24:08 +01:00
Ilya Dryomov
09ce8867e8 doc: update krbd kernel recommendations
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-02-10 21:24:08 +01:00
Kefu Chai
87bdeb23aa Merge pull request #13249 from liewegas/wip-mon-smooth
mon: smooth io/recovery stats over longer period

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-11 04:02:48 +08:00
Kefu Chai
108f2e20a8 Merge pull request #13264 from tchaikov/wip-print-failed-test-name
qa/workunits/rados/test.sh: print test name when it fails

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-02-11 03:57:45 +08:00
Kefu Chai
d52918779a Merge pull request #13362 from adamemerson/wip-oh-yeah
test: Fix mismatched sign comparison in histogram test

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-02-11 03:56:31 +08:00
Samuel Just
6da3f9a5d2 Merge pull request #13344 from gregsfortytwo/wip-osd-discussion-docs
Wip osd discussion docs

Reviewed-by: Samuel Just <sjust@redhat.com>
2017-02-10 11:20:02 -08:00
Samuel Just
534ae8fe04 Merge pull request #13342 from athanatos/wip-17831-18583-18809
osd/: don't leak context for Blessed*Context or RecoveryQueueAsync

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-02-10 11:18:02 -08:00
Adam C. Emerson
ae43b774a4 test: Fix mismatched sign comparison in histogram test
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-02-10 13:50:58 -05:00
Ken Dreyer
0be7a9ae4e doc: improve firewalld instructions
firewalld in RHEL 7.3 contains service definitions for ceph's ports, so
we can simply use "--add-service=ceph-mon" or "--add-service=ceph"
rather than having to remember specific port numbers.

Break out two examples for both MONs and OSDs/MDSs.

Add the "firewall-cmd --reload" step to ensure the --permanent configs
take effect immediately.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-02-10 11:08:28 -07:00
John Spray
880cbf09aa Merge pull request #13137 from jcsp/wip-18661
qa: fix race in Mount.open_background

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-02-10 17:48:05 +00:00
John Spray
a3fd3f225c Merge pull request #13099 from jcsp/wip-18663
qa/tasks: force umount during kclient teardown
2017-02-10 17:42:37 +00:00
Sage Weil
6470a90034 Merge pull request #13281 from theanalyst/release/v12.0.0
doc: v12.0.0 release notes

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-10 10:57:27 -06:00
Sage Weil
411d488823 Merge pull request #13302 from YankunLi/lyk_clean_code
rgw: clean redundant code

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-10 10:53:14 -06:00
Sage Weil
edebfed48e Merge pull request #13304 from majianpeng/async-tracing
msg/async: cleanup code.

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-02-10 10:52:45 -06:00
Sage Weil
e9b3f16ade Merge pull request #13329 from Adirl/fix_febe
msg: Fix calls to Messenger::create with new parameter

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-02-10 10:48:58 -06:00
Sage Weil
602278dc25 Merge pull request #13351 from tchaikov/wip-init-ceph-newline
init-ceph: print trailing n in "status" output

Reviewed-by: Nathan Cutler <nculter@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-10 10:40:36 -06:00
Sage Weil
7c43f5e7e2 Merge pull request #13356 from rubenk/rgw-docs-fix-typo
doc: Fix typo and grammar in RGW config reference

Reviewed-by: Sage Weil <sage@redhat.com>
2017-02-10 10:38:09 -06:00
Kefu Chai
787f6ac699 qa/workunits/rados/test.sh: print test name when it fails
we have

2017-02-04T16:15:46.090 INFO:tasks.workunit.client.0.mira032.stdout:error in 22088
2017-02-04T16:15:46.092 INFO:tasks.workunit.client.0.mira032.stderr:bash: line 1: 22092 Alarm clock             ceph_test_rados_api_aio 2>&1
2017-02-04T16:15:46.096 INFO:tasks.workunit.client.0.mira032.stderr:     22093 Done                    | tee ceph_test_rados_api_aio.log
2017-02-04T16:15:46.099 INFO:tasks.workunit.client.0.mira032.stderr:     22094 Done                    | sed "s/^/                  api_aio: /"
2017-02-04T16:15:46.102 INFO:tasks.workunit.client.0.mira032.stderr:+

if a unittest in rados/test.sh fails in teuthology.log, but it would
be desirable to have the failed test name in the line of "error in
22088".

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-02-10 23:54:29 +08:00
Jason Dillaman
697416b286 Merge pull request #13258 from trociny/wip-18819
common: possible lockdep false alarm for ThreadPool lock

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-10 10:17:23 -05:00
Jason Dillaman
26672a3497 Merge pull request #13287 from guihecheng/rbd-fix
librbd: fix segfault on EOPNOTSUPP returned while fetching snapshot timestamp

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-10 09:21:47 -05:00
Ruben Kerkhof
3a1c7b19df doc: Fix typo and grammar in RGW config reference
Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
2017-02-10 15:07:38 +01:00
Jason Dillaman
9a3c4d0511 Merge pull request #13322 from ceph/wip-include-workqueue
librbd: Include WorkQueue.h since we use it

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-02-10 08:58:38 -05:00
Zhiqiang Wang
1842a910cc osd: fix the setting of soid in sub_op_push
In the case of recovery pull using sub op, and if the prep push on
remote peers fail for some reasons, recovery_info.soid is not set
in prep_push_op_blank. Use it on the primary would lead to an
assertion failure.

Signed-off-by: Zhiqiang Wang <zhiqiang@xsky.com>
2017-02-10 17:52:44 +08:00
Kefu Chai
68ab318944 init-ceph: print trailing n in "status" output
the version command is handled by HelpHook, which does not print newline
at the end of the returned JSON. so the output of "status" subcommand
looks like:

=== osd.1 ===
osd.1: running {"version":"Development"}=== osd.2 ===
osd.2: not running.

with this change, a newline is added to the end of version.

also use the "daemon" subcommand to talk to the asok, let the "ceph" cli
to figure out the asok path.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-02-10 17:42:55 +08:00