]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoMerge PR #21535 into master
Patrick Donnelly [Tue, 24 Apr 2018 04:28:04 +0000 (21:28 -0700)]
Merge PR #21535 into master

* refs/pull/21535/head:
MDSMonitor: do not resize cluster when MDS is starting

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
7 years agoMerge PR #21536 into master
Patrick Donnelly [Tue, 24 Apr 2018 04:27:55 +0000 (21:27 -0700)]
Merge PR #21536 into master

* refs/pull/21536/head:
qa: check old_max_mds is not wiped by marked down twice
MDSMonitor: do not wipe old_max_mds when marked down twice

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
7 years agoMerge pull request #21590 from sebastian-philipp/dashboard-fix-taskmanager-race
Kefu Chai [Tue, 24 Apr 2018 01:37:36 +0000 (09:37 +0800)]
Merge pull request #21590 from sebastian-philipp/dashboard-fix-taskmanager-race

mgr/dashboard: Fix data race and use-before-assignment

Reviewed-by: Ricardo Dias <rdias@suse.com>
7 years agoMDSMonitor: do not resize cluster when MDS is starting 21535/head
Patrick Donnelly [Mon, 23 Apr 2018 19:46:20 +0000 (12:46 -0700)]
MDSMonitor: do not resize cluster when MDS is starting

Fixes: http://tracker.ceph.com/issues/23799
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #20959 from LiumxNL/fix-pg-fake-down
Sage Weil [Mon, 23 Apr 2018 21:30:43 +0000 (16:30 -0500)]
Merge pull request #20959 from LiumxNL/fix-pg-fake-down

pg: handle MNotifyRec event in down state

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21000 from ceph/evelu-23320
Sage Weil [Mon, 23 Apr 2018 21:29:27 +0000 (16:29 -0500)]
Merge pull request #21000 from ceph/evelu-23320

common: Improving message sent to user when getting signals

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20761 from liewegas/wip-service-unregister
Sage Weil [Mon, 23 Apr 2018 21:27:50 +0000 (16:27 -0500)]
Merge pull request #20761 from liewegas/wip-service-unregister

mgr: allow service daemons to unregister from ServiceMap

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21442 from jcsp/wip-config
Sage Weil [Mon, 23 Apr 2018 16:02:21 +0000 (11:02 -0500)]
Merge pull request #21442 from jcsp/wip-config

mgr: centralized setting/getting of mgr configs

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21580 from xiexingguo/wip-add-assert
Sage Weil [Mon, 23 Apr 2018 14:59:46 +0000 (09:59 -0500)]
Merge pull request #21580 from xiexingguo/wip-add-assert

osd/PGLog: assert out on performing overflowed log trimming

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21572 from tchaikov/wip-boost-1.67
Kefu Chai [Mon, 23 Apr 2018 14:57:47 +0000 (22:57 +0800)]
Merge pull request #21572 from tchaikov/wip-boost-1.67

cmake,make-dist: bump up boost version to 1.67

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #19985 from Liuchang0812/osd-pool-stats-in-mgr
Kefu Chai [Mon, 23 Apr 2018 14:52:22 +0000 (22:52 +0800)]
Merge pull request #19985 from Liuchang0812/osd-pool-stats-in-mgr

mon, mgr: move "osd pool stats" command to mgr and mgr python module

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21058 from trociny/wip-osd-empty-snapset
Kefu Chai [Mon, 23 Apr 2018 14:33:13 +0000 (22:33 +0800)]
Merge pull request #21058 from trociny/wip-osd-empty-snapset

osd: don't crash on empty snapset

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc: update config-key->config in mgr module docs 21442/head
John Spray [Mon, 16 Apr 2018 21:30:18 +0000 (17:30 -0400)]
doc: update config-key->config in mgr module docs

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agodoc: update mgr plugin guide
John Spray [Mon, 16 Apr 2018 21:29:42 +0000 (17:29 -0400)]
doc: update mgr plugin guide

