RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,019 Commits 219 Branches 396 Tags 1.4 GiB
990088ef16
Commit Graph

80019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yan, Zheng
990088ef16 mds: remove useless incompat feature definination in FSMap.h 
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2017-10-31 16:54:19 +08:00
Jos Collin
ca7492dc00
Merge pull request #18547 from batrick/ptl-tool-trackers 
ptl-tool: print bzs/tickets cited in commit msgs/comments

Reviewed-by: Jos Collin <jcollin@redhat.com>
 2017-10-31 04:18:35 +00:00
Kefu Chai
c41da89c72
Merge pull request #18495 from ceph/wip-da-SCA-20171013 
osd,rgw,librbd: SCA fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-10-31 12:13:28 +08:00
Kefu Chai
529f036b1b
Merge pull request #18535 from yanghonggang/master 
os/bluestore/bluestore_tool: add log-dump command to dump bluefs's log

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2017-10-31 12:04:09 +08:00
Kefu Chai
ae81011767
Merge pull request #18574 from shashalu/fix-strict-strtol 
common: strict_strtol INT_MAX and INT_MIN is valid

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-10-31 12:02:37 +08:00
Kefu Chai
7d583f1ec4
Merge pull request #18577 from tchaikov/wip-kill-clang-warning 
ceph-syn: silence clang analyzer warning

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
 2017-10-31 12:02:10 +08:00
Patrick Donnelly
010ece1d78
ptl-tool: print bzs/tickets cited in commit msgs 
This makes it easier to update issues after a merge.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-10-30 20:11:35 -07:00
Sage Weil
87f4c36107
Merge pull request #18631 from gohighsec/cleanup 
os/bluestore: delete redundant header file in KernelDevice.cc

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-30 21:18:38 -05:00
lijing
6914ab2109 bluestore: delete redundant header file in KernelDevice.cc 
Signed-off-by: Jing Li <lijing@gohighsec.com>
 2017-10-31 09:44:14 +08:00
Sage Weil
ce6ba63e14
Merge pull request #18603 from batrick/i21945 
mon/MDSMonitor: wait for readable OSDMap before sanitizing

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-30 15:43:11 -05:00
Patrick Donnelly
456b68c375
Merge PR #18039 into master 
* refs/pull/18039/head:
	mgr/dashboard: redirect away if viewed filesystem is removed
	mgr/dashboard: 404 instead of 500 on missing filesystem
	mds: fix FSMap copy constructor

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-10-30 12:24:23 -07:00
Yehuda Sadeh
ca4f10b3ee
Merge pull request #18477 from ZVampirEM77/wip-em-cleanup 
rgw: drop unused variable in copy_obj_data()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2017-10-30 11:20:05 -07:00
Ilya Dryomov
91b8fd5ee4
Merge pull request #18579 from idryomov/wip-doc-kclient-snapshots 
doc/cephfs/experimental-features: kernel client snapshots limit

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-10-30 17:42:23 +01:00
Alfredo Deza
9421c87944
Merge pull request #18513 from ceph/ceph-volume-zap 
ceph-volume: adds the ceph-volume lvm zap subcommand

Reviewed-by: Alfredo Deza <adeza@redhat.com>
 2017-10-30 10:57:33 -04:00
Jason Dillaman
c0cbf6aa90
Merge pull request #18615 from rgdoliveira/alpine 
rbd-fuse: make sure PATH_MAX is defined

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-30 08:51:34 -04:00
Kefu Chai
3bd808d02a
Merge pull request #17363 from tchaikov/wip-ceph-disk 
ceph-disk: unlock all partitions when activate

Reviewed-by: Sébastien Han <seb@redhat.com>
 2017-10-30 20:29:14 +08:00
Sage Weil
1ff950d53e
Merge pull request #18585 from yaozongyou/fix-bluestore-tool-arg-bug 
ceph-bluestore-tool: link target shouldn't ending with "\n"

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-10-30 07:00:46 -05:00
Sage Weil
74b1c0a199
Merge pull request #17995 from scienceluo/wip-luo-fix-bluestore-metadata-branch 
os/bluestore/BlueFS: Reduce unnecessary operations in collect_metadata

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-10-30 07:00:29 -05:00
Roberto Oliveira
972c34465d rbd-fuse: make sure PATH_MAX is defined 
On systems without glibc, as Alpine Linux, you might lack definition of
PATH_MAX. This patch adds the limits.h header to solve this issue.

Signed-off-by: Roberto Oliveira <robertoguimaraes8@gmail.com>
 2017-10-30 11:59:47 +00:00
Sage Weil
39eec2c569
Merge pull request #18611 from liewegas/wip-interval-set 
include/interval_set: parameterize by map type and kill btree_interval_set.h

Reviewed-by: Adam Emerson <aemerson@redhat.com>
 2017-10-30 06:59:41 -05:00
Kefu Chai
cabd93e87f
Merge pull request #18507 from hjwsm1989/skip-generation-object 
ceph-objectstore-tool: skip object with generated version

Reviewed-by: David Zafman <dzafman@redhat.com>
 2017-10-30 16:33:47 +08:00
Kefu Chai
12df4aa74e
Merge pull request #18493 from liewegas/wip-unclean-degraded 
mon/PGMap: 'unclean' does not imply damaged

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-10-30 15:02:32 +08:00
Yang Honggang
e08c246ef2 os/bluestore/bluestore_tool: add bluefs-log-dump command to dump bluefs's log 
./bin/ceph-bluestore-tool --command bluefs-log-dump --path dev/osd0/
...
0x1000: txn(seq 2 len 0xd7 crc 0x306e389b)
0x1000:  op_dir_create db
0x1000:  op_dir_create db.wal
0x1000:  op_dir_create db.slow
0x1000:  op_file_update  file

