]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agotools/cephfs: add pg_files command 11026/head
John Spray [Thu, 8 Sep 2016 22:58:26 +0000 (23:58 +0100)]
tools/cephfs: add pg_files command

Sometimes users know that particular data pool PGs
have been damaged, and they would like to scan
their files to work out which ones might have
been affected.

Fixes: http://tracker.ceph.com/issues/17249
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agolibcephfs: take ref when constructed with CephContext
John Spray [Thu, 8 Sep 2016 17:35:15 +0000 (18:35 +0100)]
libcephfs: take ref when constructed with CephContext

Previously, if you used ceph_create_with_context, then
it would try and destroy your context when you called
ceph_release.  Bad behaviour: caller created the
context, caller should decide when to destroy it.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11541 from stiopaa1/mds_sessionmap_addConst
John Spray [Wed, 19 Oct 2016 19:15:18 +0000 (21:15 +0200)]
Merge pull request #11541 from stiopaa1/mds_sessionmap_addConst

mds/SessionMap: add const to member functions

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agounittest_bluestore_types: add random put_ref test case
Sage Weil [Wed, 19 Oct 2016 18:13:20 +0000 (14:13 -0400)]
unittest_bluestore_types: add random put_ref test case

This appeared to fail under load, but works fine here.
:/

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agounittest_bluestore_types: fix gc tests
Sage Weil [Wed, 19 Oct 2016 18:12:42 +0000 (14:12 -0400)]
unittest_bluestore_types: fix gc tests

In ef8989ce7417034aa715de4fe83d1f0363c044f4 we disabled
gc for non-compressed blobs.  So mark these test ones as
compressed.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11438 from trociny/wip-17488
Jason Dillaman [Wed, 19 Oct 2016 15:41:26 +0000 (11:41 -0400)]
Merge pull request #11438 from trociny/wip-17488

rbd-nbd: support disabling auto-exclusive lock transition logic

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11546 from umullan/uday
Sage Weil [Wed, 19 Oct 2016 13:58:34 +0000 (08:58 -0500)]
Merge pull request #11546 from umullan/uday

doc: Fix broken link for caps

8 years agoMerge pull request #11558 from ifed01/wip-rmcoll-more-fixes
Sage Weil [Wed, 19 Oct 2016 13:54:06 +0000 (08:54 -0500)]
Merge pull request #11558 from ifed01/wip-rmcoll-more-fixes

os/memstore, os/filestore: fix store_test's to satisfy rm_coll behavi…

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/memstore, os/filestore: fix store_test's to satisfy rm_coll behavior expected... 11558/head
Igor Fedotov [Wed, 19 Oct 2016 13:41:40 +0000 (13:41 +0000)]
os/memstore, os/filestore: fix store_test's to satisfy rm_coll behavior expected in store_test

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11207 from yehudasa/wip-17372
Orit Wasserman [Wed, 19 Oct 2016 13:36:09 +0000 (15:36 +0200)]
Merge pull request #11207 from yehudasa/wip-17372

rgw: get_zonegroup() uses "default" zonegroup if empty
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #10919 from pritha-srivastava/wip-17076
Orit Wasserman [Wed, 19 Oct 2016 13:33:17 +0000 (15:33 +0200)]
Merge pull request #10919 from pritha-srivastava/wip-17076

rgw: Replacing '+' with "%20" in canonical uri for s3 v4 auth.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11316 from stiopaa1/mds_sessionMapUnnamedNamespace
John Spray [Wed, 19 Oct 2016 13:28:51 +0000 (15:28 +0200)]
Merge pull request #11316 from stiopaa1/mds_sessionMapUnnamedNamespace

mds/SessionMap.cc:put classes in unnamed namespace

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11450 from stiopaa1/mds_damagetable_moveClassesToCCfile
John Spray [Wed, 19 Oct 2016 13:27:58 +0000 (15:27 +0200)]
Merge pull request #11450 from stiopaa1/mds_damagetable_moveClassesToCCfile

mds/DamageTable: move classes to .cc file

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11511 from stiopaa1/mds_mdsmap_addConstToMemFunctions
John Spray [Wed, 19 Oct 2016 13:27:07 +0000 (15:27 +0200)]
Merge pull request #11511 from stiopaa1/mds_mdsmap_addConstToMemFunctions

