Commit Graph

73551 Commits

Author SHA1 Message Date
Sage Weil
c011314b77 Merge pull request #15516 from javacruft/i386-cmake-fixes
cmake: misc fixes for build on i386

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-07 16:00:10 -05:00
Sage Weil
91c5af152e Merge pull request #15525 from wjwithagen/wip-wjw-clang-testosdmap
test: osd/TestOSDMap.cc: fix Clang complain about promotion

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-07 15:59:54 -05:00
Adam C. Emerson
7059b9b201 Merge pull request #15498 from adamemerson/wip-fixation
test: Fix narrowing conversion
rgw: Support certain archaic and antiquated distributions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-07 13:29:28 -04:00
Yuri Weinstein
17376dbff6 Merge pull request #15436 from liewegas/wip-versions
mon: {mon,osd,mds} {versions,count-metadata}

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-07 09:36:59 -07:00
Sage Weil
2cbcec1876 Merge pull request #15501 from liewegas/wip-blocked-is-err
mon/PGMap: call blocked requests ERR not WARN

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-07 11:17:39 -05:00
Sage Weil
7cacb701ad mon/PGMap: call requests blocked for 128x as long ERR not WARN
- rename the option (max -> warn)
- add an err_..._ratio multiplier
- switch to HEALTH_ERR once requests are blocked long enough
- make the error ratio high (default is 32*128s -> about an hour) so that
we don't trigger on a heavily loaded cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-07 12:16:58 -04:00
Adam C. Emerson
af8d9bdf07 rgw: Support certain archaic and antiquated distributions
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-06-07 12:11:40 -04:00
Adam C. Emerson
42fb84b811 test: Fix narrowing conversion
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-06-07 11:37:43 -04:00
Sage Weil
99332b9afd Merge pull request #15531 from liewegas/wip-osd-pglog
osd: rename osd -> osd_pglog; include pglog-related bufferlists

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-07 09:48:57 -05:00
Sage Weil
85887a7a0a osd/osd_types: put pg_log_entry_t::extra_reqids in osd_pglog mempool
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-07 10:48:03 -04:00
Sage Weil
b322be3be5 osd: put pg_log_entry_t::snaps in osd_pglog mempool
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-07 10:48:03 -04:00
Sage Weil
b7f5261830 osd: map ObjectModDesc to osd_pglog pool
This can consume significant space for EC pools.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-07 10:48:03 -04:00
Sage Weil
5b3cfc0890 osd: move pglog to osd_pglog mempool
This actually everything in the osd mempool, so it's basically a rename.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-07 10:48:02 -04:00
Kefu Chai
8f5a5a9c12 Merge pull request #15413 from tchaikov/wip-rgw-boost-cleanup
rgw: drop asio/{yield,coroutine}.hpp replacements

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-07 22:34:42 +08:00
Sage Weil
b34507fbf1 Merge pull request #15434 from yuyuyu101/wip-lz4
compressor: add LZ4 support

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-07 09:07:45 -05:00
Sage Weil
136b1c1f98 Merge pull request #15512 from jcsp/wip-mgrmap-epoch
mon: don't prefix mgr summary with epoch number

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-07 09:05:58 -05:00
Sage Weil
fca1721247 Merge pull request #15437 from dachary/wip-bluestore
ceph-disk: add --filestore argument, default to --bluestore

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-07 09:02:29 -05:00
Sage Weil
8ccd0c79c2 Merge pull request #15547 from wjwithagen/wip-wjw-freebsd-get_device_by_fd
common/blkdev.cc: propagate get_device_by_fd to different OSes

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-07 08:43:08 -05:00
Sage Weil
f477191ab0 Merge pull request #15435 from liewegas/wip-bluestore-warning
os/bluestore: fix warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-06-07 08:41:41 -05:00
Sage Weil
94d17fbe5e Merge pull request #15371 from liewegas/wip-mon-client-features
mon: track features from connect clients, and use it to gate set-require-min-compat-client

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-07 08:31:46 -05:00
Willem Jan Withagen
6d83ae7de6 common/blkdev.cc: propagate get_device_by_fd to different OSes
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-06-07 11:21:57 +02:00
Kefu Chai
a88896ac51 Merge pull request #15530 from tchaikov/wip-jq-without-first
qa/workunits/ceph-helpers.sh: use syntax understood by jq 1.3

