RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 05:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,312 Commits 211 Branches 394 Tags 1.3 GiB
9607a52edd
Commit Graph

79312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mykola Golub
9607a52edd Merge pull request #18277 from dillaman/wip-librbd-unused-variables 
librbd: remove unused variables from ReadResult refactor

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-10-13 09:46:46 +03:00
Kefu Chai
33b8797ffe Merge pull request #17793 from amitkumar50/cov-misc-6 
librbd,os: address coverity false positives

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-13 12:17:37 +08:00
Kefu Chai
c7784e2dce Merge pull request #17825 from amitkumar50/cov-misc-9 
librbd,test: address coverity false positives

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-13 12:17:10 +08:00
Kefu Chai
f7822816db Merge pull request #17972 from cbodley/wip-21401 
auth: keep /dev/urandom open for get_random_bytes

Reviewed-by: Adam Emerson <aemerson@redhat.com>
 2017-10-13 12:16:26 +08:00
Kefu Chai
5f021b2d36 Merge pull request #18204 from ownedu/wip-fix-async-rdma-coredump 
msg/async/rdma: fix a coredump introduced by PR #18053

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-10-13 12:15:27 +08:00
Kefu Chai
d94730fb19 Merge pull request #18217 from liewegas/wip-pg-clang 
osd/PG: fix clang build vs private state events

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-10-13 12:14:31 +08:00
Kefu Chai
cedfc34b95 Merge pull request #18259 from xiexingguo/wip-blue-reclaim 
os/bluestore/BlueFS: sanity check that alloc->allocate() won't return 0

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-13 12:12:45 +08:00
Kefu Chai
eaf1e21f88 Merge pull request #18262 from tchaikov/wip-rocksdb 
rocksdb: sync with upstream

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
 2017-10-13 12:10:57 +08:00
Jason Dillaman
7a3c51352f librbd: remove unused variables from ReadResult refactor 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-12 18:35:28 -04:00
Yuri Weinstein
5cfe11e11d Merge pull request #18210 from shangfufei/wip-async-fix 
msg/async: fix bug of data type conversion when uint64_t -> int -> uint64_t

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Amit Kumar amitkuma@redhat.com
 2017-10-12 12:54:24 -07:00
Yuri Weinstein
862463dbfc Merge pull request #18246 from liewegas/wip-seesaw-warning 
qa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-10-12 12:52:42 -07:00
Mykola Golub
914c99717e Merge pull request #18270 from dillaman/wip-21391 
cls/journal: possible infinite loop within tag_list class method

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-10-12 22:39:55 +03:00
Jason Dillaman
9e7475f8fb cls/journal: fixed possible infinite loop which could kill the OSD 
Fixes: http://tracker.ceph.com/issues/21771
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-12 09:00:30 -04:00
Jason Dillaman
5d9cfebaba test: ceph_test_cls_journal was dropped when converting to cmake 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-12 08:57:49 -04:00
Joao Eduardo Luis
651baae2da Merge pull request #18258 from shinobu-x/sk-osdmonitor_move_bufferlist_before_use 
mon/OSDMonitor: cleanup: move bufferlist before use

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
 2017-10-12 09:24:22 +01:00
Kefu Chai
357fc97b67 Merge pull request #18235 from tchaikov/wip-qa-backfilling 
qa: s/backfill/backfilling/

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-12 14:54:41 +08:00
Kefu Chai
27fbad47b7 Merge pull request #18222 from adamemerson/wip-don't-fix-what-ain't-broke 
config: Remove _get_val

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-10-12 14:50:53 +08:00
Kefu Chai
318189465d rocksdb: sync with upstream 
to pickup two changes

- prefetched skiplist
- enable SSE42 CRC32 on EL7

Fixes: http://tracker.ceph.com/issues/21603
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-10-12 11:45:56 +08:00
xie xingguo
4be8a9d552 os/bluestore/BlueFS: sanity check that alloc->allocate() won't return 0 
If alloc[id]->allocate() returns 0, no space is actually reclaimed.
But BlueStore treats returning 0 as success and will keep reclaiming
space from BlueFS until hit the given threshold, which turns out to
be deadloop-prone.

For now, Bitmap and Stupid never return 0-length allocated space
(which is instead converted to -ENOSPC to suggest an error to caller),
so sanity checking against result code 0 will suffice.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-10-12 10:34:27 +08:00
Shinobu Kinjo
6cf668308a mon/OSDMonitor: Move bufferlist before use 
Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
 2017-10-12 11:03:12 +09:00
Yuri Weinstein
9494a69fd9 Merge pull request #17824 from shashalu/fix-lc-expiration 
rgw:lc fix expiration time

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
 2017-10-11 09:37:58 -07:00
John Spray
fd7bcb2160 Merge pull request #18102 from MI-OSiRIS/mgr_influx_dbcheck 
Modify mgr-influx module database check to not require admin privileges

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-10-11 17:33:47 +01:00
Yuri Weinstein
86256e105a Merge pull request #18104 from linuxbox2/rgw-rel-lock-earlyx 
rgw: release cls lock if taken in RGWCompleteMultipart

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-10-11 09:30:36 -07:00
Yuri Weinstein
8ef4760825 Merge pull request #18175 from yaozongyou/fix-radosgw-admin-command-arg-bug 
rgw: fix command argument error for radosgw-admin

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
 2017-10-11 09:30:02 -07:00
