]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agomsg/async/rdma: reduce number of rdma rx/tx buffers 13190/head
Adir Lev [Mon, 30 Jan 2017 14:27:30 +0000 (16:27 +0200)]
msg/async/rdma: reduce number of rdma rx/tx buffers

issue: none

Change-Id: Ied523fec3210af152508b102c48aff5633343ab4
Signed-off-by: Adir Lev <adirl@mellanox.com>
8 years agoMerge pull request #13186 from Adirl/fix_rdma_compile
Kefu Chai [Mon, 30 Jan 2017 12:19:11 +0000 (20:19 +0800)]
Merge pull request #13186 from Adirl/fix_rdma_compile

cmake: fix broken RDMA compilation after merge PR #12878

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13003 from Jing-Scott/dev/swift-container-acl-info
Radoslaw Zarzynski [Mon, 30 Jan 2017 11:58:56 +0000 (12:58 +0100)]
Merge pull request #13003 from Jing-Scott/dev/swift-container-acl-info

rgw: swift: the http referer acl in swift API should be shown

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #13005 from Jing-Scott/dev/swift-http-url-parse
Radoslaw Zarzynski [Mon, 30 Jan 2017 11:55:35 +0000 (12:55 +0100)]
Merge pull request #13005 from Jing-Scott/dev/swift-http-url-parse

rgw: swift: The http referer should be parsed to compare in swift API

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #12874 from Jing-Scott/dev/swift-ref
Radoslaw Zarzynski [Mon, 30 Jan 2017 11:44:21 +0000 (12:44 +0100)]
Merge pull request #12874 from Jing-Scott/dev/swift-ref

rgw: the swift container acl should support field .ref

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agocmake: fix broken RDMA compilation after merge PR #12878 13186/head
Oren Duer [Mon, 30 Jan 2017 09:58:03 +0000 (09:58 +0000)]
cmake: fix broken RDMA compilation after merge PR #12878

issue: 965984

Change-Id: I2e401acf204069d3907001d276c58d9fb4cd0d58
Signed-off-by: Oren Duer <oren@mellanox.com>
8 years agoMerge pull request #13142 from Adirl/remove_compilation_warning
Haomai Wang [Sat, 28 Jan 2017 07:52:17 +0000 (15:52 +0800)]
Merge pull request #13142 from Adirl/remove_compilation_warning

msg/async/rdma: Remove compilation warning

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #13057 from wido/issue-18635
Sage Weil [Fri, 27 Jan 2017 21:38:24 +0000 (15:38 -0600)]
Merge pull request #13057 from wido/issue-18635

systemd: Restart Mon after 10s in case of failure

Reviewd-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #13140 from liewegas/wip-bluestore-statfs
Sage Weil [Fri, 27 Jan 2017 21:37:25 +0000 (15:37 -0600)]
Merge pull request #13140 from liewegas/wip-bluestore-statfs

os/bluestore: fix statfs to not include DB partition in free space

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #13135 from liewegas/wip-kerneldevice-debug
Sage Weil [Fri, 27 Jan 2017 21:37:13 +0000 (15:37 -0600)]
Merge pull request #13135 from liewegas/wip-kerneldevice-debug

os/bluestore/KernelDevice: fix debug message

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #13124 from ukernel/wip-18675
John Spray [Fri, 27 Jan 2017 16:41:36 +0000 (17:41 +0100)]
Merge pull request #13124 from ukernel/wip-18675

client: remove request from session->requests when handling forward

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #13095 from ukernel/wip-18660
John Spray [Fri, 27 Jan 2017 16:40:46 +0000 (17:40 +0100)]
Merge pull request #13095 from ukernel/wip-18660

mds: skip fragment space check for replayed request

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #13052 from ukernel/wip-16768
John Spray [Fri, 27 Jan 2017 16:39:32 +0000 (17:39 +0100)]
Merge pull request #13052 from ukernel/wip-16768

mds: don't modify inode that is not projected

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #12973 from ukernel/wip-18578
John Spray [Fri, 27 Jan 2017 16:37:31 +0000 (17:37 +0100)]
Merge pull request #12973 from ukernel/wip-18578

