RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,285 Commits 226 Branches 396 Tags 1.7 GiB
a577659d09
Commit Graph

54285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
a577659d09 Merge pull request #8233 from majianpeng/bluestore-perfcount 
os/bluestore: perf counters

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-06-07 09:10:25 -04:00
Kefu Chai
8d7b8e1f93 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>
 2016-06-07 12:05:26 +08:00
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
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
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
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
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
John Spray
ed18dcde6a 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>
 2016-06-06 10:45:29 +01:00
John Spray
83cf189922 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>
 2016-06-06 10:43:37 +01:00
John Spray
22d24f7290 Merge pull request #8799 from renhwztetecs/renhw-wip-fusemain 
client/fuse: object release order error 

Reviewed-by: Yan, Zheng <zyan@redhat.com>
 2016-06-06 10:42:59 +01:00
Mykola Golub
430e025984 Merge pull request #9459 from dillaman/wip-16123 
test/rbd: fsx needs to shut down the journal

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-06-06 10:20:54 +03:00
Kefu Chai
9e768393bf cmake: s/BUILD_SHARED_LIBS/ENABLE_SHARED/ 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-06 12:42:02 +08:00
Kefu Chai
4e5a0186a1 Merge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration 
common/ceph_json.h: remove duplicate declaration

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-06 10:57:23 +08:00
Michal Jarzabek
d6d5da1bc1 common/ceph_json.h: remove duplicate declaration 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-06-05 22:15:48 +01:00
Michal Jarzabek
0a157e088b all: add const to operator<< param 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-06-05 22:12:56 +01:00
Kefu Chai
3c83ab2caa 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>
 2016-06-05 14:15:02 +08:00
Kefu Chai
abe240b57e Merge pull request #9178 from wjwithagen/wip-wjw-freebsd-compile-2 
build: freebsd changes (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-05 14:01:23 +08:00
Ali Maredia
50eab6e4a8 Merge pull request #9446 from ceph/wip-cmake 
cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
 2016-06-04 18:28:40 -04:00
Samuel Just
8b7b7c7a23 PG::replica_scrub: don't adjust pool on max object 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-06-04 10:09:49 -07:00