Reviewed-by: David Zafman <dzafman@redhat.com>
2017-06-07 16:44:54 +08:00
Kefu Chai
853ae30b15 Merge pull request #15423 from liewegas/wip-fix-indent
mon/FSCommand: fix indentation

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-07 13:09:45 +08:00
Kefu Chai
b55b464f39 Merge pull request #15497 from liewegas/wip-log-last
mon/LogMonitor: 'log last' command

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-07 12:30:06 +08:00
Kefu Chai
8904af1e81 Merge pull request #15522 from liewegas/wip-19901
ceph_test_rados_api_misc: fix LibRadosMiscConnectFailure.ConnectFailure retry

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-07 12:20:57 +08:00
Sage Weil
b172605060 mon/OSDMonitor: validate set-require-min-compat-client against connected clients
Prevent the user from setting a require_min_compat_client if a disallowed
client is currently connected to the mon cluster.  Instead, you'll get an
error like

Error EPERM: cannot set require_min_compat_client to luminous: 1 connected client(s) look like jewel (missing 0x800000000200000); add --yes-i-really-mean-it to do it anyway

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-06 23:11:31 -04:00
Sage Weil
4c00be3428 common: ceph_release_[from_]features
Map releases to client features (and back again).

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-06 23:11:30 -04:00
Sage Weil
c73eeb58bb mon: add 'features' command to show connected client features
for whole mon cluster

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-06 23:11:30 -04:00
Sage Weil
0e28e758a7 Merge pull request #15422 from liewegas/wip-osd-rotational
osd: hdd vs ssd defaults for osd op thread pool

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-06 22:09:46 -05:00
Sage Weil
bdbf7dcea4 Merge pull request #15517 from liewegas/wip-20197
qa/suites/rados/upgrade: restart mds
2017-06-06 22:07:32 -05:00
Sage Weil
c582c945f3 Merge pull request #15523 from ceph/wip-16674
selinux: Allow read on var_run_t

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-06 22:04:48 -05:00
Kefu Chai
a52445e3c8 qa/workunits/ceph-helpers.sh: use syntax understood by jq 1.3
trusty still ships jq 1.3 which does not offer "first". see
https://stedolan.github.io/jq/manual/v1.3/ .

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-07 09:32:21 +08:00
Jason Dillaman
7bda34ea3b Merge pull request #14745 from trociny/wip-18789
rbd-mirror: coordinate image syncs with leader

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-06-06 20:56:49 -04:00
Haomai Wang
c41ab152e9 Merge pull request #15243 from yuyuyu101/wip-20049
msg: don't set msgr addr when disabing client bind

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-06-07 08:32:53 +08:00
Yehuda Sadeh
7bd8773f7a Merge pull request #14117 from zhangsw/fix-rgw-getobjectmetadata-bug
rgw: return the version id in get object and object metadata request.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-06-06 17:18:39 -07:00
Josh Durgin
bc8c432a69 Merge pull request #15386 from ivancich/wip-add-readme-that-dmclock-is-a-subtree
doc: add README to dmclock subdir to inform developers it's a git subtree

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-06 15:48:04 -07:00
Yuri Weinstein
69af8fa26f Merge pull request #15392 from dillaman/wip-20049
msg: do not enable client-side binding by default

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-06-06 15:18:51 -07:00
Willem Jan Withagen
96f85585e5 test: osd/TestOSDMap.cc: fix Clang complain about promotion
/home/jenkins/workspace/ceph-freebsd/src/test/osd/TestOSDMap.cc:444:15: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'int' in initializer list [-Wc++11-narrowing]
    m.set(x, {i});
              ^
