Jason Dillaman
4939ff707b
librbd: added trash_get API method to retrieve image status
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-05-01 10:10:16 -04:00
Jason Dillaman
4b48b9fe68
librbd: extended parent info API to retrieve parent id
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-05-01 10:10:13 -04:00
Jason Dillaman
e33c7a7d16
librbd: get_parent_info should return cached parent name
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-05-01 09:06:22 -04:00
Sage Weil
1e0162fecc
Merge pull request #14887 from liewegas/wip-kraken-x
...
qa/suites/upgrade/kraken-x: misc fixes
2017-05-01 06:55:30 -05:00
Sage Weil
feb532c6d6
Merge pull request #14890 from xiexingguo/wip-fix-bluestore-typo
...
os/bluestore: fix typo(s/trasnaction/transaction/)
2017-05-01 06:43:53 -05:00
xie xingguo
42a9930aef
os/bluestore: fix typo(s/trasnaction/transaction/)
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-05-01 15:32:59 +08:00
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
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
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
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
Kefu Chai
7b676f4f0f
Merge pull request #14384 from hrchu/radosgw-admin-key
...
doc: rgw: Rewrite the key management
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-28 23:32:16 +08:00
Sage Weil
d063c3dc73
qa/suites/upgrade/kraken-x/stress-split-erasure-code: fix
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-28 11:14:45 -04:00
Sage Weil
79f95bc65f
qa/suites/upgrade/kraken-x/parallel: fix
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-28 11:13:50 -04:00