...for recent config changes.  Explain about MgrModule.OPTIONS,
and explain the new store/config distinction.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoqa: update mgr test for MgrModule.OPTIONS
John Spray [Mon, 16 Apr 2018 20:00:39 +0000 (16:00 -0400)]
qa: update mgr test for MgrModule.OPTIONS

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: add MgrModule.OPTIONS definitions to modules
John Spray [Mon, 16 Apr 2018 16:10:13 +0000 (12:10 -0400)]
mgr: add MgrModule.OPTIONS definitions to modules

They need these to do upgrades properly.  Where there
was an existing structure describing config, merge
these together to avoid having two lists of options.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #21188 from guzhongyan/mgr-disable-fix
Sage Weil [Mon, 23 Apr 2018 14:12:55 +0000 (09:12 -0500)]
Merge pull request #21188 from guzhongyan/mgr-disable-fix

mon,mgr: improve 'mgr module disable' cmd

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #21597 from LenzGr/dashboard-releasenotes
Sage Weil [Mon, 23 Apr 2018 14:01:15 +0000 (09:01 -0500)]
Merge pull request #21597 from LenzGr/dashboard-releasenotes

PendingReleaseNotes: Added note about Dashboard v2, fixed typo

7 years agoMerge pull request #21581 from tchaikov/wip-objcls-sdk
Sage Weil [Mon, 23 Apr 2018 13:28:14 +0000 (08:28 -0500)]
Merge pull request #21581 from tchaikov/wip-objcls-sdk

objclass-sdk: expose __cls_init() to the world

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agomgr: load MgrModule.OPTIONS and use it in upgrade
John Spray [Mon, 16 Apr 2018 14:49:57 +0000 (10:49 -0400)]
mgr: load MgrModule.OPTIONS and use it in upgrade

Modules will now only migrate items from config-key
into config options if they appear in the module's
schema.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: introduce MgrModule.OPTIONS field
John Spray [Mon, 16 Apr 2018 21:29:08 +0000 (17:29 -0400)]
mgr: introduce MgrModule.OPTIONS field

Now is a good time to start requiring
modules to explicitly list their configuration
settings, so that we can do a proper job of
migrating configuration from old config-key style,
i.e. knowing what's a config setting and what's
a KV store item.

Throw an exception if a module tries to
access a setting outside their schema, so
that we have some confidence that the schema
is complete.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: fix up a couple of double-lookups
John Spray [Mon, 16 Apr 2018 13:13:10 +0000 (09:13 -0400)]
mgr: fix up a couple of double-lookups

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoqa: test mgr live configuration updates
John Spray [Tue, 10 Apr 2018 13:28:36 +0000 (09:28 -0400)]
qa: test mgr live configuration updates

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agovstart: use "config set" for mgr modules
John Spray [Mon, 16 Apr 2018 10:01:35 +0000 (06:01 -0400)]
vstart: use "config set" for mgr modules

...instead of pre-mimic config-key set.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr/restful: migrate to new get_store interface
John Spray [Mon, 16 Apr 2018 09:37:50 +0000 (05:37 -0400)]
mgr/restful: migrate to new get_store interface

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon: warn user doing "config key set mgr/..."
John Spray [Mon, 9 Apr 2018 19:37:55 +0000 (15:37 -0400)]
mon: warn user doing "config key set mgr/..."

This is still completely legal, but isn't going
to have the effect they wanted if they were
trying to set a configuration option for a mgr module.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: replace get_config_prefix with get_store_prefix
John Spray [Mon, 16 Apr 2018 09:39:44 +0000 (05:39 -0400)]
mgr: replace get_config_prefix with get_store_prefix

The _prefix variant was only used for data-ish things,
so we can just move it over to operate on store instead
of config, rather than having a _prefix variant for both.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: don't migrate config values that look like data
John Spray [Mon, 16 Apr 2018 09:39:03 +0000 (05:39 -0400)]
mgr: don't migrate config values that look like data

A quickie heuristic, but sufficient to avoid picking
up e.g. SSL certs and trying to cram them into
config values.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon: grant mgr profile "config" commands
John Spray [Wed, 11 Apr 2018 16:08:39 +0000 (12:08 -0400)]
mon: grant mgr profile "config" commands

