]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoos/bluestore: remove intermediate key var to avoid string copy 12643/head
xie xingguo [Fri, 23 Dec 2016 08:56:33 +0000 (16:56 +0800)]
os/bluestore: remove intermediate key var to avoid string copy

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #12636 from badone/wip-doc-pg-states
Xie Xingguo [Fri, 23 Dec 2016 02:33:53 +0000 (10:33 +0800)]
Merge pull request #12636 from badone/wip-doc-pg-states

doc: Remove "splitting" state

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #12543 from hjwsm1989/cleanup2
Xie Xingguo [Fri, 23 Dec 2016 00:57:03 +0000 (08:57 +0800)]
Merge pull request #12543 from hjwsm1989/cleanup2

  osd/ECBackend: remove unused variable "ReadCB"

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agodoc: Remove "splitting" state 12636/head
Brad Hubbard [Thu, 22 Dec 2016 23:23:19 +0000 (09:23 +1000)]
doc: Remove "splitting" state

There is no splitting state so remove it from pg-states.rst

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge remote-tracking branch 'gh/kraken'
Sage Weil [Thu, 22 Dec 2016 23:16:49 +0000 (18:16 -0500)]
Merge remote-tracking branch 'gh/kraken'

# Conflicts:
# src/os/bluestore/BlueStore.cc

8 years agoMerge pull request #12629 from liewegas/wip-bluestore-shard-extents
Sage Weil [Thu, 22 Dec 2016 18:50:32 +0000 (12:50 -0600)]
Merge pull request #12629 from liewegas/wip-bluestore-shard-extents

os/bluestore: remove 'extents' from shard_info

Reviewed-by: Somnath Roy <somnath.roy@sandisk.com>
8 years agoMerge pull request #12616 from atheism/rgw-ldap-fix-simple-bind
Matt Benjamin [Thu, 22 Dec 2016 18:49:04 +0000 (13:49 -0500)]
Merge pull request #12616 from atheism/rgw-ldap-fix-simple-bind

rgw: ldap: simple_bind() should set ldap version option on tldap

8 years agoos/bluestore: remove 'extents' from shard_info 12629/head
Sage Weil [Thu, 22 Dec 2016 16:03:51 +0000 (11:03 -0500)]
os/bluestore: remove 'extents' from shard_info

We don't use this field; no need to consume the space
on disk.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12394 from ifed01/wip-bluestore-fix-reshard
Sage Weil [Thu, 22 Dec 2016 15:25:05 +0000 (09:25 -0600)]
Merge pull request #12394 from ifed01/wip-bluestore-fix-reshard

os/bluestore: refactor ExtentMap::update to avoid preceeding db updat…

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12464 from ifed01/wip-bluestore-turnoff-block-write
Sage Weil [Thu, 22 Dec 2016 15:24:42 +0000 (09:24 -0600)]
Merge pull request #12464 from ifed01/wip-bluestore-turnoff-block-write

os/bluestore: add a debug option to bypass block device writes for bl…

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12526 from hjwsm1989/ec-cleanup
Sage Weil [Thu, 22 Dec 2016 15:24:31 +0000 (09:24 -0600)]
Merge pull request #12526 from hjwsm1989/ec-cleanup

osd/ECBackend: only need check missing_loc when doing recovery

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12527 from hjwsm1989/cleanup
Sage Weil [Thu, 22 Dec 2016 15:24:01 +0000 (09:24 -0600)]
Merge pull request #12527 from hjwsm1989/cleanup

osd/PrimaryLogPG: unify the access to primary pg

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12564 from kylinstorage/wip-cleanup-pg-stat-t
Sage Weil [Thu, 22 Dec 2016 15:23:10 +0000 (09:23 -0600)]
Merge pull request #12564 from kylinstorage/wip-cleanup-pg-stat-t

osd/ECBackend: cleanup for unnecessary copy with pg_stat_t

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12576 from kylinstorage/wip-cleanup-bluestore-coll-ref
Sage Weil [Thu, 22 Dec 2016 15:22:54 +0000 (09:22 -0600)]
Merge pull request #12576 from kylinstorage/wip-cleanup-bluestore-coll-ref

