]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agolibrbd: quickly check for duplicate snap name upon create 9594/head
Jason Dillaman [Wed, 8 Jun 2016 14:12:04 +0000 (10:12 -0400)]
librbd: quickly check for duplicate snap name upon create

During journal replay, quickly check for a duplicate snap name
before allocating a snapshot sequence from the OSDs and
reverting due to the duplicate name.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: stop external replayer before closing remote journaler
Jason Dillaman [Tue, 7 Jun 2016 18:45:16 +0000 (14:45 -0400)]
rbd-mirror: stop external replayer before closing remote journaler

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: stop journal recorder before starting external replay
Jason Dillaman [Tue, 7 Jun 2016 16:42:52 +0000 (12:42 -0400)]
librbd: stop journal recorder before starting external replay

Fixes: http://tracker.ceph.com/issues/16165
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8008 from cernceph/dvanders_minsize
Yuri Weinstein [Wed, 8 Jun 2016 14:34:04 +0000 (07:34 -0700)]
Merge pull request #8008 from cernceph/dvanders_minsize

mon: default ec min_size to k+1

Dan van der Ster <daniel.vanderster@cern.ch>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8789 from vuhuong/wip-msgr-flex-prop-list
Yuri Weinstein [Wed, 8 Jun 2016 14:30:17 +0000 (07:30 -0700)]
Merge pull request #8789 from vuhuong/wip-msgr-flex-prop-list

msgr,xio: flexible Messenger::create options

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9184 from liewegas/wip-addr-work
Yuri Weinstein [Wed, 8 Jun 2016 14:26:50 +0000 (07:26 -0700)]
Merge pull request #9184 from liewegas/wip-addr-work

msg: encode entity_addr_t with features

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9486 from ifed01/wip-bluestore-stats3
Sage Weil [Wed, 8 Jun 2016 14:24:33 +0000 (10:24 -0400)]
Merge pull request #9486 from ifed01/wip-bluestore-stats3

os/bluestore: add per-store allocation/compression statistics

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9314 from xiexingguo/xxg-wip-fix-radosclient
Yuri Weinstein [Wed, 8 Jun 2016 14:21:58 +0000 (07:21 -0700)]
Merge pull request #9314 from xiexingguo/xxg-wip-fix-radosclient

RadosClient: reduce cpu burning; fix message leak

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9413 from stiopaa1/common_simplecache_addMove
Yuri Weinstein [Wed, 8 Jun 2016 14:20:42 +0000 (07:20 -0700)]
Merge pull request #9413 from stiopaa1/common_simplecache_addMove

common/simple_cache.hpp: add std::move

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9414 from branch-predictor/bp-no-invalidate-new-ptr
Yuri Weinstein [Wed, 8 Jun 2016 14:19:08 +0000 (07:19 -0700)]
Merge pull request #9414 from branch-predictor/bp-no-invalidate-new-ptr

buffer: don't invalidate crc cache of new ptr before zeroing it

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoos/BlueStore: Adds improved per-store statistics including compression ones. 9486/head
Igor Fedotov [Mon, 6 Jun 2016 16:06:48 +0000 (19:06 +0300)]
os/BlueStore: Adds improved per-store statistics including compression ones.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #9487 from ceph/wip_control_compiler_diagnostic_colors
Casey Bodley [Wed, 8 Jun 2016 14:09:47 +0000 (10:09 -0400)]
Merge pull request #9487 from ceph/wip_control_compiler_diagnostic_colors

