Commit Graph

85867 Commits

Author SHA1 Message Date
Kefu Chai
c01eeadd00
Merge pull request #21555 from tchaikov/wip-23763
test/librados: increase pgp_num along with pg_num

Reviewed-by: John Spray <john.spray@redhat.com>
2018-04-24 18:32:21 +08:00
John Spray
8c59d02759
Merge pull request #21139 from guzhongyan/cmd-wildcard
mon,mgr: remove single wildcard '*' from ceph comand line description

Reviewed-by: John Spray <john.spray@redhat.com>
2018-04-24 11:19:32 +01:00
John Spray
726905c1f9
Merge pull request #21424 from MI-OSiRIS/influx
mgr/influx: Added Additional Stats

Reviewed-by: John Spray <john.spray@redhat.com>
2018-04-24 11:18:13 +01:00
John Spray
f959371a0a
Merge pull request #21607 from jcsp/wip-mgr-selftest-fixup
mgr: reconcile can_run checks and selftest

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-04-24 11:17:16 +01:00
Lenz Grimmer
b89dbe9e57
Merge pull request #21559 from votdev/autofocus
mgr/dashboard: Add 'autofocus' directive

Reviewed-by: Ricardo Marques <rimarques@suse.com>
2018-04-24 11:50:42 +02:00
Lenz Grimmer
83a740575a
Merge pull request #21602 from votdev/fix_rbd_form
mgr/dashboard: Adapt RBD form to new application_metadata type

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
2018-04-24 11:33:33 +02:00
Patrick Donnelly
d71dbdc299
Merge PR #21166 into master
* refs/pull/21166/head:
	mds: fix occasional dir rstat inconsistency between multi-MDSes

Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-04-23 21:28:14 -07:00
Patrick Donnelly
326d00a8d6
Merge PR #21510 into master
* refs/pull/21510/head:
	mon: respect standby_for_fscid when choosing standby replay mds
	mon: fix standby replay in multimds setup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-04-23 21:28:09 -07:00
Patrick Donnelly
f34b2b2afc
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>
2018-04-23 21:28:04 -07:00
Patrick Donnelly
613d3b72cf
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>
2018-04-23 21:27:55 -07:00
Kefu Chai
cdcbd47e1e qa/suite: whitelist PG_AVAILABILITY in rados_api_tests.yaml
pg will be created when increasing pgp-num and pg-num. so at that
moment, PG_AVAILABILITY is reported. so whitelist it in all tests which
run rados/test.sh. that script exercises ceph_test_rados_api_list.

Fixes: http://tracker.ceph.com/issues/23763
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-04-24 10:16:12 +08:00
Kefu Chai
3d2e5449f1 test/librados: increase pgp_num along with pg_num
Fixes: http://tracker.ceph.com/issues/23763
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-04-24 10:16:12 +08:00
Kefu Chai
713ebcdd34
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>
2018-04-24 09:37:36 +08:00
Patrick Donnelly
19ff550c54
MDSMonitor: do not resize cluster when MDS is starting
Fixes: http://tracker.ceph.com/issues/23799

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-04-23 16:08:00 -07:00
John Spray
b1e8d63bf7 mgr: handle commands sent to unavailable modules
There are some up-front checks in DaemonServer
but it shouldn't assume that its checks are
necessarily going to match the choices about
how ActivePyModules composes its ::modules member,
so let's have some extra checks to avoid
risk of crashing mgr on commands sent to
unhealthy/unloaded modules.

Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 17:32:36 -04:00
Sage Weil
a2636967f3
Merge pull request #20959 from LiumxNL/fix-pg-fake-down
pg: handle MNotifyRec event in down state

Reviewed-by: Sage Weil <sage@redhat.com>
2018-04-23 16:30:43 -05:00
John Spray
cf5ef59bcc mgr: execute modules even if can_run=false
We execute modules even if can_run=false, so that it is possible
to load them for running their selftest hooks.  However,
we already raise health messages about the fact that they're
enabled but can't run, so we don't want to also raise
health messages about whatever exceptions they raise
from serve()

Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 17:30:41 -04:00
Kefu Chai
60e3a2404f qa/tasks/mgr: pass "--force" to "mgr module enable"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-04-23 17:30:40 -04:00
Kefu Chai
67ac7496b7 debian: let ceph-mgr suggests python-influxdb
the influx plugin requires influxdb python module to function, but
influxdb mgr plugin is optional for users who don't use influxdb.
so it's marked "Suggests" at this moment before we use a more flexible
packaging scheme.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-04-23 17:30:40 -04:00
Sage Weil
f9cd5b1f0c
Merge pull request #21000 from ceph/evelu-23320
common: Improving message sent to user when getting signals