mds: fix incorrect assertion in Server::_dir_is_nonempty()

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #12825 from stiopaa1/r11124_refuseToDoFsNew
John Spray [Fri, 27 Jan 2017 16:35:38 +0000 (17:35 +0100)]
Merge pull request #12825 from stiopaa1/r11124_refuseToDoFsNew

mon/MDSMonitor.cc:refuse fs new on pools with obj

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #12489 from gregsfortytwo/wip-fix-rename-bounds
John Spray [Fri, 27 Jan 2017 16:33:41 +0000 (17:33 +0100)]
Merge pull request #12489 from gregsfortytwo/wip-fix-rename-bounds

client: fix the cross-quota rename boundary check conditions

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #12440 from runsisi/wip-fix-fp-exception
John Spray [Fri, 27 Jan 2017 16:32:49 +0000 (17:32 +0100)]
Merge pull request #12440 from runsisi/wip-fix-fp-exception

include/fs_types: fix unsigned integer overflow

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13088 from jcsp/wip-16397-unpin
John Spray [Fri, 27 Jan 2017 14:39:41 +0000 (15:39 +0100)]
Merge pull request #13088 from jcsp/wip-16397-unpin

qa: unpin knfs from ubuntu

Reviewed-by: Jeff Layton <jlayton@redhat.com>
8 years agoMerge pull request #13148 from tchaikov/wip-18692
Dan Mick [Fri, 27 Jan 2017 03:43:34 +0000 (19:43 -0800)]
Merge pull request #13148 from tchaikov/wip-18692

packaging: install libceph-common.so* not libceph-common.so.*

Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agopackaging: install libceph-common.so* not libceph-common.so.* 13148/head
Kefu Chai [Fri, 27 Jan 2017 02:43:36 +0000 (10:43 +0800)]
packaging: install libceph-common.so* not libceph-common.so.*

Fixes: http://tracker.ceph.com/issues/18692
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13087 from athanatos/wip-17831-18583
Josh Durgin [Thu, 26 Jan 2017 23:50:53 +0000 (15:50 -0800)]
Merge pull request #13087 from athanatos/wip-17831-18583

osd/PrimaryLogPG::try_lock_for_read: give up if missing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #12934 from athanatos/wip-18529
Josh Durgin [Thu, 26 Jan 2017 23:14:45 +0000 (15:14 -0800)]
Merge pull request #12934 from athanatos/wip-18529

test/pybind/test_rados.py: tolerate TimedOut in test_ping_monitor

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13110 from dillaman/wip-18666
Mykola Golub [Thu, 26 Jan 2017 21:44:01 +0000 (23:44 +0200)]
Merge pull request #13110 from dillaman/wip-18666

librbd: prevent self-blacklisting during break lock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoradosgw/swift: clean up flush / newline behavior.
Marcus Watts [Wed, 11 Jan 2017 05:06:15 +0000 (00:06 -0500)]
radosgw/swift: clean up flush / newline behavior.

The current code emits a newline after swift errors, but fails
to account for it when it calculates 'content-length'.  This results in
some clients (go github.com/ncw/swift) producing complaints about the
unsolicited newline such as this,
Unsolicited response received on idle HTTP channel starting with "\n"; err=<nil>

This logic eliminates the newline on flush.  This makes the content length
calculation correct and eliminates the stray newline.

There was already existing separator logic in the rgw plain formatter
that can emit a newline at the correct point.  It had been checking
"len" to decide if previous data had been emitted, but that's reset to 0
by flush().  So, this logic adds a new per-instance variable to separately
track state that it emitted a previous item (and should emit a newline).

Fixes: http://tracker.ceph.com/issues/18473
Signed-off-by: Marcus Watts <mwatts@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agotest/pybind/test_rados.py: tolerate empty output from mon ping 12934/head
Samuel Just [Sat, 14 Jan 2017 00:14:46 +0000 (16:14 -0800)]
test/pybind/test_rados.py: tolerate empty output from mon ping

