]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agorgw: Drop Unused function in rgw_usage.cc 16497/head
weiqiaomiao [Sat, 22 Jul 2017 00:53:58 +0000 (08:53 +0800)]
rgw: Drop Unused function in rgw_usage.cc

fix compile warnning in any PR (Ex: https://jenkins.ceph.com/job/ceph-pull-requests/29193/console):
/home/jenkins-build/build/workspace/ceph-pull-requests/src/rgw/rgw_usage.cc:33:13: warning: ‘void dump_usage_bucket_info(ceph::Formatter*, std::__cxx11::string&, cls_user_bucket_entry&)’ defined but not used [-Wunused-function]
 static void dump_usage_bucket_info(Formatter *formatter, string& name, cls_user_bucket_entry& entry)

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
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 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 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 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 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 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 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 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>
8 years agolog/SubsystemMap: return a size_t from get_num
John Spray [Fri, 7 Jul 2017 14:08:57 +0000 (10:08 -0400)]
log/SubsystemMap: return a size_t from get_num

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agomgr: tighten initialization of keyring setting
John Spray [Fri, 7 Jul 2017 14:08:07 +0000 (10:08 -0400)]
mgr: tighten initialization of keyring setting

We should not proceed if setting this fails.  Also
the meta=false setting is not what you want when
calling into set_val after initialization, I'm not sure
how that ever worked!

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: separate config opts definitions from subsys definitions
John Spray [Wed, 5 Jul 2017 20:32:05 +0000 (16:32 -0400)]
common: separate config opts definitions from subsys definitions

Previously these were all in one header and inclusions of it
got really verbose from everyone having to define SUBSYS and OPTION
macros even though they only wanted to pick out one or the other.

Also, this separates the subsys.h stuff (staying) from the legacy
config opt definitions (transitional, will go).

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: remove ::validate definitions
John Spray [Wed, 5 Jul 2017 20:25:17 +0000 (16:25 -0400)]
common: remove ::validate definitions

These will be replaced by validate methods
on Option subclasses that need them.  The code
that was in these files moved to options.[h|cc]

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: hook in 'safe' flag to new config options
John Spray [Wed, 5 Jul 2017 13:12:46 +0000 (09:12 -0400)]
common: hook in 'safe' flag to new config options

It's a poor substitute for real a concurrency solution
but for the moment carry it forward so that the options
structure can replace the list of config_option
in md_config_t.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: s/config_opts/legacy_config_opts/
John Spray [Wed, 5 Jul 2017 11:18:30 +0000 (07:18 -0400)]
common: s/config_opts/legacy_config_opts/

Name change reflects that newly added config opts
don't need to go here.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: use a vector instead of array in options.cc
John Spray [Wed, 5 Jul 2017 11:04:47 +0000 (07:04 -0400)]
common: use a vector instead of array in options.cc

Avoids retro 80s style blank entry at the end :-)

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agocommon: rip out option code generation bit
John Spray [Wed, 5 Jul 2017 10:58:09 +0000 (06:58 -0400)]
common: rip out option code generation bit

We can have a legacy (static field) config object
that includes fields from config_opts.h, and
then switch to using dynamic get() for newly
added options, so that we don't need to do
code generation for the new config infrastructure.

Signed-off-by: John Spray <john.spray@redhat.com>
8 years agog++ ../src/convert.cc -o cv -I../src -I.
Sage Weil [Mon, 26 Jun 2017 19:31:34 +0000 (15:31 -0400)]
g++ ../src/convert.cc -o cv -I../src -I.
./cv > /tmp/foo
...and copy that into options.cc
bin/generate_option_header > ../src/common/config_fields.h

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/options: more constness
Kefu Chai [Wed, 7 Jun 2017 03:42:32 +0000 (11:42 +0800)]
common/options: more constness

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon/options: specialize on non bool integeral types
Kefu Chai [Wed, 7 Jun 2017 03:11:55 +0000 (11:11 +0800)]
common/options: specialize on non bool integeral types

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon/options: new options infrastructure
Sage Weil [Fri, 12 May 2017 03:31:50 +0000 (22:31 -0500)]
common/options: new options infrastructure

Define schema for config options.  Helper to generate a header fragment
to declare the types.

