]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agomon: make MDSMonitor tolerant of slow mon elections 11167/head
John Spray [Wed, 21 Sep 2016 10:45:38 +0000 (11:45 +0100)]
mon: make MDSMonitor tolerant of slow mon elections

Previously MDS daemons would get failed incorrectly
when they appeared to have timed out due to
delays in calling into MDSMonitor that were
actually caused by e.g. slow leveldb writes leading
to slow mon elections.

Fixes: http://tracker.ceph.com/issues/17308
Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomon: clean up MDSMonitor interface
John Spray [Wed, 9 Nov 2016 19:51:34 +0000 (19:51 +0000)]
mon: clean up MDSMonitor interface

This was almost all public.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11836 from batrick/client-new-20161108
John Spray [Tue, 15 Nov 2016 23:04:03 +0000 (23:04 +0000)]
Merge pull request #11836 from batrick/client-new-20161108

 client: remove unnecessary bufferptr[] for writev

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11837 from batrick/client-unique-20161108
John Spray [Tue, 15 Nov 2016 23:03:09 +0000 (23:03 +0000)]
Merge pull request #11837 from batrick/client-unique-20161108

client: use unique_ptr

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11904 from stiopaa1/mds_scrubheader_passStringByConstRef
John Spray [Tue, 15 Nov 2016 22:36:17 +0000 (22:36 +0000)]
Merge pull request #11904 from stiopaa1/mds_scrubheader_passStringByConstRef

mds/ScrubHeader.h: pass string by const reference

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #11651 from stiopaa1/mds_mdsrank_protectedDestructor
John Spray [Tue, 15 Nov 2016 22:35:47 +0000 (22:35 +0000)]
Merge pull request #11651 from stiopaa1/mds_mdsrank_protectedDestructor

mds/MDSRank.h: make destructor protected

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11338 from stiopaa1/mds_sessionmap_unneededCount
John Spray [Tue, 15 Nov 2016 22:33:54 +0000 (22:33 +0000)]
Merge pull request #11338 from stiopaa1/mds_sessionmap_unneededCount

mds/SessionMap.cc: remove unneeded use of count

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11957 from batrick/mds-deactivate-doc
John Spray [Tue, 15 Nov 2016 22:21:16 +0000 (22:21 +0000)]
Merge pull request #11957 from batrick/mds-deactivate-doc

doc: clarify mds deactivate purpose

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11985 from batrick/op-tracker-mds-event
John Spray [Tue, 15 Nov 2016 21:59:28 +0000 (21:59 +0000)]
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>
8 years agoMerge pull request #11958 from batrick/cls-lua-lua_next
John Spray [Tue, 15 Nov 2016 21:52:36 +0000 (21:52 +0000)]
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>
8 years agoMerge pull request #11833 from stiopaa1/mds_migrator_removeUnneededUseOfCount
John Spray [Tue, 15 Nov 2016 21:47:21 +0000 (21:47 +0000)]
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>
8 years agoMerge pull request #10940 from stiopaa1/mds_beacon_moveCMDSBeaconSenderClass
John Spray [Tue, 15 Nov 2016 21:37:31 +0000 (21:37 +0000)]
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>
8 years agoMerge pull request #11887 from jcsp/wip-efragment-cleanup
John Spray [Tue, 15 Nov 2016 21:35:02 +0000 (21:35 +0000)]
Merge pull request #11887 from jcsp/wip-efragment-cleanup

mds: remove unused EFragment::OP_ONESHOT

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #12004 from bassamtabbara/wip-fix-civetweb-submodule
Yehuda Sadeh [Tue, 15 Nov 2016 19:22:03 +0000 (11:22 -0800)]
Merge pull request #12004 from bassamtabbara/wip-fix-civetweb-submodule

rgw: revert unintentional change to civetweb

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agorgw: revert unintentional change to civetweb 12004/head
Bassam Tabbara [Tue, 15 Nov 2016 19:13:20 +0000 (11:13 -0800)]
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>
8 years agoMerge pull request #11908 from stiopaa1/mds_mdcache_removeUnusedFunctions
John Spray [Tue, 15 Nov 2016 18:52:26 +0000 (18:52 +0000)]
Merge pull request #11908 from stiopaa1/mds_mdcache_removeUnusedFunctions

