bluestore: fixed compilation error when enable spdk with gcc 4.8.5

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>

Merge pull request #16475 from amitkumar50/branchAffliation

Add amitkumar50 affiliation to .organizationmap

Reviewed-by: Jos Collin <jcollin@redhat.com>

Add amitkumar50 affiliation to .organizationmap

Signed-off-by: Amit Kumar <amitkuma@redhat.com>

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>

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>

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>

Merge pull request #16462 from wjwithagen/wjw-warning-unused-unsetdumpable

common: prevent unset_dumpable from generating warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>

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>

common/options: update for latest added

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

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>

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>

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>

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>

common: update options.cc for latest master

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

common: fix Option::is_safe

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

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>

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>

rgw: set mins on options to avoid unneeded max()

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

common: update options.cc for master

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

common: move validation in Option and add a test

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

test: update md_config_t unit test

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

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>

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>

common/options: separate "service" from "tags"

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

common: enforce min/max/enum on config options

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

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>

common: update options.cc for latest additions

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

mon: implement `config set`

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

mds: implement `config set`

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

osd: implement `config set`

This is a friendlier replacement for injectargs.

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

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>

common: implement "config help" to output schema

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

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>

common: respect daemon defaults in config options

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

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>

common: reinstate config opt validators

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

common: sync up options.cc with latest master

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

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>

log/SubsystemMap: return a size_t from get_num

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

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>

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>

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>

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>

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>

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>

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>

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>

common/options: more constness

Signed-off-by: Kefu Chai <kchai@redhat.com>

common/options: specialize on non bool integeral types

Signed-off-by: Kefu Chai <kchai@redhat.com>

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>

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>

ceph-syn: parse --num-client locally; remove global option

Signed-off-by: Sage Weil <sage@redhat.com>

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>

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>

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>

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>

common: prevent unset_dumpable from generating warnings

 - Let the struct at least have a CTR

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

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>

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

Signed-off-by: Sage Weil <sage@redhat.com>

qa/tasks/reg11184: import run

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #16429 from liewegas/wip-jewel-x

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

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>

Merge pull request #16423 from liewegas/wip-ls

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

Reviewed-by: Kefu Chai <kchai@redhat.com>

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>

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>

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

Fixes: http://tracker.ceph.com/issues/20705
Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #14287 from oritwas/wip-rgw-usage

rgw: usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Merge pull request #15673 from yehudasa/wip-20107

cls/refcount: store and use list of retired tags

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #16421 from tchaikov/wip-19939

messages/: always set header.version in encode_payload()

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #16418 from theanalyst/doc-rgw-tenant-names

doc: rgw clarify limitations when creating tenant names

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>

Merge pull request #16443 from wjwithagen/bug-wjw-qa-test-reorder

cephtool/test.sh: Only delete a test pool when no longer needed.

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #16451 from tchaikov/wip-qa-reg11184

qa/tasks/reg11184: use literal 'foo' instead pool_name

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

qa/tasks/reg11184: use literal 'foo' instead pool_name

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #16412 from wido/zabbix-release-notes

doc: Add Zabbix ceph-mgr plugin to PendingReleaseNotes

Reviewed-by: Kefu Chai <kchai@redhat.com>

release notes: Add Zabbix ceph-mgr module to PendingReleaseNotes

Signed-off-by: Wido den Hollander <wido@42on.com>

doc: rgw clarify limitations when creating tenant names

We only allow alphanumeric and underscore characters in tenant names
according to the validation in `RGWHandler_REST::validate_tenant_name`

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

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

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

cephtool/test.sh: Only delete a test pool when no longer needed.

the pool_getset pool is deleted before all tests on it are complete

4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1990: test_mon_osd_pool_set:  ceph osd pool delete pool_get
set pool_getset --yes-i-really-really-mean-it
4: pool 'pool_getset' removed
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1992: test_mon_osd_pool_set:  ceph osd pool get rbd crush_r
ule
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1992: test_mon_osd_pool_set:  grep 'crush_rule: '
4: crush_rule: replicated_rule
4: /home/jenkins/workspace/ceph-master/qa/workunits/cephtool/test.sh:1994: test_mon_osd_pool_set:  ceph -f json osd pool get poo
l_getset compression_mode
4: Error ENOENT: unrecognized pool 'pool_getset'

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

Merge pull request #16403 from wjwithagen/bug-wjw-ceph-osd-stat

test: ceph osd stat out has changed, fix tests for that

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #16428 from idryomov/wip-krbd-luminous-thrash

qa: thrash tests for backoff and upmap

Reviewed-by: Vasu Kulkarni <vasu@redhat.com>

Merge pull request #16424 from tchaikov/wip-assert-in-c

include/assert: test c++ before using static_cast<>

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #16400 from liewegas/wip-crush-rule-id

crush: s/ruleset/id/ in decompiled output; prevent compilation when ruleset != id

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #16402 from liewegas/wip-20105

ceph_test_rados_api_watch_notify: flush after unwatch

Reviewed-by: Kefu Chai <kchai@redhat.com>

mon: hide 'osd crush rule list' (we prefer 'ls')

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #16433 from dmick/wip-ccache

do_cmake.sh: fix syntax for /bin/sh (doesn't have +=)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

mon/HealthMonitor: fix summary of monitor clock skew

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

mon: Fix deep_age copy paste error

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

do_cmake.sh: fix syntax for /bin/sh (doesn't have +=)

Signed-off-by: Dan Mick <dan.mick@redhat.com>

librados: 'pg ls' is not a mgr command

Note that this breaks the command *during* the mon upgrade from jewel ->
luminous, which is slightly annoying, but means we avoid proxying via the
mon after upgrade is complete, which is good and IMO more important.

In the future we may want librados to cache the command descriptions so
that commands can be directed automatically.

Signed-off-by: Sage Weil <sage@redhat.com>

mon: restore mgr command lookup so that we can still proxy to mgr

Since mgr commands aren't in the main mon_commands array now, we need to
explicitly look up commands there too.  This restores the behavior
implemented below in which we forward misdirected mgr commands to the mon.

Signed-off-by: Sage Weil <sage@redhat.com>

mon: constify _get_moncommand

Signed-off-by: Sage Weil <sage@redhat.com>

doc: update osd recovery sleep description

Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #16309 from fangyuxiangGL/fix-admin-rest-api

rgw: modify email to empty by admin RESTful api doesn't work

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #15952 from jdurgin/wip-peering-deletes

osd: process deletes during recovery instead of peering

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #16376 from jecluis/wip-mon-fix-loglast

mon/LogMonitor: don't read list's end() for log last

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #16419 from Abhishekvrshny/fix-err-msg

rgw: fix error message in removing bucket with --bypass-gc flag

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>

doc: add osd recovery sleep for HDDs and SSDs

Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #16431 from jeffgreenca/master

doc: Fixed a typo in yum repo filename script

Merge pull request #15763 from dillaman/wip-pool-tags

mon: support pool application metadata key/values

Reviewed-by: Sage Weil <sage@redhat.com>

doc: Fixed a typo in yum repo filename script

Signed-off-by: Jeff Green <jeff.green.ca@gmail.com>