...and remove redundant config-key lines (these are applied
to mgr anyway in the next block, and mgr even has a broader
config-key permission in the line above).

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: clean up ActivePyModules logging
John Spray [Wed, 11 Apr 2018 12:45:53 +0000 (08:45 -0400)]
mgr: clean up ActivePyModules logging

This was running the prefix and message together.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: fix PyModuleConfig::set_config
John Spray [Mon, 9 Apr 2018 19:51:05 +0000 (15:51 -0400)]
mgr: fix PyModuleConfig::set_config

Commands were slightly wrong.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: remove dead update_perf_schema fn definition
John Spray [Mon, 9 Apr 2018 19:30:50 +0000 (15:30 -0400)]
mgr: remove dead update_perf_schema fn definition

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: rework kv store load path
John Spray [Mon, 9 Apr 2018 19:25:45 +0000 (15:25 -0400)]
mgr: rework kv store load path

The locking and blocking around this was a bit
tricky.  Do the simple thing, and pull the
load_store out to Mgr so that it can be safely
done as part of the background_init process (just drop
Mgr::lock across blocking actions).

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: update python interface for store vs. config
John Spray [Mon, 9 Apr 2018 19:24:14 +0000 (15:24 -0400)]
mgr: update python interface for store vs. config

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: separate out module_config and store_cache
John Spray [Wed, 4 Apr 2018 13:19:57 +0000 (09:19 -0400)]
mgr: separate out module_config and store_cache

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomgr: centralized setting/getting of mgr configs
Rubab-Syed [Fri, 16 Feb 2018 10:51:11 +0000 (15:51 +0500)]
mgr: centralized setting/getting of mgr configs

Signed-off-by: Rubab Syed<rubab.syed21@gmail.com>
7 years agoPendingReleaseNotes: Added note about Dashboard v2, fixed typo 21597/head
Lenz Grimmer [Mon, 23 Apr 2018 11:28:53 +0000 (13:28 +0200)]
PendingReleaseNotes: Added note about Dashboard v2, fixed typo

Added a bullet point about the new Ceph mgr dashboard, fixed typo in the
LZ4 compression bullet point.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
7 years agoMerge pull request #21588 from xiexingguo/wip-fix-ec-ar-order
Kefu Chai [Mon, 23 Apr 2018 10:52:48 +0000 (18:52 +0800)]
Merge pull request #21588 from xiexingguo/wip-fix-ec-ar-order

osd/PG: perfer EC async_recovery_targets in reverse order of cost

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21562 from LenzGr/mgr-dashboard-documentation
Ricardo Dias [Mon, 23 Apr 2018 10:36:46 +0000 (11:36 +0100)]
Merge pull request #21562 from LenzGr/mgr-dashboard-documentation

doc: updated dashboard feature list (added new RGW details, Pools)

Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agomgr/dashboard: Fix data race and use-before-assignment 21590/head
Sebastian Wagner [Mon, 23 Apr 2018 08:13:28 +0000 (10:13 +0200)]
mgr/dashboard: Fix data race and use-before-assignment

The race happes, if a task raises an exception very early.
Then, `self.getter_thread.event` fails as `getter_thread` is
already `None`

Also fix use-before-assignment, as `t0` and `t1` are only defined,
if no exception was raised.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
7 years agoMerge pull request #21564 from dillaman/wip-23809
Mykola Golub [Mon, 23 Apr 2018 06:07:19 +0000 (09:07 +0300)]
Merge pull request #21564 from dillaman/wip-23809

rbd: cleanup handling of IEC byte units

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #21408 from hsepeng/oisizemismatch-osd-bugfix
Kefu Chai [Mon, 23 Apr 2018 05:59:15 +0000 (13:59 +0800)]
Merge pull request #21408 from hsepeng/oisizemismatch-osd-bugfix

