]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoMerge pull request #12104 from pritha-srivastava/wip_sts_role_rest
Adam C. Emerson [Wed, 1 Feb 2017 19:01:49 +0000 (14:01 -0500)]
Merge pull request #12104 from pritha-srivastava/wip_sts_role_rest

rgw: Added code for REST APIs for AWS Roles.

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13189 from gaurav36/bug-18326-image-rename-non-rbd-pool
Jason Dillaman [Wed, 1 Feb 2017 17:47:01 +0000 (12:47 -0500)]
Merge pull request #13189 from gaurav36/bug-18326-image-rename-non-rbd-pool

rbd: destination pool should be source pool if it is not specified

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12948 from trociny/wip-17020
Jason Dillaman [Wed, 1 Feb 2017 16:17:23 +0000 (11:17 -0500)]
Merge pull request #12948 from trociny/wip-17020

rbd-mirror: add support for active/passive daemon instances

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13013 from wangzhengyong/master
Sage Weil [Wed, 1 Feb 2017 14:55:22 +0000 (08:55 -0600)]
Merge pull request #13013 from wangzhengyong/master

os/bluestore: remove no use parameter in bluestore_blob_t::map_bl

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12782 from atheism/rgw-orphan-fix-error-messages
Sage Weil [Wed, 1 Feb 2017 14:49:09 +0000 (08:49 -0600)]
Merge pull request #12782 from atheism/rgw-orphan-fix-error-messages

rgw: orphan: fix error messages

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13199 from chipitsine/master
Sage Weil [Wed, 1 Feb 2017 14:46:59 +0000 (08:46 -0600)]
Merge pull request #13199 from chipitsine/master

mds,mon: Clean issues detected by cppcheck

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13203 from ifed01/wip-bluestore-more-dump
Sage Weil [Wed, 1 Feb 2017 14:44:50 +0000 (08:44 -0600)]
Merge pull request #13203 from ifed01/wip-bluestore-more-dump

os: extend ObjectStore interface to dump store's performance counters

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12974 from ukernel/wip-multimds-misc
John Spray [Wed, 1 Feb 2017 13:20:48 +0000 (14:20 +0100)]
Merge pull request #12974 from ukernel/wip-multimds-misc

mds: miscellaneous fixes

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoqa/suites/rbd: add rbd-mirror-ha test 12948/head
Mykola Golub [Wed, 1 Feb 2017 07:43:49 +0000 (08:43 +0100)]
qa/suites/rbd: add rbd-mirror-ha test

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoqa/workunits/rbd: tweaks to use RBD_MIRROR_USE_EXISTING_CLUSTER locally
Mykola Golub [Mon, 12 Dec 2016 12:20:04 +0000 (14:20 +0200)]
qa/workunits/rbd: tweaks to use RBD_MIRROR_USE_EXISTING_CLUSTER locally

This var is mostly used when running rbd_mirror test scripts on
teuthology.  It can be used locally though to speedup re-running the
tests:

Set a test temp directory:

  export RBD_MIRROR_TEMDIR=/tmp/tmp.rbd_mirror

Run the tests the first time with NOCLEANUP flag (the cluster and
daemons are not stopped on finish):

  RBD_MIRROR_NOCLEANUP=1 ../qa/workunits/rbd/rbd_mirror.sh

Now, to re-run the test without restarting the cluster, run cleanup
with USE_EXISTING_CLUSTER flag:

  RBD_MIRROR_USE_EXISTING_CLUSTER=1 \
    ../qa/workunits/rbd/rbd_mirror_ha.sh cleanup

and then run the tests:

  RBD_MIRROR_USE_EXISTING_CLUSTER=1
    ../qa/workunits/rbd/rbd_mirror_ha.sh

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoqa/workunits/rbd: tests for rbd mirror HA
Mykola Golub [Mon, 10 Oct 2016 11:22:48 +0000 (14:22 +0300)]
qa/workunits/rbd: tests for rbd mirror HA

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoqa/workunits/rbd: allow to start several daemons for the same cluster
Mykola Golub [Mon, 10 Oct 2016 07:29:32 +0000 (10:29 +0300)]
qa/workunits/rbd: allow to start several daemons for the same cluster