Yuri Weinstein
d3055cd777 Merge pull request #18193 from cbodley/wip-rgw-pool-application-jewel 
qa/rgw: ignore errors from 'pool application enable'

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
 2017-10-11 08:48:09 -07:00
Yuri Weinstein
6f9c008b7a Merge pull request #18225 from adamemerson/wip-retract-assertions 
rgw: Remove assertions in IAM Policy

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
 2017-10-11 08:44:30 -07:00
Kefu Chai
f136dbd460 Merge pull request #17420 from tchaikov/wip-19705 
arch/arm: set ceph_arch_aarch64_crc32 only if the build host supports crc32cx

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-10-11 22:48:00 +08:00
Sage Weil
2b67a95316 Merge pull request #18242 from tchaikov/wip-21758 
crushtool: print error message to stderr not dout(1)

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-11 08:44:45 -05:00
Sage Weil
0a886bc9f3 qa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN 
Mgr can get marked down when mon weirdness is happening.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-11 08:24:50 -05:00
Matt Benjamin
e6c3ba5cc0 Merge pull request #18137 from cbodley/wip-21685 
rgw: RGWUser::init no longer overwrites user_id
 2017-10-11 08:32:49 -04:00
John Spray
e498041607 Merge pull request #18233 from gmayyyha/ceph-fs-status-21752 
mgr/status: fix ceph fs status returns error

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-10-11 11:21:11 +01:00
Kefu Chai
dc78d40af7 crushtool: print error message to stderr not dout(1) 
in hope to fix the mysterious test failure where cli/crushtool/build.t
prints nothing when error message is expected.

Fixes: http://tracker.ceph.com/issues/21758
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-10-11 17:45:22 +08:00
shangfufei
38990a61c9 msg/async: fix bug of data type conversion in do_request() 
Signed-off-by: shangfufei <shangfufei@inspur.com>
 2017-10-11 14:46:26 +08:00
ownedu
322f87f8a9 msg/async/rdma: fix a coredump bug which is introduced by PR #18053, 
where the iterator is not working properly after erase().

Signed-off-by: Yan Lei <yongyou.yl@alibaba-inc.com>
 2017-10-11 14:31:30 +08:00
Kefu Chai
3245fd90ec Merge pull request #18230 from ceph/liewegas-patch-1 
.githubmap: Update

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-10-11 12:08:12 +08:00
Kefu Chai
e21114274f qa: s/backfill/backfilling/ 
it's renamed "backfilling" in 4015343f .

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-10-11 11:52:43 +08:00
Xie Xingguo
f9e8ba7f4d Merge pull request #18203 from majianpeng/bluestore-wake-kvfinathread 
os/bluestore/BlueStore: ASAP wake up _kv_finalize_thread.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
 2017-10-11 11:35:40 +08:00
Kefu Chai
d2f290f243 Merge pull request #18201 from gregsfortytwo/wip-21737-shutdown-assert 
common: by default, do not assert on leaks in the shared_cache code

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-11 11:20:00 +08:00
Kefu Chai
95072822e1 Merge pull request #18218 from tchaikov/wip-21609 
mon/PGMap: let pg_string_state() return boost::optional<>

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-11 11:05:08 +08:00
Kefu Chai
246e497d22 Merge pull request #18213 from tchaikov/wip-log-on-osx 
log: fix build on osx

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
 2017-10-11 11:03:29 +08:00
Kefu Chai
d35730e64d Merge pull request #18216 from tchaikov/wip-cmake-cleanup 
cmake: set supported language the right way

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2017-10-11 11:02:29 +08:00
Yanhu Cao
4a90daa700 mgr/status: fix ceph fs status returns error 
Fixes: http://tracker.ceph.com/issues/21752

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
 2017-10-11 09:31:14 +08:00
Xie Xingguo
0ffa676250 Merge pull request #18228 from ktdreyer/doc-mds-blacklist-interval-manual 
doc: rm stray ")" character from mds config ref

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-10-11 08:37:08 +08:00
Josh Durgin
a0c921c835 Merge pull request #17900 from markhpc/wip-filestore-rocksdb-compaction-readahead-master 
common/options.cc: Set Filestore rocksdb compaction readahead option.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-10-10 16:52:18 -07:00
Sage Weil
e0a183566c Update .githubmap 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-10 17:25:21 -05:00
Patrick Donnelly
7feb6b28f0
Merge PR #18223 into master 
* refs/pull/18223/head:
	githubmap: define merge conflict resolution

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-10 14:33:59 -07:00
Ken Dreyer
0fcdba5339 doc: rm stray ")" character from mds config ref 
I accidentally introduced this in
4fb89a6317

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
 2017-10-10 15:11:46 -06:00
Adam C. Emerson
b3118cabb8 rgw: Remove assertions in IAM Policy 
A couple of them could be triggered by user input.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-10-10 16:21:48 -04:00
Patrick Donnelly
e0e348eedf
githubmap: define merge conflict resolution 
Use "union" merge to automatically resolve trivial append merge conflicts from
using ptl-tool.py.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-10-10 12:06:34 -07:00
Matt Benjamin
65b7543390 Merge pull request #17882 from ZVampirEM77/wip-rgw-encryption 
rgw: clean up and fix some bugs for encryption
 2017-10-10 14:56:08 -04:00