Unlike the old config_opts.h approach, we will not intialize values in
the header.  This avoids a recompile if there is a change and also allows
us to specify different defaults and do parsing and validation at runtime.
Instead, we'll intialize values in the constructure of the containing
class.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon: remove max_open_files config option
Sage Weil [Fri, 12 May 2017 02:52:23 +0000 (21:52 -0500)]
common: remove max_open_files config option

The only user is init-ceph, and it can get at it via ceph-conf without
the option being declared here.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoceph-syn: parse --num-client locally; remove global option
Sage Weil [Fri, 12 May 2017 02:49:35 +0000 (21:49 -0500)]
ceph-syn: parse --num-client locally; remove global option

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16028 from jcsp/wip-mgr-commands
Kefu Chai [Fri, 21 Jul 2017 10:16:13 +0000 (18:16 +0800)]
Merge pull request #16028 from jcsp/wip-mgr-commands

mon: load mgr commands at runtime

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16415 from xiexingguo/wip-health-mon
Kefu Chai [Fri, 21 Jul 2017 10:12:31 +0000 (18:12 +0800)]
Merge pull request #16415 from xiexingguo/wip-health-mon

mon: a few health fixes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoRevert "Test-enable XIO messenger and IB/RDMA support" 16449/head
Nathan Cutler [Thu, 20 Jul 2017 11:41:29 +0000 (13:41 +0200)]
Revert "Test-enable XIO messenger and IB/RDMA support"

This reverts commit 71cbc832ded17212d840afa709700a2ca1a498b9.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Conflicts:
ceph.spec.in (trivial resolution)

8 years agoMerge pull request #16409 from liupan1111/wip-restructure-bs
Kefu Chai [Fri, 21 Jul 2017 08:55:38 +0000 (16:55 +0800)]
Merge pull request #16409 from liupan1111/wip-restructure-bs

os/bluestore: move aio.h/cc from fs dir to bluestore dir

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16328 from neha-ojha/recovery_sleep_default
Kefu Chai [Fri, 21 Jul 2017 08:55:02 +0000 (16:55 +0800)]
Merge pull request #16328 from neha-ojha/recovery_sleep_default

osd: Add recovery sleep configuration option for HDDs and SSDs

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agocommon: prevent unset_dumpable from generating warnings 16462/head
Willem Jan Withagen [Thu, 20 Jul 2017 21:01:20 +0000 (23:01 +0200)]
common: prevent unset_dumpable from generating warnings

 - Let the struct at least have a CTR

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #16470 from tchaikov/wip-watch-audit-channel
Kefu Chai [Fri, 21 Jul 2017 05:41:43 +0000 (13:41 +0800)]
Merge pull request #16470 from tchaikov/wip-watch-audit-channel

qa/workunits/cephtool/test.sh: fix test to watch audit channel

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoqa/workunits/cephtool/test.sh: fix test to watch audit channel 16470/head
Sage Weil [Thu, 20 Jul 2017 21:37:03 +0000 (17:37 -0400)]
qa/workunits/cephtool/test.sh: fix test to watch audit channel

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agodoc/mgr: add Prometheus plugin docs 16406/head
Dan Mick [Fri, 21 Jul 2017 03:14:42 +0000 (20:14 -0700)]
doc/mgr: add Prometheus plugin docs

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agomgr/index.rst: clarify which toplevel items are plugins
Dan Mick [Fri, 21 Jul 2017 03:09:39 +0000 (20:09 -0700)]
mgr/index.rst: clarify which toplevel items are plugins

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agodoc/mgr/zabbix.rst: fix subheadings, add subsubheadings
Dan Mick [Fri, 21 Jul 2017 03:09:05 +0000 (20:09 -0700)]
doc/mgr/zabbix.rst: fix subheadings, add subsubheadings

