RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-10 10:19:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,020 Commits 219 Branches 396 Tags 1.3 GiB
14588e544f
Commit Graph

60020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spray
14588e544f mon: clean up MDSMonitor interface 
This was almost all public.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-11-15 23:09:21 +00:00
John Spray
669cbfbda8 Merge pull request #11836 from batrick/client-new-20161108 
client: remove unnecessary bufferptr[] for writev

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-15 23:04:03 +00:00
John Spray
916ad85853 Merge pull request #11837 from batrick/client-unique-20161108 
client: use unique_ptr

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-15 23:03:09 +00:00
John Spray
6ca6fd1ed9 Merge pull request #11904 from stiopaa1/mds_scrubheader_passStringByConstRef 
mds/ScrubHeader.h: pass string by const reference

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-15 22:36:17 +00:00
John Spray
4ed46effde Merge pull request #11651 from stiopaa1/mds_mdsrank_protectedDestructor 
mds/MDSRank.h: make destructor protected

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-15 22:35:47 +00:00
John Spray
163c6285d2 Merge pull request #11338 from stiopaa1/mds_sessionmap_unneededCount 
mds/SessionMap.cc: remove unneeded use of count

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-15 22:33:54 +00:00
John Spray
556c8caf23 Merge pull request #11957 from batrick/mds-deactivate-doc 
doc: clarify mds deactivate purpose

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-11-15 22:21:16 +00:00
John Spray
82f5750b51 Merge pull request #11985 from batrick/op-tracker-mds-event 
mds: revert "mds/Mutation: remove redundant _dump method"

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-15 21:59:28 +00:00
John Spray
212b9737b8 Merge pull request #11958 from batrick/cls-lua-lua_next 
lua: use simpler lua_next traversal structure

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-11-15 21:52:36 +00:00
John Spray
8a08531135 Merge pull request #11833 from stiopaa1/mds_migrator_removeUnneededUseOfCount 
mds/Migrator.h: remove unneeded use of count

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-11-15 21:47:21 +00:00
John Spray
2c06ab400a Merge pull request #10940 from stiopaa1/mds_beacon_moveCMDSBeaconSenderClass 
mds/Beacon: move C_MDS_BeaconSender class to .cc

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-11-15 21:37:31 +00:00
John Spray
dcefd455e3 Merge pull request #11887 from jcsp/wip-efragment-cleanup 
mds: remove unused EFragment::OP_ONESHOT

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-11-15 21:35:02 +00:00
Yehuda Sadeh
0d038b035d Merge pull request #12004 from bassamtabbara/wip-fix-civetweb-submodule 
rgw: revert unintentional change to civetweb

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-11-15 11:22:03 -08:00
Bassam Tabbara
6a430a2b54 rgw: revert unintentional change to civetweb 
https://github.com/ceph/ceph/pull/11800 uninternionally updated
the civetweb submodule.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
 2016-11-15 11:15:57 -08:00
John Spray
6b4e508afa Merge pull request #11908 from stiopaa1/mds_mdcache_removeUnusedFunctions 
mds/MDCache.h: remove unused functions

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-15 18:52:26 +00:00
Sage Weil
503cb53626 Merge pull request #11964 from xiexingguo/xxg-wip-bluestore-1112 
os/bluestore: misc. fixes and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-15 12:45:39 -06:00
Sage Weil
799e51eb98 Merge pull request #11986 from xiexingguo/xxg-wip-bluestore-1115 
os/bluestore: dedup if space overlap truly exists

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2016-11-15 12:45:00 -06:00
Sage Weil
f4e8e58063 Merge pull request #11803 from XinzeChi/wip-openpgs 
osd: do not open pgs when the pg is not in pg_map

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-11-15 11:14:58 -06:00
Kefu Chai
6a5bd23c4f Merge pull request #11962 from tchaikov/wip-doc-rebuilddb 
doc: fix the script for rebuild monitor db

Reviewed-by: Shylesh Kumar <shmohan@redhat.com>
 2016-11-16 00:44:02 +08:00
Kefu Chai
eadf98fecd Merge pull request #11984 from batrick/sphinx-py3-error 
doc/man: avoid file builtin to solve build error

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-11-15 22:03:36 +08:00
Patrick Donnelly
425cb9fbe1
doc/man: avoid file builtin to solve build error 
Sphinx running with Python 3.X fails:

    # Sphinx version: 1.4.8
    # Python version: 3.5.2 (CPython)
    # Docutils version: 0.12 release
    # Jinja2 version: 2.8
    # Last messages:

    # Loaded extensions:
    Traceback (most recent call last):
      File "/usr/lib/python3.5/site-packages/sphinx/cmdline.py", line 243, in main
        opts.warningiserror, opts.tags, opts.verbosity, opts.jobs)
      File "/usr/lib/python3.5/site-packages/sphinx/application.py", line 137, in __init__
        confoverrides or {}, self.tags)
      File "/usr/lib/python3.5/site-packages/sphinx/config.py", line 287, in __init__
        execfile_(filename, config)
      File "/usr/lib/python3.5/site-packages/sphinx/util/pycompat.py", line 130, in execfile_
        exec_(code, _globals)
      File "conf.py", line 56, in <module>
      File "conf.py", line 47, in _get_manpages
      File "conf.py", line 12, in _get_description
    NameError: name 'file' is not defined

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-11-15 09:00:01 -05:00
Jason Dillaman
8f035924a7 Merge pull request #11808 from trociny/wip-17010 
librbd: default features should be negotiated with the OSD

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-11-15 08:36:51 -05:00
Jason Dillaman
4c3056e94d Merge pull request #11821 from trociny/wip-test_notify 
test/librbd: in test_notify set object-map and fast-diff features by default

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-11-15 08:35:40 -05:00
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
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