Fixes: http://tracker.ceph.com/issues/18529
Signed-off-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #13007 from Werkov/rgw-fix-tempurl-url-encoding-master
Yehuda Sadeh [Thu, 26 Jan 2017 19:34:38 +0000 (11:34 -0800)]
Merge pull request #13007 from Werkov/rgw-fix-tempurl-url-encoding-master

rgw: Use decoded URI when verifying TempURL

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoos/bluestore: fix statfs to not include DB partition in free space 13140/head
Sage Weil [Thu, 26 Jan 2017 19:22:53 +0000 (14:22 -0500)]
os/bluestore: fix statfs to not include DB partition in free space

If we report the DB space as vailable, ceph thinks the OSD can store more
data and will not mark the cluster as full as easily.  And in reality, we
can't actually store data in this space--only metadata.  Avoid the problem
by not reporting it as available.

Fixes: http://tracker.ceph.com/issues/18599
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agosync/rdma: Remove warning 13142/head
Sarit Zubakov [Mon, 16 Jan 2017 08:53:28 +0000 (08:53 +0000)]
sync/rdma: Remove warning

Fixed warning - of sending unsigned short int to %x

issue: 944710

Change-Id: I2820e8da77467a4a645d9653b4964e7a2198656b
Signed-off-by: Sarit Zubakov <saritz@mellanox.com>
8 years agoMerge pull request #12444 from oritwas/wip-rgw-fix-secondary_versioning
Yehuda Sadeh [Thu, 26 Jan 2017 18:49:41 +0000 (10:49 -0800)]
Merge pull request #12444 from oritwas/wip-rgw-fix-secondary_versioning

rgw: complete versioning enablement after sending it to meta master

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13074 from liewegas/wip-bluestore-crc-error
Sage Weil [Thu, 26 Jan 2017 17:21:15 +0000 (11:21 -0600)]
Merge pull request #13074 from liewegas/wip-bluestore-crc-error

os/bluestore: include logical object offset in crc error

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore/KernelDevice: fix debug message 13135/head
Sage Weil [Thu, 26 Jan 2017 16:02:06 +0000 (11:02 -0500)]
os/bluestore/KernelDevice: fix debug message

Not even sure why this compiles :/.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12878 from tchaikov/wip-cmake
Kefu Chai [Thu, 26 Jan 2017 15:59:36 +0000 (23:59 +0800)]
Merge pull request #12878 from tchaikov/wip-cmake

cmake: link ceph-{mgr,mon,mds,osd} against libcommon statically

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13122 from orendu/fix-rdma-compilation
Kefu Chai [Thu, 26 Jan 2017 11:23:09 +0000 (19:23 +0800)]
Merge pull request #13122 from orendu/fix-rdma-compilation

cmake: Fix broken async/rdma compilation since move to libceph-common

Reviewed-by: Adir Lev <adirl@mellanox.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Amir Vadai <amir@vadai.me>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13101 from Adirl/fix_mem_leak
Haomai Wang [Thu, 26 Jan 2017 10:25:54 +0000 (18:25 +0800)]
Merge pull request #13101 from Adirl/fix_mem_leak

msg/async/rdma: Fix memory leak of OSD

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agocmake: Fix broken async/rdma compilation since move to libceph-common 13122/head
Oren Duer [Thu, 26 Jan 2017 07:48:20 +0000 (07:48 +0000)]
cmake: Fix broken async/rdma compilation since move to libceph-common

Was broken since merge of pull request #12840

Signed-off-by: Oren Duer <oren@mellanox.com>
8 years agoclient: remove request from session->requests when handling forward 13124/head
Yan, Zheng [Thu, 26 Jan 2017 08:58:41 +0000 (16:58 +0800)]
client: remove request from session->requests when handling forward

Client::handle_client_request_forward() reset request->mds to -1,
it should also remove request from session->requests. Otherwise
Client::kick_requests_closed() get confused.

Fixes: http://tracker.ceph.com/issues/18675
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
8 years agoMerge pull request #13075 from tchaikov/wip-zstd
Kefu Chai [Thu, 26 Jan 2017 07:28:01 +0000 (15:28 +0800)]
Merge pull request #13075 from tchaikov/wip-zstd

