]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomgr/balancer: remove dead code
Sage Weil [Wed, 27 Sep 2017 15:19:30 +0000 (11:19 -0400)]
mgr/balancer: remove dead code

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/balancer: include pg up mapping in MappingState
Sage Weil [Wed, 27 Sep 2017 15:19:23 +0000 (11:19 -0400)]
mgr/balancer: include pg up mapping in MappingState

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/balancer: normalize weight-set weights to sum to target weight
Sage Weil [Tue, 26 Sep 2017 22:36:06 +0000 (18:36 -0400)]
mgr/balancer: normalize weight-set weights to sum to target weight

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/balancer: note root id in Eval
Sage Weil [Tue, 26 Sep 2017 22:35:42 +0000 (18:35 -0400)]
mgr/balancer: note root id in Eval

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/balancer: make crush-compat mode work!
Sage Weil [Tue, 26 Sep 2017 22:00:08 +0000 (18:00 -0400)]
mgr/balancer: make crush-compat mode work!

- it does multiple iterations, like the upmap optimizer.
- it decreases the step size if it isn't improving, in the hope
that it is overshooting the minimum
- debug output is cleaned up a bit (the info level should be
genuinely useful)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16651 from jcsp/wip-mgr-module-interface
Sage Weil [Wed, 1 Nov 2017 12:27:20 +0000 (07:27 -0500)]
Merge pull request #16651 from jcsp/wip-mgr-module-interface

mgr: python interface rework + enable modules to run in standby mode

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomon: include disabled modules in `mgr module ls` 16651/head
John Spray [Wed, 1 Nov 2017 10:35:14 +0000 (06:35 -0400)]
mon: include disabled modules in `mgr module ls`

Otherwise, when someone wants to see what's possible
to do with `mgr module enable` they have to trawl
through the whole mgr map dump.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agodoc: describe using `mgr module ...` commands
John Spray [Wed, 1 Nov 2017 10:34:36 +0000 (06:34 -0400)]
doc: describe using `mgr module ...` commands

...including the new "mgr services" command.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agodoc: describe how to implement standby modules
John Spray [Wed, 1 Nov 2017 10:28:30 +0000 (06:28 -0400)]
doc: describe how to implement standby modules

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoqa: fix mgr caps
John Spray [Mon, 23 Oct 2017 09:37:49 +0000 (05:37 -0400)]
qa: fix mgr caps

This was still using Kraken era settings

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoqa: expand mgr testing
John Spray [Thu, 19 Oct 2017 11:50:19 +0000 (07:50 -0400)]
qa: expand mgr testing

Some extra coverage of the dashboard, including its standby
redirect mode and the publishing of URIs.

Also invoking the command_spam mode of the selftest module.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/selftest: extend test and add background spam mode
John Spray [Tue, 17 Oct 2017 22:39:17 +0000 (18:39 -0400)]
mgr/selftest: extend test and add background spam mode

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: drop GIL around set_uri, set_health_checks
John Spray [Tue, 17 Oct 2017 22:16:22 +0000 (18:16 -0400)]
mgr: drop GIL around set_uri, set_health_checks

These didn't need to keep the GIL to go and do their
pure C++ parts, and by keeping it they could deadlock
while trying to take ActiveMgrModules::lock.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: fix ~MonCommandCompletion
John Spray [Tue, 17 Oct 2017 22:14:43 +0000 (18:14 -0400)]
mgr: fix ~MonCommandCompletion

This was doing a Py_DECREF outside of the Gil.

Fixes: http://tracker.ceph.com/issues/21593
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: update for SafeThreadState
John Spray [Mon, 16 Oct 2017 14:51:34 +0000 (10:51 -0400)]
mgr: update for SafeThreadState

A bunch of the previous commits were done
before this class existed, so updating in
one go instead of trying to edit history
in fine detail.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: refactor PyOSDMap etc implementation
John Spray [Fri, 13 Oct 2017 15:31:22 +0000 (11:31 -0400)]
mgr: refactor PyOSDMap etc implementation