Signed-off-by: Yang Honggang <joseph.yang@xtaotech.com>
 2017-10-29 23:10:00 -04:00
Sage Weil
059d046745
Merge pull request #18553 from liewegas/wip-preempt-feature 
osd/PG: remote recovery preemption, and new feature bit to condition it on

Reviewed-by: David Zafman <dzafman@redhat.com>
 2017-10-29 21:36:38 -05:00
Yuri Weinstein
51d0dbe315
Merge pull request #18594 from zmc/wip-cephmetrics 
suites/cephmetrics: Add Centos 7

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
 2017-10-29 18:25:43 -07:00
Mykola Golub
f2127532df
Merge pull request #18601 from dillaman/wip-21961 
rbd-mirror: clean up spurious error log messages

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-10-29 09:03:15 +02:00
Sage Weil
3d1b782cca osd/PG: handle spurious remote revoke or toofull 
If we restart the recovery reservation process for some reason (e.g.,
local preemption), we may still get a racing REVOKE from the replicas in
the previous round.  Ignore.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 22:49:44 -05:00
Jason Dillaman
625222edbc rbd-mirror: journal debug message should not be logged as error 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-28 18:30:17 -04:00
Jason Dillaman
1e1d15eb0c rbd-mirror: avoid attempting to decode an empty client data buffer 
Fixes: http://tracker.ceph.com/issues/21961
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-28 18:29:10 -04:00
Mykola Golub
0d19edf6c5
Merge pull request #18604 from dillaman/wip-21960 
cls/journal: ensure tags are properly expired

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-10-29 00:27:39 +03:00
Sage Weil
70ddb0c18b unittest_interval_set: test with flat_map<> too 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:25:05 -05:00
Sage Weil
3dafe9d33e include/btree_interval_set: remove it! 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:25:05 -05:00
Sage Weil
762dd42971 os/bluestore: use interval_set<...,btree_map<...>> 
This avoid the code duplication, yay!

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:25:05 -05:00
Sage Weil
78d5afde43 include/btree_map: clean up wrapper header around btree_map 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:25:05 -05:00
Sage Weil
79f9c86dfd os/bluestore/BitMapAllocator: drop useless include 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:25:05 -05:00
Sage Weil
7bbb7958df include/interval_set: cbegin/cend -> begin/end 
c{begin,end} don't exist for btree_map<>.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:25:05 -05:00
Sage Weil
87aed2026a include/interval_set: tolerate maps that invalidate iterator on change 
These changes picked out of the diff between the original
btree_interval_set.h and interval_set.h (sadly I had it rolled into the
initial commit so it was tedious to identify these).

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:25:05 -05:00
Sage Weil
d254259059 include/interval_set: templating map used 
Default to std::map for backward compat.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:21:38 -05:00
Sage Weil
08fb3351ed osd/PG: handle RELEASE race with Remote*Reserved on replica 
If we get a REQUEST and RELEASE in quick succession, we may process a
local Remote*Reserved back in the RepNotRecovering state.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 16:03:13 -05:00
Adam C. Emerson
00c11ff2f7 Merge pull request #18602 from adamemerson/wip-optional-failure 
rgw: Fix dereference of empty optional

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
 2017-10-28 14:14:58 -04:00
Sage Weil
ea0bfe6688 osd/PG: fix Remote*Preempted handling in ReplicaActive 
This was only half-implemented by c1e652a454

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-28 08:12:02 -05:00
Jason Dillaman
19fa1c7f5b cls/journal: ensure tags are properly expired 
Previously, if only the local image was using the journal or if
a disconnected peer was attached, the tag entries could not be
expired even if unreferenced.

Fixes: http://tracker.ceph.com/issues/21960
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-10-28 08:48:00 -04:00
Yao Zongyou
39c68d128c ceph-bluestore-tool: the link target should not ending with new line 
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
 2017-10-28 18:23:30 +08:00
Yao Zongyou
d418a04e9f ceph-bluestore-tool: the right action is prime-osd-dir not prime-osd-dev 
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
 2017-10-28 18:22:27 +08:00
Mykola Golub
9625274d3f
Merge pull request #18592 from dillaman/wip-21956 
cls/journal: fixed possible infinite loop in expire_tags

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-10-28 09:36:30 +03:00
Xie Xingguo
32f2edd5fd
Merge pull request #18607 from yaozongyou/fix-typo 
doc: fix typo e.g,. => e.g.,

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-10-28 09:44:53 +08:00
Yao Zongyou
9eb9b8f3da doc: fix typo e.g,. => e.g., 
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
 2017-10-28 09:06:24 +08:00
Sage Weil
cd94b1bedf
Merge pull request #18519 from liewegas/wip-21712-c 
ceph_test_objectstore: do not change model for 0-length zero

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-10-27 17:41:35 -05:00
Sage Weil
81c3e4f868 osd/PG: send release to remote reservations in progress 
If we have a REQUEST outstanding and then cancel, send a RELEASE to the
REQUEST target too, so that they too can clean up.  This avoids leaving
the replica in the RepRecovering state when the primary is restarting
the whole reservation process.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-10-27 17:37:47 -05:00
Adam C. Emerson
5249139be7 rgw: Fix dereference of empty optional 
Due to the lack of a return, there was a case where an invalid ARN
could cause a dereference of an uninitialized boost::optional.

As a bit of defensive programming, restructure a couple functions to
make that kind of error impossible by ensuring the optional is only in
scope when it is initialized and relying less in early return on
error.

Fixes: http://tracker.ceph.com/issues/21962

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-10-27 18:26:11 -04:00