compressor/zstd: add zstd compression plugin

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw: swift: The http referer should be parsed to compare in swift API 13005/head
Jing Wenjun [Thu, 19 Jan 2017 13:26:17 +0000 (21:26 +0800)]
rgw: swift: The http referer should be parsed to compare in swift API
The http referer should be parsed to compare with the url set on the container read acl. If we set .r:www.example.com on container read acl, we should parse the hostname 'www.example.com' of the http referer like 'http://www.example.com' from the http request.

Fixes: http://tracker.ceph.com/issues/18685
Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
8 years agolibrbd: prevent self-blacklisting during break lock 13110/head
Jason Dillaman [Wed, 25 Jan 2017 19:45:56 +0000 (14:45 -0500)]
librbd: prevent self-blacklisting during break lock

Fixes: http://tracker.ceph.com/issues/18666
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13086 from dillaman/wip-librbd-lock-init-race
Mykola Golub [Wed, 25 Jan 2017 17:08:47 +0000 (19:08 +0200)]
Merge pull request #13086 from dillaman/wip-librbd-lock-init-race

librbd: race initializing exclusive lock and configuring IO path

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agocompressor/zstd: add zstd compressor 13075/head
Sage Weil [Thu, 19 Jan 2017 18:57:33 +0000 (12:57 -0600)]
compressor/zstd: add zstd compressor

Build/link of zstd itself is maybe not ideal, but it works fine.

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoadd src/zstd submodule
Sage Weil [Tue, 20 Sep 2016 14:44:32 +0000 (09:44 -0500)]
add src/zstd submodule

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomsg/async/rdma: Fix memory leak of OSD 13101/head
Sarit Zubakov [Sun, 22 Jan 2017 14:25:32 +0000 (16:25 +0200)]
msg/async/rdma: Fix memory leak of OSD

We can delete qp only in RDMADispatcher::handle_async_event() which call
"erase_qpn" to enable deletion.

issue: 959004

Change-Id: Iab69cb365b37a09e9608d4b3c595e05278bbe021
Signed-off-by: Sarit Zubakov <saritz@mellanox.com>
8 years agoMerge pull request #13090 from dzafman/wip-18624
Kefu Chai [Wed, 25 Jan 2017 14:32:13 +0000 (22:32 +0800)]
Merge pull request #13090 from dzafman/wip-18624

Revert "PrimaryLogPG::failed_push: update missing as well"

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13096 from amirv/new_connect_arg
Haomai Wang [Wed, 25 Jan 2017 14:22:22 +0000 (22:22 +0800)]
Merge pull request #13096 from amirv/new_connect_arg

msg/RDMA: Fix broken compilation due to new argument in net.connect()

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #9348 from LiumxNL/fix-mksnap
Sage Weil [Wed, 25 Jan 2017 12:35:36 +0000 (06:35 -0600)]
Merge pull request #9348 from LiumxNL/fix-mksnap

mon/OSDMonitor: make snaps on tier pool should not be allowed

8 years agoMerge pull request #12937 from chendave/auth_method
Sage Weil [Wed, 25 Jan 2017 12:35:10 +0000 (06:35 -0600)]
Merge pull request #12937 from chendave/auth_method

auth: Enhancement for the supported auth methods

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12992 from tchaikov/wip-demangle-on-freebsd
Sage Weil [Wed, 25 Jan 2017 12:34:52 +0000 (06:34 -0600)]
Merge pull request #12992 from tchaikov/wip-demangle-on-freebsd

common/BackTrace: demangle on FreeBSD also

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #12620 from varadakari/wip-rocksdb-histogram
Sage Weil [Wed, 25 Jan 2017 12:34:24 +0000 (06:34 -0600)]
Merge pull request #12620 from varadakari/wip-rocksdb-histogram

os/bluestore: kvdb histogram

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #13031 from dzafman/wip-calc-stats
Sage Weil [Wed, 25 Jan 2017 12:33:48 +0000 (06:33 -0600)]
Merge pull request #13031 from dzafman/wip-calc-stats

osd: Calculate degraded and misplaced more accurately

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13032 from liewegas/wip-bluefs-append
Sage Weil [Wed, 25 Jan 2017 12:24:30 +0000 (06:24 -0600)]
Merge pull request #13032 from liewegas/wip-bluefs-append