mds/MDSMap.h: add const to member functions

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11550 from renhwztetecs/renhw-wip-mgr-doc
John Spray [Wed, 19 Oct 2016 13:21:45 +0000 (15:21 +0200)]
Merge pull request #11550 from renhwztetecs/renhw-wip-mgr-doc

doc/mgr: fix mgr how long to wait to failover

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11304 from ajarr/wip-volume-client-recovery-fixes
John Spray [Wed, 19 Oct 2016 13:18:34 +0000 (15:18 +0200)]
Merge pull request #11304 from ajarr/wip-volume-client-recovery-fixes

ceph_volume_client: fix recovery from partial auth update

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11386 from xiexingguo/xxg-wip-mgr-1008
John Spray [Wed, 19 Oct 2016 13:16:22 +0000 (15:16 +0200)]
Merge pull request #11386 from xiexingguo/xxg-wip-mgr-1008

mgr: misc minor changes

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11507 from ceph/wip-17579
Alfredo Deza [Wed, 19 Oct 2016 12:23:10 +0000 (08:23 -0400)]
Merge pull request #11507 from ceph/wip-17579

build/ops: deb: add python dependencies where needed

Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agobuild/ops: deb: add python dependencies where needed 11507/head
Nathan Cutler [Sat, 15 Oct 2016 08:54:52 +0000 (10:54 +0200)]
build/ops: deb: add python dependencies where needed

this reverts 48f4576 and f140a8c

Fixes: http://tracker.ceph.com/issues/17579
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agobuild/ops: deb: put depends on separate lines
Nathan Cutler [Sat, 15 Oct 2016 08:53:37 +0000 (10:53 +0200)]
build/ops: deb: put depends on separate lines

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #11557 from xiexingguo/xxg-wip-bluestore-1019
Igor Fedotov [Wed, 19 Oct 2016 11:40:24 +0000 (14:40 +0300)]
Merge pull request #11557 from xiexingguo/xxg-wip-bluestore-1019

os/bluestore: kill overlay related options

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11516 from david-z/wip-add-force-ro-ceph-string
John Spray [Wed, 19 Oct 2016 11:35:20 +0000 (13:35 +0200)]
Merge pull request #11516 from david-z/wip-add-force-ro-ceph-string

common/ceph_string: add ceph string constants for CEPH_SESSION_FORCE_RO

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11552 from tchaikov/wip-fix-enc
Kefu Chai [Wed, 19 Oct 2016 10:33:09 +0000 (18:33 +0800)]
Merge pull request #11552 from tchaikov/wip-fix-enc

include/object: pass "snapid_t&" to bound_encode()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11434 from batrick/mds-cmd-deprecated
John Spray [Wed, 19 Oct 2016 10:23:34 +0000 (12:23 +0200)]
Merge pull request #11434 from batrick/mds-cmd-deprecated

Flag deprecated mds commands and omit deprecated mon commands in help output

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11486 from batrick/client-gid
John Spray [Wed, 19 Oct 2016 10:20:44 +0000 (12:20 +0200)]
Merge pull request #11486 from batrick/client-gid

client: get gid from MonClient

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11373 from ukernel/wip-mds-recall-warning
John Spray [Wed, 19 Oct 2016 10:19:48 +0000 (12:19 +0200)]
Merge pull request #11373 from ukernel/wip-mds-recall-warning

mds: fix false "failing to respond to cache pressure" warning

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11551 from wjwithagen/wip-wjw-freebsd-lltng
Kefu Chai [Wed, 19 Oct 2016 09:23:15 +0000 (17:23 +0800)]
Merge pull request #11551 from wjwithagen/wip-wjw-freebsd-lltng

do_freebsd.sh: Do not use LTTNG on FreeBSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoinclude/object: pass "snapid_t&" to bound_encode() 11552/head
Kefu Chai [Wed, 19 Oct 2016 09:01:23 +0000 (17:01 +0800)]
include/object: pass "snapid_t&" to bound_encode()

