Commit Graph

93663 Commits

Author SHA1 Message Date
Sage Weil
54efc4517c mon/MonMap: add missing modeline
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
b1aec88c9f vstart.sh: put mon addrs in mon_host, not 'mon addr'
Notably, mon addr won't take an addrvec, while everything else will.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
d151ece3af msg/async: better debug around conn map lookups and updates
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
395947ae40 mon/MonClient: dump initial monmap at debug level 10
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
b92be2ca9b qa/standalone/osd/osd-fast-mark-down: use v1 addr w/ simplemessenger
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
a19b8e5b14 qa/tasks/ceph: set initial monmap features with using addrvec addrs
The --add option will only infer a bare IP to include a v2 addr if the
NAUTILUS feature is there, and that isn't normally present on a freshly
generate monmap.  Add it if we are doing addrvecs!

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
a274e772f2 monmaptool: add --enable-all-features option
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
241d402d7c qa/tasks/ceph: only use monmaptool --addv if addr has [,:v]
Otherwise, we want the --add path, which has the logic to infer ports,
v2+v1, etc.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
ac2430a43d qa/tasks/ceph_manager: make get_mon_status use mon addr
We don't have the 'mon addr' config property any more.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
545df766be qa/tasks/ceph: keep mon addrs in ctx namespace
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
27b7867d83 mon/OSDMonitor: log all osd addrs on boot
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
a1cebd00a9 msg/simple: behave when v2 and v1 addrs are present at target
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
609c6d76bc mon/MonClient: warn if global_id changes
Shouldn't happen!

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
50f5e328d7 msg/Connection: add warning/note on get_peer_global_id
This field isn't populated for loopback connections because the msgr
doesn't have any insight into what global_id its user has.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
d64cac170e mds/MDSDaemon: clean up handle_mds_map debug output a bit
The old wording was misleading!

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
d980907fc4 qa/suites/rados/upgrade: debug mds
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
9e63e63468 mds/MDSRank: improve is_stale_message to handle addrvecs
If we get a connection on a loopback from ourselves, get_source_addrs()
will have everything we bound to, but the mdsmap may only have the v1
address.  Avoid the addrvec comparison by instead comparing the
ConnectionRefs.

NOTE: this implementation is a stopgap.  We should really maintain a map
of ConnectionRefs for the current up set and compare the ConnectionRefs
directly instead of comparing addr(vecs).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
76ccf140ed msg/async: make loopback detect when sending to one of our many addrs
Drop the assert just because it's inefficient and not necessary.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
68913080b5 qa/suites/rados/upgrade: no aggressive pg num changes
We now run with mixed mons and old mgrs, so this won't work.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
0a67e02c14 mon/OSDMonitor: require nautilus mons for require_osd_release=nautilus
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
deb92c9d89 mon/OSDMonitor: require mimic mons for require_osd_release=mimic
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
576b6a77f1 qa/suites/rados/thrash-old-clients: use legacy addr syntax in ceph.conf
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
103c0238d4 msg/async: preserve peer features when replacing a connection
The features are now stored in the protocol implementation.  When we replace
an existing connection, copy those features so that our connect_msg_reply
calculates the correct features for the session.

This fixes an issue where a 3-mon cluster, after upgrading the two followers
but not the leader, was unable to include the (luminous) leader in the
quorum because it was seeing missing features in the connect reply, because
the new mons were replacing an old instance of the connection and weren't
copying the features, and that old instance had connect_msg.features == 0.

Add some debug lines that helped (finally) identify the problem.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
1ab352dd31 qa/tasks/ceph.py: move methods from teuthology.git into ceph.py directly; support mon bind * options
Having these live in teuthology.git is silly, since they are only consumed
by the ceph task, and it is hard to revise the behavior.

