]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoOSDMonitor: check mon_max_pool_pg_num when set pool pg_num 16511/head
chenhg [Sun, 23 Jul 2017 09:21:26 +0000 (17:21 +0800)]
OSDMonitor: check mon_max_pool_pg_num when set pool pg_num

Check the mon_max_pool_pg_num when creating pools, but did not

check in the the modification. So we can create a pool and then

modify pg_num exceeds the mon_max_pool_pg_num limit.

By following these steps can verify this problem

step 1: set  mon_max_pool_pg_num = 65536

step 2: ceph osd pool create testpool 65536 65536

step 3: ceph osd pool set testpool pg_num 65537

Signed-off-by: chenhg <c744402859@gmail.com>
8 years agoMerge pull request #16488 from liewegas/wip-skewed
Sage Weil [Sat, 22 Jul 2017 18:07:43 +0000 (13:07 -0500)]
Merge pull request #16488 from liewegas/wip-skewed

common/options: remove mon_warn_osd_usage_min_max_delta from options.cc too

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16490 from jdurgin/wip-20739
Sage Weil [Sat, 22 Jul 2017 18:07:28 +0000 (13:07 -0500)]
Merge pull request #16490 from jdurgin/wip-20739

osd/PrimaryLogPG: skip deleted missing objects in pg[n]ls

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16501 from liewegas/wip-fix-mgr-commands
Sage Weil [Sat, 22 Jul 2017 18:07:05 +0000 (13:07 -0500)]
Merge pull request #16501 from liewegas/wip-fix-mgr-commands

mon: do not dereference empty mgr_commands

8 years agoMerge pull request #16500 from liewegas/wip-compact-sudo
Sage Weil [Sat, 22 Jul 2017 18:01:20 +0000 (13:01 -0500)]
Merge pull request #16500 from liewegas/wip-compact-sudo

qa/workunits/cephtool/test.sh: add sudo for daemon compact

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15991 from dillaman/wip-rbd-auth-profile
Sage Weil [Sat, 22 Jul 2017 03:38:42 +0000 (22:38 -0500)]
Merge pull request #15991 from dillaman/wip-rbd-auth-profile

mon,osd: new rbd-based cephx cap profiles

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16432 from liewegas/wip-mgr-daemonstate-lock
Sage Weil [Sat, 22 Jul 2017 03:36:26 +0000 (22:36 -0500)]
Merge pull request #16432 from liewegas/wip-mgr-daemonstate-lock

mgr: add per-DaemonState lock

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #16460 from liewegas/wip-mgr-metadata
Sage Weil [Sat, 22 Jul 2017 03:36:09 +0000 (22:36 -0500)]
Merge pull request #16460 from liewegas/wip-mgr-metadata

mon: add mgr metdata commands, and overall 'versions' command for all daemon versions

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16465 from xiexingguo/wip-shutup-noscrub-warn
Sage Weil [Sat, 22 Jul 2017 03:35:43 +0000 (22:35 -0500)]
Merge pull request #16465 from xiexingguo/wip-shutup-noscrub-warn

mon: stop issuing not-[deep]-scrubbed warnings if disabled

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16477 from tchaikov/wip-health-mon
Sage Weil [Sat, 22 Jul 2017 03:34:50 +0000 (22:34 -0500)]
Merge pull request #16477 from tchaikov/wip-health-mon

mon/HealthMonitor: trigger a proposal if stat updated

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16478 from xiexingguo/wip-drop-empty-message
Sage Weil [Sat, 22 Jul 2017 03:34:32 +0000 (22:34 -0500)]
Merge pull request #16478 from xiexingguo/wip-drop-empty-message

mon/HealthMonitor: avoid sending unnecessary MMonHealthChecks to leader

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16480 from jcsp/wip-rm-convert
Sage Weil [Sat, 22 Jul 2017 03:34:08 +0000 (22:34 -0500)]
Merge pull request #16480 from jcsp/wip-rm-convert

common: remove config opt conversion utility

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
8 years agomon: do not dereference empty mgr_commands 16501/head
Sage Weil [Sat, 22 Jul 2017 03:31:55 +0000 (23:31 -0400)]
mon: do not dereference empty mgr_commands

This may be empty before the initial quorum commits the static command
list.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/workunits/cephtool/test.sh: add sudo for daemon compact 16500/head
Sage Weil [Sat, 22 Jul 2017 03:18:03 +0000 (23:18 -0400)]
qa/workunits/cephtool/test.sh: add sudo for daemon compact

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge PR 16390 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:23:10 +0000 (13:23 -0700)]
Merge PR 16390 into master