otherwise the STL container's encoders will segfault when trying to
figure out the element size: they use "denc(*(A*)nullptr, elem_size)"
to do the calculation.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc/mgr: fix mgr how long to wait to failover 11550/head
huanwen ren [Wed, 19 Oct 2016 09:01:28 +0000 (17:01 +0800)]
doc/mgr: fix mgr how long to wait to failover

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
8 years agodo_freebsd.sh: Do not use LLTNG on FreeBSD 11551/head
Willem Jan Withagen [Wed, 19 Oct 2016 08:58:22 +0000 (10:58 +0200)]
do_freebsd.sh: Do not use LLTNG on FreeBSD

  FreeBSD has Dtrace

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #11534 from ceph/wip-17607-ceph-disk
Kefu Chai [Wed, 19 Oct 2016 07:29:58 +0000 (15:29 +0800)]
Merge pull request #11534 from ceph/wip-17607-ceph-disk

tests: ceph-disk: force debug monc = 0

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: kill overlay related options 11557/head
xie xingguo [Wed, 19 Oct 2016 06:29:16 +0000 (14:29 +0800)]
os/bluestore: kill overlay related options

These two options are not used anymore.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agodoc: Fix broken link for caps 11546/head
Uday Mullangi [Wed, 19 Oct 2016 06:08:50 +0000 (11:38 +0530)]
doc: Fix broken link for caps
http://tracker.ceph.com/issues/17587
Signed-off-by: Uday udaymjl@gmail.com
8 years agoMerge pull request #11512 from wjwithagen/wip-wjw-freebsd-depends
Kefu Chai [Wed, 19 Oct 2016 03:32:59 +0000 (11:32 +0800)]
Merge pull request #11512 from wjwithagen/wip-wjw-freebsd-depends

FreeBSD: update require packages

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11204 from liewegas/wip-rados-ack
Sage Weil [Wed, 19 Oct 2016 02:40:44 +0000 (21:40 -0500)]
Merge pull request #11204 from liewegas/wip-rados-ack

librados: do not request osd ack if no completed completion is set

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #11213 from liewegas/wip-osd-fastinfo
Sage Weil [Wed, 19 Oct 2016 02:39:58 +0000 (21:39 -0500)]
Merge pull request #11213 from liewegas/wip-osd-fastinfo

osd: add a pg _fastinfo attribute to reduce per-io metadata updates

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #11354 from liewegas/wip-rocksdb
Sage Weil [Wed, 19 Oct 2016 02:38:53 +0000 (21:38 -0500)]
Merge pull request #11354 from liewegas/wip-rocksdb

rocksdb: update to latest, and make it the default for the mons

8 years agoMerge pull request #11500 from liewegas/wip-lttng
Sage Weil [Wed, 19 Oct 2016 02:38:40 +0000 (21:38 -0500)]
Merge pull request #11500 from liewegas/wip-lttng

CMakeLists.txt: enable LTTNG by default

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomds/SessionMap: add const to member functions 11541/head
Michal Jarzabek [Tue, 18 Oct 2016 20:55:14 +0000 (21:55 +0100)]
mds/SessionMap: add const to member functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoMerge pull request #11540 from liewegas/wip-bluestore-cow
Sage Weil [Tue, 18 Oct 2016 20:53:37 +0000 (15:53 -0500)]
Merge pull request #11540 from liewegas/wip-bluestore-cow

os/bluestore: default bluestore_clone_cow=true

8 years agoMerge pull request #11539 from liewegas/wip-bluestore-gc
Sage Weil [Tue, 18 Oct 2016 20:53:25 +0000 (15:53 -0500)]
Merge pull request #11539 from liewegas/wip-bluestore-gc

os/bluestore: no garbage collection for uncompressed blobs

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: default bluestore_clone_cow=true 11540/head
Sage Weil [Tue, 18 Oct 2016 20:52:49 +0000 (16:52 -0400)]
os/bluestore: default bluestore_clone_cow=true

This has been stable for a long time.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoRevert "ceph_test_objecstore: use 1TB block device" 11539/head
Sage Weil [Tue, 18 Oct 2016 20:50:28 +0000 (16:50 -0400)]
Revert "ceph_test_objecstore: use 1TB block device"