Implement real python classes from the C side,
rather than exposing only module methods.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/PyOSDMap: add CRUSH get_item_weight
Sage Weil [Tue, 26 Sep 2017 22:35:29 +0000 (18:35 -0400)]
mgr/PyOSDMap: add CRUSH get_item_weight

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr: fix py_module_registry shutdown
John Spray [Mon, 16 Oct 2017 10:33:48 +0000 (06:33 -0400)]
mgr: fix py_module_registry shutdown

Was calling way too early, which did a
Py_Finalize before the modules had been
joined.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: fix thread naming
John Spray [Thu, 12 Oct 2017 17:14:02 +0000 (13:14 -0400)]
mgr: fix thread naming

Was passing a reference to a local stringstream into
Thread::create, not realising that it was taking a char*
reference instead of a copy.  Result was garbage (or usually,
all threads having the name of the last one created)

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: cut down duplication between active+standby
John Spray [Fri, 6 Oct 2017 15:02:44 +0000 (11:02 -0400)]
mgr: cut down duplication between active+standby

...by using PyModuleRunner class from ActivePyModule too.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: fix os._exit overrides
John Spray [Wed, 4 Oct 2017 17:13:25 +0000 (13:13 -0400)]
mgr: fix os._exit overrides

These would throw an exception when passed
a status code.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon/MgrMonitor: reset services map on drop_active
John Spray [Thu, 24 Aug 2017 18:07:37 +0000 (14:07 -0400)]
mon/MgrMonitor: reset services map on drop_active

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/dashboard: implement standby mode
John Spray [Tue, 22 Aug 2017 18:47:10 +0000 (14:47 -0400)]
mgr/dashboard: implement standby mode

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agopybind/mgr: add MgrStandbyModule
John Spray [Tue, 22 Aug 2017 15:41:26 +0000 (11:41 -0400)]
pybind/mgr: add MgrStandbyModule

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: standby modules come up and run now
John Spray [Tue, 22 Aug 2017 18:42:11 +0000 (14:42 -0400)]
mgr: standby modules come up and run now

...they still don't have access to any config though.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: enable running modules in standby mode
John Spray [Wed, 16 Aug 2017 14:23:59 +0000 (10:23 -0400)]
mgr: enable running modules in standby mode

Modules can implement a second, separate class
that has access to very little state about the
system and can't implement commands.

They have just enough information to redirect
or forward incoming requests/traffic to the
active instance of the module on the active mgr.

This enables module authors to create modules
that end users can access via any (running) mgr node
at any time, rather than having to first work out
which mgr node is active.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: clean up python source file naming
John Spray [Tue, 15 Aug 2017 10:53:18 +0000 (06:53 -0400)]
mgr: clean up python source file naming

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: refactor python module management
John Spray [Mon, 14 Aug 2017 10:31:18 +0000 (06:31 -0400)]
mgr: refactor python module management

Separate out the *loading* of modules from
the *running* of modules.

This is a precursor to enabling modules to run
in standby mode.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agopybind/mgr: use set_uri hook from dashboard+restful modules
John Spray [Thu, 27 Jul 2017 17:49:27 +0000 (13:49 -0400)]
pybind/mgr: use set_uri hook from dashboard+restful modules

No more guessing the URL!

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: enable python modules to advertise their service URI
John Spray [Thu, 27 Jul 2017 15:50:23 +0000 (11:50 -0400)]
mgr: enable python modules to advertise their service URI