by optionally specifyning daemon instance after cluster name and
colon, like:

  start_mirror ${cluster}:${instance}

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agorbd-mirror HA: pool replayer should be started/stopped when lock acquired/released
Mykola Golub [Sun, 15 Jan 2017 18:15:14 +0000 (19:15 +0100)]
rbd-mirror HA: pool replayer should be started/stopped when lock acquired/released

Fixes: http://tracker.ceph.com/issues/17020
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agorbd-mirror HA: create pool locker / leader class
Mykola Golub [Mon, 23 Jan 2017 14:22:51 +0000 (15:22 +0100)]
rbd-mirror HA: create pool locker / leader class

Fixes: http://tracker.ceph.com/issues/17019
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agorbd-mirror HA: add new lock released/acquired and heartbeat messages
Mykola Golub [Mon, 23 Jan 2017 14:17:54 +0000 (15:17 +0100)]
rbd-mirror HA: add new lock released/acquired and heartbeat messages

Fixes: http://tracker.ceph.com/issues/17018
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agorbd-mirror: add class for mirror status watcher
Mykola Golub [Tue, 3 Jan 2017 10:10:01 +0000 (12:10 +0200)]
rbd-mirror: add class for mirror status watcher

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agolibrbd: equality operator for managed_lock::Locker
Mykola Golub [Mon, 30 Jan 2017 14:52:31 +0000 (15:52 +0100)]
librbd: equality operator for managed_lock::Locker

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agolibrbd: add create_async_context_callback helper
Mykola Golub [Sun, 29 Jan 2017 21:07:53 +0000 (22:07 +0100)]
librbd: add create_async_context_callback helper

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agolibrbd: missing const qualifiers
Mykola Golub [Wed, 25 Jan 2017 21:29:41 +0000 (22:29 +0100)]
librbd: missing const qualifiers

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agolibrbd: track in-fly break_lock and get_locker requests in managed lock
Mykola Golub [Tue, 24 Jan 2017 11:53:51 +0000 (12:53 +0100)]
librbd: track in-fly break_lock and get_locker requests in managed lock

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agolibrbd: pass notifier_id to Watcher handle_notify
Mykola Golub [Thu, 24 Nov 2016 08:11:19 +0000 (10:11 +0200)]
librbd: pass notifier_id to Watcher handle_notify

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agolibrbd: allow watcher derived classes access ioctx, oid and work queue
Mykola Golub [Thu, 24 Nov 2016 08:05:34 +0000 (10:05 +0200)]
librbd: allow watcher derived classes access ioctx, oid and work queue

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agorbd: destination pool should be source pool if it is not specified 13189/head
Gaurav Kumar Garg [Mon, 30 Jan 2017 12:03:20 +0000 (13:03 +0100)]
rbd: destination pool should be source pool if it is not specified

Currently if user perform image rename operation and user give pool
name as a optional parameter (--pool=<pool_name>) then currently
its taking this optional pool name for source pool and making
destination pool name default pool name.
With this fix if user provide pool name as a optional pool name
parameter then it  will consider both soruce and destination pool
name as optional parameter pool name.

Fixes: http://tracker.ceph.com/issues/18326
Reported-by: МАРК КОРЕНБЕРГ <socketpair@gmail.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
8 years agoMerge pull request #13077 from guzhongyan/fix_wrongly_init
Jason Dillaman [Tue, 31 Jan 2017 19:35:37 +0000 (14:35 -0500)]
Merge pull request #13077 from guzhongyan/fix_wrongly_init

librbd: initialize diff parent overlap to zero

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #12537 from liewegas/wip-optracker
Sage Weil [Tue, 31 Jan 2017 18:54:12 +0000 (12:54 -0600)]
Merge pull request #12537 from liewegas/wip-optracker

common/TrackedOp: various cleanups and optimizations

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #13205 from dachary/wip-crush-documentation
Sage Weil [Tue, 31 Jan 2017 18:52:11 +0000 (12:52 -0600)]
Merge pull request #13205 from dachary/wip-crush-documentation