mds/MDCache.h: remove unused functions

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #11964 from xiexingguo/xxg-wip-bluestore-1112
Sage Weil [Tue, 15 Nov 2016 18:45:39 +0000 (12:45 -0600)]
Merge pull request #11964 from xiexingguo/xxg-wip-bluestore-1112

os/bluestore: misc. fixes and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11986 from xiexingguo/xxg-wip-bluestore-1115
Sage Weil [Tue, 15 Nov 2016 18:45:00 +0000 (12:45 -0600)]
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>
8 years agoMerge pull request #11803 from XinzeChi/wip-openpgs
Sage Weil [Tue, 15 Nov 2016 17:14:58 +0000 (11:14 -0600)]
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>
8 years agoMerge pull request #11962 from tchaikov/wip-doc-rebuilddb
Kefu Chai [Tue, 15 Nov 2016 16:44:02 +0000 (00:44 +0800)]
Merge pull request #11962 from tchaikov/wip-doc-rebuilddb

doc: fix the script for rebuild monitor db

Reviewed-by: Shylesh Kumar <shmohan@redhat.com>
8 years agoMerge pull request #11984 from batrick/sphinx-py3-error
Kefu Chai [Tue, 15 Nov 2016 14:03:36 +0000 (22:03 +0800)]
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>
8 years agodoc/man: avoid file builtin to solve build error 11984/head
Patrick Donnelly [Tue, 15 Nov 2016 03:46:23 +0000 (22:46 -0500)]
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>
8 years agoMerge pull request #11808 from trociny/wip-17010
Jason Dillaman [Tue, 15 Nov 2016 13:36:51 +0000 (08:36 -0500)]
Merge pull request #11808 from trociny/wip-17010

librbd: default features should be negotiated with the OSD

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11821 from trociny/wip-test_notify
Jason Dillaman [Tue, 15 Nov 2016 13:35:40 +0000 (08:35 -0500)]
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>
8 years agoMerge pull request #11840 from yangdongsheng/rbd_mirror_options
Jason Dillaman [Tue, 15 Nov 2016 13:34:38 +0000 (08:34 -0500)]
Merge pull request #11840 from yangdongsheng/rbd_mirror_options

rbd-mirror: configuration overrides for hard coded timers

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoos/bluestore: note 1st existed coll instead of 1st coll 11986/head
xie xingguo [Tue, 15 Nov 2016 09:03:48 +0000 (17:03 +0800)]
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>
8 years agoos/bluestore: move comments to proper place
xie xingguo [Tue, 15 Nov 2016 07:15:51 +0000 (15:15 +0800)]
os/bluestore: move comments to proper place

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: drop wal_op_onodes
xie xingguo [Tue, 15 Nov 2016 07:10:13 +0000 (15:10 +0800)]
os/bluestore: drop wal_op_onodes

Which is currently unused.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: dedup if space overlap truly exists
xie xingguo [Tue, 15 Nov 2016 05:59:56 +0000 (13:59 +0800)]
os/bluestore: dedup if space overlap truly exists

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomds: revert "mds/Mutation: remove redundant _dump method" 11985/head
Patrick Donnelly [Mon, 14 Nov 2016 23:30:35 +0000 (18:30 -0500)]
mds: revert "mds/Mutation: remove redundant _dump method"

This reverts commit 93d0fc9d937186861b41b054235955475c65b5c1.

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>
8 years agoos/bluestore: simplify OmapIteratorImpl::valid() 11964/head
xie xingguo [Tue, 15 Nov 2016 02:18:36 +0000 (10:18 +0800)]
os/bluestore: simplify OmapIteratorImpl::valid()

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: formatting nits
xie xingguo [Tue, 15 Nov 2016 00:32:25 +0000 (08:32 +0800)]
os/bluestore: formatting nits

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: make fsck() can catch uninitialized sbid too
xie xingguo [Mon, 14 Nov 2016 07:25:03 +0000 (15:25 +0800)]
os/bluestore: make fsck() can catch uninitialized sbid too

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11973 from ceph/wip-17898-ceph-disk-flake8
Dan Mick [Mon, 14 Nov 2016 23:42:35 +0000 (15:42 -0800)]
Merge pull request #11973 from ceph/wip-17898-ceph-disk-flake8