Fixes: http://tracker.ceph.com/issues/17460
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon/MgrMonitor: store services in map and expose with command
John Spray [Thu, 27 Jul 2017 15:49:45 +0000 (11:49 -0400)]
mon/MgrMonitor: store services in map and expose with command

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomessages: `services` in MMgrBeacon
John Spray [Thu, 27 Jul 2017 15:46:40 +0000 (11:46 -0400)]
messages: `services` in MMgrBeacon

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon/MgrMap: store list of services
John Spray [Thu, 27 Jul 2017 15:45:53 +0000 (11:45 -0400)]
mon/MgrMap: store list of services

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: carry PyModules ref in MonCommandCompletion
John Spray [Thu, 27 Jul 2017 10:31:01 +0000 (06:31 -0400)]
mgr: carry PyModules ref in MonCommandCompletion

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agopybind: update MgrModule for ceph_state->ceph_module
John Spray [Wed, 26 Jul 2017 16:31:13 +0000 (12:31 -0400)]
pybind: update MgrModule for ceph_state->ceph_module

& tidy up the places where ceph_state was getting
used outside of MgrModule.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: refactor python interface
John Spray [Wed, 26 Jul 2017 11:44:00 +0000 (07:44 -0400)]
mgr: refactor python interface

Expose a python class instead of a module,
so that we have a place to carry our reference
to our MgrPyModule* and to PyModules*, rather than
passing a handle for the former and using
a global pointer for the latter.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/dashboard: remove blue highlight on scrubbing pg states
John Spray [Thu, 3 Aug 2017 10:22:35 +0000 (06:22 -0400)]
mgr/dashboard: remove blue highlight on scrubbing pg states

This was kind of unnecessary, highlighting a completely normal
and healthy situation in a different colour.  The blue was
also really hard to read against a grey background.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/dashboard: clean up fs standby list when empty
John Spray [Thu, 27 Jul 2017 15:42:16 +0000 (11:42 -0400)]
mgr/dashboard: clean up fs standby list when empty

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18243 from jan--f/mgr-prom-osd-status
John Spray [Wed, 1 Nov 2017 11:42:15 +0000 (12:42 +0100)]
Merge pull request #18243 from jan--f/mgr-prom-osd-status

pybind/mgr/prometheus: add osd_in/out metric; make osd_weight a metric

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18651 from aermolaev/patch-1
Kefu Chai [Wed, 1 Nov 2017 10:01:14 +0000 (18:01 +0800)]
Merge pull request #18651 from aermolaev/patch-1

doc: fix typo in radosgw/dynamicresharding.rst

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agodoc: fix typo in dynamicresharding.rst: admon => admin 18651/head
Alexander Ermolaev [Tue, 31 Oct 2017 12:59:07 +0000 (15:59 +0300)]
doc: fix typo in dynamicresharding.rst: admon => admin

Signed-off-by: Alexander Ermolaev <ave@integros.com>
7 years agoMerge pull request #18660 from ownedu/wip-fix-async-rdma-typo
Haomai Wang [Wed, 1 Nov 2017 06:14:53 +0000 (01:14 -0500)]
Merge pull request #18660 from ownedu/wip-fix-async-rdma-typo

msg/async/rdma: a tiny typo fix.

Reviewed-by: Kefu Chai <kefu@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #18268 from jcsp/wip-20629
Kefu Chai [Wed, 1 Nov 2017 06:10:03 +0000 (14:10 +0800)]
Merge pull request #18268 from jcsp/wip-20629

mon: handle monitor lag when killing mgrs

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agomsg/async/rdma: a tiny typo fix. 18660/head
ownedu [Wed, 1 Nov 2017 03:38:27 +0000 (11:38 +0800)]
msg/async/rdma: a tiny typo fix.

Signed-off-by: Yan Lei <yongyou.yl@alibaba-inc.com>
7 years agoMerge pull request #18329 from ifed01/wip-fix-mempool-dump
Kefu Chai [Wed, 1 Nov 2017 02:54:26 +0000 (10:54 +0800)]
Merge pull request #18329 from ifed01/wip-fix-mempool-dump