(otherwise subheadings appear as top-level items in the TOC, because
they're marked just like the title)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agoqa: remove workloadgen test 16453/head
Sage Weil [Thu, 20 Jul 2017 22:06:50 +0000 (18:06 -0400)]
qa: remove workloadgen test

The CRUSH rule creation is busted (rules and buckets out of order), but
after I fix that it doesn't seem to run right anyway.  Remove it.
We get the mon thrasher coverage from rados/monthrash already; I don't
think this is adding meaningful coverage for the amount of effort it takes
to maintain.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocrush/CrushCompiler: enforce buckets before rules rule
Sage Weil [Thu, 20 Jul 2017 21:59:11 +0000 (17:59 -0400)]
crush/CrushCompiler: enforce buckets before rules rule

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: bail out if no map yet 16455/head
Sage Weil [Thu, 20 Jul 2017 21:44:58 +0000 (17:44 -0400)]
osd: bail out if no map yet

If we get pings before finishing our startup we may not yet have an
osdmap.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoqa/tasks/reg11184: import run 16454/head
Sage Weil [Thu, 20 Jul 2017 21:42:59 +0000 (17:42 -0400)]
qa/tasks/reg11184: import run

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/PGLog: force write of may_include_deletes after split 16459/head
Josh Durgin [Thu, 20 Jul 2017 20:27:24 +0000 (16:27 -0400)]
osd/PGLog: force write of may_include_deletes after split

When a collection is split this needs to be persisted again. Normally
this is only persisted when the missing set is rebuilt during a new
interval when it previous did not include deletes, but during split we
keep the in-memory missing set may_include_deletes flag, but do not
rebuild the missing set.

Fixes: http://tracker.ceph.com/issues/20704
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoceph_objectstore_tool: always write may_include_deletes if it's set
Josh Durgin [Thu, 20 Jul 2017 19:44:35 +0000 (15:44 -0400)]
ceph_objectstore_tool: always write may_include_deletes if it's set

This prevents us from importing a missing set without also setting the
may_include_deletes_in_missing omap value if appropriate.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agomsg: restore peer addr checks
Sage Weil [Thu, 20 Jul 2017 17:59:45 +0000 (13:59 -0400)]
msg: restore peer addr checks

This was dropped in bf4938567943c80345966f9c5a3bdc75a913175b but should
not have been.  Since we are advertising the addr and not the bind
addr there is no reason to disable this check.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd,mds,mgr: do not dereference null rotating_keys
Sage Weil [Thu, 20 Jul 2017 17:07:32 +0000 (13:07 -0400)]
osd,mds,mgr: do not dereference null rotating_keys

Immediately after we bind to a port, but before we have set up our
auth infrastructure, we may get incoming connections.  Deny them.  Since
we are not yet advertising ourselves these are peers trying to connect
to old instances of daemons, not us.

This triggers now because of bf4938567943c80345966f9c5a3bdc75a913175b.
Previously, the peer would see we were a different addr and drop the
connection.  Now, it continues.

Fixes: http://tracker.ceph.com/issues/20667
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #16429 from liewegas/wip-jewel-x
Sage Weil [Thu, 20 Jul 2017 15:47:05 +0000 (10:47 -0500)]
Merge pull request #16429 from liewegas/wip-jewel-x

qa/suites/upgrade/jewel-x: misc fixes for new health checks

8 years agoMerge pull request #16374 from majianpeng/bluestore-double-count-kv-queue-lat
Sage Weil [Thu, 20 Jul 2017 15:44:40 +0000 (10:44 -0500)]
Merge pull request #16374 from majianpeng/bluestore-double-count-kv-queue-lat

os/bluestore/BlueStore: Avoid double counting state_kv_queued_lat.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #16423 from liewegas/wip-ls
Sage Weil [Thu, 20 Jul 2017 15:43:34 +0000 (10:43 -0500)]
Merge pull request #16423 from liewegas/wip-ls

mon: '* list' -> '* ls'

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16434 from badone/wip-fix-deep-age-reporting
Sage Weil [Thu, 20 Jul 2017 15:43:15 +0000 (10:43 -0500)]
Merge pull request #16434 from badone/wip-fix-deep-age-reporting

mon: Fix deep_age copy paste error

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #16444 from tchaikov/wip-test-osd-stat
Kefu Chai [Thu, 20 Jul 2017 15:41:53 +0000 (23:41 +0800)]
Merge pull request #16444 from tchaikov/wip-test-osd-stat

qa/workunits/cephtool/test.sh: "ceph osd stat" output changed, update accordingly

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>