os/bluestore/BlueFS: tune flushing of writes

Tested-by: Chagam, Anjaneya <anjaneya.chagam@intel.com>
8 years agoMerge pull request #13072 from wido/issue-18638
Sage Weil [Wed, 25 Jan 2017 12:22:41 +0000 (06:22 -0600)]
Merge pull request #13072 from wido/issue-18638

osd: Return correct osd_objectstore in OSD metadata

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #13018 from songbaisen/s11
Sage Weil [Wed, 25 Jan 2017 12:22:15 +0000 (06:22 -0600)]
Merge pull request #13018 from songbaisen/s11

global: we need to handle the init_on_startup return value when global_init.

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomsg/RDMA: Fix broken compilation due to new argument in net.connect() 13096/head
Amir Vadai [Wed, 25 Jan 2017 08:36:00 +0000 (10:36 +0200)]
msg/RDMA: Fix broken compilation due to new argument in net.connect()

Fixes: 6e4ed291afc3 ("msg: add ms_bind_before_connect to bind before connect")
Change-Id: Ia45f215b5d59dfc8545017518e5162404059829e
Signed-off-by: Amir Vadai <amir@vadai.me>
8 years agomds: don't purge strays when mds is in clientreplay state 13095/head
Yan, Zheng [Wed, 25 Jan 2017 07:28:23 +0000 (15:28 +0800)]
mds: don't purge strays when mds is in clientreplay state

MDS does not trim log when it's in clientreplay state. If mds hang
at clientreplay state (due to bug), purging strays can submit lots
of log events and create very large mds log.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
8 years agomds: skip fragment space check for replayed request
Yan, Zheng [Wed, 25 Jan 2017 03:03:45 +0000 (11:03 +0800)]
mds: skip fragment space check for replayed request

when handling replayed request, stray directory can be different
from the stray directory used by the original request. The fragment
space check for stray directory can fail.

Fixes: http://tracker.ceph.com/issues/18660
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
8 years agoRevert "PrimaryLogPG::failed_push: update missing as well" 13090/head
David Zafman [Wed, 25 Jan 2017 00:30:24 +0000 (16:30 -0800)]
Revert "PrimaryLogPG::failed_push: update missing as well"

This reverts commit dd48b972afde2dfa9ab1a6942c7961750222986d.

Fixes: http://tracker.ceph.com/issues/18624
Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agorgw: swift: the http referer acl in swift API should be shown 13003/head
Jing Wenjun [Thu, 19 Jan 2017 13:00:26 +0000 (21:00 +0800)]
rgw: swift: the http referer acl in swift API should be shown
The container acl about http referer set should be shown in container metadata dump.

Fixes: http://tracker.ceph.com/issues/18665
Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
8 years agoqa: unpin knfs from ubuntu 13088/head
John Spray [Tue, 24 Jan 2017 22:06:29 +0000 (22:06 +0000)]
qa: unpin knfs from ubuntu

We have an updated nfs-utils that is no longer
generating spurious selinux warnings on CentOS.

Fixes: http://tracker.ceph.com/issues/16397
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #12445 from pritha-srivastava/wip_glob_func
Adam C. Emerson [Tue, 24 Jan 2017 20:16:44 +0000 (15:16 -0500)]
Merge pull request #12445 from pritha-srivastava/wip_glob_func

rgw: Added a globbing method for AWS Policies.

8 years agoMerge pull request #13084 from linuxbox2/wip-librgw-parentref
Matt Benjamin [Tue, 24 Jan 2017 19:58:58 +0000 (14:58 -0500)]
Merge pull request #13084 from linuxbox2/wip-librgw-parentref

rgw_file:  interned RGWFileHandle objects need parent refs

8 years agoMerge pull request #13083 from dachary/wip-15653-crush-weights
Sage Weil [Tue, 24 Jan 2017 19:52:52 +0000 (13:52 -0600)]
Merge pull request #13083 from dachary/wip-15653-crush-weights

crush: verify weights is influenced by the number of replicas

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13076 from dillaman/wip-18617
Mykola Golub [Tue, 24 Jan 2017 19:32:13 +0000 (21:32 +0200)]
Merge pull request #13076 from dillaman/wip-18617

