Commit Graph

69186 Commits

Author SHA1 Message Date
Sage Weil
993179870e osd/osd_internal_types: wake snaptrimmer on put_read lock, too
The snaptrimmer can block taking a write lock, which might happen due to
a conficting EC read.  When the EC read completes, we need to wake up the
snaptrimmer.

Fixes: http://tracker.ceph.com/issues/19131
Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-02 15:03:57 -06:00
Jason Dillaman
870bc38823 Merge pull request #13571 from trociny/wip-18784
rbd-mirror A/A: leader should track up/down rbd-mirror instances

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-03-02 12:03:25 -05:00
Kefu Chai
86f0d93f55 Merge pull request #13746 from tahia-khan/wip-doc-quick-ceph-deploy
doc: deletes duplicated word and clarifies an example

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-03 00:13:57 +08:00
Sage Weil
5fdddd268e Merge pull request #13689 from Liuchang0812/wip-19107-cleanup-confutil
common: use ref to avoid unnecessary memory copy

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-02 10:07:30 -06:00
Sage Weil
50d215dafa Merge pull request #13739 from Liuchang0812/fix-unittest-hostname
test: unittest_hostname compile error on freebsd

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-03-02 10:05:21 -06:00
Sage Weil
d22b481391 Merge pull request #13693 from Liuchang0812/wip-add-override-in-mon-headers
mon: add override in headers

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-02 10:04:04 -06:00
Mykola Golub
a08af6cb1c Merge pull request #13701 from dillaman/wip-19010
librbd: simplify image open/close semantics

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-03-02 17:42:54 +02:00
liuchang0812
d873e24833 common: use ref to avoid unnecessary memory copy
Fixes: http://tracker.ceph.com/issues/19107

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-03-02 21:58:01 +08:00
Tahia Khan
7a0ab204aa doc: deletes duplicated word and clarifies an example
Signed-off-by: Tahia Khan <tahia.khan@gmail.com>
2017-03-02 08:44:53 -05:00
Mykola Golub
2ec5806c8c Merge pull request #13679 from dillaman/wip-librbd-image-cache-clip
librbd: image-extent cache needs to clip out-of-bounds read buffers

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-03-02 15:01:35 +02:00
liuchang0812
2199315c40 mon: add override in headers
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-03-02 20:46:26 +08:00
Kefu Chai
a15e5045ff Merge pull request #13427 from ly798/update-info
mailmap: Liu Yang affiliation

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-03-02 17:00:48 +08:00
Haomai Wang
73fdc579b5 Merge pull request #13738 from yuyuyu101/wip-fix-ib
msg/async/rdma: fix potential racing connection usage

Reviewed-by: Adir lev <adirl@mellanox.com>
2017-03-02 15:52:03 +08:00
Haomai Wang
2ce11e1872 Merge pull request #13655 from Adirl/ulimit
msg/async/rdma: check ulimit

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-02 15:02:21 +08:00
Sarit Zubakov
750bd5e7df msg/async/rdma: check ulimit
On RDMA, memlock should be unlimited. If it is not then
warn the user

issue: 973654

Change-Id: If1e07722aaca9df88714828ca3f7398a2504e262
Signed-off-by: Sarit Zubakov <saritz@mellanox.com>
Signed-off-by: Adir Lev <adirl@mellanox.com>
2017-03-02 08:59:35 +02:00
Haomai Wang
911fbf30a0 Merge pull request #13510 from yuyuyu101/wip-rdma-buffer-size
common/config_opts: improve rdma buffer size to 128k
2017-03-02 14:47:01 +08:00
liuchang0812
efe027dcb2 test: unittest_hostname compile error on freebsd
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-03-02 14:29:57 +08:00
Kefu Chai
d34df3183c Merge pull request #13713 from drunkard/master
doc: misc minor fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-02 14:16:48 +08:00
Haomai Wang
f7c6bffdec msg/async/rdma: fix incorrect method name
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-03-02 11:53:13 +08:00
Haomai Wang
4323ec25c4 msg/async/rdma: keep qp_conns lock to prevent connection alive
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-03-02 11:44:59 +08:00
Haomai Wang
97e0486979 msg/async/rdma: remove unused variables
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-03-02 11:41:52 +08:00
Haomai Wang
595f945cbd Merge pull request #13525 from yuyuyu101/wip-infiniband-fork
msg/async/rdma: make Infiniband can be forkable
2017-03-02 11:36:51 +08:00
Haomai Wang
522555070b msg/async/rdma: restart Infiniband resources to handle fork properly
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-03-02 11:36:12 +08:00
Haomai Wang
f1ae21ba2e Merge pull request #13666 from Adirl/chunk_size
msg/async/rdma: rename chunk_size to buffer_size

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-02 11:34:44 +08:00
Drunkard Zhang
230605eeeb doc: add missed commas
Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
2017-03-02 11:04:35 +08:00
Drunkard Zhang
d46fca02c4 doc: add mark for quoted content
Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
2017-03-02 11:04:35 +08:00
Drunkard Zhang
7088fe7718 doc: command typo fix, s/radosgw_admin/radosgw-admin
Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
2017-03-02 11:04:35 +08:00
Drunkard Zhang
590da965e7 doc: fix aiming of command ping
Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
2017-03-02 11:04:35 +08:00
Drunkard Zhang
bcb89fbe0d doc: hyperlink typo fix in dev/index
The doc compiler complains about this.

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
2017-03-02 11:04:35 +08:00
Haomai Wang
1a457beb3e Merge pull request #13680 from yuyuyu101/wip-tx-zerocopy
msg/async/rdma: refactor tx handle flow to get rid of locks

