Commit Graph

75963 Commits

Author SHA1 Message Date
Sage Weil
33daf6f746 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>
2017-07-21 11:00:42 -05:00
Sage Weil
9bd678e88a 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>
2017-07-21 10:59:36 -05:00
Sage Weil
29996ea673 Merge pull request #16461 from liewegas/wip-skewed
mon/PGMap: remove skewed utilizatoin warning

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-21 10:58:33 -05:00
Sage Weil
7832c53375 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>
2017-07-21 11:58:08 -04:00
Sage Weil
f236b5e783 mgr/DaemonState: add per DaemonState lock
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:30:02 -04:00
Sage Weil
410ab9a25d 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>
2017-07-21 10:28:53 -05:00
Sage Weil
7d59d0d0b0 doc/man/8/ceph: document 'ceph mgr *' commands
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:25:26 -04:00
Sage Weil
3bc029f469 mgr: use rvalue ref for MMgrBeacon metadata
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:25:26 -04:00
Sage Weil
75ac7d85da qa/workunits/cephtool/test.sh: add a few tests
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:25:05 -04:00
Sage Weil
293b7ba956 mgr/ServiceMap: fix typo in service status summary
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:25:04 -04:00
Sage Weil
80a42122a0 mon: 'versions' command to show running versions for daemons of all types
Easier!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:25:04 -04:00
Sage Weil
4f1db4c437 mon: factor out count_metadata w/ counter helper
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:25:04 -04:00
Sage Weil
831e2a75a6 mon/MgrMonitor: 'mgr metadata', 'mgr versions', 'mgr count-metadata'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:25:04 -04:00
Sage Weil
1bf4a89890 mon/MgrMonitor: store mgr daemon metadata
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-21 11:24:44 -04:00
Sage Weil
8d177dbb84 Merge pull request #16484 from jecluis/wip-20371-qa-suites
qa: flush out monc's dropped msgs on msgr failure injection
2017-07-21 09:46:53 -05:00
Joao Eduardo Luis
6f6fbe7870 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>
2017-07-21 15:29:21 +01:00
Casey Bodley
6929f21c4e Merge pull request #16448 from linuxbox2/wip-supriti-ord
rgw_file: properly & |'d flags

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-21 10:11:46 -04:00
Jason Dillaman
04cf38cc15 osd: support cmpext operation on EC-backed pools
The forthcoming RBD compare_and_write operation needs to
support this operation when blocks are stored on an EC
pool.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-21 09:35:04 -04:00
wangzhengyong
15ab53fcb7 osd: fix cmpext bug
Signed-off-by: Zhengyong Wang <wangzhengyong@cmss.chinamobile.com>
2017-07-21 09:35:04 -04:00
Jason Dillaman
732a9504cb osd: migrated async reads to op finisher
Once an async read completes, the OpContext is re-executed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-21 09:35:03 -04:00
Jason Dillaman
c4f4689c45 osd: generic async operation finisher handler
The COPY_FROM operation has a custom data path for restarting
itself after the read has completed. The CMPEXT operation will
need similar restart handling when running on EC pools so that
it can guard ops after an async read completes.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-21 09:35:03 -04:00
Jason Dillaman
fa220bdda1 osd: OpContext ops should be passed as a pointer instead of reference
It's currently being provided a bogus memory reference by 'simple_opc_create'.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-21 09:35:03 -04:00
Jos Collin
5128e7b135 Merge pull request #16475 from amitkumar50/branchAffliation
Add amitkumar50 affiliation to .organizationmap

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-21 13:19:09 +00:00
amitkuma
a087849603 Add amitkumar50 affiliation to .organizationmap
Signed-off-by: Amit Kumar <amitkuma@redhat.com>
2017-07-21 20:36:00 +05:30
Nikita Gerasimov
424166db02 ceph-disk: Fix for missing 'not' in *_is_diskdevice checks
In 85d7f8817e was introdused
is_diskdevice() tests but in some 'if' statements 'not' are lost.

Fixes: http://tracker.ceph.com/issues/20706
Signed-off-by: Nikita Gerasimov <nikita.gerasimov@oracle.com>
2017-07-21 15:34:28 +03:00
Jos Collin
fae6dc4786 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>
2017-07-21 12:11:29 +00:00
John Spray
60642bf7f5 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>
2017-07-21 08:06:47 -04:00
John Spray
223c8ce27f 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>
2017-07-21 13:02:16 +01:00
Jason Dillaman
ee958a5930 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>
2017-07-21 08:00:50 -04:00
Kefu Chai
6a821eea8e Merge pull request #16462 from wjwithagen/wjw-warning-unused-unsetdumpable
common: prevent unset_dumpable from generating warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-21 19:50:45 +08:00
xie xingguo
cb1616b7e4 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>
2017-07-21 19:50:11 +08:00
Kefu Chai
4599eb7963 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>
2017-07-21 19:31:19 +08:00
Kefu Chai
3aa3b4b60d 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>
2017-07-21 18:31:53 +08:00
John Spray
b519ed0519 common/options: update for latest added
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:30:27 -04:00
John Spray
85779cba67 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>
2017-07-21 06:27:30 -04:00
John Spray
7267065cdf 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>
2017-07-21 06:27:30 -04:00
John Spray
4340f4b6c6 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>
2017-07-21 06:27:30 -04:00
John Spray
55989f5853 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>
2017-07-21 06:27:29 -04:00
John Spray
e7d66bd3d9 common: update options.cc for latest master
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:27:29 -04:00
John Spray
be2136cd34 common: fix Option::is_safe
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:27:29 -04:00
John Spray
54740dd568 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>
2017-07-21 06:27:29 -04:00
John Spray
b0fbd7151c 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>
2017-07-21 06:27:29 -04:00
John Spray
7cde2e51e4 rgw: set mins on options to avoid unneeded max()
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:27:29 -04:00
John Spray
c3ba6ce588 common: update options.cc for master
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:27:28 -04:00
John Spray
1411953083 common: move validation in Option and add a test
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:27:28 -04:00
John Spray
291a7f597d test: update md_config_t unit test
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:27:28 -04:00
John Spray
a3054ef0d9 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>
2017-07-21 06:27:28 -04:00
John Spray
1e9b62c1b6 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>
2017-07-21 06:27:28 -04:00
John Spray
0f04dab0b7 common/options: separate "service" from "tags"
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:27:27 -04:00
John Spray
3f99f6ef20 common: enforce min/max/enum on config options
Signed-off-by: John Spray <john.spray@redhat.com>
2017-07-21 06:27:27 -04:00