Reviewed-by: Sage Weil <sage@redhat.com>
2018-04-23 16:29:27 -05:00
Sage Weil
06a2cc5a2f
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>
2018-04-23 16:27:50 -05:00
Sage Weil
6a3c4e4652
Merge pull request #21442 from jcsp/wip-config
mgr: centralized setting/getting of mgr configs

Reviewed-by: Sage Weil <sage@redhat.com>
2018-04-23 11:02:21 -05:00
Volker Theile
9a4d379705 mgr/dashboard: Fix bug in RBD form.
Signed-off-by: Volker Theile <vtheile@suse.com>
2018-04-23 17:13:31 +02:00
Sage Weil
7003d415db
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>
2018-04-23 09:59:46 -05:00
Kefu Chai
f612f0f151
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>
2018-04-23 22:57:47 +08:00
Kefu Chai
2c41c2f160
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>
2018-04-23 22:52:22 +08:00
Kefu Chai
9a48ccb576
Merge pull request #21058 from trociny/wip-osd-empty-snapset
osd: don't crash on empty snapset

Reviewed-by: Sage Weil <sage@redhat.com>
2018-04-23 22:33:13 +08:00
John Spray
8453c0edba doc: update config-key->config in mgr module docs
Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 10:14:31 -04:00
John Spray
5414b73800 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>
2018-04-23 10:14:31 -04:00
John Spray
4b3f026d07 qa: update mgr test for MgrModule.OPTIONS
Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 10:14:31 -04:00
John Spray
a5f71c59a5 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>
2018-04-23 10:14:31 -04:00
Sage Weil
5b99b6f8d2
Merge pull request #21188 from guzhongyan/mgr-disable-fix
mon,mgr: improve 'mgr module disable' cmd

Reviewed-by: John Spray <john.spray@redhat.com>
2018-04-23 09:12:55 -05:00
Sage Weil
868a41e45a
Merge pull request #21597 from LenzGr/dashboard-releasenotes
PendingReleaseNotes: Added note about Dashboard v2, fixed typo
2018-04-23 09:01:15 -05:00
Volker Theile
379276ecee Address comments.
Signed-off-by: Volker Theile <vtheile@suse.com>
2018-04-23 15:45:28 +02:00
Volker Theile
1daa8b0ab3 mgr/dashboard: Add 'autofocus' directive
Signed-off-by: Volker Theile <vtheile@suse.com>
2018-04-23 15:45:28 +02:00
Sage Weil
25d754a9b0
Merge pull request #21581 from tchaikov/wip-objcls-sdk
objclass-sdk: expose __cls_init() to the world

Reviewed-by: Sage Weil <sage@redhat.com>
2018-04-23 08:28:14 -05:00
John Spray
6c8fba9758 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>
2018-04-23 07:32:12 -04:00
John Spray
bca1bb43c6 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>
2018-04-23 07:29:47 -04:00
John Spray
c928983340 mgr: fix up a couple of double-lookups
Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 07:29:47 -04:00
John Spray
d4ed33c2e0 qa: test mgr live configuration updates
Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 07:29:47 -04:00
John Spray
98a3d0e04a vstart: use "config set" for mgr modules
...instead of pre-mimic config-key set.

Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 07:29:47 -04:00
John Spray
54e5cef234 mgr/restful: migrate to new get_store interface
Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 07:29:47 -04:00
John Spray
69f0a0966e 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>
2018-04-23 07:29:46 -04:00
John Spray
dd7631c292 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>
2018-04-23 07:29:46 -04:00
John Spray
1d830df901 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>
2018-04-23 07:29:46 -04:00
John Spray
f2b340a842 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>
2018-04-23 07:29:46 -04:00
John Spray
6e447fd101 mgr: clean up ActivePyModules logging
This was running the prefix and message together.

Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 07:29:46 -04:00
John Spray
3bc9850e6f mgr: fix PyModuleConfig::set_config
Commands were slightly wrong.

Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 07:29:45 -04:00
John Spray
48c9071d63 mgr: remove dead update_perf_schema fn definition
Signed-off-by: John Spray <john.spray@redhat.com>
2018-04-23 07:29:45 -04:00
John Spray
37484af0b8 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>
2018-04-23 07:29:45 -04:00