This reverts commit 5389133ff9a7783d77796ed73893e26f34c6e5d2.

This is too slow with the bitmap allocator.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: No garbage collection for uncompressed blobs
Roushan Ali [Tue, 18 Oct 2016 19:43:19 +0000 (12:43 -0700)]
os/bluestore: No garbage collection for uncompressed blobs

Signed-off-by: Roushan Ali<roushan.ali@sandisk.com>
8 years agoMerge pull request #11536 from liewegas/wip-fullbit-dump
Sage Weil [Tue, 18 Oct 2016 18:43:17 +0000 (13:43 -0500)]
Merge pull request #11536 from liewegas/wip-fullbit-dump

mds: fix EMetaBlob::fullbit xattr dump

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #11533 from ifed01/wip-kstore-rmcoll-fix
Sage Weil [Tue, 18 Oct 2016 18:22:11 +0000 (13:22 -0500)]
Merge pull request #11533 from ifed01/wip-kstore-rmcoll-fix

os/kstore: rmcoll fix to satisfy store_test

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agomds: fix EMetaBlob::fullbit xattr dump 11536/head
Sage Weil [Tue, 18 Oct 2016 18:02:47 +0000 (14:02 -0400)]
mds: fix EMetaBlob::fullbit xattr dump

- show xattr names!
- bound the values

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotests: ceph-disk: force debug monc = 0 11534/head
Loic Dachary [Tue, 18 Oct 2016 15:33:23 +0000 (17:33 +0200)]
tests: ceph-disk: force debug monc = 0

The sh function will collect both stderr and stdout and debug
will mess the json parsing.

Fixes: http://tracker.ceph.com/issues/17607
Signed-off-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11525 from wjwithagen/wip-wjw-freebsd-getopt
Sage Weil [Tue, 18 Oct 2016 14:45:24 +0000 (09:45 -0500)]
Merge pull request #11525 from wjwithagen/wip-wjw-freebsd-getopt

tools/ceph-monstore-update-crush.sh: FreeBSD getopt is not compatible…

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11524 from wjin/filestore_perfcounter
Sage Weil [Tue, 18 Oct 2016 14:41:54 +0000 (09:41 -0500)]
Merge pull request #11524 from wjin/filestore_perfcounter

os/filestore: clean filestore perfcounters

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11518 from umullan/uday
Sage Weil [Tue, 18 Oct 2016 14:31:54 +0000 (09:31 -0500)]
Merge pull request #11518 from umullan/uday

doc: fix broken links

8 years agoMerge pull request #11522 from wjwithagen/wip-wjw-freebsd-readable.sh
Sage Weil [Tue, 18 Oct 2016 14:30:06 +0000 (09:30 -0500)]
Merge pull request #11522 from wjwithagen/wip-wjw-freebsd-readable.sh

FreeBSD:test/encoding/readable.sh": fix nproc and ls -v calls

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11528 from jcsp/wip-vstart-1osd
Sage Weil [Tue, 18 Oct 2016 14:28:26 +0000 (09:28 -0500)]
Merge pull request #11528 from jcsp/wip-vstart-1osd

vstart: decrease pool size if <3 OSDs

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoosd/PG: add perfcounters for pg info updates 11213/head
Sage Weil [Tue, 18 Oct 2016 14:16:13 +0000 (10:16 -0400)]
osd/PG: add perfcounters for pg info updates

Note info updates (of any kind), fastinfo updates,
and biginfo updates.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: proper set resulting pnext to avoid returning local var 11533/head
Igor Fedotov [Tue, 18 Oct 2016 13:50:17 +0000 (13:50 +0000)]
os/bluestore: proper set resulting pnext to avoid returning local var

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/kstore: fix KStore rm_coll handler to behave similar to bluestore one
Igor Fedotov [Tue, 18 Oct 2016 13:42:12 +0000 (13:42 +0000)]
os/kstore: fix KStore rm_coll handler to behave similar to bluestore one

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoceph-objectstore-tool: relax cur_struct_v checks
Sage Weil [Mon, 17 Oct 2016 18:27:16 +0000 (14:27 -0400)]
ceph-objectstore-tool: relax cur_struct_v checks

