Commit Graph

71716 Commits

Author SHA1 Message Date
Jos Collin
861c2b0a1f test: c_write_operations.cc: silence warning from -Wsign-compare
The following warning appears during make:

ceph/src/googletest/googletest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 = int]’:
ceph/src/googletest/googletest/include/gtest/gtest.h:1421:23:   required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 = int; bool lhs_is_null_literal = false]’
ceph/src/test/librados/c_write_operations.cc:246:3:   required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (lhs == rhs) {
       ~~~~^~~~~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-05-01 11:55:24 +05:30
Jos Collin
74ca5837a3 test: silence warning from -Wsign-compare
The following warning appears during make:
In file included from ceph/src/test/librados/TestCase.h:9:0,
                 from ceph/src/test/librados/c_read_operations.cc:10:
ceph/src/googletest/googletest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = long unsigned int]’:
ceph/src/googletest/googletest/include/gtest/gtest.h:1421:23:   required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = long unsigned int; bool lhs_is_null_literal = false]’
ceph/src/test/librados/c_read_operations.cc:685:3:   required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (lhs == rhs) {
       ~~~~^~~~~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-05-01 09:07:48 +05:30
Kefu Chai
61a87c2c31 Merge pull request #14883 from tchaikov/wip-mgr-misc
mgr: Misc. bug fixes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-01 09:15:18 +08:00
Kefu Chai
45d03d8b55 Merge pull request #14878 from tchaikov/wip-19801
msg/simple: use my addr when setting sock priority

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-05-01 00:37:41 +08:00
Kefu Chai
f0aab98567 Merge pull request #14884 from tchaikov/wip-singleton-bluestore-tests
qa/suites/rados/singleton-bluestore: concat settings

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2017-05-01 00:13:38 +08:00
Kefu Chai
86c9137fa0 qa/suites/rados/singleton-bluestore: concat settings
otherwise the bluestore tests will fail with failures like

qa/workunits/cephtool/test.sh:1343: test_mon_osd_pool:  ceph osd pool set ec_test allow_ec_overwrites true
Error EINVAL: pool must only be stored on bluestore for scrubbing to work: osd.1 uses filestore
qa/workunits/cephtool/test.sh:1343: test_mon_osd_pool:  return 1

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-30 23:19:07 +08:00
Sage Weil
1a0cfc4dcb Merge pull request #14876 from liewegas/wip-bluestore-alloc
os/bluestore: roundoff bluefs allocs to bluefs_alloc_size

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-30 10:02:44 -05:00
Mykola Golub
8c2631c6f7 Merge pull request #14846 from dillaman/wip-rbd-cli
qa/workunits/rbd: increased trash deferment period

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-04-30 09:59:52 +03:00
John Spray
cd69c0416a mon: tweak mgr status text
Previously at startup we saw contradictory status
that had a "no active mgr" health message and then
a line that said "active: x".

Mitigate that a bit by indicating that a !available
active daemon is starting up.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-30 10:30:03 +08:00
John Spray
f79ae2504a mgr: fix message refcounting
Let's be consistent and push the m->put down into
the handle_(M<class>* m) functions the way
we do in the rest of the codebase.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-30 10:30:03 +08:00
John Spray
b1e5d492d6 mgr: fix deadlock in dispatch
Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-30 10:30:03 +08:00
John Spray
e7060410f7 mgr: get fresh maps on second load of Mgr
I think we got away with this when Client::init was
re-initialising the MonClient, but now that (bogus)
stuff isn't happening any more as Client doesn't
init/teardown monc/objecter itself.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-30 10:23:14 +08:00
John Spray
b4ed832ad3 vstart: fix mgr caps for MDS daemons
Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-30 10:21:30 +08:00
John Spray
9988a564d8 mgr: improve handle_command
Run the python module calls in a finisher so that
they don't block the daemonserver lock and so that
they can call back into mgr stuff if they need to.

Fix passing through commands to python modules, this
was giving EINVAL because only things with a MgrCommand
were getting let in.

Also fix get_command_descriptions, which was not
including the output of the formatter in the response.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-30 10:21:30 +08:00
John Spray
f68ad16e86 mon: don't enqueue periodic digest if one is already waiting
This was causing mons to send far more digest messages than
should have been sent.  Could have been responsible for
reports of very high CPU consumption on the mgr daemon.

Fixes: http://tracker.ceph.com/issues/18994
Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-30 10:21:29 +08:00
John Spray
64e36c5f80 common/finisher: use distinct lock names
Two Finishers should not be considered equivalent
for lockdep purposes: for example in mgr we have
our in-mgr Finisher, and then any finishers that
might be in libraries called by modules.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-30 10:21:29 +08:00
Kefu Chai
61e2ff4840 cmake: enable crosscompile of boost
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-30 02:01:33 +08:00
Kefu Chai
2b9c9f0a09 Merge pull request #14837 from wjwithagen/wip-wjw-freebsd-ceph-disk-mpath
ceph-disk: ceph-disk on FreeBSD should not use mpath-code

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-29 20:28:23 +08:00
Willem Jan Withagen
6727618e20 ceph-disk: ceph-disk on FreeBSD should not use mpath-code
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-04-29 12:48:50 +02:00
Kefu Chai
9658ff21f0 msg/async: refactor NetHandler::set_priority() to sync with msg/simple
so it's sync'ed with Pipe::set_socket_options()

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-29 13:38:57 +08:00
Kefu Chai
256b5b8069 msg/simple: use my addr when setting sock priority
actually we always fails to set ToS of listening
socket. 6f1037e22c reveals this issue.

Fixes: http://tracker.ceph.com/issues/19801
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-29 13:38:56 +08:00
Kefu Chai
6b34e18e34 Merge pull request #14872 from tchaikov/wip-19770
qa/erasure-code: override min_size to 2

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-29 12:39:23 +08:00
Kefu Chai
7424345c77 qa/erasure-code: override min_size to 2
so isa(k=2,m=1) can survive with 1 down OSD.

Fixes: http://tracker.ceph.com/issues/19770
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-29 10:43:17 +08:00
Kefu Chai
5f50298025 qa/tasks/rados: add optional setting of "min_size"
this setting only affects the newly created pool

Fixes: http://tracker.ceph.com/issues/19770
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-29 10:39:02 +08:00
Sage Weil
a9bd266df0 Merge pull request #14758 from xiexingguo/fix-can_mark_out-output
mon/OSDMonitor: fix output func name in can_mark_out

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-28 19:40:44 -05:00
Sage Weil
4c41537556 Merge pull request #14847 from smithfarm/wip-19797
tests: rados: move cephtool.yaml to new singleton/bluestore subsuite

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 19:39:12 -05:00
Sage Weil
b81caa017e Merge pull request #14849 from tchaikov/wip-19787
mon/OSDMonitor: do not alter the "created" epoch of a pg

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 19:38:30 -05:00
Sage Weil
1868c56f54 qa/suites/upgrade/kraken-x: limit fs matrix
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-28 17:51:33 -04:00
Sage Weil
92b6227fcf Merge pull request #14161 from jcsp/wip-mgr-legacy-mds
mgr: fix metadata handling from old MDS daemons

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 16:43:41 -05:00
Sage Weil
22ef06db64 Merge pull request #14706 from SUSE/wip-fix-19629
mgr: fix crash on set_config from python module with insufficient caps

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-28 16:41:27 -05:00
Sage Weil
11247bda59 Merge pull request #14855 from tchaikov/wip-increase-lec
mon/OSDMonitor: increase last_epoch_clean's lower bound if possible

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 16:40:30 -05:00
Sage Weil
827ac097db Merge pull request #14859 from liewegas/wip-nonnull
librados: fix rados_pool_list when buf is null

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-04-28 16:40:02 -05:00
Sage Weil
c394d6a080 Merge pull request #14860 from liupan1111/wip-fix-journal-sleep-performance
os/filestore: use new sleep strategy when io_submit gets EAGAIN.

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 16:39:09 -05:00
Sage Weil
aefd3373aa Merge pull request #14862 from tchaikov/wip-templatize-intarith
include/intarith: templatize ctz/clz/cbits helpers

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 16:38:51 -05:00
Sage Weil
eaacbdf6a6 Merge pull request #14863 from tchaikov/wip-kill-clang-warnings
osd/OSDMap: should update input param if osd dne

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-28 16:38:33 -05:00
Sage Weil
6648142207 Merge pull request #14864 from renhwztetecs/renhw-wip-mgr-key
mgr: add mgr allow * to client.admin

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 16:38:06 -05:00
J. Eric Ivancich
e80a884c3c Modify ceph cmake files to bring in dmclock library and tests. Include
dmclock tests in ceph-test for builds.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-04-28 17:13:56 -04:00
J. Eric Ivancich
06b037b68b Merge commit '0bca9fe991c7e1f623d2a387f54e63f18d3227eb' as 'src/dmclock' 2017-04-28 17:13:42 -04:00
J. Eric Ivancich
0bca9fe991 Squashed 'src/dmclock/' content from commit d6586d7
git-subtree-dir: src/dmclock
git-subtree-split: d6586d73679f4a1bdf335235d309e2352f0c76c6
2017-04-28 17:13:42 -04:00
Ramesh Chander
286e939153 os/bluestore: roundoff bluefs allocs to bluefs_alloc_size
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
2017-04-28 15:15:33 -04:00
Dan Mick
557b2a7870 qa/workunits/mon/test_mon_config_key.py: add test for list and dump
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-04-28 11:45:40 -07:00
Mykola Golub
6258e4ccea Merge pull request #14832 from dillaman/wip-rbd-mirror-deletion
rbd-mirror: image deletions should be handled by assigned instance

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-04-28 21:01:17 +03:00
Yehuda Sadeh
a5afab1086 Merge pull request #14842 from cbodley/wip-rgw-admin-suite
qa/rgw: fix assertions in radosgw_admin task

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-28 09:39:59 -07:00
Sage Weil
d0b2e606f7 Merge pull request #14826 from tchaikov/wip-prime-pg-temp
mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-04-28 11:27:22 -05:00
Sage Weil
e1065fed07 Merge pull request #14818 from tchaikov/wip-rocksdb
rocksdb: sync with upstream

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-28 11:26:54 -05:00
Yuri Weinstein
ebdce966de Merge pull request #14817 from TsaiJin/wip-set-boolean-variable-with-boolean-value
osd: ReplicatedBackend::prep_push() remove redundant variable assignments

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-28 08:38:06 -07:00
Yuri Weinstein
75c1818f1e Merge pull request #14835 from tchaikov/wip-19743
mgr: do shutdown using finisher so we can do it in the right order

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 08:34:19 -07:00
Yuri Weinstein
5f6db0e81a Merge pull request #14838 from liewegas/wip-mgr-dirs
debian/ceph-base.dirs: create bootstrap-mgr dirs

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-04-28 08:32:52 -07:00
Sage Weil
e3998f0e30 osd/PG: fix upgrade()
We need to update the infover_key on any upgrade.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-28 11:32:17 -04:00
Sage Weil
993e2d5fac osd/osd_types: encode all_participants for pi_compact
The all_participants is only updated on add_interval and
cannot be rebuilt from the intervals vector alone since
we only keep the smallset subset of peers to probe that
we need.  And it wasn't being encoded/decoded.  Or
dumped.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-28 11:32:17 -04:00