* refs/remotes/upstream/pull/16390/head:
mds: cleanup with unique_ptr
mds: add to get version in the mds_commands
mds: cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge PR 16379 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:23:07 +0000 (13:23 -0700)]
Merge PR 16379 into master

* refs/remotes/upstream/pull/16379/head:
qa: fix MDS_CLIENT_RECALL copy error

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16337 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:23:04 +0000 (13:23 -0700)]
Merge PR 16337 into master

* refs/remotes/upstream/pull/16337/head:
mds: clear dirty rstat flag on non-auth inode when finishing scatter update

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16280 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:23:01 +0000 (13:23 -0700)]
Merge PR 16280 into master

* refs/remotes/upstream/pull/16280/head:
Client: mkdirs bugs when two clients send mkdir request for a same dir

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16278 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:58 +0000 (13:22 -0700)]
Merge PR 16278 into master

* refs/remotes/upstream/pull/16278/head:
MDSMonitor: show laggy MDSs at higher debug level

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16270 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:56 +0000 (13:22 -0700)]
Merge PR 16270 into master

* refs/remotes/upstream/pull/16270/head:
mds: improve wording of mdsmap dne logging

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16232 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:53 +0000 (13:22 -0700)]
Merge PR 16232 into master

* refs/remotes/upstream/pull/16232/head:
MDS: update the mlogger of mds in function check_memory_usage

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16231 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:50 +0000 (13:22 -0700)]
Merge PR 16231 into master

* refs/remotes/upstream/pull/16231/head:
Client: get rid of variable "butnot" in "client::get_caps"

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16226 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:47 +0000 (13:22 -0700)]
Merge PR 16226 into master

* refs/remotes/upstream/pull/16226/head:
qa: wait for OSDMap to propagate for snap purge

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 16149 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:44 +0000 (13:22 -0700)]
Merge PR 16149 into master

* refs/remotes/upstream/pull/16149/head:
mds: misc cleanup

Reviewed-by: Zheng Yan <zyan@redhat.com>
8 years agoMerge PR 15942 into master
Patrick Donnelly [Fri, 21 Jul 2017 20:22:36 +0000 (13:22 -0700)]
Merge PR 15942 into master

* refs/remotes/upstream/pull/15942/head:
client: add unlock_fh_pos when abort

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoosd/PrimaryLogPG: skip deleted missing objects in pg[n]ls 16490/head
Josh Durgin [Fri, 21 Jul 2017 19:02:53 +0000 (15:02 -0400)]
osd/PrimaryLogPG: skip deleted missing objects in pg[n]ls

Fixes: http://tracker.ceph.com/issues/20739
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoPendingReleaseNotes: added blurb for new RBD cap profiles 15991/head
Jason Dillaman [Wed, 19 Jul 2017 20:43:13 +0000 (16:43 -0400)]
PendingReleaseNotes: added blurb for new RBD cap profiles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoosd: expand profile caps upon construction to avoid potential race
Jason Dillaman [Tue, 11 Jul 2017 12:09:26 +0000 (08:09 -0400)]
osd: expand profile caps upon construction to avoid potential race

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/workunits/rbd: rbd-mirror tests should use 'mirror' user
Jason Dillaman [Mon, 10 Jul 2017 17:03:11 +0000 (13:03 -0400)]
qa/workunits/rbd: rbd-mirror tests should use 'mirror' user

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/suites/rbd: mirroring tests should use rbd cap profiles
Jason Dillaman [Fri, 7 Jul 2017 17:05:34 +0000 (13:05 -0400)]
qa/suites/rbd: mirroring tests should use rbd cap profiles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoqa/workunits/rbd: devstack test should use auth profiles
Jason Dillaman [Fri, 7 Jul 2017 17:10:11 +0000 (13:10 -0400)]
qa/workunits/rbd: devstack test should use auth profiles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agodoc: include details for new RBD cap profiles
Jason Dillaman [Fri, 7 Jul 2017 14:41:07 +0000 (10:41 -0400)]
doc: include details for new RBD cap profiles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon,osd: drop the "allow" prefix for profile caps
Jason Dillaman [Fri, 30 Jun 2017 13:58:36 +0000 (09:58 -0400)]
mon,osd: drop the "allow" prefix for profile caps