Reviewed-by: Adir lev <adirl@mellanox.com>
2017-03-02 10:00:16 +08:00
Zack Cerza
49aee217e0 Merge pull request #13706 from zmc/wip-openstack-volumes
qa/suites/ceph-deploy: Drop OpenStack volume count
2017-03-01 16:35:42 -07:00
Brad Hubbard
f321309c9c Merge pull request #13657 from badone/wip-rgw-setuid-no-coredump
rgw: set dumpable flag after setuid post ff0e521

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2017-03-02 08:54:37 +10:00
Sage Weil
8d179d2a14 Merge pull request #12998 from Liuchang0812/wip-11081
common: fix that $host always expands to localhost instead of actual hostname

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-01 16:30:24 -06:00
Sage Weil
ad5f382aa4 Merge pull request #13651 from rzarzynski/wip-bs-bitmap-nocct-in-entry
os/bluestore: remove CephContext* from BmapEntry.

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-01 16:29:09 -06:00
Sage Weil
86f2d14c96 Merge pull request #13662 from majianpeng/aio-memset
os/aio: remove the redundant memset(struct iocb)

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-01 16:28:38 -06:00
Sage Weil
7a1d9170d3 Merge pull request #13668 from songbaisen/m3
osd: the osd should not share map with others when it is in stopping state

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-01 16:27:24 -06:00
Sage Weil
f85cec8315 Merge pull request #13702 from liewegas/wip-trackedop-desc
common/TrackedOp: make TrackedOp::reset_desc() safe

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-03-01 16:26:54 -06:00
Zack Cerza
5fa96a60d7 qa/suites/ceph-deploy: Drop OpenStack volume count
Looks like we only need two per node, since there is only one OSD per
node, and ceph-deploy wants two disks per OSD to account for the
journal.

Signed-off-by: Zack Cerza <zack@redhat.com>
2017-03-01 15:15:49 -07:00
Mykola Golub
496cc53de9 Merge pull request #13729 from dillaman/wip-librbd-compile-warnings
librbd: eliminate compiler warnings

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-03-01 23:57:54 +02:00
Kefu Chai
2f157ae3ff Merge pull request #11995 from SUSE/wip_timeouts_ceph-create-keys
ceph-create-keys: Add connection timeouts.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-03-02 01:07:22 +08:00
Haomai Wang
f104300156 msg/async: must destruct ConnectedSocket in the his own thread
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-03-02 00:05:06 +08:00
Haomai Wang
bc580b0a61 msg/async/rdma: refactor RDMAStack to accelerate tx handle
previously Dispatcher thread will poll both rx and tx events, then dispatch
these events to RDMAWorker and RDMAConnectedSocketImpl.

Actually tx event handling is a lightweight task and we make these handling
inline now. rx event dispatching is still working.

Another change is adding tx cq to make event polling separated.

removing lots of codes yet.

Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-03-02 00:04:59 +08:00
Jason Dillaman
445cac55c0 librbd: eliminate compiler warnings
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-03-01 10:34:58 -05:00
Sage Weil
e6e83659f5 Merge pull request #13343 from liewegas/wip-faster-dispatch
osd: faster dispatch

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-03-01 09:21:55 -06:00
Radoslaw Zarzynski
d40a318f63 Merge pull request #13557 from prallabh/healthcheck
rgw: Correct the return codes for the health check feature

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-03-01 13:06:06 +01:00
Kefu Chai
fec59e80ef Merge pull request #13685 from tchaikov/wip-19097
mgr/MgrClient: use unique_ptr for MgrClient::session

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-01 18:12:14 +08:00
Haomai Wang
3955caca28 Merge pull request #13716 from Adirl/move_counter
msg/async/rdma: move active_queue_pairs perf counter dec to polling

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-01 15:54:17 +08:00
DanielBar-On
b364d24a57 msg/async/rdma: move active_queue_pairs perf counter dec to polling
removing dead qp's is actually done at polling. if polling is busy then
dead qp will not be removed and active_queue_pair counter is not correct.

issue: 992513

Change-Id: I825e813ce0632fd01f6d29adc87e0e33a2bc13d9
Signed-off-by: DanielBar-On <danielbo@mellanox.com>
2017-03-01 09:02:28 +02:00
root
4da2bf310f rgw: Correct the return codes for the health check feature
Fixes: http://tracker.ceph.com/issues/19025
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
2017-03-01 11:49:24 +05:30
Kefu Chai
27d4dcdf2d mon/MonClient: do not assert on auth in build_authorizer()
* there is chance that some connections is still trying to authorize
  itself after the MonClient is shut down. do not assert in this case,
  but it is a sign of bug, or bad shutdown sequence, so print a message to
  dout().
* do not use active_con->get_auth() as an alternative to `this->auth` if
  it is not available. because we promote the authorized conn in
  pending_cons as the active_con, and std::swap(active_conn->auth, this->auth)
  with the monc_lock. so there is no point to return active_con->get_auth(),
  as it's always null.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-03-01 10:11:12 +08:00