crush: API documentation

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agocrush: API documentation 13205/head
Loic Dachary [Tue, 31 Jan 2017 17:33:37 +0000 (18:33 +0100)]
crush: API documentation

Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agoMerge pull request #13164 from dzafman/wip-18718
David Zafman [Tue, 31 Jan 2017 16:19:10 +0000 (08:19 -0800)]
Merge pull request #13164 from dzafman/wip-18718

osd: Fix useless MAX(0, unsigned) to prevent out of wack misplaced

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: add submit latency perf counter. 13203/head
Igor Fedotov [Tue, 31 Jan 2017 14:22:23 +0000 (14:22 +0000)]
os/bluestore: add submit latency perf counter.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agotest/fio: add performance counters dump on FIO job completion.
Igor Fedotov [Tue, 31 Jan 2017 14:19:33 +0000 (14:19 +0000)]
test/fio: add performance counters dump on FIO job completion.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos: add dump_perf_counters method to ObjectStore implementations.
Igor Fedotov [Tue, 31 Jan 2017 14:18:12 +0000 (14:18 +0000)]
os: add dump_perf_counters method to ObjectStore implementations.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/bluestore: fix typos in perf counter public names.
Igor Fedotov [Tue, 31 Jan 2017 13:32:31 +0000 (13:32 +0000)]
os/bluestore: fix typos in perf counter public names.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agotest/fio: fix misordered parameter for queue_transaction.
Igor Fedotov [Tue, 31 Jan 2017 13:26:07 +0000 (13:26 +0000)]
test/fio: fix misordered parameter for queue_transaction.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #13193 from dillaman/wip-18738
Mykola Golub [Tue, 31 Jan 2017 13:53:29 +0000 (15:53 +0200)]
Merge pull request #13193 from dillaman/wip-18738

journal: stop processing removal after error

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #13069 from SUSE/wip-hammer-retirement
Jason Dillaman [Tue, 31 Jan 2017 12:56:17 +0000 (07:56 -0500)]
Merge pull request #13069 from SUSE/wip-hammer-retirement

doc: add 0.94.10 and hammer EOL to releases.rst

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoClean issues detected by cppcheck 13199/head
Ilya Shipitsin [Tue, 31 Jan 2017 12:07:39 +0000 (17:07 +0500)]
Clean issues detected by cppcheck

[src/mds/MDLog.cc:1172] -> [src/mds/MDLog.cc:1173]: (warning) Either the condition 'sle!=NULL' is redundant or there is possible null pointer dereference: sle.
[src/mon/MDSMonitor.cc:2622] -> [src/mon/MDSMonitor.cc:2625]: (warning) Either the condition 'mds_map!=nullptr' is redundant or there is possible null pointer dereference: mds_map.

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
8 years agoMerge pull request #13151 from smithfarm/wip-ceph-release-notes
Abhishek L [Tue, 31 Jan 2017 09:58:01 +0000 (10:58 +0100)]
Merge pull request #13151 from smithfarm/wip-ceph-release-notes

tools: ceph-release-notes: ignore low-numbered PRs

8 years agoMerge pull request #13190 from Adirl/reduce_num_buffers
Haomai Wang [Tue, 31 Jan 2017 09:50:03 +0000 (17:50 +0800)]
Merge pull request #13190 from Adirl/reduce_num_buffers

msg/async/rdma: reduce number of rdma rx/tx buffers

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #13066 from liewegas/wip-aio-read
Sage Weil [Tue, 31 Jan 2017 03:43:36 +0000 (21:43 -0600)]
Merge pull request #13066 from liewegas/wip-aio-read

os/bluestore: use aio for reads

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #13071 from liewegas/wip-omap-getkeys-rados-test
Sage Weil [Tue, 31 Jan 2017 03:43:17 +0000 (21:43 -0600)]
Merge pull request #13071 from liewegas/wip-omap-getkeys-rados-test

qa/suites/rados/basic: set low omap limit for rgw workload

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #13150 from tchaikov/wip-mon-cleanup
Sage Weil [Tue, 31 Jan 2017 03:42:48 +0000 (21:42 -0600)]
Merge pull request #13150 from tchaikov/wip-mon-cleanup