The use of the a profile implies that it sets everything up. If
support for deny is ever added, it doesn't make much sense to
deny a profile.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoosd: new 'rbd'/'rbd-read-only' osd cap profiles
Jason Dillaman [Thu, 29 Jun 2017 01:42:41 +0000 (21:42 -0400)]
osd: new 'rbd'/'rbd-read-only' osd cap profiles

The 'rbd' profile provides read-only class access on all pools
to the 'rbd_children' object and write access to the optionally
specified pool. The 'rbd-read-only' profile does as its name
implies.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoosd: primitive cephx osd profile cap support
Jason Dillaman [Thu, 29 Jun 2017 01:20:09 +0000 (21:20 -0400)]
osd: primitive cephx osd profile cap support

The two new example profiles are read-only and read-write

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: added 'rbd' profile
Jason Dillaman [Mon, 26 Jun 2017 20:56:23 +0000 (16:56 -0400)]
mon: added 'rbd' profile

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomon: support regex-based restrictions on command caps
Jason Dillaman [Mon, 26 Jun 2017 20:38:15 +0000 (16:38 -0400)]
mon: support regex-based restrictions on command caps

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #16445 from tchaikov/wip-16895
Kefu Chai [Fri, 21 Jul 2017 18:24:28 +0000 (02:24 +0800)]
Merge pull request #16445 from tchaikov/wip-16895

test: create asok files in a temp directory under $TMPDIR

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agocommon/options: remove mon_warn_osd_usage_min_max_delta from options.cc too 16488/head
Sage Weil [Fri, 21 Jul 2017 17:36:23 +0000 (13:36 -0400)]
common/options: remove mon_warn_osd_usage_min_max_delta from options.cc too

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest: create asok files in a temp directory under $TMPDIR 16445/head
Kefu Chai [Thu, 20 Jul 2017 11:20:04 +0000 (19:20 +0800)]
test: create asok files in a temp directory under $TMPDIR

to shorten the pathname of unix domain socket created for admin socket,
so it does not exceed the limit of 107 on GNU/Linux:

* ceph-helper.sh: the temp directory is named ${TMPDIR:-/tmp}/ceph-asok.$$
* vstart.sh: the temp directory is named `mktemp -u -d "${TMPDIR:-/tmp}/ceph-asok.XXXXXX"`

Fixes: http://tracker.ceph.com/issues/16895
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16408 from yanghonggang/master
Yuri Weinstein [Fri, 21 Jul 2017 16:41:02 +0000 (09:41 -0700)]
Merge pull request #16408 from yanghonggang/master

osd: fix pg ref leaks when osd shutdown

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #16449 from smithfarm/wip-obsolete-xio
Sage Weil [Fri, 21 Jul 2017 16:01:39 +0000 (11:01 -0500)]
Merge pull request #16449 from smithfarm/wip-obsolete-xio

build/ops: rpm: Drop legacy libxio support

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16453 from liewegas/wip-workloadgen
Sage Weil [Fri, 21 Jul 2017 16:01:22 +0000 (11:01 -0500)]
Merge pull request #16453 from liewegas/wip-workloadgen

crush: enforce buckets-before-rules rule

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
8 years agoMerge pull request #16455 from liewegas/wip-20667
Sage Weil [Fri, 21 Jul 2017 16:00:42 +0000 (11:00 -0500)]
Merge pull request #16455 from liewegas/wip-20667

osd,mds,mgr: do not dereference null rotating_keys

Reviewed-by: Bassam Tabbara <Bassam.Tabbara@Quantum.com>
8 years agoMerge pull request #16459 from jdurgin/wip-20704
Sage Weil [Fri, 21 Jul 2017 15:59:36 +0000 (10:59 -0500)]
Merge pull request #16459 from jdurgin/wip-20704

osd: fix a couple bugs with persisting the missing set when it contains deletes

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16461 from liewegas/wip-skewed
Sage Weil [Fri, 21 Jul 2017 15:58:33 +0000 (10:58 -0500)]
Merge pull request #16461 from liewegas/wip-skewed

mon/PGMap: remove skewed utilizatoin warning

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agomon/PGMap: remove skewed utilizatoin warning 16461/head
Sage Weil [Fri, 21 Jul 2017 15:58:08 +0000 (11:58 -0400)]
mon/PGMap: remove skewed utilizatoin warning

This has a few problems:

1- It does not do it's analysis over CRUSH rule roots/classes, which
means that an innocent user of classes will see skewed usage (bc hdds are
more full than ssds, say)

2- It does not take degraded clusters into account, which means the warning
will appear when a fresh OSD is added.