test: use librados API to retrieve config params

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12866 from dzafman/wip-18471
David Zafman [Tue, 24 Jan 2017 19:02:38 +0000 (11:02 -0800)]
Merge pull request #12866 from dzafman/wip-18471

qa/workunits/ceph-helpers: wait_for_clean() races with pg creation

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agorgw_file: interned RGWFileHandle objects need parent refs 13084/head
Matt Benjamin [Sat, 31 Dec 2016 04:30:16 +0000 (23:30 -0500)]
rgw_file:  interned RGWFileHandle objects need parent refs

RGW NFS fhcache/RGWFileHandle operators assume existence of the
full chain of parents from any object to the its fs_root--this is
a consequence of the weakly-connected namespace design goal, and
not a defect.

This change ensures the invariant by taking a parent ref when
objects are interned (when a parent ref is guaranteed).  Parent
refs are returned when objects are destroyed--essentially by the
invariant, such a ref must exist.

The extra ref is omitted when parent->is_root(), as that node is
not in the LRU cache.

Fixes: http://tracker.ceph.com/issues/18650
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #13038 from linuxbox2/wip-librgw-invalidate
Matt Benjamin [Tue, 24 Jan 2017 17:15:12 +0000 (12:15 -0500)]
Merge pull request #13038 from linuxbox2/wip-librgw-invalidate

rgw_file: add timed namespace invalidation

8 years agolibrbd: race initializing exclusive lock and configuring IO path 13086/head
Jason Dillaman [Tue, 24 Jan 2017 15:34:05 +0000 (10:34 -0500)]
librbd: race initializing exclusive lock and configuring IO path

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12916 from Liuchang0812/xmlformatter-fix
Kefu Chai [Tue, 24 Jan 2017 15:20:16 +0000 (23:20 +0800)]
Merge pull request #12916 from Liuchang0812/xmlformatter-fix

common/xmlformatter: turn on underscored and add unittest

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agolibrbd: improve debug logging for lock / watch state machines 13076/head
Jason Dillaman [Tue, 24 Jan 2017 14:48:43 +0000 (09:48 -0500)]
librbd: improve debug logging for lock / watch state machines

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agotest: use librados API to retrieve config params
Jason Dillaman [Tue, 24 Jan 2017 02:24:41 +0000 (21:24 -0500)]
test: use librados API to retrieve config params

The CephContext object is not ABI-stable, so it is necessary to
use the "conf_get" librados methods to safely retrieve a setting.

Fixes: http://tracker.ceph.com/issues/18617
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agocrush: verify weights is influenced by the number of replicas 13083/head
Loic Dachary [Tue, 24 Jan 2017 12:08:32 +0000 (13:08 +0100)]
crush: verify weights is influenced by the number of replicas

Refs: http://tracker.ceph.com/issues/15653

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agorgw_file: add timed namespace invalidation 13038/head
Matt Benjamin [Thu, 19 Jan 2017 23:14:30 +0000 (18:14 -0500)]
rgw_file: add timed namespace invalidation

With change, librgw/rgw_file consumers can provide an invalidation
callback, which is used by the library to invalidate directories
whose contents should be forgotten.

The existing RGWLib GC mechanism is being used to drive this.  New
configuration params have been added.  The main configurable is
rgw_nfs_namespace_expire_secs, the expire timeout.

Updated post Yehuda review.

Fixes: http://tracker.ceph.com/issues/18651
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #12956 from liuhongtong/wip-nvmedevice
Haomai Wang [Tue, 24 Jan 2017 10:07:05 +0000 (18:07 +0800)]
Merge pull request #12956 from liuhongtong/wip-nvmedevice

os/bluestore: fix NVMEDevice::open failure if serial number ends with a …

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Pan liu <liupan1111@gmail.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoosd: Return correct osd_objectstore in OSD metadata 13072/head
Wido den Hollander [Mon, 23 Jan 2017 20:06:05 +0000 (21:06 +0100)]
osd: Return correct osd_objectstore in OSD metadata

