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
60,112 Commits 219 Branches 396 Tags 1.4 GiB
c723f5417a
Commit Graph

60112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Dillaman
7c26117116 Merge pull request #11840 from yangdongsheng/rbd_mirror_options 
rbd-mirror: configuration overrides for hard coded timers

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-11-15 08:34:38 -05:00
xie xingguo
685137f2d0 os/bluestore: note 1st existed coll instead of 1st coll 
We store the coll mainly for cache trim and we shall try
our best to do it whenever it is possible.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-15 17:08:40 +08:00
xie xingguo
f7991aa6ea os/bluestore: move comments to proper place 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-15 15:15:51 +08:00
xie xingguo
acdeab954e os/bluestore: drop wal_op_onodes 
Which is currently unused.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-15 15:10:13 +08:00
xie xingguo
db81cf3798 os/bluestore: dedup if space overlap truly exists 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-15 13:59:56 +08:00
Patrick Donnelly
14884f257a
mds: revert "mds/Mutation: remove redundant _dump method" 
This reverts commit 93d0fc9d93.

This commit had the unintentional side-effect of preventing TrackedOp
dumps from including MDS specific events.

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

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-14 23:19:25 -05:00
xie xingguo
5884850fa8 os/bluestore: simplify OmapIteratorImpl::valid() 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-15 10:18:36 +08:00
xie xingguo
8ae9ecfd35 os/bluestore: formatting nits 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-15 08:32:25 +08:00
xie xingguo
6b4bee27cc os/bluestore: make fsck() can catch uninitialized sbid too 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-15 08:30:13 +08:00
Dan Mick
238fd2ad37 Merge pull request #11973 from ceph/wip-17898-ceph-disk-flake8 
ceph-disk: fix flake8 errors

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-11-14 15:42:35 -08:00
Loic Dachary
8b3bc583c0 Merge pull request #11971 from dachary/wip-17898-flake8 
tests: pin flake8 to avoid behavior changes

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
 2016-11-14 23:08:04 +01:00
Ken Dreyer
9f3403b1e1 ceph-disk: fix flake8 errors 
flake8 3.1.1 surfaces the following issues:

ceph_disk/main.py:173:1: E305 expected 2 blank lines after class or
function definition, found 1
ceph_disk/main.py:5011:1: E305 expected 2 blank lines after class or
function definition, found 1

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
 2016-11-14 14:49:15 -07:00
Gregory Farnum
6a8aa286a3 Merge pull request #11954 from stiopaa1/mds_MDCache_removeUnneededClear 
mds/MDCache.h: remove unneeded call to clear func

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-14 13:15:25 -08:00
Gregory Farnum
d54b8a2bc4 Merge pull request #11912 from SUSE/wip-17747-followup 
doc: drop --journal-check from ceph-mds man page

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-11-14 13:07:06 -08:00
Samuel Just
033ad5b46c OSDMonitor: only reject MOSDBoot based on up_from if inst matches 
If the osd actually restarts, there is no guarrantee that the epoch will
advance past up_from.  If the inst is different, it can't really be a
dup.  At worst, it might be a queued MOSDBoot from a previous inst, but
in that case, the real inst would see itself marked up, and then back
down causing it to try booting again.

Fixes: http://tracker.ceph.com/issues/17899
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-11-14 11:50:23 -08:00
Loic Dachary
0c6046a111 tests: pin flake8 to avoid behavior changes 
Fixes: http://tracker.ceph.com/issues/17898

Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-11-14 19:33:13 +01:00
Sage Weil
1d5002705f Merge pull request #11967 from wjwithagen/wip-wjw-buffer-splice 
common/buffer.cc: raw_pipe depends on splice(2)

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-14 11:10:16 -06:00
Kefu Chai
1a9c3d6265 Merge pull request #11914 from tchaikov/wip-17857 
ReplicatedPG::failed_push: release read lock on failure

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-15 00:02:40 +08:00
Willem Jan Withagen
f44dcc81e9 common/buffer.cc: raw_pipe depends on splice(2) 
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2016-11-14 16:59:17 +01:00
Sage Weil
199b526469 Merge pull request #11919 from liewegas/wip-bluestore-cache-meta 
os/bluestore: bluestore_cache_meta_ratio = .5

Reviewed-by: Mark Nelson <mnelson@redhat.com>
 2016-11-14 09:56:46 -06:00
Sage Weil
1c6455eaea os/bluestore: precondition enough to write two 256mb buffers 
We now match the new bluestore_rocksdb_options.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-11-14 10:42:53 -05:00
Sage Weil
8addcd4cdc os/bluestore: bluestore_cache_meta_ratio = .5 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-11-14 10:28:43 -05:00
Dongsheng Yang
a0fccea742 rbd-mirror: configuration overrides for hard coded timers 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2016-11-14 09:41:41 -05:00
Kefu Chai
eb8b4c8897 Merge pull request #11842 from ceph/wip-cmake 
cmake: librbd cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-11-14 22:08:36 +08:00
Kefu Chai
b3224a18f6 ReplicatedPG::failed_push: release read lock on failure 
and requeue the blocked ops.