See http://tracker.ceph.com/issues/20730

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr/DaemonState: add per DaemonState lock 16432/head
Sage Weil [Wed, 19 Jul 2017 21:28:48 +0000 (17:28 -0400)]
mgr/DaemonState: add per DaemonState lock

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16406 from dmick/wip-mgr-counters
Sage Weil [Fri, 21 Jul 2017 15:28:53 +0000 (10:28 -0500)]
Merge pull request #16406 from dmick/wip-mgr-counters

mgr: perf schema fns/change notification and Prometheus plugin

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agodoc/man/8/ceph: document 'ceph mgr *' commands 16460/head
Sage Weil [Fri, 21 Jul 2017 15:21:38 +0000 (11:21 -0400)]
doc/man/8/ceph: document 'ceph mgr *' commands

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr: use rvalue ref for MMgrBeacon metadata
Sage Weil [Fri, 21 Jul 2017 15:13:24 +0000 (11:13 -0400)]
mgr: use rvalue ref for MMgrBeacon metadata

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/workunits/cephtool/test.sh: add a few tests
Sage Weil [Thu, 20 Jul 2017 20:38:48 +0000 (16:38 -0400)]
qa/workunits/cephtool/test.sh: add a few tests

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomgr/ServiceMap: fix typo in service status summary
Sage Weil [Thu, 20 Jul 2017 20:35:35 +0000 (16:35 -0400)]
mgr/ServiceMap: fix typo in service status summary

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: 'versions' command to show running versions for daemons of all types
Sage Weil [Thu, 20 Jul 2017 20:35:20 +0000 (16:35 -0400)]
mon: 'versions' command to show running versions for daemons of all types

Easier!

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: factor out count_metadata w/ counter helper
Sage Weil [Thu, 20 Jul 2017 20:25:42 +0000 (16:25 -0400)]
mon: factor out count_metadata w/ counter helper

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/MgrMonitor: 'mgr metadata', 'mgr versions', 'mgr count-metadata'
Sage Weil [Thu, 20 Jul 2017 19:59:57 +0000 (15:59 -0400)]
mon/MgrMonitor: 'mgr metadata', 'mgr versions', 'mgr count-metadata'

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/MgrMonitor: store mgr daemon metadata
Sage Weil [Thu, 20 Jul 2017 19:59:38 +0000 (15:59 -0400)]
mon/MgrMonitor: store mgr daemon metadata

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16484 from jecluis/wip-20371-qa-suites
Sage Weil [Fri, 21 Jul 2017 14:46:53 +0000 (09:46 -0500)]
Merge pull request #16484 from jecluis/wip-20371-qa-suites

qa: flush out monc's dropped msgs on msgr failure injection

8 years agoqa: flush out monc's dropped msgs on msgr failure injection 16484/head
Joao Eduardo Luis [Fri, 21 Jul 2017 14:29:21 +0000 (15:29 +0100)]
qa: flush out monc's dropped msgs on msgr failure injection

We have a few open tickets regarding the mgr being down during suites
involving messenger failure injection. There are a few suspicions that
this may be related with the monclient, but we'll need more logs to
validate those suspicions and, more, to validate we're actually fixing
the issue.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
8 years agoMerge pull request #16448 from linuxbox2/wip-supriti-ord
Casey Bodley [Fri, 21 Jul 2017 14:11:46 +0000 (10:11 -0400)]
Merge pull request #16448 from linuxbox2/wip-supriti-ord

rgw_file: properly & |'d flags

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #16475 from amitkumar50/branchAffliation
Jos Collin [Fri, 21 Jul 2017 13:19:09 +0000 (13:19 +0000)]
Merge pull request #16475 from amitkumar50/branchAffliation

Add amitkumar50 affiliation to .organizationmap

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoAdd amitkumar50 affiliation to .organizationmap 16475/head
amitkuma [Fri, 21 Jul 2017 14:56:20 +0000 (20:26 +0530)]
Add amitkumar50 affiliation to .organizationmap

Signed-off-by: Amit Kumar <amitkuma@redhat.com>
8 years agoMerge pull request #16430 from yuriw/wip_add_luminous
Jos Collin [Fri, 21 Jul 2017 12:11:29 +0000 (12:11 +0000)]
Merge pull request #16430 from yuriw/wip_add_luminous

qa: Added luminous to the mix in schedule_subset.sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agocommon: remove config opt conversion utility 16480/head
John Spray [Fri, 21 Jul 2017 12:06:47 +0000 (08:06 -0400)]
common: remove config opt conversion utility