Allows developers to turn on diagnostic colors for compiler output when stderr is not a terminal

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoos/BlueStore: Fixes fake blob length after put_ref removes all the extents
Igor Fedotov [Mon, 6 Jun 2016 15:01:15 +0000 (18:01 +0300)]
os/BlueStore: Fixes fake blob length after put_ref removes all the extents

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/BlueStore: Adding compressed_length field to blob and fixing corresponding issues...
Igor Fedotov [Mon, 6 Jun 2016 14:57:47 +0000 (17:57 +0300)]
os/BlueStore: Adding compressed_length field to blob and fixing corresponding issues at read path

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/ObjectStore: Refactor ObjectStore::statfs method to return extended statistics
Igor Fedotov [Mon, 6 Jun 2016 14:43:39 +0000 (17:43 +0300)]
os/ObjectStore: Refactor ObjectStore::statfs method to return extended statistics

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #9412 from Yan-waller/yj-hwip-rgwfixglobalinit
Orit Wasserman [Wed, 8 Jun 2016 08:05:08 +0000 (10:05 +0200)]
Merge pull request #9412 from Yan-waller/yj-hwip-rgwfixglobalinit

rgw/init: add errno and remove some unnecessary temporary variables.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9331 from stiopaa1/common_workQueue_addOverride
Kefu Chai [Wed, 8 Jun 2016 06:48:58 +0000 (14:48 +0800)]
Merge pull request #9331 from stiopaa1/common_workQueue_addOverride

common/WorkQueue.h: add override to virtual func

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9389 from badone/wip-releases-table-plus-jewel
Kefu Chai [Wed, 8 Jun 2016 06:45:10 +0000 (14:45 +0800)]
Merge pull request #9389 from badone/wip-releases-table-plus-jewel

doc: Add Jewel header to releases table

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9529 from gregsfortytwo/wip-cephfs-doc-link
Gregory Farnum [Wed, 8 Jun 2016 00:36:46 +0000 (17:36 -0700)]
Merge pull request #9529 from gregsfortytwo/wip-cephfs-doc-link

doc: include link to CephFS' experimental features

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9551 from dillaman/wip-16178
Mykola Golub [Tue, 7 Jun 2016 20:20:03 +0000 (23:20 +0300)]
Merge pull request #9551 from dillaman/wip-16178

cls_rbd: mirror image status summary should read full directory

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9563 from markhpc/wip-rocksdb-jemalloc
Sage Weil [Tue, 7 Jun 2016 17:15:48 +0000 (13:15 -0400)]
Merge pull request #9563 from markhpc/wip-rocksdb-jemalloc

kv: explicitly set DISABLE_JEMALLOC for rocksdb in Makefile.am.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoexplicitly set JEMALLOC for rocksdb. 9563/head
Mark Nelson [Tue, 7 Jun 2016 16:27:17 +0000 (11:27 -0500)]
explicitly set JEMALLOC for rocksdb.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
9 years agoChange implementation to use a documented CACHE variable, and allow 9487/head
J. Eric Ivancich [Mon, 6 Jun 2016 15:32:01 +0000 (11:32 -0400)]
Change implementation to use a documented CACHE variable, and allow
any of the three values supported by GCC to be used. Just as the GCC
default is 'auto', so is the default within the cmake file.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
9 years agoAdd documentation to README.cmake.md. Have cmake produce messages
J. Eric Ivancich [Fri, 3 Jun 2016 16:39:01 +0000 (12:39 -0400)]
Add documentation to README.cmake.md. Have cmake produce messages
(status or warning) when diagnostics color is requested via
-DDIAG_COLOR_ALWAYS=yes.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
9 years agoIf compiler allows it and if -DDIAG_COLOR_ALWAYS=yes is provided to
J. Eric Ivancich [Fri, 3 Jun 2016 15:44:03 +0000 (11:44 -0400)]
If compiler allows it and if -DDIAG_COLOR_ALWAYS=yes is provided to
cmake, turn on diagnostic colors always, even when compiler output
does not go directly to terminal (e.g., when piped to "less -R").

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
9 years agoMerge pull request #9370 from majianpeng/bitmap-allocator
Sage Weil [Tue, 7 Jun 2016 15:30:29 +0000 (11:30 -0400)]
Merge pull request #9370 from majianpeng/bitmap-allocator

os/bluestore/BitMapAllocator: fix free space beyond size of BitAlloca…

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #8657 from rzarzynski/wip-rgw-swift-auth
Matt Benjamin [Tue, 7 Jun 2016 14:36:30 +0000 (10:36 -0400)]
Merge pull request #8657 from rzarzynski/wip-rgw-swift-auth