Revise the behavior by adding mon_bind_* options.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
572311b614 mon/MonMap: adjust build_initial behavior for mkfs vs probe
For the mkfs case, interpret an ambiguous port as a v2 address.  For probe,
try both.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
5992a61c2c mon/MonMap: improve ambiguous addr behavior
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
b1493f0d9a qa/suites/rados/upgrade: spread mons a bit
This will mean 2/3 mons have default ports.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
fbdc1358e6 qa/rados/thrash-old-clients: keep mons on separate hosts
This ensures the mons can use default ports, ceph.conf won't have v1: or
v2: prefixes, and old clients will be happy.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
7559a47f5b qa/standalone/mon/misc.sh: tweak test to be more robust
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
2f786f3299 qa/tasks/mon_seesaw: expect v1/v2 prefix in addr
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
55a9c7522f osd/OSDMap: fix is_blacklisted() check to assume type ANY
Note that this still does a copy of the addr struct (as it did before).
This could be more efficient...

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
0610e56265 mon/OSDMonitor: use ANY addr type for blacklisting
Client addresses are untyped in that they can connect to v1 or v2 server
endpoints, so blacklist them as TYPE_ANY.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:20 -06:00
Matt Benjamin
3dda250cad
Merge pull request #25473 from theanalyst/rgw/version-copy-fix
rgw: fix versioned obj copy generating tags
2019-01-03 10:42:31 -05:00
ningtao
47da5a0caa mon: shutdown messenger early to avoid accessing deleted logger
In the monitor shutdown process, the MSG thread exits after the logger is released,
causing the null pointer to be accessed. So move the logger release to the MSG thread after it exits

Fixes: http://tracker.ceph.com/issues/37780

Signed-off-by: ningtao <ningtao@sangfor.com.cn>
2019-01-03 23:20:12 +08:00
Sage Weil
2483f3ed3c common/ceph_time: 'mo' for month
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 09:18:39 -06:00
Kefu Chai
407750d16e
Merge pull request #25761 from tchaikov/wip-qa-health-schema
mgr/dashboard: updated API test to reflect changes in ModuleInfo

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-03 23:15:45 +08:00
Sage Weil
8cbaac69cf Merge PR #25736 into master
* refs/pull/25736/head:
	common/options: document some osd/rados options
	unittest_osdmap: feed options as defaults
	mon/OSDMonitor: allow osd_pool_default_pgp_num to be 0

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-01-03 09:03:39 -06:00
Kefu Chai
a3e37c2019
Merge pull request #25766 from tchaikov/wip-rgw-readdir-flags
pybind/rgw: pass the flags to callback function

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2019-01-03 23:01:29 +08:00
Patrick Donnelly
e4bd6c114d
common: expose internal StackStringStream via deref
This makes it much easier to use and works similar to a smart ptr.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-01-03 06:48:16 -08:00
Kefu Chai
9a92825489
Merge pull request #25635 from rhcs-dashboard/36740-pool-stats-disabled-by-default
mgr/dashboard: pool stats not returned by default

Reviewed-by: Volker Theile <vtheile@suse.com>
2019-01-03 22:45:54 +08:00
Volker Theile
9de21d6165 mgr/telemetry: Fix various issues
- Set module config type to ``str``, otherwise default values are ``'None'`` (str) instead of ``None`` which will cause ``init_module_config`` to fail.
- RuntimeError does not format strings.

Signed-off-by: Volker Theile <vtheile@suse.com>
2019-01-03 15:44:31 +01:00
Patrick Donnelly
38044113a1
Merge PR #25528 into master
* refs/pull/25528/head:
	mds: log evicted clients to clog/dbg

Reviewed-by: Zheng Yan <zyan@redhat.com>
2019-01-03 06:43:29 -08:00
Casey Bodley
782f25e00f
Merge pull request #24845 from pritha-srivastava/wip-rgw-assume-role-fixes
rgw: Minor fixes to AssumeRole for boto compliance.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2019-01-03 09:24:58 -05:00
Casey Bodley
905f7103a3
Merge pull request #25180 from pritha-srivastava/wip-rgw-user-policy-fixes
rgw: Fixes to permission evaluation related to user policies.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-01-03 09:22:36 -05:00
Kefu Chai
67e19d1215
Merge pull request #25659 from Linbing/wip-fixup-read-deadlock
os/bluestore: fixup access a destroy cond cause deadlock or undefine behavior

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-03 22:06:27 +08:00
Sage Weil
50687a2971 Merge PR #25673 into master
* refs/pull/25673/head:
	mon/Monitor: quorum_age in JSON output as int, not string

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-03 07:23:57 -06:00
Sage Weil
51ee347540 common/options: use new parse_timespan
It's more complete and robust, and lives in ceph_time.h where it probably
belongs.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 07:19:20 -06:00
Sage Weil
6564664669 common/ceph_time: add parse_timespan
Make it understand units like 'hours', 'minute', 'm', 'w', etc.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 07:19:20 -06:00
Sage Weil
b8fceaf6f9 vstart.sh: force setting dashboard options before first mgr starts
These options are unknown before the mgr first starts and registers them.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 07:10:12 -06:00
Sage Weil
2f5a1becb8 mon/ConfigMonitor: add --force flag to 'config set'
Add a force flag to override option and/or value checks.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 07:10:12 -06:00