osd/PrimaryLogPG: fix the oi size mismatch with real object size

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomgr/DaemonServer: use helper to get DaemonKey 20761/head
Sage Weil [Mon, 9 Apr 2018 22:04:40 +0000 (17:04 -0500)]
mgr/DaemonServer: use helper to get DaemonKey

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/MgrClient: close mgr session on daemon MgrClient shutdown
Sage Weil [Tue, 13 Mar 2018 20:13:56 +0000 (15:13 -0500)]
mgr/MgrClient: close mgr session on daemon MgrClient shutdown

If we are a service daemon, send a MMgrClose on shutdown to clear ourselves
out of the ServiceMap.

Note that this is a best-effort attempt; we don't block shutdown if the
mgr isn't currently available.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon,mgr: improve 'mgr module disable/enable' cmds 21188/head
Gu Zhongyan [Tue, 3 Apr 2018 02:42:45 +0000 (10:42 +0800)]
mon,mgr: improve 'mgr module disable/enable' cmds

when running those cmds, check if the module do exist
or is disabled already.
also check if the module is enabled already.

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
7 years agoosd/PG: perfer EC async_recovery_targets in reverse order of cost 21588/head
xie xingguo [Mon, 23 Apr 2018 00:50:21 +0000 (08:50 +0800)]
osd/PG: perfer EC async_recovery_targets in reverse order of cost

This is a follow-up fix of https://github.com/ceph/ceph/pull/21578,
in which I forget that erasure-coded-pools share the same logic
when determining the async_recovery_targets..

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #21549 from rjfd/wip-dashboard-fix-qa-whitelist
Kefu Chai [Sat, 21 Apr 2018 15:15:53 +0000 (23:15 +0800)]
Merge pull request #21549 from rjfd/wip-dashboard-fix-qa-whitelist

qa/suites/rados/mgr/tasks/dashboard: add MDS_ALL_DOWN to whitelist

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa/suites/rados/mgr/tasks/dashboard: add MDS_(ALL_DOWN|UP_LESS_THAN_MAX) to whitelist 21549/head
Ricardo Dias [Fri, 20 Apr 2018 07:53:38 +0000 (08:53 +0100)]
qa/suites/rados/mgr/tasks/dashboard: add MDS_(ALL_DOWN|UP_LESS_THAN_MAX) to whitelist

Signed-off-by: Ricardo Dias <rdias@suse.com>
7 years agoMerge pull request #21560 from jan--f/fix_strtoll_interface
Kefu Chai [Sat, 21 Apr 2018 14:33:36 +0000 (22:33 +0800)]
Merge pull request #21560 from jan--f/fix_strtoll_interface

common/strtoll: remove superfluous const modifier

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21550 from wjwithagen/wjw-kevent-fix
Kefu Chai [Sat, 21 Apr 2018 14:32:43 +0000 (22:32 +0800)]
Merge pull request #21550 from wjwithagen/wjw-kevent-fix

EventKqueue: Clang want realloc return to be typed

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21579 from tchaikov/wip-test.sh-with-multi-mds
Kefu Chai [Sat, 21 Apr 2018 14:31:43 +0000 (22:31 +0800)]
Merge pull request #21579 from tchaikov/wip-test.sh-with-multi-mds

qa/workunits/cephtool/test.sh: fix test_mon_mds()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21578 from xiexingguo/wip-fix-async-recovery-peer
Kefu Chai [Sat, 21 Apr 2018 14:31:07 +0000 (22:31 +0800)]
Merge pull request #21578 from xiexingguo/wip-fix-async-recovery-peer

osd/PG: perfer async_recovery_targets in reverse order of cost

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21552 from smithfarm/wip-23805
Kefu Chai [Sat, 21 Apr 2018 14:30:33 +0000 (22:30 +0800)]
Merge pull request #21552 from smithfarm/wip-23805

qa/standalone/ceph-helpers.sh: provide argument to dirname

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoobjclass-sdk: expose __cls_init() to the world 21581/head
Kefu Chai [Sat, 21 Apr 2018 08:41:55 +0000 (16:41 +0800)]
objclass-sdk: expose __cls_init() to the world

the __cls_init() function should be visible. otherwise we cannot call it
to register the cls methods

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PGLog: assert out on performing overflowed log trimming 21580/head
xie xingguo [Sat, 21 Apr 2018 02:33:49 +0000 (10:33 +0800)]
osd/PGLog: assert out on performing overflowed log trimming