bluestore: avoid unnecessary copy with coll_t

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12579 from hjwsm1989/smallfix
Sage Weil [Thu, 22 Dec 2016 15:22:38 +0000 (09:22 -0600)]
Merge pull request #12579 from hjwsm1989/smallfix

osd/PG: check the connection first in fulfill_log

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12583 from liupan1111/wip-add-throttle-bluestore
Sage Weil [Thu, 22 Dec 2016 15:20:02 +0000 (09:20 -0600)]
Merge pull request #12583 from liupan1111/wip-add-throttle-bluestore

os/bluestore: add perf variable for throttle info in bluestore

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/bluefs: make bluefs_preextend_wal_files default is false.
Jianpeng Ma [Thu, 22 Dec 2016 16:06:50 +0000 (00:06 +0800)]
os/bluestore/bluefs: make bluefs_preextend_wal_files default is false.

This make rocksdb log corruption. Before fix, disable this function.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoMerge remote-tracking branch 'gh/kraken'
Sage Weil [Thu, 22 Dec 2016 14:16:03 +0000 (09:16 -0500)]
Merge remote-tracking branch 'gh/kraken'

8 years agomon: MonMap: clear 'mon_info' during decode
Joao Eduardo Luis [Wed, 21 Dec 2016 23:40:47 +0000 (23:40 +0000)]
mon: MonMap: clear 'mon_info' during decode

It so happens that it's not safe to assume the monmap will be in an
empty state upon decoding.