Do not simply read the configuration value as it might have changed
during OSD startup by reading the type from disk.

Fixes: http://tracker.ceph.com/issues/18638
Signed-off-by: Wido den Hollander <wido@42on.com>
8 years agoMerge pull request #13055 from optimistyzy/2017123_random_read
Haomai Wang [Tue, 24 Jan 2017 04:01:27 +0000 (12:01 +0800)]
Merge pull request #13055 from optimistyzy/2017123_random_read

os/bluestore/NVMEDevice.cc: fix the random read issue.

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoos/bluestore/NVMEDevice.cc: use aio_wake in both read and read_random 13055/head
optimistyzy [Mon, 23 Jan 2017 01:56:03 +0000 (09:56 +0800)]
os/bluestore/NVMEDevice.cc: use aio_wake in both read and read_random

There are some issues with random read, it seems that
we did not call aio_wake.

Signed-off-by: optimistyzy <optimistyzy@gmail.com>
8 years agoMerge pull request #12929 from wjwithagen/wip-wjw-empty-cluster_network
Sage Weil [Tue, 24 Jan 2017 03:16:21 +0000 (21:16 -0600)]
Merge pull request #12929 from wjwithagen/wip-wjw-empty-cluster_network

common/pick_address.cc: Copy public_netw to cluster_netw if cluster empty

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge branch 'master' into wip-wjw-empty-cluster_network 12929/head
Sage Weil [Tue, 24 Jan 2017 03:16:09 +0000 (21:16 -0600)]
Merge branch 'master' into wip-wjw-empty-cluster_network

8 years agoos/bluestore: include logical object offset in crc error message 13074/head
Sage Weil [Tue, 24 Jan 2017 00:51:06 +0000 (18:51 -0600)]
os/bluestore: include logical object offset in crc error message

This is more useful to the user.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12901 from yuyuyu101/wip-msgr-client-bind
Yuri Weinstein [Mon, 23 Jan 2017 23:00:26 +0000 (15:00 -0800)]
Merge pull request #12901 from yuyuyu101/wip-msgr-client-bind

msg: client bind

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13036 from SUSE/wip-michal-koutny
Nathan Cutler [Mon, 23 Jan 2017 21:25:34 +0000 (22:25 +0100)]
Merge pull request #13036 from SUSE/wip-michal-koutny

mailmap: Michal Koutny affiliation

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Michal Koutný <mkoutny@suse.com>
8 years agomon/MDSMonitor.cc:refuse fs new on pools with obj 12825/head
Michal Jarzabek [Sat, 7 Jan 2017 15:41:46 +0000 (15:41 +0000)]
mon/MDSMonitor.cc:refuse fs new on pools with obj

Fixes: http://tracker.ceph.com/issues/11124
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoMerge pull request #12326 from vshankar/wip-15028
Jason Dillaman [Mon, 23 Jan 2017 15:39:16 +0000 (10:39 -0500)]
Merge pull request #12326 from vshankar/wip-15028

librbd: create fewer empty objects during copyup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoos/bluestore/BlueFS: tolerate longer tail 13032/head
Sage Weil [Mon, 23 Jan 2017 15:24:40 +0000 (10:24 -0500)]
os/bluestore/BlueFS: tolerate longer tail

The important requirement here is that we have enough buffer to write the
whole page.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlueFS: increase size threshold before we flush (and generate io)
Sage Weil [Fri, 20 Jan 2017 18:59:56 +0000 (13:59 -0500)]
os/bluestore/BlueFS: increase size threshold before we flush (and generate io)

Having this too high means you might be more bursty. In practice,
though, the commit path is doing explicit syncs on small chunks
anyway.  And compaction work should probably stay reasonably chunky.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlueFS: preallocate larger write buffer
Sage Weil [Fri, 20 Jan 2017 18:57:42 +0000 (13:57 -0500)]
os/bluestore/BlueFS: preallocate larger write buffer

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agounittest_bit_alloc race fix
Ramesh Chander [Mon, 2 Jan 2017 08:01:55 +0000 (00:01 -0800)]
unittest_bit_alloc race fix

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13056 from optimistyzy/123_logic
Haomai Wang [Mon, 23 Jan 2017 14:44:07 +0000 (22:44 +0800)]
Merge pull request #13056 from optimistyzy/123_logic