Performing overflowed log-trim can be a sign of big trouble, e.g.,
the **complete_to** iterator will now point to an invalid position
of the original pg-log list when the trimming is done, and hence
randomly trigger **Segmentation fault**s as below:
```
2018-03-07 17:38:46.109018 7f274a4ed700 -1 *** Caught signal (Segmentation fault) **
1: (()+0xa51f31) [0x7f278290bf31]
2: (()+0xf370) [0x7f277fb4f370]
3: (PrimaryLogPG::recover_got(hobject_t, eversion_t)+0x266) [0x7f2782512786]
4: (PrimaryLogPG::on_local_recover(hobject_t const&, ObjectRecoveryInfo const&, std::shared_ptr<ObjectContext>, bool, ObjectStore::Tran
saction*)+0x2a4) [0x7f278251f3b4]
5: (ReplicatedBackend::handle_push(pg_shard_t, PushOp const&, PushReplyOp*, ObjectStore::Transaction*)+0x2e2) [0x7f2782690f82]
6: (ReplicatedBackend::_do_push(boost::intrusive_ptr<OpRequest>)+0x194) [0x7f2782691224]
7: (ReplicatedBackend::_handle_message(boost::intrusive_ptr<OpRequest>)+0x2f1) [0x7f278269fd41]
8: (PGBackend::handle_message(boost::intrusive_ptr<OpRequest>)+0x50) [0x7f27825c2470]
```

The root cause of why PGs are starting to trim more log entries than
we expect is still lost to me, but setting the trap here should generally
do no harm and hopefully expose the above problem a little bit more offen.
We'll see.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #21507 from liewegas/wip-rados-test
Kefu Chai [Sat, 21 Apr 2018 01:30:02 +0000 (09:30 +0800)]
Merge pull request #21507 from liewegas/wip-rados-test

qa/workunits/rados/test.sh: ensure tee output is valid filename

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #20921 from jcsp/wip-23385
Kefu Chai [Sat, 21 Apr 2018 01:29:25 +0000 (09:29 +0800)]
Merge pull request #20921 from jcsp/wip-23385

mgr: improve reporting on unloadable modules

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20343 from trociny/wip-rados-ordersnap
Kefu Chai [Sat, 21 Apr 2018 01:28:05 +0000 (09:28 +0800)]
Merge pull request #20343 from trociny/wip-rados-ordersnap

librados: add OPERATION_ORDERSNAP flag and yet another aio_operate method

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21521 from tchaikov/wip-stoll
Kefu Chai [Sat, 21 Apr 2018 01:24:55 +0000 (09:24 +0800)]
Merge pull request #21521 from tchaikov/wip-stoll

common/strtol: fix strict_strtoll() so it accepts hex starting with 0x

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoqa/workunits/cephtool/test.sh: fix test_mon_mds() 21579/head
Kefu Chai [Sat, 21 Apr 2018 01:19:05 +0000 (09:19 +0800)]
qa/workunits/cephtool/test.sh: fix test_mon_mds()

"ceph fs set cephfs allow_multimds false" is deprecated, and multimds is
enabled by default, so "ceph fs set cephfs max_mds 4" won't fail with
the default settings.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake,make-dist: bump up boost version to 1.67 21572/head
Kefu Chai [Wed, 18 Apr 2018 04:18:58 +0000 (12:18 +0800)]
cmake,make-dist: bump up boost version to 1.67

* to pick up the fix of https://svn.boost.org/trac10/ticket/11622
* also the boost::python's library name now includes the version suffix
  of python version, so update BuildBoost.cmake accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PG: perfer async_recovery_targets in reverse order of cost 21578/head
xie xingguo [Fri, 20 Apr 2018 10:29:26 +0000 (18:29 +0800)]
osd/PG: perfer async_recovery_targets in reverse order of cost

Theoretically peers which have a longer list of objects to recover
shall equivalently take a longer time to recover and hence have a
bigger chance to block client ops.