Now that the new options.cc stuff has landed, this is no longer
needed.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #16211 from jcsp/wip-options-jcsp
John Spray [Fri, 21 Jul 2017 12:02:16 +0000 (13:02 +0100)]
Merge pull request #16211 from jcsp/wip-options-jcsp

common: Revamp config option definitions

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16313 from Songweibin/wip-mirror-peer
Jason Dillaman [Fri, 21 Jul 2017 12:00:50 +0000 (08:00 -0400)]
Merge pull request #16313 from Songweibin/wip-mirror-peer

rbd: make it more understandable when adding peer returns error

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #16462 from wjwithagen/wjw-warning-unused-unsetdumpable
Kefu Chai [Fri, 21 Jul 2017 11:50:45 +0000 (19:50 +0800)]
Merge pull request #16462 from wjwithagen/wjw-warning-unused-unsetdumpable

common: prevent unset_dumpable from generating warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomon/HealthMonitor: avoid sending unnecessary MMonHealthChecks to leader 16478/head
xie xingguo [Fri, 21 Jul 2017 10:35:06 +0000 (18:35 +0800)]
mon/HealthMonitor: avoid sending unnecessary MMonHealthChecks to leader

If there is no historic warnings and no new warnings is generated,
skip sending MMonHealthChecks(for peon) or updating quorum_checks(for leader).

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16454 from liewegas/wip-fix-ceph-scrub
Kefu Chai [Fri, 21 Jul 2017 11:31:19 +0000 (19:31 +0800)]
Merge pull request #16454 from liewegas/wip-fix-ceph-scrub

qa/tasks/ceph_manager: wait for osd to start after objectstore-tool sequence

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomon/HealthMonitor: trigger a proposal if stat updated 16477/head
Kefu Chai [Fri, 21 Jul 2017 10:00:26 +0000 (18:00 +0800)]
mon/HealthMonitor: trigger a proposal if stat updated

leader should always propose if the peon update it with new health stats

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon/options: update for latest added 16211/head
John Spray [Fri, 21 Jul 2017 10:30:27 +0000 (06:30 -0400)]
common/options: update for latest added

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: fix erasure_code_dir definition
John Spray [Thu, 20 Jul 2017 15:54:33 +0000 (11:54 -0400)]
common: fix erasure_code_dir definition

This was missing its `safe` flag, causing some attempts
to set it during testing to fail.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agotest: use config set_val_or_die instead of set_val
John Spray [Thu, 20 Jul 2017 15:53:38 +0000 (11:53 -0400)]
test: use config set_val_or_die instead of set_val

...in places that the return code was not being checked.

This fixes cases where an error in the config schema or the
value being passed in would cause weird failures beacuse the
set_val had not taken effect.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon/options: fix overflowing 64 bit literals
John Spray [Thu, 20 Jul 2017 11:58:41 +0000 (07:58 -0400)]
common/options: fix overflowing 64 bit literals

This manifested as a failure in objectstore tool test_fuse.sh

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agotest: update daemon_config.cc for conf changes
John Spray [Thu, 20 Jul 2017 00:37:02 +0000 (20:37 -0400)]
test: update daemon_config.cc for conf changes

This was only partially updated in previous commits
for --num-clients, --num-open-files.

Also update int validation test to reflect that values
are now 64 bit internally.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: update options.cc for latest master
John Spray [Wed, 19 Jul 2017 12:10:42 +0000 (08:10 -0400)]
common: update options.cc for latest master

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: fix Option::is_safe
John Spray [Thu, 13 Jul 2017 09:19:18 +0000 (05:19 -0400)]
common: fix Option::is_safe

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: remove usage of set_daemon_default for now
John Spray [Fri, 14 Jul 2017 09:54:01 +0000 (05:54 -0400)]
common: remove usage of set_daemon_default for now

The code in common_preinit is still there to override
these settings as appropriate.

The set_daemon_default stuff was breaking ceph-conf tests (because
you would get the client-side defaults when asking about an OSD's
settings), and md_config_t isn't properly identifying daemons
using code_env yet.

Ticket to add it back in:
http://tracker.ceph.com/issues/20627

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: run validator on all defaults
John Spray [Fri, 14 Jul 2017 00:34:42 +0000 (20:34 -0400)]
common: run validator on all defaults

