RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,602 Commits 1 Branch 394 Tags 1.4 GiB
e223d2eaff
Commit Graph

54602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
39725ea785 Merge pull request #9361 from stiopaa1/osd_osd_override 
osd/OSD.h: add override to virtual functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-07 12:03:19 +08:00
Vikhyat Umrao
a00720d9aa rbd: add error message "snapshot is already protected" 
Fixes: http://tracker.ceph.com/issues/15807

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
 2016-06-07 09:06:25 +05:30
Kefu Chai
3caafc4476 buffer: add a test for iterator::copy(huge_chunk, dest) 
Fixes: http://tracker.ceph.com/issues/16010
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-07 11:23:28 +08:00
Kefu Chai
053bfa650b buffer: fix advance(unsigned) to avoid int underflow 
by chaning
- the signature of advance(unsigned) to advance(size_t)
- the signature of seek(int) to seek(ssize_t)

Fixes: http://tracker.ceph.com/issues/16010
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-07 11:23:28 +08:00
Jason Dillaman
276fed6b70 librbd: potential duplicate snap removal can result in crash 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-06 22:34:30 -04:00
Jianjian Huo
5bb63ebdb6 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>
 2016-06-06 18:11:41 -07:00
Jianjian Huo
8e5891306c 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>
 2016-06-06 18:11:30 -07:00
Jianpeng Ma
7ae1db2ba0 os/bluestore/BitAllocator: fix compiler warning. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2016-06-07 07:42:28 +08:00
Jianpeng Ma
fca97f8619 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>
 2016-06-07 07:37:13 +08:00
Jianpeng Ma
add4832ca8 os/bluestore/BlueStore: remove the unused perfcounter:l_bluestore_state_wal_done_lat 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2016-06-07 06:29:08 +08:00
Casey Bodley
b262e46599 Merge pull request #9527 from linuxbox2/rgw-ldap 
rgw ldap: fix ldap bindpw parsing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-06 17:55:04 -04:00
Matt Benjamin
72b2f3e8dc 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>
 2016-06-06 17:50:32 -04:00
Greg Farnum
5d9cc299e6 doc: include link to CephFS' experimental features 
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
 2016-06-06 14:46:44 -07:00
Jianjian Huo
17129122ac 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>
 2016-06-06 14:44:41 -07:00
Michal Jarzabek
689819bab4 common/ceph_json.h: add const to member function 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-06-06 21:55:46 +01:00
Samuel Just
f14c8ae61f Merge pull request #9525 from liewegas/wip-wq 
unittest_workqueue: fix wq test for 0 threads

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-06-06 13:53:06 -07:00
Josh Durgin
27edd204aa 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>
 2016-06-06 12:57:37 -07:00
Samuel Just
2d79aa9cfc 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>
 2016-06-06 12:23:46 -07:00
Sage Weil
9c7d248e0d unittest_workqueue: fix wq test for 0 threads 
In 81517aea06 we added
support for a wq with 0 worker threads.  Fix unit test
accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-06 14:20:30 -04:00
Sage Weil
f836280c46 Merge pull request #9522 from ceph/wip-rocksdb 
Makefile-rocksdb: updates
 2016-06-06 14:18:22 -04:00
Samuel Just
cef5151a62 hobject: enforce max canonical value 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-06-06 09:34:09 -07:00
Samuel Just
7c5f2acaa5 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>
 2016-06-06 09:34:04 -07:00
Jianpeng Ma
189c8f190b 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>
 2016-06-07 00:31:02 +08:00
Sage Weil
f3d68eb61c Merge pull request #9518 from cbodley/wip-mds-override 
mds: fix MDRequestImpl::print override

Reviewed-by: John Spray <jspray@redhat.com>
 2016-06-06 12:11:34 -04:00
Jianpeng Ma
f8b7eb980d 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>
 2016-06-06 23:45:53 +08:00
Jianpeng Ma
b3f353e2cf 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>
 2016-06-06 23:44:32 +08:00
Yan Jun
dc0ac7b304 rgw/basic_type: use the standard usage of string 
string::find() returns a value of size_t type, we'd better
use the std::string::npos when it find nothing.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-06-06 23:38:25 +08:00
Sage Weil
6f022acc85 Makefile-rocksdb: updates 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-06 11:16:52 -04:00
Casey Bodley
2d4aec9d7b Merge pull request #9506 from tchaikov/wip-cmake 
cmake: s/BUILD_SHARED_LIBS/ENABLE_SHARED/

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-06 10:06:41 -04:00
Casey Bodley
42e084794c 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>
 2016-06-06 09:47:45 -04:00
Casey Bodley
e29741e28f Merge pull request #9512 from Yan-waller/yj-wip-rgwdocs 
doc/rgw: correct radosgw-admin command name

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-06 09:37:07 -04:00
Sage Weil
81517aea06 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>
 2016-06-06 09:28:50 -04:00
Sage Weil
36a3571df6 Merge pull request #9470 from liewegas/wip-bluestore 
os/bluestore: shard cache to match osd op wq sharding
 2016-06-06 09:27:40 -04:00
Sage Weil
3e6c951f68 Merge pull request #9516 from liewegas/wip-bluestore-fixes 
os/bluestore: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-06-06 09:26:56 -04:00
xie xingguo
5cfb2d5c1a bluestore: add "0x" prefix for tracing messages 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-06-06 09:10:49 -04:00
xie xingguo
3d849bd322 bluestore: simplify flag translation logic 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-06-06 09:10:49 -04:00
xie xingguo
8c75de795c bluestore: fix is_allocated() method of bluestore_blob_t 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-06-06 09:10:49 -04:00
Sage Weil
944a895234 Merge pull request #9254 from branch-predictor/bp-lockdep-on-diet 
lockdep: Lockdep on diet

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-06 08:52:49 -04:00
Ilya Dryomov
2bfecb1c0a 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>
 2016-06-06 14:51:45 +02:00
Kefu Chai
3563092638 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>
 2016-06-06 20:48:30 +08:00
Sage Weil
21f6bbbeef Merge pull request #9497 from Yan-waller/yj-wip-fixosdmaptools 
tools/osdmaptool: fix some errors

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-06-06 08:46:25 -04:00
Kefu Chai
fb3d2a948a Merge pull request #9490 from stiopaa1/osd_replicatedpg_addConstOutputOp 
osd/ReplicatedPG.h: add const to operator<< param

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-06 20:46:00 +08:00
Sage Weil
c8d8fbe3f3 Merge pull request #9499 from Yan-waller/yj-wip-fixrgwwarning 
rgw/op: kill compiling warning

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-06-06 08:42:45 -04:00
Sage Weil
38ac6100c2 Merge pull request #9501 from stiopaa1/all_operatorOutput 
all: add const to operator<< param

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-06-06 08:42:03 -04:00
Sage Weil
14adc9d33f osd: default to wpq (instead of prio) 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-06 08:29:36 -04:00
Sage Weil
928887a09c msg: default ms type = async 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-06 08:29:29 -04:00
Sage Weil
02708c6850 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>
 2016-06-06 08:25:12 -04:00
Yan Jun
32de201aee doc/rgw: correct radosgw-admin command name 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-06-06 19:46:53 +08:00
John Spray
df407a7245 Merge pull request #8598 from renhwsky/wip-renhw-ceph_mds-help 
mds: fix usage() display 

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-06-06 10:47:29 +01:00
John Spray
ccf5a39c89 Merge pull request #8641 from renhwztetecs/renhw-wip-mds-cleanup 
mds: MDSDaemon::init bug fix

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-06-06 10:46:59 +01:00