mon: post-jewel cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12966 from dillaman/wip-18436
Jason Dillaman [Tue, 31 Jan 2017 02:24:22 +0000 (21:24 -0500)]
Merge pull request #12966 from dillaman/wip-18436

osdc: cache should ignore error bhs during trim

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #12800 from jcsp/wip-vstart-qasuite
John Spray [Tue, 31 Jan 2017 01:02:49 +0000 (02:02 +0100)]
Merge pull request #12800 from jcsp/wip-vstart-qasuite

Improve vstart_runner to (optionally) create its own cluster

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #12817 from liupan1111/wip-list-snapshot-time
Jason Dillaman [Mon, 30 Jan 2017 23:36:46 +0000 (18:36 -0500)]
Merge pull request #12817 from liupan1111/wip-list-snapshot-time

librbd: support to list snapshot timestamp

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agodoc: update actual firefly and estimated hammer retirement 13069/head
Nathan Cutler [Mon, 30 Jan 2017 23:21:47 +0000 (00:21 +0100)]
doc: update actual firefly and estimated hammer retirement

According to the "Understanding the release cycle" section, firefly was
actually retired when jewel was released (April 2016), and hammer will be
retired when luminous is released (estimated in May 2017).

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agodoc: add 0.94.10 to releases.rst
Nathan Cutler [Mon, 23 Jan 2017 18:34:42 +0000 (19:34 +0100)]
doc: add 0.94.10 to releases.rst

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #13098 from wido/doc-osd-greace
Josh Durgin [Mon, 30 Jan 2017 22:55:45 +0000 (14:55 -0800)]
Merge pull request #13098 from wido/doc-osd-greace

doc: Document that osd_heartbeat_grace applies to MON and OSD

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agojournal: stop processing removal after error 13193/head
Jason Dillaman [Mon, 30 Jan 2017 22:41:51 +0000 (17:41 -0500)]
journal: stop processing removal after error

Fixed: http://tracker.ceph.com/issues/18738
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13141 from dillaman/wip-18653
Ilya Dryomov [Mon, 30 Jan 2017 21:33:25 +0000 (22:33 +0100)]
Merge pull request #13141 from dillaman/wip-18653

librbd: introduce new constants for tracking max block name prefix

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
8 years agolibrbd: introduce new constants for tracking max block name prefix 13141/head
Jason Dillaman [Thu, 26 Jan 2017 19:02:11 +0000 (14:02 -0500)]
librbd: introduce new constants for tracking max block name prefix

Fixes: http://tracker.ceph.com/issues/18653
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13188 from liewegas/wip-rest-fs-name
Sage Weil [Mon, 30 Jan 2017 19:30:05 +0000 (13:30 -0600)]
Merge pull request #13188 from liewegas/wip-rest-fs-name

qa/workunits/rest: use unique pool names for cephfs test

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest: regolden formatted-output.t for timestamp metadata of rbd snapshot 12817/head
Pan Liu [Sat, 28 Jan 2017 16:45:30 +0000 (00:45 +0800)]
test: regolden formatted-output.t for timestamp metadata of rbd snapshot

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agotest: Add unit test for getting rbd snapshot timestamp info
Pan Liu [Sat, 28 Jan 2017 16:44:48 +0000 (00:44 +0800)]
test: Add unit test for getting rbd snapshot timestamp info

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agolibrbd: support to list snapshot time stamp
Pan Liu [Sat, 28 Jan 2017 16:43:33 +0000 (00:43 +0800)]
librbd: support to list snapshot time stamp

Fixes: http://tracker.ceph.com/issues/808
Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agolibrbd: Add timestamp metadata when creating rbd snapshot
Pan Liu [Fri, 27 Jan 2017 11:14:29 +0000 (19:14 +0800)]
librbd: Add timestamp metadata when creating rbd snapshot

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agoMerge pull request #12646 from SirishaGuduru/swift-api-auth-doc-change
Yehuda Sadeh [Mon, 30 Jan 2017 16:36:32 +0000 (08:36 -0800)]
Merge pull request #12646 from SirishaGuduru/swift-api-auth-doc-change