RBD relies on this behaviour to get the int-ized
form for rbd_default_features.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agorgw: set mins on options to avoid unneeded max()
John Spray [Thu, 13 Jul 2017 17:14:59 +0000 (13:14 -0400)]
rgw: set mins on options to avoid unneeded max()

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: update options.cc for master
John Spray [Thu, 13 Jul 2017 16:53:07 +0000 (12:53 -0400)]
common: update options.cc for master

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: move validation in Option and add a test
John Spray [Thu, 13 Jul 2017 16:43:43 +0000 (12:43 -0400)]
common: move validation in Option and add a test

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agotest: update md_config_t unit test
John Spray [Thu, 13 Jul 2017 12:26:01 +0000 (08:26 -0400)]
test: update md_config_t unit test

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: revert public_addr setting to a string
John Spray [Thu, 13 Jul 2017 12:24:31 +0000 (08:24 -0400)]
common: revert public_addr setting to a string

This was a string in the old schema, and tests
depended on that -- if we want to change its type
let's do that separately to the infrastructure changes.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agotools: avoid max() calls on rbd config options
John Spray [Wed, 12 Jul 2017 23:54:59 +0000 (19:54 -0400)]
tools: avoid max() calls on rbd config options

These were awkward for typing of the '1' literal vs.
the int64_t settings.  The whole max() thing is also
unnecessary now, if we set proper bounds on the option
definitions.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon/options: separate "service" from "tags"
John Spray [Wed, 12 Jul 2017 23:22:25 +0000 (19:22 -0400)]
common/options: separate "service" from "tags"

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: enforce min/max/enum on config options
John Spray [Wed, 12 Jul 2017 21:58:19 +0000 (17:58 -0400)]
common: enforce min/max/enum on config options

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoinclude/uuid: give uuid_d a < comparator
John Spray [Wed, 12 Jul 2017 21:20:02 +0000 (17:20 -0400)]
include/uuid: give uuid_d a < comparator

This is only there so that a variant<> containing
a uuid (amongst other types) can have operator< acting on it.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: update options.cc for latest additions
John Spray [Wed, 12 Jul 2017 21:19:24 +0000 (17:19 -0400)]
common: update options.cc for latest additions

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomon: implement `config set`
John Spray [Wed, 12 Jul 2017 14:10:06 +0000 (10:10 -0400)]
mon: implement `config set`

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomds: implement `config set`
John Spray [Wed, 12 Jul 2017 14:09:33 +0000 (10:09 -0400)]
mds: implement `config set`

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agoosd: implement `config set`
John Spray [Wed, 12 Jul 2017 13:05:32 +0000 (09:05 -0400)]
osd: implement `config set`

This is a friendlier replacement for injectargs.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: pass up error strings from set_val
John Spray [Wed, 12 Jul 2017 12:49:43 +0000 (08:49 -0400)]
common: pass up error strings from set_val

This is so that we can use it as a replacment
for the ugly injectargs.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: implement "config help" to output schema
John Spray [Wed, 12 Jul 2017 11:57:10 +0000 (07:57 -0400)]
common: implement "config help" to output schema

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agorgw: treat config ints as 64 bit
John Spray [Tue, 11 Jul 2017 18:24:26 +0000 (14:24 -0400)]
rgw: treat config ints as 64 bit

In the new world, all int config values are 64 bit.  When
doing a min() like this, need both sides in the same type.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: respect daemon defaults in config options
John Spray [Tue, 11 Jul 2017 14:08:20 +0000 (10:08 -0400)]
common: respect daemon defaults in config options

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: re-add unsigned config option type
John Spray [Tue, 11 Jul 2017 12:25:26 +0000 (08:25 -0400)]
common: re-add unsigned config option type

As long as some options are being consumed
via md_config_t:: members, various users
of (unsigned) int values will get compile warnings
when they e.g. compare them with other unsigned values.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: reinstate config opt validators
John Spray [Tue, 11 Jul 2017 11:00:54 +0000 (07:00 -0400)]
common: reinstate config opt validators

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: sync up options.cc with latest master
John Spray [Mon, 10 Jul 2017 12:43:25 +0000 (08:43 -0400)]
common: sync up options.cc with latest master

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon/config: hook in new Option config descriptions
John Spray [Fri, 7 Jul 2017 14:12:18 +0000 (10:12 -0400)]
common/config: hook in new Option config descriptions

The C++ class member fields continue to exist for
settings defined in common/legacy_config_opts.h, but
all the schema information is coming from common/options.cc
now.

The values in md_config_t::values are automatically
copied into the C++ class member fields for legacy config
options as needed.

Signed-off-by: John Spray <john.spray@redhat.com>