ceph-disk: fix flake8 errors

Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agoMerge pull request #11971 from dachary/wip-17898-flake8
Loic Dachary [Mon, 14 Nov 2016 22:08:04 +0000 (23:08 +0100)]
Merge pull request #11971 from dachary/wip-17898-flake8

tests: pin flake8 to avoid behavior changes

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
8 years agoceph-disk: fix flake8 errors 11973/head
Ken Dreyer [Mon, 14 Nov 2016 21:49:15 +0000 (14:49 -0700)]
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>
8 years agoMerge pull request #11954 from stiopaa1/mds_MDCache_removeUnneededClear
Gregory Farnum [Mon, 14 Nov 2016 21:15:25 +0000 (13:15 -0800)]
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>
8 years agoMerge pull request #11912 from SUSE/wip-17747-followup
Gregory Farnum [Mon, 14 Nov 2016 21:07:06 +0000 (13:07 -0800)]
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>
8 years agotests: pin flake8 to avoid behavior changes 11971/head
Loic Dachary [Mon, 14 Nov 2016 18:32:24 +0000 (19:32 +0100)]
tests: pin flake8 to avoid behavior changes

Fixes: http://tracker.ceph.com/issues/17898
Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agoMerge pull request #11967 from wjwithagen/wip-wjw-buffer-splice
Sage Weil [Mon, 14 Nov 2016 17:10:16 +0000 (11:10 -0600)]
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>
8 years agoMerge pull request #11914 from tchaikov/wip-17857
Kefu Chai [Mon, 14 Nov 2016 16:02:40 +0000 (00:02 +0800)]
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>
8 years agocommon/buffer.cc: raw_pipe depends on splice(2) 11967/head
Willem Jan Withagen [Mon, 14 Nov 2016 15:59:17 +0000 (16:59 +0100)]
common/buffer.cc: raw_pipe depends on splice(2)

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #11919 from liewegas/wip-bluestore-cache-meta
Sage Weil [Mon, 14 Nov 2016 15:56:46 +0000 (09:56 -0600)]
Merge pull request #11919 from liewegas/wip-bluestore-cache-meta

os/bluestore: bluestore_cache_meta_ratio = .5

Reviewed-by: Mark Nelson <mnelson@redhat.com>
8 years agoos/bluestore: precondition enough to write two 256mb buffers 11919/head
Sage Weil [Mon, 14 Nov 2016 15:42:53 +0000 (10:42 -0500)]
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>
8 years agoos/bluestore: bluestore_cache_meta_ratio = .5
Sage Weil [Fri, 11 Nov 2016 16:09:55 +0000 (11:09 -0500)]
os/bluestore: bluestore_cache_meta_ratio = .5

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agorbd-mirror: configuration overrides for hard coded timers 11840/head
Dongsheng Yang [Wed, 9 Nov 2016 00:39:10 +0000 (19:39 -0500)]
rbd-mirror: configuration overrides for hard coded timers

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
8 years agoMerge pull request #11842 from ceph/wip-cmake
Kefu Chai [Mon, 14 Nov 2016 14:08:36 +0000 (22:08 +0800)]
Merge pull request #11842 from ceph/wip-cmake

cmake: librbd cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoReplicatedPG::failed_push: release read lock on failure 11914/head
Kefu Chai [Fri, 11 Nov 2016 13:37:50 +0000 (21:37 +0800)]
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>
8 years agocmake:librbd: move common to the end of linked libraries 11842/head
Kefu Chai [Mon, 14 Nov 2016 08:04:48 +0000 (16:04 +0800)]
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>
8 years agocmake: move ContextCompletion.cc into rbd_internal
Kefu Chai [Wed, 9 Nov 2016 05:11:13 +0000 (13:11 +0800)]
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>
8 years agocmake: let rbd_internal depend on librbd-tp
Kefu Chai [Wed, 9 Nov 2016 04:10:03 +0000 (12:10 +0800)]
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>
8 years agoMerge pull request #11906 from tchaikov/wip-11829
Kefu Chai [Mon, 14 Nov 2016 10:20:30 +0000 (18:20 +0800)]
Merge pull request #11906 from tchaikov/wip-11829