Fixes: http://tracker.ceph.com/issues/17857
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-11-14 18:52:22 +08:00
Kefu Chai
8eb2c9d1bd cmake:librbd: move common to the end of linked libraries 
so the linked libraries are able to find the symbols in libcommon.
and do not `list(APPEND librbd ...)` anymore, which is wrong and not
necessary. librbd does not depends on krbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-11-14 18:38:55 +08:00
Kefu Chai
9f8a311ced cmake: move ContextCompletion.cc into rbd_internal 
- ContextCompletion.cc is used by TrimRequest.cc which is included by
  rbd_internal, it's more natural to put ContextCompletion.cc into
  rbd_internal also. as rbd_internal is the only consumer of this
  translation unit.
- librbd/internal.cc is not referencing any symbols from util.cc, so
  remove this include. and also, do not add
  $<TARGET_OBJECTS:common_util_obj> to librbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-11-14 18:38:55 +08:00
Kefu Chai
89d6091535 cmake: let rbd_internal depend on librbd-tp 
as librbd/AioCompletion.cc includes "tracing/librbd.h", which is offered
by librbd-tp.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-11-14 18:38:55 +08:00
Kefu Chai
12d1d0c1f5 Merge pull request #11906 from tchaikov/wip-11829 
ceph-detect-init: FreeBSD introduction of bsdrc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-11-14 18:20:30 +08:00
Pan Liu
e71c587ff0 os/filestore: handle EINTR returned by io_getevents() 
Signed-off-by: Pan Liu <pan.liu@istuary.com>
 2016-11-14 18:20:09 +08:00
Tianshan Qu
6e1c3dcb21 rgw: fix RGWSimpleRadosLockCR set_description() 
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
 2016-11-14 16:00:37 +08:00
Kefu Chai
a29a3c686e doc: fix the script for rebuild monitor db 
- escape the "$" in "$osd", so it won't be expanded by local shell
- fix the permission bits of /var/lib/ceph/mon/mon.0/store.db
- add the doc to explain the step to prepare the keyring

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-11-14 15:34:46 +08:00
Pan Liu
83edcd1f8d remove unused get_info_log_level, and unneeded include files 
Signed-off-by: Pan Liu <pan.liu@istuary.com>
 2016-11-14 15:05:46 +08:00
Willem Jan Withagen
cea6786413 ceph-detect-init: FreeBSD introduction of bsdrc 
ceph-detect-init/ceph_detect_init/freebsd/__init__.py
    New file

ceph_detect_init/__init__.py: Only test FreeBSD after it is not Linux

    If we do it the other way around it will not work during testing on FreeBSD
    because it will always have platform.system() == FreeBSD
    So first test for Linux, and only then check to see if it is FreeBSD.

ceph-detect-init/tests/test_all.py: add tests for FreeBSD
ceph-detect-init/run-tox.sh: ReEnable to run test for FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-11-14 14:34:47 +08:00
xie xingguo
865b715029 os/bluestore: static apply() method for bluestore internal-use only 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-11-14 11:16:06 +08:00
Patrick Donnelly
0f334f2870
lua: use simpler lua_next traversal structure 
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-13 21:55:53 -05:00
Patrick Donnelly
b9a63e49ea
doc: clarify mds deactivate purpose 
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-13 21:51:51 -05:00
Patrick Donnelly
e5a05739ed
doc: remove broken sentence 
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-13 21:51:29 -05:00
Patrick Donnelly
ef60b1b502
client: use unique_ptr for fsmap_user 
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-13 21:12:46 -05:00
Patrick Donnelly
c4c3d32a26
client: use unique_ptr for FSMap 
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-13 21:12:46 -05:00
Patrick Donnelly
25ab2b6dc7
client: use unique_ptr for MDSMap 
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-13 21:12:46 -05:00
Patrick Donnelly
888910d260
client: remove unnecessary bufferptr[] for writev 
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-13 21:12:36 -05:00
Kefu Chai
ddcb4a945a Merge pull request #11844 from liupan1111/master 
os/bluestore: speedup the performance of multi-replication flow by switc…

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-14 09:42:50 +08:00
Kefu Chai
7d6fa8d5c5 Merge pull request #11799 from KerLiu/fixdupassignment 
osd/OSDMap.cc: fix duplicated assignment for new_blacklist_entries

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-14 09:40:58 +08:00
Kefu Chai
473ae1d539 Merge pull request #11378 from ryneli/watch_notify_add_timeout 
librados: add timeout to watch/notify

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-14 09:36:14 +08:00
Michal Jarzabek
e6fa2a7e29 mds/MDCache.h: remove unneeded call to clear func 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-11-13 23:24:52 +00:00
Ryne Li
e3ca1e607e librados: add timeout parameter to rados_watch 
Signed-off-by: Ryne Li <lizhenqiangsnake@gmail.com>
 2016-11-13 07:21:54 -05:00
Kefu Chai
961a309532 Merge pull request #10221 from Yan-waller/yj-wip-testrados-0709 
test/rados: remove unused bufferlist variable

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-13 16:24:05 +08:00
Kefu Chai
6aad9ea173 Merge pull request #11941 from liewegas/wip-envlibrados 
qa/workunits/rados/test_envlibrados_for_rocksdb: force librados-dev install

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-13 14:53:29 +08:00
Kefu Chai
c4624271ed Merge pull request #9357 from Aran85/wip-assert-build-push 
osd/PGBackend: build_push_op segment fault

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-11-13 14:41:14 +08:00