mempool: fix lack of pool names in mempool:dump output for JSON format

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18575 from majianpeng/msg-cleanup-2
Kefu Chai [Wed, 1 Nov 2017 02:53:43 +0000 (10:53 +0800)]
Merge pull request #18575 from majianpeng/msg-cleanup-2

msg/async:  misc cleanup.

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #18581 from wzliao/wip-drop-unused-parameter
Kefu Chai [Wed, 1 Nov 2017 02:53:09 +0000 (10:53 +0800)]
Merge pull request #18581 from wzliao/wip-drop-unused-parameter

osd/PrimaryLogPG: drop unused parameters

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18588 from mogeb/rados-bench-clock
Kefu Chai [Wed, 1 Nov 2017 02:52:40 +0000 (10:52 +0800)]
Merge pull request #18588 from mogeb/rados-bench-clock

tools/rados: use the monotonic clock in rados bench

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18595 from batrick/mon-clock
Kefu Chai [Wed, 1 Nov 2017 02:50:52 +0000 (10:50 +0800)]
Merge pull request #18595 from batrick/mon-clock

mon: a few conversions to monotonic clock

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18636 from tchaikov/wip-osdmap-cleanup
Kefu Chai [Wed, 1 Nov 2017 02:48:56 +0000 (10:48 +0800)]
Merge pull request #18636 from tchaikov/wip-osdmap-cleanup

osd/OSDMap: remove the unnecessary checks for null

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18647 from tchaikov/wip-pgmap-cleanup
Kefu Chai [Wed, 1 Nov 2017 02:48:24 +0000 (10:48 +0800)]
Merge pull request #18647 from tchaikov/wip-pgmap-cleanup

mon/PGMap: use new-style options and cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18648 from tchaikov/wip-vstart-drop-num-opts
Kefu Chai [Wed, 1 Nov 2017 02:48:03 +0000 (10:48 +0800)]
Merge pull request #18648 from tchaikov/wip-vstart-drop-num-opts

vstart.sh: drop --{mon,osd,mds,rgw,mgr}_num options

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #18618 into master
Patrick Donnelly [Tue, 31 Oct 2017 23:27:44 +0000 (16:27 -0700)]
Merge PR #18618 into master

* refs/pull/18618/head:
mds: pass a reference of function to sanitize() not a copy

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #18572 from linuxbox2/wip-rgwfile-env
Casey Bodley [Tue, 31 Oct 2017 20:57:42 +0000 (16:57 -0400)]
Merge pull request #18572 from linuxbox2/wip-rgwfile-env

rgw_log, rgw_file: account for new required envvars

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18327 from PCzhangPC/clonelostmeta
Yuri Weinstein [Tue, 31 Oct 2017 20:56:56 +0000 (13:56 -0700)]
Merge pull request #18327 from PCzhangPC/clonelostmeta

librbd: cannot clone all image-metas if we have more than 64 key/value pairs

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18546 from liewegas/wip-deprecate-features
Yuri Weinstein [Tue, 31 Oct 2017 20:56:20 +0000 (13:56 -0700)]
Merge pull request #18546 from liewegas/wip-deprecate-features

include/ceph_features: deprecate a bunch of features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #18616 from xiexingguo/wip-hunt-scrub-mismatch
Yuri Weinstein [Tue, 31 Oct 2017 20:51:31 +0000 (13:51 -0700)]
Merge pull request #18616 from xiexingguo/wip-hunt-scrub-mismatch

osd/PrimaryLogPG: more oi.extents fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18634 from tchaikov/wip-qa-add-restful
vasukulkarni [Tue, 31 Oct 2017 19:36:06 +0000 (12:36 -0700)]
Merge pull request #18634 from tchaikov/wip-qa-add-restful

qa: add "restful" to ceph_mgr_modules in ceph-ansible suite

7 years agoMerge pull request #18520 from alram/kube-helm-doc
Sage Weil [Tue, 31 Oct 2017 17:09:18 +0000 (12:09 -0500)]
Merge pull request #18520 from alram/kube-helm-doc