ceph-detect-init: FreeBSD introduction of bsdrc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agodoc: fix the script for rebuild monitor db 11962/head
Kefu Chai [Mon, 14 Nov 2016 07:13:52 +0000 (15:13 +0800)]
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>
8 years agoceph-detect-init: FreeBSD introduction of bsdrc 11906/head
Willem Jan Withagen [Tue, 8 Nov 2016 14:24:08 +0000 (15:24 +0100)]
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>
8 years agoos/bluestore: static apply() method for bluestore internal-use only
xie xingguo [Mon, 14 Nov 2016 03:16:06 +0000 (11:16 +0800)]
os/bluestore: static apply() method for bluestore internal-use only

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agolua: use simpler lua_next traversal structure 11958/head
Patrick Donnelly [Sun, 14 Feb 2016 00:59:09 +0000 (19:59 -0500)]
lua: use simpler lua_next traversal structure

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agodoc: clarify mds deactivate purpose 11957/head
Patrick Donnelly [Mon, 14 Nov 2016 02:51:35 +0000 (21:51 -0500)]
doc: clarify mds deactivate purpose

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agodoc: remove broken sentence
Patrick Donnelly [Mon, 14 Nov 2016 02:51:17 +0000 (21:51 -0500)]
doc: remove broken sentence

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoclient: use unique_ptr for fsmap_user 11837/head
Patrick Donnelly [Wed, 2 Nov 2016 15:48:55 +0000 (11:48 -0400)]
client: use unique_ptr for fsmap_user

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoclient: use unique_ptr for FSMap
Patrick Donnelly [Wed, 2 Nov 2016 15:47:25 +0000 (11:47 -0400)]
client: use unique_ptr for FSMap

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoclient: use unique_ptr for MDSMap
Patrick Donnelly [Wed, 2 Nov 2016 15:20:16 +0000 (11:20 -0400)]
client: use unique_ptr for MDSMap

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoclient: remove unnecessary bufferptr[] for writev 11836/head
Patrick Donnelly [Wed, 2 Nov 2016 13:18:50 +0000 (09:18 -0400)]
client: remove unnecessary bufferptr[] for writev

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #11844 from liupan1111/master
Kefu Chai [Mon, 14 Nov 2016 01:42:50 +0000 (09:42 +0800)]
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>
8 years agoMerge pull request #11799 from KerLiu/fixdupassignment
Kefu Chai [Mon, 14 Nov 2016 01:40:58 +0000 (09:40 +0800)]
Merge pull request #11799 from KerLiu/fixdupassignment

osd/OSDMap.cc: fix duplicated assignment for new_blacklist_entries

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11378 from ryneli/watch_notify_add_timeout
Kefu Chai [Mon, 14 Nov 2016 01:36:14 +0000 (09:36 +0800)]
Merge pull request #11378 from ryneli/watch_notify_add_timeout

librados: add timeout to watch/notify

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomds/MDCache.h: remove unneeded call to clear func 11954/head
Michal Jarzabek [Sun, 13 Nov 2016 19:44:07 +0000 (19:44 +0000)]
mds/MDCache.h: remove unneeded call to clear func

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agolibrados: add timeout parameter to rados_watch 11378/head
Ryne Li [Mon, 10 Oct 2016 19:47:32 +0000 (15:47 -0400)]
librados: add timeout parameter to rados_watch

Signed-off-by: Ryne Li <lizhenqiangsnake@gmail.com>
8 years agoMerge pull request #10221 from Yan-waller/yj-wip-testrados-0709
Kefu Chai [Sun, 13 Nov 2016 08:24:05 +0000 (16:24 +0800)]
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>
8 years agoMerge pull request #11941 from liewegas/wip-envlibrados
Kefu Chai [Sun, 13 Nov 2016 06:53:29 +0000 (14:53 +0800)]
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>
8 years agoMerge pull request #9357 from Aran85/wip-assert-build-push
Kefu Chai [Sun, 13 Nov 2016 06:41:14 +0000 (14:41 +0800)]
Merge pull request #9357 from Aran85/wip-assert-build-push

osd/PGBackend: build_push_op segment fault

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #11800 from bassamtabbara/wip-make-leveldb-optional
Kefu Chai [Sun, 13 Nov 2016 06:39:11 +0000 (14:39 +0800)]
Merge pull request #11800 from bassamtabbara/wip-make-leveldb-optional