Also, to minimize the risk of data loss, we want to bring those broken
(inconsistent) peers back to normal as soon as possible. Putting them
into the async_recovery_targets queue, however, did quite the oppsite.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #21358 from cbodley/wip-23663
Casey Bodley [Sat, 21 Apr 2018 00:35:09 +0000 (20:35 -0400)]
Merge pull request #21358 from cbodley/wip-23663

rgw: fix use of libcurl with empty header values

http://pulpito.ceph.com/cbodley-2018-04-20_19:15:33-rgw-wip-cbodley-testing-distro-basic-smithi/

7 years agoMerge pull request #21380 from cbodley/wip-23680
Casey Bodley [Sat, 21 Apr 2018 00:33:47 +0000 (20:33 -0400)]
Merge pull request #21380 from cbodley/wip-23680

rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agoMerge pull request #21567 from cbodley/wip-23778
Casey Bodley [Sat, 21 Apr 2018 00:32:32 +0000 (20:32 -0400)]
Merge pull request #21567 from cbodley/wip-23778

random: revert change from boost::optional to std::optional

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21455 from dmick/wip-ceph-volume
Alfredo Deza [Sat, 21 Apr 2018 00:10:31 +0000 (20:10 -0400)]
Merge pull request #21455 from dmick/wip-ceph-volume

ceph-volume: Nits noticed while studying code

7 years agoMerge pull request #21571 from tchaikov/wip-23517
Jason Dillaman [Fri, 20 Apr 2018 20:53:03 +0000 (16:53 -0400)]
Merge pull request #21571 from tchaikov/wip-23517

cmake: hide symbols import from other libraries in libcls_*

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21573 from tchaikov/wip-cmake
Kefu Chai [Fri, 20 Apr 2018 18:01:30 +0000 (02:01 +0800)]
Merge pull request #21573 from tchaikov/wip-cmake

cmake: s/boost_256/boost_sha256/

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21570 from alfredodeza/wip-cv-doc-updates
Andrew Schoen [Fri, 20 Apr 2018 17:40:11 +0000 (17:40 +0000)]
Merge pull request #21570 from alfredodeza/wip-cv-doc-updates

ceph-volume update man page for prepare/activate flags

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agocmake: s/boost_256/boost_sha256/ 21573/head
Kefu Chai [Fri, 20 Apr 2018 17:33:21 +0000 (01:33 +0800)]
cmake: s/boost_256/boost_sha256/

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21484 from tchaikov/wip-cmake-common-cleanup
Kefu Chai [Fri, 20 Apr 2018 17:21:32 +0000 (01:21 +0800)]
Merge pull request #21484 from tchaikov/wip-cmake-common-cleanup

cmake, common: silence cmake and gcc warnings

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agocmake: disable gflags support in rocksdb 21484/head
Kefu Chai [Wed, 18 Apr 2018 07:05:45 +0000 (15:05 +0800)]
cmake: disable gflags support in rocksdb

to silence the warnings like

CMake Warning at CMakeLists.txt:73 (find_package):
  By not providing "Findgflags.cmake" in CMAKE_MODULE_PATH this project
has
  asked CMake to find a package configuration file provided by "gflags",
but
  CMake did not find one.

  Could not find a package configuration file provided by "gflags" with
any
  of the following names:

    gflagsConfig.cmake
    gflags-config.cmake

  Add the installation prefix of "gflags" to CMAKE_PREFIX_PATH or set
  "gflags_DIR" to a directory containing one of the above files.  If
"gflags"
  provides a separate development package or SDK, be sure it has been
  installed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake,make-dist: use sha256 instead of md5 for checksum
Kefu Chai [Wed, 18 Apr 2018 04:26:02 +0000 (12:26 +0800)]
cmake,make-dist: use sha256 instead of md5 for checksum

the boost's download page offers the SHA256 hash, so it'd be easier to
verify the hash this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: hide symbols import from other libraries in libcls_* 21571/head
Kefu Chai [Fri, 20 Apr 2018 13:59:29 +0000 (21:59 +0800)]
cmake: hide symbols import from other libraries in libcls_*