doc: Fixes radosgw-admin ex: in swift auth section

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoqa/workunits/rest: use unique pool names for cephfs test 13188/head
Sage Weil [Mon, 30 Jan 2017 16:14:31 +0000 (11:14 -0500)]
qa/workunits/rest: use unique pool names for cephfs test

Using cephfs_[meta]data collides with the pools that teuthology
already creates if an mds is defined.

This became a (noticeable) problem with 052c3d3f681017d56b5b0ee5cf6f65bffc952a4c

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13054 from oritwas/wip-rgw-period-update-crash
Casey Bodley [Mon, 30 Jan 2017 14:52:13 +0000 (09:52 -0500)]
Merge pull request #13054 from oritwas/wip-rgw-period-update-crash

rgw: fix period update crash

Reviewed-by: Casey Bodley <cbodley@redhat.com>
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 agodoc: Document that osd_heartbeat_grace applies to MON and OSD 13098/head
Wido den Hollander [Wed, 25 Jan 2017 12:12:07 +0000 (13:12 +0100)]
doc: Document that osd_heartbeat_grace applies to MON and OSD

This value has to be set in both the [mon] and [osd] section since
both daemons read this value.

Signed-off-by: Wido den Hollander <wido@42on.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 agoosd: Fix useless MAX(0, unsigned) to prevent out of wack misplaced 13164/head
David Zafman [Fri, 27 Jan 2017 22:42:37 +0000 (14:42 -0800)]
osd: Fix useless MAX(0, unsigned) to prevent out of wack misplaced

Still want to prevent strange results if for some reason num_objects
is less than osd_missing.

Fixes: http://tracker.ceph.com/issues/18718
Signed-off-by: David Zafman <dzafman@redhat.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 agocommon/TrackedOp: log at level 6 12537/head
Sage Weil [Fri, 16 Dec 2016 19:15:24 +0000 (14:15 -0500)]
common/TrackedOp: log at level 6

This is above the default log level.  I have yet to encounter a situation
where the optracker output was helpful during a crash, and this saves
a significant amount of cpu time (~2-3% in my test).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: some cleanup
Sage Weil [Fri, 16 Dec 2016 18:59:00 +0000 (13:59 -0500)]
common/TrackedOp: some cleanup

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: manage current in parent class
Sage Weil [Fri, 16 Dec 2016 18:53:41 +0000 (13:53 -0500)]
common/TrackedOp: manage current in parent class

No reason for child to muck with this!

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: cache op description
Sage Weil [Fri, 16 Dec 2016 16:36:06 +0000 (11:36 -0500)]
common/TrackedOp: cache op description

Only calculate it once.  Invalidate from OSD after a full decode (when it
changes).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: take option time arg
Sage Weil [Fri, 16 Dec 2016 17:35:48 +0000 (12:35 -0500)]
common/TrackedOp: take option time arg

Fix the callers to use this instead of calling into Tracker directly.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OpRequest: drop useless helpers
Sage Weil [Fri, 16 Dec 2016 17:13:40 +0000 (12:13 -0500)]
osd/OpRequest: drop useless helpers

No callers!

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: use preallocated vector for events
Sage Weil [Thu, 15 Dec 2016 23:25:20 +0000 (18:25 -0500)]
common/TrackedOp: use preallocated vector for events

This avoids an allocation per mark_event() call.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: fix formatter output
Sage Weil [Thu, 15 Dec 2016 23:14:17 +0000 (18:14 -0500)]
common/TrackedOp: fix formatter output

Spaces not allowed.  Lowercase by convention.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: add const char* and string variants of event
Sage Weil [Thu, 15 Dec 2016 23:14:03 +0000 (18:14 -0500)]
common/TrackedOp: add const char* and string variants of event