Turns out the MonClient will reuse the MonMap instance when decoding
the just received map from the monitors. Should the monitors be on an
older version that do not support 'mon_info', this field will not be
decoded (after all, there's no field to decode from); but by this time,
the MonClient would already have a built monmap, which could have
populated 'mon_info' with temporary mon names from 'mon initial
members'.

Given the existing entries in 'mon_info', and the conflicting entries in
'mon_addr', we would end up asserting in 'sanitize_mons()'. This becomes
a non-issue if 'mon_info' is empty, as was unfortunately presumed.

Fixes: http://tracker.ceph.com/issues/18265
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
8 years agoMerge pull request #12604 from ommoreno/wip-16966
Sage Weil [Thu, 22 Dec 2016 14:04:26 +0000 (08:04 -0600)]
Merge pull request #12604 from ommoreno/wip-16966

os/bluestore: allow multiple SPDK BlueStore OSD instances

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #12618 from Liuchang0812/fix-blue-store-unused-var
Sage Weil [Thu, 22 Dec 2016 13:55:35 +0000 (07:55 -0600)]
Merge pull request #12618 from Liuchang0812/fix-blue-store-unused-var

os/bluestore: remove a never read value

8 years agoMerge branch 'kraken' into wip-18314 12599/head
Sage Weil [Thu, 22 Dec 2016 13:53:23 +0000 (07:53 -0600)]
Merge branch 'kraken' into wip-18314

8 years agoos/bluestore: remove a never read value 12618/head
liuchang0812 [Thu, 22 Dec 2016 08:17:55 +0000 (16:17 +0800)]
os/bluestore: remove a never read value

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agorgw: ldap: simple_bind() should set ldap option on tldap 12616/head
Weibing Zhang [Thu, 22 Dec 2016 06:38:27 +0000 (14:38 +0800)]
rgw: ldap: simple_bind() should set ldap option on tldap

    ldap_set_option() should set option for "tldap" other than "ldap".
    The current code will lead to "Protocol error" as the ldap version
    of tldap is not set.

Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
8 years agoMerge pull request #12556 from Adirl/support_roceV2
Haomai Wang [Thu, 22 Dec 2016 04:25:30 +0000 (12:25 +0800)]
Merge pull request #12556 from Adirl/support_roceV2

msg/async/rdma: Support for RoCE v2 and SL

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge remote-tracking branch 'gh/kraken'
Sage Weil [Thu, 22 Dec 2016 03:21:41 +0000 (22:21 -0500)]
Merge remote-tracking branch 'gh/kraken'

8 years agoMerge pull request #12603 from liewegas/wip-fix-rwordered
Sage Weil [Thu, 22 Dec 2016 03:03:43 +0000 (21:03 -0600)]
Merge pull request #12603 from liewegas/wip-fix-rwordered

osd: fix CEPH_OSD_FLAG_RWORDERED

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoosd: fix CEPH_OSD_FLAG_RWORDERED 12603/head
Sage Weil [Wed, 21 Dec 2016 19:24:37 +0000 (14:24 -0500)]
osd: fix CEPH_OSD_FLAG_RWORDERED

Broke this in 3a2ed3b136de68192f661b6992cbb96ce6aafd20.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoAdded "bluestore" prefix to new config options 12604/head
Orlando Moreno [Wed, 21 Dec 2016 17:18:37 +0000 (10:18 -0700)]
Added "bluestore" prefix to new config options

Signed-off-by: Orlando Moreno <orlando.moreno@intel.com>
8 years agomsg/async/rdma: Support for RoCE v2 and SL 12556/head
Adir Lev [Sun, 11 Dec 2016 16:38:58 +0000 (16:38 +0000)]
msg/async/rdma: Support for RoCE v2 and SL

Adding GID support to ceph.conf
Search configured GID in GIDs table with specific RoCE version.
Use it instead of index 0 (default)
Add service level support to supprt PFC

Change-Id: I5369bdeb6797e1c440110bdb4ad8e54ee6db9857
Signed-off-by: Oren Duer <oren@mellanox.com> Adir Lev <adirl@mellanox.com>
8 years agoMerge pull request #12598 from ly798/typo-fix-in-docs
Sage Weil [Wed, 21 Dec 2016 15:56:50 +0000 (09:56 -0600)]
Merge pull request #12598 from ly798/typo-fix-in-docs

doc: typo fix in s3_compliance

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12601 from rishabhkumar296/ceph12684
Sage Weil [Wed, 21 Dec 2016 15:54:31 +0000 (09:54 -0600)]
Merge pull request #12601 from rishabhkumar296/ceph12684

msg/simple: Remove dead code in pipe.cc

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoRemove dead code in pipe.cc 12601/head
Rishabh Kumar [Wed, 21 Dec 2016 15:09:44 +0000 (20:39 +0530)]
Remove dead code in pipe.cc

Fixes: http://tracker.ceph.com/issues/12684
Signed-off-by: Rishabh Kumar <kris.kr296@gmail.com>
8 years agoosd/PrimaryLogPG: enlarge omap request bytes limitation
Yan, Zheng [Wed, 21 Dec 2016 08:35:50 +0000 (16:35 +0800)]
osd/PrimaryLogPG: enlarge omap request bytes limitation

For cephfs, 4M buffer can only encode about 5k dentries. It's too
small for directory.

Fixes: http://tracker.ceph.com/issues/18314
Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agodoc: typo fix in s3_compliance 12598/head
LiuYang [Wed, 21 Dec 2016 06:54:40 +0000 (14:54 +0800)]
doc: typo fix in s3_compliance

Signed-off-by: LiuYang <yippeetry@gmail.com>
8 years agoos/bluestore: add perf variable for throttle info in bluestore 12583/head
Pan Liu [Wed, 21 Dec 2016 02:28:26 +0000 (10:28 +0800)]
os/bluestore: add perf variable for throttle info in bluestore

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agoMerge pull request #12587 from yuriw/wip-fix-subset-script-master
Jason Dillaman [Tue, 20 Dec 2016 23:47:39 +0000 (18:47 -0500)]
Merge pull request #12587 from yuriw/wip-fix-subset-script-master

qa: fixed script to schedule rados and other suites with --subset option

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agochanged script name 12587/head
Yuri Weinstein [Tue, 20 Dec 2016 17:36:19 +0000 (09:36 -0800)]
changed script name
added kraken
parameterized suite name to be able to use for rados, rbd etc.

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
8 years agoMerge pull request #12590 from athanatos/wip-ping-write-ordered
Sage Weil [Tue, 20 Dec 2016 23:13:31 +0000 (17:13 -0600)]
Merge pull request #12590 from athanatos/wip-ping-write-ordered

osd: force watch PING to be write ordered

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12593 from wjwithagen/wip-wjw-freebssd-SO_reuseaddr
Sage Weil [Tue, 20 Dec 2016 20:07:23 +0000 (14:07 -0600)]
Merge pull request #12593 from wjwithagen/wip-wjw-freebssd-SO_reuseaddr

msg/async/net_handler.cc: Do not apply SO_REUSEADDR for FreeBSD

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12584 from mkoderer/openstack_nova_doc
Jason Dillaman [Tue, 20 Dec 2016 19:00:36 +0000 (14:00 -0500)]
Merge pull request #12584 from mkoderer/openstack_nova_doc

doc: mention corresponding libvirt section in nova.conf

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agomsg/async/net_handler.cc: Do not apply SO_REUSEADDR for FreeBSD 12593/head
Willem Jan Withagen [Tue, 20 Dec 2016 18:43:47 +0000 (19:43 +0100)]
msg/async/net_handler.cc: Do not apply SO_REUSEADDR for FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoosd/: treat PINGs as RWORDERED 12590/head
Samuel Just [Tue, 20 Dec 2016 17:47:41 +0000 (09:47 -0800)]
osd/: treat PINGs as RWORDERED

89fd030bf9436dc4e37cc3a0f935ec077455d9d5 switched them to show up
as reads to avoid logging them, but we still pipeline them with
reconnects.  Thus, also force them to be rwordered.

Fixes: http://tracker.ceph.com/issues/18310
Signed-off-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12540 from dmick/wip-18297
Sage Weil [Tue, 20 Dec 2016 15:56:32 +0000 (09:56 -0600)]
Merge pull request #12540 from dmick/wip-18297

ceph.in: allow 'flags' to not be present in cmddescs

8 years agoMerge pull request #12577 from liewegas/wip-osd-backfill
Josh Durgin [Tue, 20 Dec 2016 15:51:24 +0000 (07:51 -0800)]
Merge pull request #12577 from liewegas/wip-osd-backfill

qa/tasks/osd_backfill.py: wait for osd.[12] to start

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #12574 from liewegas/wip-bluestore-split
Sage Weil [Tue, 20 Dec 2016 14:43:29 +0000 (08:43 -0600)]
Merge pull request #12574 from liewegas/wip-bluestore-split

os/bluestore: preserve source collection cache during split

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoDOC: Mention corresponding section in nova.conf 12584/head
Marc Koderer [Tue, 20 Dec 2016 13:49:19 +0000 (14:49 +0100)]
DOC: Mention corresponding section in nova.conf

rbd_user and rbd_secret_uuid are part of the libvirt configuration.

Signed-off-by: Marc Koderer <marc@koderer.com>
8 years agoMerge pull request #12472 from dillaman/wip-18244
Mykola Golub [Tue, 20 Dec 2016 11:10:55 +0000 (13:10 +0200)]
Merge pull request #12472 from dillaman/wip-18244

librbd: remove image header lock assertions

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years ago osd/PG: check the connection first in fulfill_log 12579/head
huangjun [Tue, 20 Dec 2016 05:31:59 +0000 (13:31 +0800)]
  osd/PG: check the connection first in fulfill_log
          No need to prepare reply message if the connection not exist

Signed-off-by: huangjun <hjwsm1989@gmail.com>
8 years agoMerge pull request #12532 from ifed01/wip-bluestore-large-onode-test
Sage Weil [Tue, 20 Dec 2016 03:26:41 +0000 (21:26 -0600)]
Merge pull request #12532 from ifed01/wip-bluestore-large-onode-test

os/bluestore: add UT for an estimation of Onode in-memory size

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12505 from ceph/wip-jlayton-submount
Sage Weil [Tue, 20 Dec 2016 03:18:19 +0000 (21:18 -0600)]
Merge pull request #12505 from ceph/wip-jlayton-submount

client: set metadata["root"] from mount method when it's called with …

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #12570 from wjwithagen/patch-9
Sage Weil [Tue, 20 Dec 2016 03:17:19 +0000 (21:17 -0600)]
Merge pull request #12570 from wjwithagen/patch-9

common/str_list.h: fix clang warning about std::move

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #12541 from liewegas/wip-bluestore-omap-flush
Sage Weil [Tue, 20 Dec 2016 03:15:37 +0000 (21:15 -0600)]
Merge pull request #12541 from liewegas/wip-bluestore-omap-flush

os/bluestore: include modified objects in flush list even if onode unchanged

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoqa/tasks/osd_backfill.py: wait for osd.[12] to start 12577/head
Sage Weil [Tue, 20 Dec 2016 02:55:54 +0000 (21:55 -0500)]
qa/tasks/osd_backfill.py: wait for osd.[12] to start

...before sending a tell command.  Otherwise osd.2 might
start without 1, the io unblocks, and the tell fails
because osd.1 is still down.

Fixes: http://tracker.ceph.com/issues/18303
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agobluestore: avoid unnecessary copy with coll_t 12576/head
Yunchuan Wen [Tue, 20 Dec 2016 01:52:30 +0000 (09:52 +0800)]
bluestore: avoid unnecessary copy with coll_t

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
8 years agoos/bluestore: allow multiple SPDK BlueStore OSD instances
Orlando Moreno [Mon, 19 Dec 2016 23:57:32 +0000 (16:57 -0700)]
os/bluestore: allow multiple SPDK BlueStore OSD instances

Fixes: http://tracker.ceph.com/issues/16966
Signed-off-by: Orlando Moreno <orlando.moreno@intel.com>
8 years agoos/bluestore: preserve source collection cache during split 12574/head
Sage Weil [Mon, 19 Dec 2016 22:04:26 +0000 (17:04 -0500)]
os/bluestore: preserve source collection cache during split

OSD split transactions look something like

 mkcoll new
 split old
 ...
 omap_rmkey_range old
 omap_setkeys old
 omap_setkeys new

The last part splits the log into two pieces.  The
problem is that the rmkey_range needs to wait on old
omap transactions to flush, and those are linked to the
old onode, and split clears the cache.  The result is
that we don't wait, rmkeyrange leaves some recent pg log
keys behind, and on OSD restart we get an error because
the object doesn't belong to the (old) collection.

Fix this by preserving objects in the old collection and
only clear out objects that are moving to the newly
split collections.  This will include the pgmeta object
that we care about.

(Note that we are one step closer to preserving the
cache contents across the split, but not quite there
yet: at this point we don't have all of the destination
collections.  A change in the ObjectStore interface is
probably needed to make that not be extremely awkward.)

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12571 from athanatos/wip-15943
Samuel Just [Mon, 19 Dec 2016 21:50:15 +0000 (13:50 -0800)]
Merge pull request #12571 from athanatos/wip-15943

osd: Fix map gaps again (bug 15943)

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12572 from liewegas/wip-python-rados-test
vasukulkarni [Mon, 19 Dec 2016 20:25:38 +0000 (12:25 -0800)]
Merge pull request #12572 from liewegas/wip-python-rados-test

qa/workunits: include extension for nose tests

8 years agoMerge pull request #12568 from ifed01/wip-bluestore-onode-diet2
Sage Weil [Mon, 19 Dec 2016 20:15:03 +0000 (14:15 -0600)]
Merge pull request #12568 from ifed01/wip-bluestore-onode-diet2

os/bluestore: reduce Onode in-memory footprint

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12555 from socketpair/usr_bin
Sage Weil [Mon, 19 Dec 2016 20:13:32 +0000 (14:13 -0600)]
Merge pull request #12555 from socketpair/usr_bin

systemd: Fix startup of ceph-mgr on Debian 8

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12355 from chhabaramesh/bit_alloc_mempool
Sage Weil [Mon, 19 Dec 2016 20:13:10 +0000 (14:13 -0600)]
Merge pull request #12355 from chhabaramesh/bit_alloc_mempool

os/bluestore: simplified allocator interfaces to single apis

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoqa/workunits: include extension for nose tests 12572/head
Sage Weil [Mon, 19 Dec 2016 19:08:11 +0000 (14:08 -0500)]
qa/workunits: include extension for nose tests

When you have a relative path you have to include the extension.
Weird.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12412 from ceph/wip-jlayton-suid
jtlayton [Mon, 19 Dec 2016 18:26:27 +0000 (13:26 -0500)]
Merge pull request #12412 from ceph/wip-jlayton-suid

client/mds: Clear setuid bits when writing or truncating

8 years agoClang/str_list.h: fix clang warning about std::move 12570/head
Willem Jan Withagen [Mon, 19 Dec 2016 16:29:38 +0000 (17:29 +0100)]
Clang/str_list.h: fix clang warning about std::move

/home/jenkins/workspace/ceph-master/src/include/str_list.h:99:10: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
  return std::move(str_vec);
         ^
/home/jenkins/workspace/ceph-master/src/include/str_list.h:99:10: note: remove std::move call here
  return std::move(str_vec);
         ^~~~~~~~~~       ~
1 warning generated.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #12565 from trociny/wip-18247-fixup
Jason Dillaman [Mon, 19 Dec 2016 15:33:24 +0000 (10:33 -0500)]
Merge pull request #12565 from trociny/wip-18247-fixup

common: fix clang compilation error

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoos/bluestore: remove duplicate sbid member for Blob, use one from shared_blob member 12568/head
Igor Fedotov [Mon, 19 Dec 2016 14:37:06 +0000 (14:37 +0000)]
os/bluestore: remove duplicate sbid member for Blob, use one from shared_blob member
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/bluestore: declare a member for Blob's cached bufferlist if explicitly enabled...
Igor Fedotov [Mon, 19 Dec 2016 14:00:05 +0000 (14:00 +0000)]
os/bluestore: declare a member for Blob's cached bufferlist if explicitly enabled by CACHE_BLOG_BL macro only

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/bluestore: recalculate shared blob key instead of keeping it in memory
Igor Fedotov [Mon, 19 Dec 2016 12:55:09 +0000 (12:55 +0000)]
os/bluestore: recalculate shared blob key instead of keeping it in memory
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/bluestore: include modified objects in flush list even if onode unchanged 12541/head
Sage Weil [Mon, 19 Dec 2016 15:03:44 +0000 (10:03 -0500)]
os/bluestore: include modified objects in flush list even if onode unchanged

We use the onode flush list so that we can ->flush() as
a barrier before doing any read/modify/write.  For
example, omap_rmkeyrange will flush before reading to
see what keys to erase in order to ensure that any
previous inserts are applied to the db and we see them
and remove them.

However, some omap operations don't update the onode
itself, which means write_onode() doesn't get called and
we aren't put on this list.

Add a note_modified_object() helper that can be called
instead of write_onode() for those cases.  That way we
get on the list and flush() works as expected.

We could have resolved this by just putting ourselves on
the dirty onode list, but in practice every OSD op is
writing omap keys to the pgmeta object and there is no
need to touch the onode key in this case, so doing so
would be a big regression.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12548 from Liuchang0812/add-document-rgw
Sage Weil [Mon, 19 Dec 2016 14:44:27 +0000 (08:44 -0600)]
Merge pull request #12548 from Liuchang0812/add-document-rgw

doc: explain rgw_fcgi_socket_backlog in rgw/config-ref.rst

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12561 from kylinstorage/wip-fix-osdmaptool-zero
Sage Weil [Mon, 19 Dec 2016 14:38:43 +0000 (08:38 -0600)]
Merge pull request #12561 from kylinstorage/wip-fix-osdmaptool-zero

osdmaptool: fix divide by zero error

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12497 from dillaman/wip-18243
Mykola Golub [Mon, 19 Dec 2016 13:58:59 +0000 (15:58 +0200)]
Merge pull request #12497 from dillaman/wip-18243

journal: prevent repetitive error messages after being blacklisted

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoECBackend: cleanup for unnecessary copy with pg_stat_t 12564/head
Yunchuan Wen [Mon, 19 Dec 2016 09:12:38 +0000 (17:12 +0800)]
ECBackend: cleanup for unnecessary copy with pg_stat_t

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
8 years agoremove unused wait argument and related function versions 12355/head
Ramesh Chander [Mon, 19 Dec 2016 04:13:58 +0000 (20:13 -0800)]
remove unused wait argument and related function versions

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agocommon: fix clang compilation 12565/head
Mykola Golub [Mon, 19 Dec 2016 06:44:22 +0000 (08:44 +0200)]
common: fix clang compilation

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agoosdmaptool: fix divide by zero error 12561/head
Yunchuan Wen [Mon, 19 Dec 2016 04:48:14 +0000 (12:48 +0800)]
osdmaptool: fix divide by zero error

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
8 years agoMerge pull request #12558 from Adirl/fix_bad_len_msg
Haomai Wang [Mon, 19 Dec 2016 01:59:51 +0000 (09:59 +0800)]
Merge pull request #12558 from Adirl/fix_bad_len_msg

msg/async/rdma: fix bad message that went to the user

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agozone block offset bug fix and related unit test case
Ramesh Chander [Sun, 18 Dec 2016 18:23:42 +0000 (10:23 -0800)]
zone block offset bug fix and related unit test case

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
zone block offset related test case

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agoallocat_extent api rename and tests for new api
Ramesh Chander [Fri, 16 Dec 2016 14:58:53 +0000 (06:58 -0800)]
allocat_extent api rename and tests for new api

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agoremove cont alloc alloc_blocks calls from allocator code and test
Ramesh Chander [Fri, 16 Dec 2016 09:38:46 +0000 (01:38 -0800)]
remove cont alloc alloc_blocks calls from allocator code and test

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agoconsolidate allocator calls to single alloc_extent api
Ramesh Chander [Fri, 16 Dec 2016 07:41:11 +0000 (23:41 -0800)]
consolidate allocator calls to single alloc_extent api

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agoallocator min_alloc arguments in call stack and tests
Ramesh Chander [Wed, 14 Dec 2016 06:41:25 +0000 (22:41 -0800)]
allocator min_alloc arguments in call stack and tests

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agoallocator alloc_extents min_alloc
Ramesh Chander [Tue, 13 Dec 2016 14:50:59 +0000 (06:50 -0800)]
allocator alloc_extents min_alloc

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agoos/bluestore:Bluefs balance should use alloc_extent api with bluefs_alloc_size
Ramesh Chander [Wed, 7 Dec 2016 06:04:30 +0000 (22:04 -0800)]
os/bluestore:Bluefs balance should use alloc_extent api with bluefs_alloc_size

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agomsg/async/rdma: fix bad message that went to the user 12558/head
Avner BenHanoch [Tue, 6 Dec 2016 09:38:36 +0000 (09:38 +0000)]
msg/async/rdma: fix bad message that went to the user

1. the printed value of "bad length" was incorrect, because 'r' was changed before the log line.
2. log appeared to user as error even though everything was calm; hence, reducing its severity

issue: 914840

Change-Id: I41520d27fc53fbbe07b61dd915e16448b87769d5
Signed-off-by: Avner BenHanoch <avnerb@mellanox.com>
8 years agoFix startup of Ceph cluster manager daemon on Debian 8 12555/head
Mark Korenberg [Sun, 18 Dec 2016 12:54:13 +0000 (17:54 +0500)]
Fix startup of Ceph cluster manager daemon on Debian 8

Signed-off-by: Mark Korenberg <socketpair@gmail.com>
8 years agoMerge pull request #12531 from dachary/wip-18291-bluestore
Loic Dachary [Sun, 18 Dec 2016 08:59:23 +0000 (09:59 +0100)]
Merge pull request #12531 from dachary/wip-18291-bluestore

ceph-disk: do not create bluestore wal/db partitions by default

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoceph-disk: do not create bluestore wal/db partitions by default 12531/head
Loic Dachary [Fri, 16 Dec 2016 15:23:03 +0000 (16:23 +0100)]
ceph-disk: do not create bluestore wal/db partitions by default

Fixes: http://tracker.ceph.com/issues/18291
Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agodoc: explain rgw_fcgi_socket_backlog in rgw/config-ref.rst 12548/head
liuchang0812 [Sat, 17 Dec 2016 14:49:42 +0000 (22:49 +0800)]
doc: explain rgw_fcgi_socket_backlog in rgw/config-ref.rst

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agoMerge pull request #12458 from Liuchang0812/add-more-log-for-network-error
Xie Xingguo [Sat, 17 Dec 2016 04:54:32 +0000 (12:54 +0800)]
Merge pull request #12458 from Liuchang0812/add-more-log-for-network-error

osd: enhance logging for osd network error

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoods: enhance logging for osd network error 12458/head
liuchang0812 [Tue, 13 Dec 2016 08:06:14 +0000 (16:06 +0800)]
ods: enhance logging for osd network error

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years ago osd/ECBackend: remove unused variable "ReadCB" 12543/head
huangjun [Sat, 17 Dec 2016 02:00:06 +0000 (10:00 +0800)]
  osd/ECBackend: remove unused variable "ReadCB"

Signed-off-by: huangjun <hjwsm1989@gmail.com>
8 years agoMerge pull request #12343 from liewegas/wip-bluestore-release
Sage Weil [Fri, 16 Dec 2016 23:40:47 +0000 (17:40 -0600)]
Merge pull request #12343 from liewegas/wip-bluestore-release

os/bluestore: simplify allocator release flow

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12351 from xiexingguo/xxg-wip-bluestore-1207
Sage Weil [Fri, 16 Dec 2016 23:40:30 +0000 (17:40 -0600)]
Merge pull request #12351 from xiexingguo/xxg-wip-bluestore-1207

os/bluestore: clear omap flag if parent has none

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12353 from xiexingguo/xxg-wip-bluestore-1207-01
Sage Weil [Fri, 16 Dec 2016 23:40:06 +0000 (17:40 -0600)]
Merge pull request #12353 from xiexingguo/xxg-wip-bluestore-1207-01

os/bluestore: don't implicitly create the source object for clone

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12466 from kylinstorage/wip-remove-unused-class-declaration
Sage Weil [Fri, 16 Dec 2016 23:39:44 +0000 (17:39 -0600)]
Merge pull request #12466 from kylinstorage/wip-remove-unused-class-declaration

remove unused declaration

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge branch 'master' into wip-remove-unused-class-declaration 12466/head
Sage Weil [Fri, 16 Dec 2016 23:38:32 +0000 (17:38 -0600)]
Merge branch 'master' into wip-remove-unused-class-declaration

8 years agoceph.in: allow 'flags' to not be present in cmddescs 12540/head
Dan Mick [Fri, 16 Dec 2016 22:58:46 +0000 (14:58 -0800)]
ceph.in: allow 'flags' to not be present in cmddescs

the 'flags' key in the command description dict may not be
present on older monitors.  Check for existence before
using it.

Introduced in 61d63433dfdcc08ecc21ba4f645794da5e01823c

Fixes: http://tracker.ceph.com/issues/18297
Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agoMerge pull request #12538 from liewegas/wip-workunits
Sage Weil [Fri, 16 Dec 2016 21:38:24 +0000 (15:38 -0600)]
Merge pull request #12538 from liewegas/wip-workunits

qa/tasks/workunit: retry on ceph.git if checkout fails

Reviewed-by: Josh Durgin <jdurgin@redhat.com>