so they will not be involved when resolving symbols. ld tries to
keep a shared library around even if it fails to load it if it offers
some unique symbols. in that case, the library will not be properly
unloaded, and even worse it will interfere with following dlopen()
calls, because it is marked with NODELETE by dlopen(). if it has some
unresolved symbol and does offer some "unique" symbols required by
the library to be loaded, the library will fail to load, despite the
fact that the "unique" symbol is also offered by the executable.

for more details, see
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60731 and
https://sourceware.org/bugzilla/show_bug.cgi?id=14577

Fixes: http://tracker.ceph.com/issues/23517
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agodoc/man/ceph-volume update flags for activate 21570/head
Alfredo Deza [Fri, 20 Apr 2018 16:22:40 +0000 (12:22 -0400)]
doc/man/ceph-volume update flags for activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc/man/ceph-volume update flags for prepare
Alfredo Deza [Fri, 20 Apr 2018 16:46:48 +0000 (12:46 -0400)]
doc/man/ceph-volume update flags for prepare

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agorandom: revert change from boost::optional to std::optional 21567/head
Casey Bodley [Fri, 20 Apr 2018 15:47:37 +0000 (11:47 -0400)]
random: revert change from boost::optional to std::optional

somehow this was breaking the seeding of thread-local engines on gcc.
we'll have to investigate this further, but for now i'm reverting this
piece to get messengers working again

Fixes: http://tracker.ceph.com/issues/23778
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agodoc: updated dashboard feature list (added new RGW details, Pools) 21562/head
Lenz Grimmer [Fri, 20 Apr 2018 16:11:07 +0000 (18:11 +0200)]
doc: updated dashboard feature list (added new RGW details, Pools)

Updated the dashboard feature list in the documentation to mention
the possibility to list Ceph pools and the RGW users and their buckets.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
7 years agoMerge pull request #21516 from rjfd/wip-dashboard-rest-improvements
Ricardo Dias [Fri, 20 Apr 2018 15:45:26 +0000 (16:45 +0100)]
Merge pull request #21516 from rjfd/wip-dashboard-rest-improvements

mgr/dashboard: RESTController improvements

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #21353 from Devp00l/pool-list
Ricardo Dias [Fri, 20 Apr 2018 15:40:08 +0000 (16:40 +0100)]
Merge pull request #21353 from Devp00l/pool-list

mgr/dashboard: Pool listing

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #21563 from idryomov/wip-krbd-lock-timeout-fixup
Jason Dillaman [Fri, 20 Apr 2018 15:36:09 +0000 (11:36 -0400)]
Merge pull request #21563 from idryomov/wip-krbd-lock-timeout-fixup

doc: lock_timeout is a per mapping option

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/workunits/rbd/import_export: update unit formatting 21564/head
Jason Dillaman [Fri, 20 Apr 2018 15:31:27 +0000 (11:31 -0400)]
qa/workunits/rbd/import_export: update unit formatting

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/workunits/rbd/cli_generic: update unit formatting
Jason Dillaman [Fri, 20 Apr 2018 15:26:48 +0000 (11:26 -0400)]
qa/workunits/rbd/cli_generic: update unit formatting

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/cli-integration/rbd: updated unit formatting
Jason Dillaman [Fri, 20 Apr 2018 15:19:46 +0000 (11:19 -0400)]
test/cli-integration/rbd: updated unit formatting

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd: correct object size formatting
Jason Dillaman [Fri, 20 Apr 2018 15:00:37 +0000 (11:00 -0400)]
rbd: correct object size formatting

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agodoc: lock_timeout is a per mapping option 21563/head
Ilya Dryomov [Fri, 20 Apr 2018 14:33:20 +0000 (16:33 +0200)]
doc: lock_timeout is a per mapping option

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
7 years agoMerge pull request #21522 from idryomov/wip-krbd-lock-timeout-test
Ilya Dryomov [Fri, 20 Apr 2018 14:21:48 +0000 (16:21 +0200)]
Merge pull request #21522 from idryomov/wip-krbd-lock-timeout-test