This avoids the full std::string (copy) for most events.  Wrap it up
into an Event class to hide some of the guts.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: drop unneeded _mark_event; pass c string
Sage Weil [Thu, 15 Dec 2016 22:58:39 +0000 (17:58 -0500)]
common/TrackedOp: drop unneeded _mark_event; pass c string

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: use intrusive list for session op queue
Sage Weil [Thu, 15 Dec 2016 19:01:12 +0000 (14:01 -0500)]
osd: use intrusive list for session op queue

We can avoid these list<> allocations in the fast dispatch path.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: add get() and put()
Sage Weil [Thu, 15 Dec 2016 15:06:11 +0000 (10:06 -0500)]
common/TrackedOp: add get() and put()

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: make TrackedOp an intrusive::list::list_base_hook<>
Sage Weil [Thu, 15 Dec 2016 14:55:13 +0000 (09:55 -0500)]
common/TrackedOp: make TrackedOp an intrusive::list::list_base_hook<>

This lets us put these in efficient lists.  Note that callers must take
care to bump the ref count manually!

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: xlist -> intrusive::list
Sage Weil [Thu, 15 Dec 2016 14:50:33 +0000 (09:50 -0500)]
common/TrackedOp: xlist -> intrusive::list

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/TrackedOp: use explicit ref count, intrusive_ptr
Sage Weil [Thu, 15 Dec 2016 14:38:02 +0000 (09:38 -0500)]
common/TrackedOp: use explicit ref count, intrusive_ptr

This is more efficient and more explicit than shared_ptr.  It will also
allow us to put these in intrusive lists.

Note that before we used the shared_ptr OnDelete property only for the
live ops and left it off for the history.  Here we rename is_tracked to
state and explicit note whether we are untracked, live, or history.

Also, now that we #include OpRequest in osd_types.h, we have to include
the .cc file (and ~OpRequest definition) in libcommon to avoid a link
error on all the unit tests etc.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomds/Mutation: make Mutation a TrackedOp
Sage Weil [Thu, 15 Dec 2016 04:06:36 +0000 (23:06 -0500)]
mds/Mutation: make Mutation a TrackedOp

This seems silly now, but is needed in order to switch from shared_ptr to
intrusive_ptr.  The TrackOp is the refcounted thing, and we want to be
able to cast beween MutationRefs and MDRequestRefs, so... we need to make
sure the refcounting is done via a common parent, TrackedOp.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomessages/MLock: drop unnecessary #include
Sage Weil [Wed, 14 Dec 2016 20:57:56 +0000 (15:57 -0500)]
messages/MLock: drop unnecessary #include

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: only use aio for read if there are >1 blobs 13066/head
Sage Weil [Tue, 24 Jan 2017 14:42:24 +0000 (09:42 -0500)]
os/bluestore: only use aio for read if there are >1 blobs

If we have a single blob to read it is not worth the context switch.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlockDevice: allow sync read to accumulate on bl
Sage Weil [Tue, 24 Jan 2017 16:11:49 +0000 (11:11 -0500)]
os/bluestore/BlockDevice: allow sync read to accumulate on bl

Do not clear the target bl; instead, append to it.  This makes our
behavior consistent with aio_read, which does the same.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: do read io via aio in parallel
Sage Weil [Mon, 23 Jan 2017 15:16:22 +0000 (10:16 -0500)]
os/bluestore: do read io via aio in parallel

Dispatch all blob reads in parallel via aio.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/KernelDevice: avoid possible use-after-free for ioc->priv
Sage Weil [Mon, 23 Jan 2017 19:46:34 +0000 (14:46 -0500)]
os/bluestore/KernelDevice: avoid possible use-after-free for ioc->priv

If aio_wake() triggers destruction, ioc->priv might be a
use-after-free (this is the case for the BlueStore read path).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/NVMEDevice: implement aio_read
Sage Weil [Mon, 23 Jan 2017 16:48:10 +0000 (11:48 -0500)]
os/bluestore/NVMEDevice: implement aio_read

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlockDevice: add aio_read API
Sage Weil [Mon, 23 Jan 2017 15:14:39 +0000 (10:14 -0500)]
os/bluestore/BlockDevice: add aio_read API

NVMEDevice not implemented yet.

Signed-off-by: Sage Weil <sage@redhat.com>