mon: support for building without leveldb + mon mkfs bug fix

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11664 from sysnote/wip-17719
Kefu Chai [Sun, 13 Nov 2016 06:38:10 +0000 (14:38 +0800)]
Merge pull request #11664 from sysnote/wip-17719

mon: fix "OSDs marked OUT wrongly after monitor failover"

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #10196 from xiaoxichen/fix_16609
Kefu Chai [Sun, 13 Nov 2016 06:34:24 +0000 (14:34 +0800)]
Merge pull request #10196 from xiaoxichen/fix_16609

log/LogClient: fill seq & who for syslog and graylog

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoBlueStore: speedup the performance of multi-replication flow by 11844/head
Pan Liu [Wed, 9 Nov 2016 09:45:27 +0000 (17:45 +0800)]
BlueStore: speedup the performance of multi-replication flow by
switching the callback order in bluestore.

In Bluestore ack callback and commit callback are queued one by one in
the function "BlueStore;:_txc_finish_kv". Therefore, just only one callback
is needed to call, in order to improve performance. We do this by switching
the callback order in bluestore, and the callback work can be done in
sub_op_modify_commit and doesn't need to do it again in sub_op_modify_applied.

Signed-off-by: Pan Liu <pan.liu@istuary.com>
8 years agoMerge pull request #11805 from tchaikov/wip-deprecate-readdir-r
Sage Weil [Sat, 12 Nov 2016 13:35:58 +0000 (07:35 -0600)]
Merge pull request #11805 from tchaikov/wip-deprecate-readdir-r

deprecate readdir_r() with readdir()

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11824 from xiexingguo/xxg-wip-kill-pg-splitting
Sage Weil [Sat, 12 Nov 2016 13:35:46 +0000 (07:35 -0600)]
Merge pull request #11824 from xiexingguo/xxg-wip-kill-pg-splitting

osd: kill PG_STATE_SPLITTING

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11874 from wido/osd-no-scrub-recovery
Sage Weil [Sat, 12 Nov 2016 13:35:13 +0000 (07:35 -0600)]
Merge pull request #11874 from wido/osd-no-scrub-recovery

osd: Add config option to disable new scrubs during recovery

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11880 from cbodley/wip-ms-type-random
Sage Weil [Sat, 12 Nov 2016 13:35:00 +0000 (07:35 -0600)]
Merge pull request #11880 from cbodley/wip-ms-type-random

msg: seed random engine used for ms_type="random"

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11898 from liewegas/wip-filestore-hashindex
Sage Weil [Sat, 12 Nov 2016 13:34:41 +0000 (07:34 -0600)]
Merge pull request #11898 from liewegas/wip-filestore-hashindex

os/filestore/HashIndex: fix list_by_hash_* termination on reaching end

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoqa/workunits/rados/test_envlibrados_for_rocksdb: force librados-dev install 11941/head
Sage Weil [Sat, 12 Nov 2016 13:30:59 +0000 (08:30 -0500)]
qa/workunits/rados/test_envlibrados_for_rocksdb: force librados-dev install

On trusty we see

 WARNING: The following packages cannot be authenticated!
   librados-dev
 E: There are problems and -y was used without --force-yes

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: assert from access violation
xie xingguo [Sat, 12 Nov 2016 08:33:37 +0000 (16:33 +0800)]
os/bluestore: assert from access violation

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: use built-in methods for ExtentMap resharding and encoding
xie xingguo [Sat, 12 Nov 2016 08:29:30 +0000 (16:29 +0800)]
os/bluestore: use built-in methods for ExtentMap resharding and encoding

Hope this can improve the code readability a little...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11907 from badone/wip-pipe-socket-typos
Brad Hubbard [Sat, 12 Nov 2016 02:53:06 +0000 (12:53 +1000)]
Merge pull request #11907 from badone/wip-pipe-socket-typos

msg: Fix typos in socket creation error message

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11392 from Oloremo/keystone_docs
Yehuda Sadeh [Fri, 11 Nov 2016 23:40:47 +0000 (15:40 -0800)]
Merge pull request #11392 from Oloremo/keystone_docs