NVMEDevice.cc: cleanup the logic in data_buf_next_sge

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12938 from LiumxNL/fix-process-osd-failure
Kefu Chai [Mon, 23 Jan 2017 12:07:35 +0000 (20:07 +0800)]
Merge pull request #12938 from LiumxNL/fix-process-osd-failure

mon/OSDMonitor: fix process osd failure

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #9419 from songbaisen/a4
Kefu Chai [Mon, 23 Jan 2017 11:43:35 +0000 (19:43 +0800)]
Merge pull request #9419 from songbaisen/a4

osdmaptool: show all the pg map to osds info

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12828 from donglinpeng/dlppull
Kefu Chai [Mon, 23 Jan 2017 11:42:14 +0000 (19:42 +0800)]
Merge pull request #12828 from donglinpeng/dlppull

common/buffer: close pipe fd if set nonblocking fails.

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agosystemd: Restart Mon after 10s in case of failure 13057/head
Wido den Hollander [Mon, 23 Jan 2017 07:18:27 +0000 (08:18 +0100)]
systemd: Restart Mon after 10s in case of failure

In some situations the IP address the Monitor wants to bind to
might not be available yet.

This might for example be a IPv6 Address which is still performing
DAD or waiting for a Router Advertisement to be send by the Router(s).

Have systemd wait for 10s before starting the Mon and increase the amount
of times it does so to 5.

This allows the system to bring up IP Addresses in the mean time while
systemd waits with restarting the Mon.

Fixes: #18635
Signed-off-by: Wido den Hollander <wido@42on.com>
8 years agoNVMEDevice.cc: cleanup the logic in data_buf_next_sge 13056/head
optimistyzy [Mon, 23 Jan 2017 02:53:32 +0000 (10:53 +0800)]
NVMEDevice.cc: cleanup the logic in data_buf_next_sge

Signed-off-by: optimistyzy <optimistyzy@gmail.com>
8 years agoMerge pull request #12980 from liewegas/wip-osdop-printer
Sage Weil [Sun, 22 Jan 2017 16:45:37 +0000 (10:45 -0600)]
Merge pull request #12980 from liewegas/wip-osdop-printer

osd/osd_types: clean up OSDOp printers

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoosd/osd_types: clean up OSDOp printers 12980/head
Sage Weil [Thu, 19 Jan 2017 12:57:29 +0000 (06:57 -0600)]
osd/osd_types: clean up OSDOp printers

Specify which ones get offset~length instead of blacklisting those that
don't.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12950 from liewegas/wip-omap-getkeys
Sage Weil [Sun, 22 Jan 2017 16:44:04 +0000 (10:44 -0600)]
Merge pull request #12950 from liewegas/wip-omap-getkeys

osd: extend OMAP_GETKEYS and GETVALS to include a 'more' output field

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #12961 from songbaisen/s10
Sage Weil [Sun, 22 Jan 2017 16:43:27 +0000 (10:43 -0600)]
Merge pull request #12961 from songbaisen/s10

crush:  when osd_location_hook does not exist, we should exit error.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12975 from wonzhq/fix-pgstats-down
Sage Weil [Sun, 22 Jan 2017 16:43:00 +0000 (10:43 -0600)]
Merge pull request #12975 from wonzhq/fix-pgstats-down

mon: don't set last_osd_report when the pg stats msg is ignored

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #12976 from LiumxNL/wip-170118
Sage Weil [Sun, 22 Jan 2017 16:42:33 +0000 (10:42 -0600)]
Merge pull request #12976 from LiumxNL/wip-170118

osd/OSDMap: get_previous_up_osd_before() may run into endless loop

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12981 from liewegas/wip-crush-move-osd
Sage Weil [Sun, 22 Jan 2017 16:42:08 +0000 (10:42 -0600)]
Merge pull request #12981 from liewegas/wip-crush-move-osd

mon/OSDMonitor: make 'osd crush move ...' work on osds

Reviewed-by: Kefu Chai <kchai@redhat.com>