rgw: authentication subsystem rework

Passed teuthology rgw suite.

9 years agoMerge pull request #9532 from xiexingguo/xxg-wip-fix-csumcheck
Sage Weil [Tue, 7 Jun 2016 14:21:56 +0000 (10:21 -0400)]
Merge pull request #9532 from xiexingguo/xxg-wip-fix-csumcheck

os/bluestore: make verify_csum catch unsupported csum type error

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9492 from xiexingguo/xxg-wip-fix-bitmapallocator
Sage Weil [Tue, 7 Jun 2016 14:08:16 +0000 (10:08 -0400)]
Merge pull request #9492 from xiexingguo/xxg-wip-fix-bitmapallocator

bluestore/BitAllocator: miscellaneous fixes

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #9528 from stiopaa1/common_ceph_json_addConsToMember
Sage Weil [Tue, 7 Jun 2016 14:05:55 +0000 (10:05 -0400)]
Merge pull request #9528 from stiopaa1/common_ceph_json_addConsToMember

common/ceph_json.h: add const to member function

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9530 from majianpeng/bluestore-cleanup
Sage Weil [Tue, 7 Jun 2016 14:05:13 +0000 (10:05 -0400)]
Merge pull request #9530 from majianpeng/bluestore-cleanup

os/bluestore/BlueStore: remove the duplicated code.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9549 from ifed01/wip-bluestore-large-blob-fix
Sage Weil [Tue, 7 Jun 2016 14:03:35 +0000 (10:03 -0400)]
Merge pull request #9549 from ifed01/wip-bluestore-large-blob-fix

os/bluestore: Fix for blob length on large writes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agobluestore: end scope of std::hex properly 9532/head
xie xingguo [Tue, 7 Jun 2016 00:57:45 +0000 (08:57 +0800)]
bluestore: end scope of std::hex properly

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agobluestore: make verify_csum can catch unsupported csum type error
xie xingguo [Mon, 6 Jun 2016 14:40:54 +0000 (22:40 +0800)]
bluestore: make verify_csum can catch unsupported csum type error

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agocls_rbd: mirror image status summary should read full directory 9551/head
Jason Dillaman [Tue, 7 Jun 2016 13:36:02 +0000 (09:36 -0400)]
cls_rbd: mirror image status summary should read full directory

Previously only retrieved the status for the first 64 images in
the rbd_mirroring directory.

Fixes: http://tracker.ceph.com/issues/16178
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoos/BlueStore: Fixes improper blob length assignment when creating a new blob for... 9549/head
Igor Fedotov [Tue, 7 Jun 2016 13:34:32 +0000 (16:34 +0300)]
os/BlueStore: Fixes improper blob length assignment when creating a new blob for large writes

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/BlueStore: Adds checkes for lextent range overlaps to _fsck
Igor Fedotov [Tue, 7 Jun 2016 13:24:13 +0000 (16:24 +0300)]
os/BlueStore: Adds checkes for lextent range overlaps to _fsck

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #9533 from jjhuo/no_pagecache
Sage Weil [Tue, 7 Jun 2016 13:14:13 +0000 (09:14 -0400)]
Merge pull request #9533 from jjhuo/no_pagecache

os/bluestore: make rocksdb not to use page cache

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8233 from majianpeng/bluestore-perfcount
Sage Weil [Tue, 7 Jun 2016 13:10:25 +0000 (09:10 -0400)]
Merge pull request #8233 from majianpeng/bluestore-perfcount

os/bluestore: perf counters

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueStore: remove the duplicated code. 9530/head
Jianpeng Ma [Mon, 6 Jun 2016 13:28:47 +0000 (21:28 +0800)]
os/bluestore/BlueStore: remove the duplicated code.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agobluestore/BitAllocator: literal cleanups 9492/head
xie xingguo [Sat, 4 Jun 2016 03:55:28 +0000 (11:55 +0800)]
bluestore/BitAllocator: literal cleanups

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9296 from tchaikov/wip-test-chain_xattr
Kefu Chai [Tue, 7 Jun 2016 04:05:26 +0000 (12:05 +0800)]
Merge pull request #9296 from tchaikov/wip-test-chain_xattr