All compat pg formats can handle past interval removal
and mark-complete.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: make fastinfo apply conditionally
Sage Weil [Thu, 6 Oct 2016 16:44:03 +0000 (12:44 -0400)]
osd: make fastinfo apply conditionally

This way we don't have to bother deleting the fastinfo
attr, which will reduce the amount of work the
underlying store has to do.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: add _fastinfo PG attr for common pg_info_t updates
Sage Weil [Mon, 26 Sep 2016 15:39:41 +0000 (11:39 -0400)]
osd: add _fastinfo PG attr for common pg_info_t updates

For most IO operations we only update a handful of fields
in the pg_info_t structure.  However, the full struct,
when encoded, is on the order of 800 bytes.

This adds a new attribute, _fastinfo, which contains only
the most commonly updated fields.  When present, the
fastinfo fields should be overlayed on top of the full
info struct contained in the existing info attr.  If
a field outside of the "fast" set is updated, we clear
the fastinfo attribute and update the full info attr.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/PG: pass last_writen_info to _prepare_write_info
Sage Weil [Fri, 23 Sep 2016 15:32:11 +0000 (11:32 -0400)]
osd/PG: pass last_writen_info to _prepare_write_info

We'll use this shortly.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/osd_types: operator== for pg hit sets, history, info
Sage Weil [Fri, 23 Sep 2016 15:26:36 +0000 (11:26 -0400)]
osd/osd_types: operator== for pg hit sets, history, info

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/PG: drop unused args to _prepare_write_info
Sage Weil [Fri, 23 Sep 2016 15:08:45 +0000 (11:08 -0400)]
osd/PG: drop unused args to _prepare_write_info

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/PG: pg_stat_t ondisk_log_size == log_size
Sage Weil [Fri, 23 Sep 2016 15:08:10 +0000 (11:08 -0400)]
osd/PG: pg_stat_t ondisk_log_size == log_size

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10325 from snakeAngel2015/rgw-support-s3subuser
Orit Wasserman [Tue, 18 Oct 2016 13:15:13 +0000 (15:15 +0200)]
Merge pull request #10325 from snakeAngel2015/rgw-support-s3subuser

rgw: add suport for creating S3 type subuser of admin rest api
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoos/kstore: uniform Collection implementation with BlueStore one
Igor Fedotov [Tue, 18 Oct 2016 13:04:43 +0000 (13:04 +0000)]
os/kstore: uniform Collection implementation with BlueStore one

Signed-off-by:Igor Fedotov <ifedotov@mirantis.com>

8 years agoMerge pull request #11481 from ddiss/cmake_rgw_deps
Kefu Chai [Tue, 18 Oct 2016 12:40:59 +0000 (20:40 +0800)]
Merge pull request #11481 from ddiss/cmake_rgw_deps

cmake: check WITH_RADOSGW for fcgi and expat dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agovstart: decrease pool size if <3 OSDs 11528/head
John Spray [Tue, 11 Oct 2016 17:11:42 +0000 (18:11 +0100)]
vstart: decrease pool size if <3 OSDs

Makes it easy to do OSD=1 for e.g. doing cephfs
stuff where we don't care much about the OSDs
behaviour.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #10239 from weiqiaomiao/wqm-wip-setolh
Orit Wasserman [Tue, 18 Oct 2016 10:20:16 +0000 (12:20 +0200)]
Merge pull request #10239 from weiqiaomiao/wqm-wip-setolh

rgw: should assign 'olh_bl" to state.attrset[RGW_ATTR_OLH_ID_TAG] instead of 'bl'
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11324 from yehudasa/wip-14589
Orit Wasserman [Tue, 18 Oct 2016 09:40:34 +0000 (11:40 +0200)]
Merge pull request #11324 from yehudasa/wip-14589

rgw: dump objects in RGWBucket::check_object_index()
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agotools/ceph-monstore-update-crush.sh: FreeBSD getopt is not compatible, use the one... 11525/head
Willem Jan Withagen [Tue, 18 Oct 2016 09:33:09 +0000 (11:33 +0200)]
tools/ceph-monstore-update-crush.sh: FreeBSD getopt is not compatible, use the one from packages

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #11432 from hansbogert/patch-3
Kefu Chai [Tue, 18 Oct 2016 09:19:15 +0000 (17:19 +0800)]
Merge pull request #11432 from hansbogert/patch-3