/home/jenkins/workspace/ceph-freebsd/src/test/osd/TestOSDMap.cc:444:15: note: insert an explicit cast to silence this issue
    m.set(x, {i});
              ^
              static_cast<int>( )
1 error generated.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-06-06 23:35:18 +02:00
Sage Weil
ba32343ed7 Merge pull request #15513 from Fabian-Gruenbichler/fixmgrdesc
debian: ceph-mgr: fix package description

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2017-06-06 15:31:22 -05:00
Sage Weil
c6742770a7 Merge pull request #15375 from ivancich/wip-fix-dmclock-testing
osd/dmclock/testing: reorganize testing, building now optional

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-06-06 15:27:07 -05:00
Sage Weil
e3276bc2e4 Merge pull request #15378 from Liuchang0812/print_ret_code_of_json_command
ceph.in: print return code when json_command failed

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-06 15:26:28 -05:00
Sage Weil
6144213997 Merge pull request #15496 from wjwithagen/wip-wjw-host-to-ceph-errno
core: include/types.h, introduce host_to_ceph_errno

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-06 15:26:15 -05:00
Sage Weil
4a8836779c Merge pull request #15500 from liewegas/wip-20135
pybind/ceph_argparse: fix empty string check
2017-06-06 15:25:37 -05:00
Sage Weil
4d2d608e54 Merge pull request #15502 from xiexingguo/wip-fix-overload-extents
os/bluestore: avoid overloading extents during reshard; atomic deferred_batch_ops

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-06 15:25:16 -05:00
Sage Weil
5d517f9761 qa/suites/rados/upgrade: restart mds
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-06 16:23:25 -04:00
Boris Ranto
899adbf55c selinux: Allow read on var_run_t
Fixes: http://tracker.ceph.com/issues/16674
Signed-off-by: Boris Ranto <branto@redhat.com>
2017-06-06 21:27:58 +02:00
Sage Weil
087dff80ca ceph_test_rados_api_misc: fix LibRadosMiscConnectFailure.ConnectFailure retry
Fixes: http://tracker.ceph.com/issues/19901
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-06 15:14:12 -04:00
J. Eric Ivancich
b3e677ab1f osd/dmclock/testing: reorganize testing, building now optional
Modify cmake files to take advantage or re-organization of dmclock's
cmake set-up, specifically not having dmclock's cmake files call
add_test. Remove dmclock tests from being dependencies on ceph's
"test" target. Make change so dmclock tests are not built unless
WITH_TESTS and WITH_DMCLOCK_TESTS are both set. This is so openSUSE
Leap will build correctly.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-06-06 15:02:01 -04:00
J. Eric Ivancich
963a803d20 Merge commit '5c612d7e32a07a01b3b97f9cf58f2a3cef0e2e73'
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-06-06 15:01:03 -04:00
J. Eric Ivancich
5c612d7e32 Squashed 'src/dmclock/' changes from d6586d7..64bcc6e
64bcc6e Remove FindGTest and FindBoost, which already exist in cmake required version 2.8.11 and later. Also clean up.
ed6dc60 Do some clean-up and remove memory leaks from tests and simulations.
360172a Allow RunEvery object to be ended before destruction via "join" member function.
135b5d0 Fix two bugs discovered by valgrind. Do some other code clean-up as well.
a26d29e Modify cmake files to match naming of cmake's upstream gtest and ceph's boost.
e23e63f Reorganize CMakeLists.txt files, so that projects that incorporate dmclock can control whether add_test is called. Now, add_test is called only at the top-level. Projects that incorporate dmclock can use add_subdirectory on subdirectories beneath the top-level to selective exactly what is included.

git-subtree-dir: src/dmclock
git-subtree-split: 64bcc6ea697c7e790ec4a4229d1bb1d492f9e803
2017-06-06 15:01:02 -04:00