Update keystone doc about v3 options

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agoMerge pull request #11925 from ktdreyer/doc-infernalis-eol
Sage Weil [Fri, 11 Nov 2016 22:57:36 +0000 (16:57 -0600)]
Merge pull request #11925 from ktdreyer/doc-infernalis-eol

doc: add infernalis EOL date

8 years agodoc: add infernalis EOL date 11925/head
Ken Dreyer [Fri, 11 Nov 2016 22:44:18 +0000 (15:44 -0700)]
doc: add infernalis EOL date

Remove the estimated Infernalis EOL date, and add the actual EOL date.

As discussed on the ceph-devel mailing list, we decided to say that this
infernalis EOL date is the same date that we made the first Jewel
release available.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoMerge pull request #11924 from liewegas/wip-balloc
Dan Mick [Fri, 11 Nov 2016 21:54:06 +0000 (13:54 -0800)]
Merge pull request #11924 from liewegas/wip-balloc

unittest_bit_alloc: fix type

Merging before make check because it clearly breaks the build and the build part is done
Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agounittest_bitalloc: fix type 11924/head
Sage Weil [Fri, 11 Nov 2016 21:12:10 +0000 (16:12 -0500)]
unittest_bitalloc: fix type

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11922 from liewegas/wip-mempool-bluestore
Sage Weil [Fri, 11 Nov 2016 20:29:19 +0000 (14:29 -0600)]
Merge pull request #11922 from liewegas/wip-mempool-bluestore

mempool: changes for bitmap allocator

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
8 years agoMerge pull request #11920 from ifed01/wip-bluestore-tmp
Sage Weil [Fri, 11 Nov 2016 20:28:50 +0000 (14:28 -0600)]
Merge pull request #11920 from ifed01/wip-bluestore-tmp

os/bluestore: remove build warning in a better way

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agomempool changes for bitmap allocator 11922/head
Ramesh Chander [Fri, 11 Nov 2016 20:08:33 +0000 (15:08 -0500)]
mempool changes for bitmap allocator

[with bstore_balloc -> bluestore_alloc rename by sage]

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
8 years agoMerge pull request #11839 from liewegas/wip-mempool-buffer
Sage Weil [Fri, 11 Nov 2016 20:04:13 +0000 (14:04 -0600)]
Merge pull request #11839 from liewegas/wip-mempool-buffer

buffer: put buffers in buffer_{data,meta} mempools

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
8 years agoMerge pull request #11834 from liewegas/wip-bluestore-mempool
Sage Weil [Fri, 11 Nov 2016 20:03:43 +0000 (14:03 -0600)]
Merge pull request #11834 from liewegas/wip-bluestore-mempool

os/bluestore: move bluefs into its own mempool

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
8 years agobuffer: put data and metadata in a mempool 11839/head
Sage Weil [Wed, 9 Nov 2016 17:07:24 +0000 (12:07 -0500)]
buffer: put data and metadata in a mempool

Note that for raw_combined we leak some metadata into the data pool.

Also, we do not account for non-raw metadata or anything else in buffer.h,
as that would pollute the ABI and public interface.

Drop the namespace ceph in buffer.cc (which serves no real purpose) as it
confuses the MEMPOOL_DEFINE_* macros (they cannot be used inside a
namespace).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: add [de]allocate_aligned
Sage Weil [Tue, 8 Nov 2016 23:50:37 +0000 (18:50 -0500)]
mempool: add [de]allocate_aligned

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: move pg logs into osd mempool
Sage Weil [Tue, 8 Nov 2016 22:31:34 +0000 (17:31 -0500)]
osd: move pg logs into osd mempool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/PG: move peering evt into pool
Sage Weil [Mon, 17 Oct 2016 18:20:10 +0000 (14:20 -0400)]
osd/PG: move peering evt into pool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: move ReplicatedPG into mempool
Sage Weil [Mon, 17 Oct 2016 18:19:52 +0000 (14:19 -0400)]
osd: move ReplicatedPG into mempool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: create an osd mempool
Sage Weil [Tue, 8 Nov 2016 22:37:37 +0000 (17:37 -0500)]
mempool: create an osd mempool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: attach mempool asok commands to all ccts
Sage Weil [Tue, 8 Nov 2016 22:29:03 +0000 (17:29 -0500)]
mempool: attach mempool asok commands to all ccts

Signed-off-by: Sage Weil <sage@redhat.com>