test: Fix the order of ASSERT_EQ() in chain_xattr tests

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #9361 from stiopaa1/osd_osd_override
Kefu Chai [Tue, 7 Jun 2016 04:03:19 +0000 (12:03 +0800)]
Merge pull request #9361 from stiopaa1/osd_osd_override

osd/OSD.h: add override to virtual functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore/BlueFS: convert all read/write IO to direct IO. 9533/head
Jianjian Huo [Thu, 19 May 2016 22:11:33 +0000 (15:11 -0700)]
os/bluestore/BlueFS: convert all read/write IO to direct IO.

RocksDB is the sole user of BlueFS, after BlueFS uses direct IO,
RocksDB will have to use its own block cache to cache raw data
blocks.

Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com>
9 years agoos/bluestore: convert read_buffered() to read_random() with buffered flag
Jianjian Huo [Thu, 19 May 2016 22:03:41 +0000 (15:03 -0700)]
os/bluestore: convert read_buffered() to read_random() with buffered flag

New function will handle unaligned random read for both buffered or
direct read.

Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com>
9 years agoos/bluestore/BitAllocator: fix compiler warning. 9370/head
Jianpeng Ma [Mon, 6 Jun 2016 23:42:28 +0000 (07:42 +0800)]
os/bluestore/BitAllocator: fix compiler warning.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoos/bluestore/BitMapAllocator: fix free space beyond size of BitAllocator
Jianpeng Ma [Mon, 6 Jun 2016 23:37:13 +0000 (07:37 +0800)]
os/bluestore/BitMapAllocator: fix free space beyond size of BitAllocator

When Using bitmap allocator, the osd crashed. The stack info as
follows:

ceph-osd: os/bluestore/BitAllocator.cc:910: bool
BitAllocator::is_allocated(int64_t, int64_t): Assertion `start_block >=
0 && (start_block + num_blocks <= size())' failed.
*** Caught signal (Aborted) **
in thread 7f795bbc48c0 thread_name:ceph-osd ceph version
10.2.0-1333-g3f4cf16
(3f4cf16)
1: (()+0x98e25e) [0x55e112a9625e]
2: (()+0x109f0) [0x7f795a6719f0]
3: (gsignal()+0x38) [0x7f7958542a28]
4: (abort()+0x16a) [0x7f795854462a]
5: (()+0x2d227) [0x7f795853b227]
6: (()+0x2d2d2) [0x7f795853b2d2]
7: (()+0x7eaa59) [0x55e1128f2a59]
8: (BitAllocator::free_blocks(long, long)+0x22) [0x55e1128f2e82]
9: (BitMapAllocator::insert_free(unsigned long, unsigned long)+0x22c)
[0x55e1128ef12c]
10: (BitMapAllocator::init_add_free(unsigned long, unsigned long)+0x22c)
[0x55e1128ef41c]
11: (BlueFS::_init_alloc()+0x2b9) [0x55e1128c27b9]
12: (BlueFS::mkfs(uuid_d)+0x45a) [0x55e1128d475a]
13: (BlueStore::_open_db(bool)+0xd76) [0x55e1127bbcb6]
14: (BlueStore::mkfs()+0x8b1) [0x55e1127e4f11]
15: (OSD::mkfs(CephContext, ObjectStore, std::__cxx11::basic_string,
std::allocator > const&, uuid_d, int)+0x117) [0x55e112484de7]
16: (main()+0x101f) [0x55e112425f2f]
17: (__libc_start_main()+0xf0) [0x7f795852e580]
18: (_start()+0x29) [0x55e1124684e9]

This because in BitAllocator::init will decrease size of blkdev which
make size align w/ zone-size.
The later add free extent will beyond the size.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoos/bluestore/BlueStore: remove the unused perfcounter:l_bluestore_state_wal_done_lat 8233/head
Jianpeng Ma [Mon, 6 Jun 2016 22:29:08 +0000 (06:29 +0800)]
os/bluestore/BlueStore: remove the unused perfcounter:l_bluestore_state_wal_done_lat

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge pull request #9527 from linuxbox2/rgw-ldap
Casey Bodley [Mon, 6 Jun 2016 21:55:04 +0000 (17:55 -0400)]
Merge pull request #9527 from linuxbox2/rgw-ldap

rgw ldap: fix ldap bindpw parsing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw ldap: fix ldap bindpw parsing 9527/head
Matt Benjamin [Mon, 6 Jun 2016 20:19:17 +0000 (16:19 -0400)]
rgw ldap: fix ldap bindpw parsing

Also add additional LDAP debugging output at 0, 10, and 15 to make
troubleshooting easier.

Fixes DN search issue using QE configuration of MS AD.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agodoc: include link to CephFS' experimental features 9529/head
Greg Farnum [Mon, 6 Jun 2016 21:46:44 +0000 (14:46 -0700)]
doc: include link to CephFS' experimental features

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoRocksDBStore: add option to configure number of block cache shards
Jianjian Huo [Thu, 19 May 2016 19:06:37 +0000 (12:06 -0700)]
RocksDBStore: add option to configure number of block cache shards

rocksdb_cache_size will be splitted into number of shards evenly.
More shards will reduce lock contentions.

Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com>
9 years agocommon/ceph_json.h: add const to member function 9528/head
Michal Jarzabek [Mon, 6 Jun 2016 20:55:46 +0000 (21:55 +0100)]
common/ceph_json.h: add const to member function

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9525 from liewegas/wip-wq
Samuel Just [Mon, 6 Jun 2016 20:53:06 +0000 (13:53 -0700)]
Merge pull request #9525 from liewegas/wip-wq

unittest_workqueue: fix wq test for 0 threads

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9517 from idryomov/wip-rbd-concurrent
Josh Durgin [Mon, 6 Jun 2016 19:57:37 +0000 (12:57 -0700)]
Merge pull request #9517 from idryomov/wip-rbd-concurrent

krbd: don't segfault if images are unmapped concurrently

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #9432 from ceph/wip-16113
Samuel Just [Mon, 6 Jun 2016 19:23:46 +0000 (12:23 -0700)]
Merge pull request #9432 from ceph/wip-16113

Clean up hobject_t::max() values in decode, avoid comparing directly to get_max()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agounittest_workqueue: fix wq test for 0 threads 9525/head
Sage Weil [Mon, 6 Jun 2016 18:20:30 +0000 (14:20 -0400)]
unittest_workqueue: fix wq test for 0 threads

In 81517aea0696e4e62c2eb0830d7b0bd378c57230 we added
support for a wq with 0 worker threads.  Fix unit test
accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9522 from ceph/wip-rocksdb
Sage Weil [Mon, 6 Jun 2016 18:18:22 +0000 (14:18 -0400)]
Merge pull request #9522 from ceph/wip-rocksdb

Makefile-rocksdb: updates

9 years agohobject: enforce max canonical value 9432/head
Samuel Just [Fri, 3 Jun 2016 00:38:05 +0000 (17:38 -0700)]
hobject: enforce max canonical value

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agosrc/: remove all direct comparisons to get_max()
Samuel Just [Fri, 3 Jun 2016 00:13:09 +0000 (17:13 -0700)]
src/: remove all direct comparisons to get_max()

get_max() now returns a special singleton type from which hobject_t's
can be assigned and constructed, but which cannot be directly compared.

This patch also cleans up all such uses to use is_max() instead.

This should prevent some issues like 16113 by preventing us from
checking for max-ness by comparing against a sentinel value.  The more
complete fix will be to make all fields of hobject_t private and enforce
a canonical max() representation that way.  That patch will be hard to
backport, however, so we'll settle for this for now.

Fixes: http://tracker.ceph.com/issues/16113
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoos/bluestore/BlueStore: add perfcoutner:l_bluestore_write_penalty_read_ops
Jianpeng Ma [Mon, 6 Jun 2016 16:31:02 +0000 (00:31 +0800)]
os/bluestore/BlueStore: add perfcoutner:l_bluestore_write_penalty_read_ops

For write, because the align requirement it maybe need read data.
Using this perfcounter to record the read ops.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge pull request #9518 from cbodley/wip-mds-override
Sage Weil [Mon, 6 Jun 2016 16:11:34 +0000 (12:11 -0400)]
Merge pull request #9518 from cbodley/wip-mds-override

mds: fix MDRequestImpl::print override

Reviewed-by: John Spray <jspray@redhat.com>
9 years agoos/bluestore/BlueStore: add perfcounter: l_bluestore_wal_write_ops/bytes.
Jianpeng Ma [Mon, 6 Jun 2016 15:42:52 +0000 (23:42 +0800)]
os/bluestore/BlueStore: add perfcounter: l_bluestore_wal_write_ops/bytes.

Using this record wal ops and wal bytes.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoos/bluestore/BlueStore: Add perfcounter::l_bluestore_write_pad_bytes.
Jianpeng Ma [Mon, 6 Jun 2016 15:44:32 +0000 (23:44 +0800)]
os/bluestore/BlueStore: Add perfcounter::l_bluestore_write_pad_bytes.

For write, sometimes it need padd zero. Use this perfcounter to
record the padding bytes.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMakefile-rocksdb: updates 9522/head
Sage Weil [Mon, 6 Jun 2016 15:16:52 +0000 (11:16 -0400)]
Makefile-rocksdb: updates

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9506 from tchaikov/wip-cmake 9519/head
Casey Bodley [Mon, 6 Jun 2016 14:06:41 +0000 (10:06 -0400)]
Merge pull request #9506 from tchaikov/wip-cmake

cmake: s/BUILD_SHARED_LIBS/ENABLE_SHARED/

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agomds: fix MDRequestImpl::print override 9518/head
Casey Bodley [Mon, 6 Jun 2016 13:45:49 +0000 (09:45 -0400)]
mds: fix MDRequestImpl::print override

Fixes compiler warnings:

In file included from /home/cbodley/ceph/src/mds/Locker.cc:22:0:
/home/cbodley/ceph/src/mds/Mutation.h:161:16: warning: ‘virtual void
MutationImpl::print(std::ostream&) const’ was hidden
[-Woverloaded-virtual]
   virtual void print(ostream &out) const {
                ^
/home/cbodley/ceph/src/mds/Mutation.h:340:8: warning:   by ‘void
MDRequestImpl::print(std::ostream&)’ [-Woverloaded-virtual]
   void print(ostream &out);

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9512 from Yan-waller/yj-wip-rgwdocs
Casey Bodley [Mon, 6 Jun 2016 13:37:07 +0000 (09:37 -0400)]
Merge pull request #9512 from Yan-waller/yj-wip-rgwdocs

doc/rgw: correct radosgw-admin command name

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9175 from majianpeng/bluestore-sync-wal-apply
Sage Weil [Mon, 6 Jun 2016 13:28:50 +0000 (09:28 -0400)]
Merge pull request #9175 from majianpeng/bluestore-sync-wal-apply

os/bluestore: If using sync_wal_apply, no need start wal_tp thread.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9470 from liewegas/wip-bluestore
Sage Weil [Mon, 6 Jun 2016 13:27:40 +0000 (09:27 -0400)]
Merge pull request #9470 from liewegas/wip-bluestore

os/bluestore: shard cache to match osd op wq sharding

9 years agoMerge pull request #9516 from liewegas/wip-bluestore-fixes
Sage Weil [Mon, 6 Jun 2016 13:26:56 +0000 (09:26 -0400)]
Merge pull request #9516 from liewegas/wip-bluestore-fixes

os/bluestore: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agobluestore: add "0x" prefix for tracing messages 9516/head
xie xingguo [Thu, 2 Jun 2016 11:29:01 +0000 (19:29 +0800)]
bluestore: add "0x" prefix for tracing messages

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agobluestore: simplify flag translation logic
xie xingguo [Sat, 4 Jun 2016 09:43:58 +0000 (17:43 +0800)]
bluestore: simplify flag translation logic

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agobluestore: fix is_allocated() method of bluestore_blob_t
xie xingguo [Sat, 4 Jun 2016 10:53:58 +0000 (18:53 +0800)]
bluestore: fix is_allocated() method of bluestore_blob_t

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9254 from branch-predictor/bp-lockdep-on-diet
Sage Weil [Mon, 6 Jun 2016 12:52:49 +0000 (08:52 -0400)]
Merge pull request #9254 from branch-predictor/bp-lockdep-on-diet

lockdep: Lockdep on diet

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agokrbd: don't segfault if images are unmapped concurrently 9517/head
Ilya Dryomov [Fri, 3 Jun 2016 15:24:48 +0000 (17:24 +0200)]
krbd: don't segfault if images are unmapped concurrently

"rbd map c" can die from a NULL dereference on any of this_pool,
this_image or this_snap in wait_for_udev_add():

    <image a is mapped>
    rbd map c
                                    rbd map b
                                    rbd unmap a
                                    rbd unmap b

However unlikely, this segfault is triggered by the rbd/concurrent.sh
workunit on a regular basis.

Similarly, "rbd showmapped" can die if an image to be listed is
unmapped.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agoMerge pull request #9384 from stiopaa1/osd_replicatedpg_override
Kefu Chai [Mon, 6 Jun 2016 12:48:30 +0000 (20:48 +0800)]
Merge pull request #9384 from stiopaa1/osd_replicatedpg_override

osd/ReplicatedPG.h: add override to virtual funct

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9497 from Yan-waller/yj-wip-fixosdmaptools
Sage Weil [Mon, 6 Jun 2016 12:46:25 +0000 (08:46 -0400)]
Merge pull request #9497 from Yan-waller/yj-wip-fixosdmaptools

tools/osdmaptool: fix some errors

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9490 from stiopaa1/osd_replicatedpg_addConstOutputOp
Kefu Chai [Mon, 6 Jun 2016 12:46:00 +0000 (20:46 +0800)]
Merge pull request #9490 from stiopaa1/osd_replicatedpg_addConstOutputOp

osd/ReplicatedPG.h: add const to operator<< param

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9499 from Yan-waller/yj-wip-fixrgwwarning
Sage Weil [Mon, 6 Jun 2016 12:42:45 +0000 (08:42 -0400)]
Merge pull request #9499 from Yan-waller/yj-wip-fixrgwwarning

rgw/op: kill compiling warning

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9501 from stiopaa1/all_operatorOutput
Sage Weil [Mon, 6 Jun 2016 12:42:03 +0000 (08:42 -0400)]
Merge pull request #9501 from stiopaa1/all_operatorOutput

all: add const to operator<< param

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agorocksdb: pull up to master
Sage Weil [Mon, 6 Jun 2016 12:24:02 +0000 (08:24 -0400)]
rocksdb: pull up to master

This includes a few patches from Willem Jan Withagen
<wjw@digiware.nl> that fix the build on FreeBSD.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/rgw: correct radosgw-admin command name 9512/head
Yan Jun [Mon, 6 Jun 2016 11:45:16 +0000 (19:45 +0800)]
doc/rgw: correct radosgw-admin command name

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
9 years agoMerge pull request #8598 from renhwsky/wip-renhw-ceph_mds-help
John Spray [Mon, 6 Jun 2016 09:47:29 +0000 (10:47 +0100)]
Merge pull request #8598 from renhwsky/wip-renhw-ceph_mds-help

mds: fix usage() display

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8641 from renhwztetecs/renhw-wip-mds-cleanup
John Spray [Mon, 6 Jun 2016 09:46:59 +0000 (10:46 +0100)]
Merge pull request #8641 from renhwztetecs/renhw-wip-mds-cleanup

mds: MDSDaemon::init bug fix

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8753 from renhwztetecs/renhw-wip-fuse-fuse_file_info
John Spray [Mon, 6 Jun 2016 09:45:29 +0000 (10:45 +0100)]
Merge pull request #8753 from renhwztetecs/renhw-wip-fuse-fuse_file_info

client: fuse_file_info.fh type should be uint64_t

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8777 from ukernel/wip-allow-dirfrags
John Spray [Mon, 6 Jun 2016 09:43:37 +0000 (10:43 +0100)]
Merge pull request #8777 from ukernel/wip-allow-dirfrags

mds: fix 'allows_dirfrags' check for fragment_dir command

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8799 from renhwztetecs/renhw-wip-fusemain
John Spray [Mon, 6 Jun 2016 09:42:59 +0000 (10:42 +0100)]
Merge pull request #8799 from renhwztetecs/renhw-wip-fusemain

client/fuse: object release order error

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #9459 from dillaman/wip-16123
Mykola Golub [Mon, 6 Jun 2016 07:20:54 +0000 (10:20 +0300)]
Merge pull request #9459 from dillaman/wip-16123

test/rbd: fsx needs to shut down the journal

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agocmake: s/BUILD_SHARED_LIBS/ENABLE_SHARED/ 9506/head
Kefu Chai [Mon, 6 Jun 2016 04:42:02 +0000 (12:42 +0800)]
cmake: s/BUILD_SHARED_LIBS/ENABLE_SHARED/

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration
Kefu Chai [Mon, 6 Jun 2016 02:57:23 +0000 (10:57 +0800)]
Merge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration

common/ceph_json.h: remove duplicate declaration

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocommon/ceph_json.h: remove duplicate declaration 9503/head
Michal Jarzabek [Sun, 5 Jun 2016 21:15:48 +0000 (22:15 +0100)]
common/ceph_json.h: remove duplicate declaration

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoall: add const to operator<< param 9501/head
Michal Jarzabek [Sat, 4 Jun 2016 22:24:06 +0000 (23:24 +0100)]
all: add const to operator<< param

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9174 from majianpeng/osd-ms-dispatch
Kefu Chai [Sun, 5 Jun 2016 06:15:02 +0000 (14:15 +0800)]
Merge pull request #9174 from majianpeng/osd-ms-dispatch

OSD: cleanup code for ms_dispatch

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9178 from wjwithagen/wip-wjw-freebsd-compile-2
Kefu Chai [Sun, 5 Jun 2016 06:01:23 +0000 (14:01 +0800)]
Merge pull request #9178 from wjwithagen/wip-wjw-freebsd-compile-2

build: freebsd changes (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9446 from ceph/wip-cmake
Ali Maredia [Sat, 4 Jun 2016 22:28:40 +0000 (18:28 -0400)]
Merge pull request #9446 from ceph/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoPG::replica_scrub: don't adjust pool on max object
Samuel Just [Fri, 3 Jun 2016 00:39:09 +0000 (17:39 -0700)]
PG::replica_scrub: don't adjust pool on max object

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agohobject: compensate for non-canonical hobject_t::get_max() encodings
Samuel Just [Fri, 3 Jun 2016 00:36:21 +0000 (17:36 -0700)]
hobject: compensate for non-canonical hobject_t::get_max() encodings

This closes a loop-hole that could allow a non-canonical in memory
hobject_t::get_max() object which would return true for is_max(), but
false for *this == hobject_t::get_max().

Fixes: http://tracker.ceph.com/issues/16113
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agorgw/op: kill compiling warning 9499/head
Yan Jun [Sat, 4 Jun 2016 12:08:11 +0000 (20:08 +0800)]
rgw/op: kill compiling warning

rgw/rgw_op.cc: In member function 'virtual int RGWCreateBucket::verify_permission()':
rgw/rgw_op.cc:1810:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (buckets.count() >= s->user->max_buckets) {

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
9 years agotools/osdmaptool: fix error message if we are unable to parse pgid 9497/head
Yan Jun [Sat, 4 Jun 2016 09:08:24 +0000 (17:08 +0800)]
tools/osdmaptool: fix error message if we are unable to parse pgid

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>