qa: krbd_exclusive_option.sh: add lock_timeout test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #21513 from idryomov/wip-krbd-notrim-test
Ilya Dryomov [Fri, 20 Apr 2018 14:20:46 +0000 (16:20 +0200)]
Merge pull request #21513 from idryomov/wip-krbd-notrim-test

 qa: krbd_fallocate.sh: add notrim test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agomgr/dashboard: Add pool listing 21353/head
Stephan Müller [Fri, 13 Apr 2018 15:43:18 +0000 (17:43 +0200)]
mgr/dashboard: Add pool listing

Adds a new top level menu entry, called "Pool", which lists all pools
and contains a minimalistic detail view.

Signed-off-by: Stephan Müller <smueller@suse.com>
7 years agomgr/dashboard: K-v-table uses autoReload input
Stephan Müller [Thu, 15 Mar 2018 16:34:49 +0000 (17:34 +0100)]
mgr/dashboard: K-v-table uses autoReload input

The "autoReload" input from the data table can now be used in the key
value table as well.

Signed-off-by: Stephan Müller <smueller@suse.com>
7 years agoMerge pull request #21517 from rjfd/wip-dashboard-fix-rbd-auth
Lenz Grimmer [Fri, 20 Apr 2018 13:55:37 +0000 (15:55 +0200)]
Merge pull request #21517 from rjfd/wip-dashboard-fix-rbd-auth

mgr/dashboard: rbd: add @AuthRequired to snapshots controller

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #20869 from votdev/dashboard_rgw_ro
Lenz Grimmer [Fri, 20 Apr 2018 13:52:21 +0000 (15:52 +0200)]
Merge pull request #20869 from votdev/dashboard_rgw_ro

mgr/dashboard: Add RGW user and bucket lists (read-only)

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
7 years agocommon/strtoll: remove superfluous const modifier 21560/head
Jan Fajerski [Fri, 20 Apr 2018 13:30:45 +0000 (15:30 +0200)]
common/strtoll: remove superfluous const modifier

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #21386 from votdev/api_interceptor
Lenz Grimmer [Fri, 20 Apr 2018 09:34:47 +0000 (11:34 +0200)]
Merge pull request #21386 from votdev/api_interceptor

mgr/dashboard: Rename and refactor ApiInterceptorService class

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agoMerge pull request #21531 from LenzGr/mgr-dashboard-documentation
Ricardo Dias [Fri, 20 Apr 2018 08:55:25 +0000 (09:55 +0100)]
Merge pull request #21531 from LenzGr/mgr-dashboard-documentation

doc: updated the dashboard feature list

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoqa/standalone/ceph-helpers.sh: provide argument to dirname 21552/head
Nathan Cutler [Fri, 20 Apr 2018 08:10:15 +0000 (10:10 +0200)]
qa/standalone/ceph-helpers.sh: provide argument to dirname

Fixes: http://tracker.ceph.com/issues/23805
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoEventKqueue: Clang want realloc return to be typed 21550/head
Willem Jan Withagen [Fri, 20 Apr 2018 08:00:03 +0000 (10:00 +0200)]
EventKqueue: Clang want realloc return to be typed

Otherwise Clang start complaining:
src/msg/async/EventKqueue.cc:202:18: error: assigning to 'struct SaveEvent *' from incompatible type 'void *'
    sav_events = realloc(sav_events, sizeof(struct SaveEvent)*newsize);
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.`

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agodoc: updated the dashboard feature list 21531/head
Lenz Grimmer [Fri, 20 Apr 2018 07:50:33 +0000 (09:50 +0200)]
doc: updated the dashboard feature list

Updated and improved the Mgr Dashboard feature list: added RBD management
features.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
7 years agoMerge PR #21499 into master
Patrick Donnelly [Thu, 19 Apr 2018 23:15:28 +0000 (16:15 -0700)]
Merge PR #21499 into master

* refs/pull/21499/head:
doc/cephfs: update kernel client quotas support info

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
7 years agogithubmap: update contributors
Patrick Donnelly [Thu, 19 Apr 2018 23:15:27 +0000 (16:15 -0700)]
githubmap: update contributors

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>