doc: Update install-ceph-gateway.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoFixes: #17587 11518/head
Uday Mullangi [Tue, 18 Oct 2016 06:17:57 +0000 (11:47 +0530)]
Fixes: #17587
doc: Fixing the broken link which was refactored for authentication as part of other PR
Signed-off-by: uday udaymjl@gmail.com
8 years agoos/filestore: clean filestore perfcounters 11524/head
Wei Jin [Tue, 18 Oct 2016 02:41:19 +0000 (10:41 +0800)]
os/filestore: clean filestore perfcounters

Move filestore perfcounters from objectstore to filestore itself
and change internal index name.

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
8 years agoMerge pull request #11027 from liewegas/wip-denc
Sage Weil [Tue, 18 Oct 2016 02:21:20 +0000 (21:21 -0500)]
Merge pull request #11027 from liewegas/wip-denc

fast denc encoding

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
8 years agoMerge remote-tracking branch 'gh/kraken'
Sage Weil [Mon, 17 Oct 2016 17:35:45 +0000 (13:35 -0400)]
Merge remote-tracking branch 'gh/kraken'

8 years agocmake: find GIT_VER variables if there is no .git dir
Ali Maredia [Fri, 14 Oct 2016 18:02:17 +0000 (14:02 -0400)]
cmake: find GIT_VER variables if there is no .git dir

find CEPH_GIT_VER & CEPH_GIT_NICE_VER if there is no
ceph/.git dir by parsing ceph/src/.git_version.

scenario is for building from source tarballs generated
by make-dist, since make-dist generates .git_version
by running make_version, and then packs .git_version
into the tarball.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
(cherry picked from commit c5c6b59f296f0ace3a6cfd939027118e82ab50a4)

8 years agoMerge pull request #11502 from liewegas/wip-bluestore-keybug
Sage Weil [Mon, 17 Oct 2016 15:47:10 +0000 (10:47 -0500)]
Merge pull request #11502 from liewegas/wip-bluestore-keybug

os/bluestore: fix escaping of chars > 0x80

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/kstore: fix escaping of chars > 0x80 in keys 11502/head
Sage Weil [Fri, 14 Oct 2016 19:35:58 +0000 (15:35 -0400)]
os/kstore: fix escaping of chars > 0x80 in keys

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: fix escaping of odd chars >0x80 in keys
Sage Weil [Fri, 14 Oct 2016 19:35:33 +0000 (15:35 -0400)]
os/bluestore: fix escaping of odd chars >0x80 in keys

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoceph_test_objectstore: test unprintable chars
Sage Weil [Fri, 14 Oct 2016 19:35:06 +0000 (15:35 -0400)]
ceph_test_objectstore: test unprintable chars

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoFreeBSD:test/encoding/readable.sh": fix nproc and ls -v calls 11522/head
Willem Jan Withagen [Mon, 17 Oct 2016 14:42:15 +0000 (16:42 +0200)]
FreeBSD:test/encoding/readable.sh": fix nproc and ls -v calls

 Neither of these is available in FreeBSD.
 But sort -n is Posix, and does the same ATM.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #11521 from markhpc/wip-send_inline
Sage Weil [Mon, 17 Oct 2016 14:36:09 +0000 (09:36 -0500)]
Merge pull request #11521 from markhpc/wip-send_inline

msg/async: set ms_async_send_inline to false to improve small randread iops