doc: Kube + Helm installation

7 years agoMerge pull request #18639 from yaozongyou/make-readme-properly-align
Sage Weil [Tue, 31 Oct 2017 16:44:33 +0000 (11:44 -0500)]
Merge pull request #18639 from yaozongyou/make-readme-properly-align

doc: make the commands in README.md properly aligned

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #18499 from batrick/ptl-tool-testing-time
Jos Collin [Tue, 31 Oct 2017 15:42:20 +0000 (15:42 +0000)]
Merge pull request #18499 from batrick/ptl-tool-testing-time

ptl-tool: make branch name configurable

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoptl-tool: make branch name configurable 18499/head
Patrick Donnelly [Tue, 24 Oct 2017 00:44:19 +0000 (17:44 -0700)]
ptl-tool: make branch name configurable

Also, include hours/minutes in branch so multiple branches in a day have
different names.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18642 from zhangsw/cleanup-rgwputobj-getdata
Casey Bodley [Tue, 31 Oct 2017 14:14:52 +0000 (10:14 -0400)]
Merge pull request #18642 from zhangsw/cleanup-rgwputobj-getdata

rgw: add logs if get_data returns error in RGWPutObj::execute.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge pull request #18645 from tchaikov/wip-cmake-Findgperftools
Jason Dillaman [Tue, 31 Oct 2017 11:56:21 +0000 (07:56 -0400)]
Merge pull request #18645 from tchaikov/wip-cmake-Findgperftools

cmake: should use the value of GPERFTOOLS_LIBRARIES as REQUIRED_VARS

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18283 from tchaikov/wip-laggy-mgr
Kefu Chai [Tue, 31 Oct 2017 11:03:13 +0000 (19:03 +0800)]
Merge pull request #18283 from tchaikov/wip-laggy-mgr

 qa: reduce mon-client-hunt-interval-max-multiple to 2

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agovstart.sh: drop --{mon,osd,mds,rgw,mgr}_num options 18648/head
Kefu Chai [Tue, 31 Oct 2017 10:52:09 +0000 (18:52 +0800)]
vstart.sh: drop --{mon,osd,mds,rgw,mgr}_num options

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomon/PGMap: drop unused PGMap::update_global_delta() 18647/head
Kefu Chai [Tue, 31 Oct 2017 10:43:28 +0000 (18:43 +0800)]
mon/PGMap: drop unused PGMap::update_global_delta()

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomon/PGMap: use new-style options
Kefu Chai [Tue, 31 Oct 2017 10:42:51 +0000 (18:42 +0800)]
mon/PGMap: use new-style options

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: should check the availability of aligned_alloc() by running the test 18645/head
Kefu Chai [Tue, 31 Oct 2017 09:39:02 +0000 (17:39 +0800)]
cmake: should check the availability of aligned_alloc() by running the test

this mimics the failure of rocksdb without a working
aligned_alloc()/free().

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: should use the value of GPERFTOOLS_LIBRARIES as REQUIRED_VARS
Kefu Chai [Tue, 31 Oct 2017 08:58:02 +0000 (16:58 +0800)]
cmake: should use the value of GPERFTOOLS_LIBRARIES as REQUIRED_VARS

otherwise it's always true, even if the libaries are not found. also
the cmake output will be wrong without this change:

without this change, it is:

-- Found gperftools: GPERFTOOLS_TCMALLOC_LIBRARY;GPERFTOOLS_TCMALLOC_MINIMAL_LIBRARY;GPERFTOOLS_PROFILER_LIBRARY (found version "2.5.93")

with this change, it would be:

-- Found gperftools: /tmp/gperf/lib/libtcmalloc.so (found version "2.5.93")

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agorgw: add logs if get_data returns error in RGWPutObj::execute. 18642/head
Zhang Shaowen [Tue, 31 Oct 2017 06:42:52 +0000 (14:42 +0800)]
rgw: add logs if get_data returns error in RGWPutObj::execute.

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
7 years agodoc: make the commands in README.md properly aligned 18639/head
Yao Zongyou [Tue, 31 Oct 2017 05:44:23 +0000 (13:44 +0800)]
doc: make the commands in README.md properly aligned

The commands in README.md are aligned using one tab or eight spaces,
the github markdown engine not handle this properly, so using one tab
universely.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agoosd/PrimaryLogPG: drop unused parameters 18581/head
Liao Weizhong [Fri, 27 Oct 2017 07:35:16 +0000 (15:35 +0800)]
osd/PrimaryLogPG: drop unused parameters

Signed-off-by: Liao Weizhong <liaoweizhong@unionpay.com>
7 years agoosd/OSDMap: remove the unnecessary checks for null 18636/head
Kefu Chai [Tue, 31 Oct 2017 04:21:13 +0000 (12:21 +0800)]
osd/OSDMap: remove the unnecessary checks for null

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18547 from batrick/ptl-tool-trackers
Jos Collin [Tue, 31 Oct 2017 04:18:35 +0000 (04:18 +0000)]
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>
7 years agoMerge pull request #18495 from ceph/wip-da-SCA-20171013
Kefu Chai [Tue, 31 Oct 2017 04:13:28 +0000 (12:13 +0800)]
Merge pull request #18495 from ceph/wip-da-SCA-20171013

osd,rgw,librbd: SCA fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18535 from yanghonggang/master
Kefu Chai [Tue, 31 Oct 2017 04:04:09 +0000 (12:04 +0800)]
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>
7 years agoMerge pull request #18574 from shashalu/fix-strict-strtol
Kefu Chai [Tue, 31 Oct 2017 04:02:37 +0000 (12:02 +0800)]
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>
7 years agoMerge pull request #18577 from tchaikov/wip-kill-clang-warning
Kefu Chai [Tue, 31 Oct 2017 04:02:10 +0000 (12:02 +0800)]
Merge pull request #18577 from tchaikov/wip-kill-clang-warning

ceph-syn: silence clang analyzer warning

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoqa: add "restful" to ceph_mgr_modules in ceph-ansible suite 18634/head
Kefu Chai [Tue, 31 Oct 2017 03:21:58 +0000 (11:21 +0800)]
qa: add "restful" to ceph_mgr_modules in ceph-ansible suite

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoptl-tool: print bzs/tickets cited in commit msgs 18547/head
Patrick Donnelly [Wed, 25 Oct 2017 22:54:14 +0000 (15:54 -0700)]
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>
7 years agoMerge pull request #18631 from gohighsec/cleanup
Sage Weil [Tue, 31 Oct 2017 02:18:38 +0000 (21:18 -0500)]
Merge pull request #18631 from gohighsec/cleanup

os/bluestore: delete redundant header file in KernelDevice.cc

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agobluestore: delete redundant header file in KernelDevice.cc 18631/head
lijing [Tue, 31 Oct 2017 01:44:10 +0000 (09:44 +0800)]
bluestore: delete redundant header file in KernelDevice.cc

Signed-off-by: Jing Li <lijing@gohighsec.com>
7 years agoMerge pull request #18603 from batrick/i21945
Sage Weil [Mon, 30 Oct 2017 20:43:11 +0000 (15:43 -0500)]
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>
7 years agoMerge PR #18039 into master
Patrick Donnelly [Mon, 30 Oct 2017 19:24:23 +0000 (12:24 -0700)]
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>
7 years agoMerge pull request #18477 from ZVampirEM77/wip-em-cleanup
Yehuda Sadeh [Mon, 30 Oct 2017 18:20:05 +0000 (11:20 -0700)]
Merge pull request #18477 from ZVampirEM77/wip-em-cleanup