8 years agoSet ms_async_send_inline to false to improve small randread iops. 11521/head
Mark Nelson [Mon, 17 Oct 2016 14:10:09 +0000 (09:10 -0500)]
Set ms_async_send_inline to false to improve small randread iops.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
8 years agomgr: shutdown finisher in a graceful way 11386/head
xie xingguo [Sun, 9 Oct 2016 02:55:12 +0000 (10:55 +0800)]
mgr: shutdown finisher in a graceful way

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomgr/MgrMonitor: make period of sending digests configurable
xie xingguo [Sun, 9 Oct 2016 02:52:09 +0000 (10:52 +0800)]
mgr/MgrMonitor: make period of sending digests configurable

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/MgrMonitor: break loop on catching specified standby
xie xingguo [Sun, 9 Oct 2016 02:44:33 +0000 (10:44 +0800)]
mon/MgrMonitor: break loop on catching specified standby

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/MgrMonitor: unify updating map code path
xie xingguo [Sun, 9 Oct 2016 02:34:18 +0000 (10:34 +0800)]
mon/MgrMonitor: unify updating map code path

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomgr/MgrStandby: do not ignore result of init() of monc
xie xingguo [Sun, 9 Oct 2016 02:21:20 +0000 (10:21 +0800)]
mgr/MgrStandby: do not ignore result of init() of monc

Which can fail due to missing keyring.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomgr/MgrStandby: use mgr_beacon_period to send beacon
xie xingguo [Sun, 9 Oct 2016 01:17:17 +0000 (09:17 +0800)]
mgr/MgrStandby: use mgr_beacon_period to send beacon

Fixes: http://tracker.ceph.com/issues/17455
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11262 from jcsp/wip-17270-master
John Spray [Mon, 17 Oct 2016 12:06:42 +0000 (14:06 +0200)]
Merge pull request #11262 from jcsp/wip-17270-master

Revert "osdc: After write try merge bh."

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years ago11.0.2 v11.0.2
Jenkins Build Slave User [Mon, 17 Oct 2016 11:16:50 +0000 (11:16 +0000)]
11.0.2

8 years agoMerge pull request #11211 from ceph/wip-no-recordlock-test
John Spray [Mon, 17 Oct 2016 11:04:41 +0000 (13:04 +0200)]
Merge pull request #11211 from ceph/wip-no-recordlock-test

test: temporarily remove fork()ing flock tests

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoFixes: #17587
Uday Mullangi [Mon, 17 Oct 2016 11:04:25 +0000 (16:34 +0530)]
Fixes: #17587
doc: Fixing the broken link which was refactored for authentication as part of other PR
Signed-off-by: uday udaymjl@gmail.com
8 years agoFixes: #17587
Uday Mullangi [Mon, 17 Oct 2016 09:43:43 +0000 (15:13 +0530)]
Fixes: #17587
doc: Fixing the broken link which was refactored for authentication as part of other PR
Signed-off-by: uday udaymjl@gmail.com
8 years agoMerge pull request #11440 from ceph/wip-jlayton-linkref
John Spray [Mon, 17 Oct 2016 10:37:47 +0000 (12:37 +0200)]
Merge pull request #11440 from ceph/wip-jlayton-linkref

client: don't take extra target inode reference in ll_link

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11421 from ceph/wip-jlayton-cephfs
John Spray [Mon, 17 Oct 2016 10:36:22 +0000 (12:36 +0200)]
Merge pull request #11421 from ceph/wip-jlayton-cephfs

Small pile of random cephfs fixes and cleanup

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agocommon/ceph_string: add ceph string constants for CEPH_SESSION_FORCE_RO 11516/head
Zhi Zhang [Mon, 17 Oct 2016 07:15:19 +0000 (15:15 +0800)]
common/ceph_string: add ceph string constants for CEPH_SESSION_FORCE_RO

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
8 years agoMerge pull request #11515 from badone/wip-find_best_info-typos
Brad Hubbard [Mon, 17 Oct 2016 04:48:13 +0000 (14:48 +1000)]
Merge pull request #11515 from badone/wip-find_best_info-typos

osd: Fix typos in PG::find_best_info

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
8 years agoosd: Fix typos in PG::find_best_info 11515/head
Brad Hubbard [Mon, 17 Oct 2016 03:11:53 +0000 (13:11 +1000)]
osd: Fix typos in PG::find_best_info

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #11513 from badone/clear_primary_state-typo
Sage Weil [Mon, 17 Oct 2016 02:27:15 +0000 (21:27 -0500)]
Merge pull request #11513 from badone/clear_primary_state-typo

osd: fix typo in PG::clear_primary_state