rgw: drop unused variable in copy_obj_data()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #18579 from idryomov/wip-doc-kclient-snapshots
Ilya Dryomov [Mon, 30 Oct 2017 16:42:23 +0000 (17:42 +0100)]
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>
7 years agoMerge pull request #18513 from ceph/ceph-volume-zap
Alfredo Deza [Mon, 30 Oct 2017 14:57:33 +0000 (10:57 -0400)]
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>
7 years agoosd/PrimaryLogPG: add_object_context_to_pg_stat - fix stat 18616/head
xie xingguo [Thu, 26 Oct 2017 07:54:27 +0000 (15:54 +0800)]
osd/PrimaryLogPG: add_object_context_to_pg_stat - fix stat

There might be holes in the extents map, thus it is not always
consistent to calc the clone bytes this way.
Instead we could switch to its own (simpler and consistent) way to
count used bytes for head-object and clone respectively.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/osd_type.cc: use "<<" directly for oi.extents
xie xingguo [Thu, 26 Oct 2017 03:27:41 +0000 (11:27 +0800)]
osd/osd_type.cc: use "<<" directly for oi.extents

there's already a builtin operator<< for interval_set,
which is simpler.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/PrimaryLogPG: make oi.extents handle 0-length write/write_full properly
xie xingguo [Thu, 26 Oct 2017 03:04:33 +0000 (11:04 +0800)]
osd/PrimaryLogPG: make oi.extents handle 0-length write/write_full properly

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #18615 from rgdoliveira/alpine
Jason Dillaman [Mon, 30 Oct 2017 12:51:34 +0000 (08:51 -0400)]
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>
7 years agoMerge pull request #17363 from tchaikov/wip-ceph-disk
Kefu Chai [Mon, 30 Oct 2017 12:29:14 +0000 (20:29 +0800)]
Merge pull request #17363 from tchaikov/wip-ceph-disk

ceph-disk: unlock all partitions when activate

Reviewed-by: Sébastien Han <seb@redhat.com>
7 years agoMerge pull request #18585 from yaozongyou/fix-bluestore-tool-arg-bug
Sage Weil [Mon, 30 Oct 2017 12:00:46 +0000 (07:00 -0500)]
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>
7 years agoMerge pull request #17995 from scienceluo/wip-luo-fix-bluestore-metadata-branch
Sage Weil [Mon, 30 Oct 2017 12:00:29 +0000 (07:00 -0500)]
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>
7 years agorbd-fuse: make sure PATH_MAX is defined 18615/head
Roberto Oliveira [Sun, 29 Oct 2017 14:05:48 +0000 (14:05 +0000)]
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>
7 years agoMerge pull request #18611 from liewegas/wip-interval-set
Sage Weil [Mon, 30 Oct 2017 11:59:41 +0000 (06:59 -0500)]
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>
7 years agotools/rados: use the monotonic clock in rados bench 18588/head
Mohamad Gebai [Mon, 30 Oct 2017 09:58:11 +0000 (05:58 -0400)]
tools/rados: use the monotonic clock in rados bench

Use the steady (CLOCK_MONOTONIC) clock in the bencher. The clock is used
to measure the passage of time between events, making the monotonic clock
more suited. The system clock is affected by all changes to the system's wall
clock time, which makes it unfit to compare events times relatively to each
other.

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

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
7 years agoMerge pull request #18507 from hjwsm1989/skip-generation-object
Kefu Chai [Mon, 30 Oct 2017 08:33:47 +0000 (16:33 +0800)]
Merge pull request #18507 from hjwsm1989/skip-generation-object

ceph-objectstore-tool: skip object with generated version

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #18493 from liewegas/wip-unclean-degraded
Kefu Chai [Mon, 30 Oct 2017 07:02:32 +0000 (15:02 +0800)]
Merge pull request #18493 from liewegas/wip-unclean-degraded

mon/PGMap: 'unclean' does not imply damaged

Reviewed-by: Josh Durgin <jdurgin@redhat.com>