Commit Graph

89639 Commits

Author SHA1 Message Date
Sage Weil
c7916097c2 unittest_config: $host expands to ceph_get_short_hostname(), not hostname -s
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-01 15:57:27 -05:00
Sage Weil
bd7e27d59b mon/MonClient: set hostname in MMonSubscribe message
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-30 08:51:04 -05:00
Sage Weil
e583f80086 common/hostname: use NODE_NAME environment variable insetad, if set
This is set by rook to the physical node.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-30 08:51:04 -05:00
Sage Weil
0acb5cb454 mon: pay attention to MMonSubscribe's hostname
We weren't populating remote_host anywhere!

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-30 08:51:04 -05:00
Sage Weil
44db754624 common/util: pass real hostname when running in kubernetes/rook container
Rook will set up some environment variables to tell us what pod, pod
namespace, and physical host we are running on.  If we see them, set
'hostname' according to the hardware host, and include the pod info
in our metadata.

This allows the usual host-based logic on Ceph to work correctly, like
placing OSDs automatically in the CRUSH map.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-30 08:51:04 -05:00
Mykola Golub
9f9b525a03
Merge pull request #23733 from dillaman/wip-migration-parent
librbd: always open first parent image if it exists for a snapshot

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-08-29 21:45:08 +03:00
Andrew Schoen
bd82967b76
Merge pull request #23788 from alfredodeza/wip-rm34311
ceph-volume: tests.functional inherit SSH_ARGS from ansible

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-08-29 13:18:48 -05:00
Alfredo Deza
7a076f5e4f ceph-volume tests.functional use Debian ansible os family in deploy.yml
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-29 10:32:55 -07:00
Sage Weil
51e4eb7791 Merge PR #23742 into master
* refs/pull/23742/head:
	mon/OSDMonitor: don't change in-memory state on prune

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-29 12:25:23 -05:00
Alfredo Deza
b2a62c2b13 ceph-volume lvm.batch use the abspath attribute for Device objects in bluestore
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-29 09:56:21 -07:00
Alfredo Deza
6f3094449f ceph-volume lvm.batch remove usage of non-existent method
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-29 09:55:31 -07:00
Alfredo Deza
379cc26db5
Merge pull request #23801 from alfredodeza/wip-rm34317
doc/rados update invalid bash on bluestore migration

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-08-29 09:32:15 -07:00
Alfredo Deza
8e6269336f ceph-volume tests.functional inherit SSH_ARGS from ansible with synchronize module
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-29 09:14:42 -07:00
Andrew Schoen
b5c3082d4e
Merge pull request #23787 from alfredodeza/wip-rm34310
ceph-volume lvm.batch remove non-existent sys_api property

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2018-08-29 11:12:37 -05:00
Kefu Chai
c682176daa
Merge pull request #23741 from liewegas/wip-protect-monmap
mon: only share monmap after authenticating

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-08-29 23:36:31 +08:00
Kefu Chai
8d1b253f97
Merge pull request #23738 from dmick/wip-fix-crashdump
global/signal_handler.cc: report assert_file as correct name

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-08-29 23:26:46 +08:00
Kefu Chai
13a6b68ac3
Merge pull request #23734 from hjwsm1989/wip-speedup-upmap
osd/OSDMap: map pgs with smaller batchs in calc_pg_upmaps

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-08-29 23:25:30 +08:00
Kefu Chai
786bec6e37
Merge pull request #23681 from tchaikov/wip-26994
qa/mgr/selftest: handle always-on module fall out

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-08-29 22:51:24 +08:00
Alfredo Deza
28bbcb2baf doc/rados update invalid bash on bluestore migration
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-29 07:26:11 -07:00
Lenz Grimmer
6b129aca22
Merge pull request #23706 from tspmelo/wip-update-angular
mgr/dashboard: Update Angular packages

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
2018-08-29 11:34:16 +02:00
Alfredo Deza
a76fccba5f ceph-volume lvm.batch remove non-existent sys_api property
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-28 14:28:08 -07:00
Noah Watkins
ea15b625f3 qa/mgr/selftest: handle always-on module fall out
need a non-always-on module. hello doesn't work because it isn't
installed. so switch to selftest.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>
2018-08-28 13:45:58 -07:00
Jason Dillaman
1b090ca41e
Merge pull request #23765 from chenzhua/master
doc: fix spelling errors in rbd doc

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-08-28 13:02:52 -04:00
Casey Bodley
c79aa2468c
Merge pull request #23596 from cbodley/wip-rgw-no-datalog-marker
rgw multisite: incremental data sync uses truncated flag to detect end of listing

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2018-08-28 11:30:31 -04:00
Casey Bodley
dde867463f
Merge pull request #23768 from wjwithagen/wjw-fix-shared_mutex
core: Clang misses <optional> include

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-08-28 09:00:54 -04:00
Tiago Melo
2b3379186a mgr/dashboard: Update Angular packages
Signed-off-by: Tiago Melo <tmelo@suse.com>
2018-08-28 13:03:01 +01:00
Willem Jan Withagen
bea9fd14e3 core: Clang misses <optional> include
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2018-08-28 12:26:46 +02:00
Kai Wagner
7c92b1fcc6
Merge pull request #23764 from ceph/docs
doc: fixed typo in cephfs snapshots

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-08-28 09:59:57 +02:00
Kefu Chai
d6a0592f7e
Merge pull request #23699 from tchaikov/wip-monc-drop-rwlock
auth: drop the RWLock in AuthClientHandler

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-08-28 15:36:23 +08:00
Kai Wagner
d7f5c281c8 doc: fixed typo in cephfs snapshots
Signed-off-by: Kai Wagner <kwagner@suse.com>
2018-08-28 08:56:47 +02:00
Chen Zhenghua
f2d1f94322 doc: fix spelling errors in rbd doc
Signed-off-by: Chen Zhenghua <chen.zhenghua@zte.com.cn>
2018-08-28 14:56:16 +08:00
Jos Collin
dc2d43d5a1
Merge pull request #23763 from chenzhua/master
doc: fix cephfs spelling errors

Reviewed-by: Jos Collin <jcollin@redhat.com>
2018-08-28 08:11:48 +05:30
Chen Zhenghua
4108ecdb2c doc: fix cephfs spelling errors
Signed-off-by: Chen Zhenghua <chen.zhenghua@zte.com.cn>
2018-08-28 09:49:36 +08:00
Joao Eduardo Luis
8aa759054c mon/OSDMonitor: don't change in-memory state on prune
We were modifying the in-memory state when running through several
osdmap pruning functions.

Should the transaction we're encoding not be committed, we may end up in
a state where we have a stale in-memory state that does not match what
is on disk; including having in-memory state while not having on-disk
state.

We prevent this sort of inconsistency by working on temporary states
instead.

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

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
2018-08-28 00:12:50 +01:00
Jason Dillaman
bed4857487 librbd: always open first parent image if it exists for a snapshot
The deep-copy and migration features required force-opening the
parent image just in case the deep-flatten feature wasn't enabled
on an image. This change simplies the code by always opening the
direct parent image, which really only matters if a cloned image
has snapshots w/o the deep-flatten feature.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-08-27 17:32:08 -04:00
Sage Weil
8b43b548a1 Merge PR #23718 into master
* refs/pull/23718/head:
	cleanup: Replace always-false assertions with abort
	include/assert: Smarten up ceph_assert
	common: Call ceph_abort(), not abort()
	include,common: Remove assert and clobber-foo
	rbd_replay: Use ceph_assert for asserts.
	rbd_fuse: Use ceph_assert for asserts.
	osdc: Use ceph_assert for asserts.
	osd: Use ceph_assert for asserts.
	msg: Use ceph_assert for asserts.
	mgr: Use ceph_assert for asserts.
	messages: Use ceph_assert for asserts.
	mds: Use ceph_assert for asserts.
	log: Use ceph_assert for asserts.
	libradosstriper: Use ceph_assert for asserts.
	librados: Use ceph_assert for asserts.
	kv: Use ceph_assert for asserts.
	test: Use ceph_assert for asserts.
	key_value_store: Use ceph_assert for asserts.
	json_spirit: Use ceph_assert for asserts.
	journal: Use ceph_assert for asserts.
	global: Use ceph_assert for asserts.
	erasure-code: Use ceph_assert for asserts.
	rbd: Use ceph_assert for asserts.
	tools: Use ceph_assert for asserts.
	rgw: Use ceph_assert for asserts.
	mon: Use ceph_assert for asserts.
	crush: Use ceph_assert for asserts in C++ code.
	crimson: Use ceph_assert for asserts.
	compressor: Use ceph_assert for asserts.
	cls: Use ceph_assert for asserts.
	client: Use ceph_assert for asserts.
	auth: Use ceph_assert for asserts
	os: Use ceph_assert for asserts
	common: Use ceph_assert for asserts
	include: Use ceph_assert for asserts
	include/assert: Deprecate assert macro

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-27 15:31:43 -05:00
Sage Weil
50da6257b5 mon: only share monmap after authenticated
It is no longer necessary to fetch a monmap pre-authentication, something
we previous did for get_monmap_privately().  New code has replaced this
with get_monmap_and_config(), and it authenticates in order to get that
same information (plus configs).

That change was made in mimic, but we must support upgrades from N-2,
which means that luminous daemons still need to function.  The only caller
for get_monmap_privately() in luminous is from ceph-osd during mkfs.
Disabling this here means that new OSDs cannot be created using nautilus
mons and a luminous ceph-osd.  Include a note for the (future) nautilus
upgrade notes.

Reported-by: Christopher Ryan Harrell <harrellcr@email.arizona.edu>
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-27 12:02:05 -05:00
Sage Weil
5cf69712f2 mon/AuthMonitor: do not share monmap until authenticated
Reported-by: Christopher Ryan Harrell <harrellcr@email.arizona.edu>
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-27 12:02:00 -05:00
Sage Weil
d08f65e7d8
Merge pull request #23750 from tchaikov/wip-doc-cephx
doc/dev/cephx_protocol: fix couple errors

Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-27 10:51:10 -04:00
Sage Weil
3e2c3f9979
Merge pull request #23747 from tchaikov/wip-monclient-no-magic-nr
mon/MonClient: avoid using magic number for the `MAuth::protocol`

Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-27 10:50:04 -04:00
Adam C. Emerson
eb59c69674 cleanup: Replace always-false assertions with abort
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
d3291b2ec8 include/assert: Smarten up ceph_assert
Change ceph_assert_msg to not require a CephContext. Add
ceph_assert_msgf that accepts a format string.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
8bf55d9589 common: Call ceph_abort(), not abort()
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
34164d55c8 include,common: Remove assert and clobber-foo
Since everything is using the ceph_assert macro, get rid of the assert
macro in include/assert.h .

As that is no longer a concern, get of macros to break the compile if
our macro gets replaced with the system assert.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
65fac538f0 rbd_replay: Use ceph_assert for asserts.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
5db1005420 rbd_fuse: Use ceph_assert for asserts.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
c1179cd446 osdc: Use ceph_assert for asserts.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
9d239edf2c osd: Use ceph_assert for asserts.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
f7e2afc9c5 msg: Use ceph_assert for asserts.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00
Adam C. Emerson
ab23c50696 mgr: Use ceph_assert for asserts.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-08-27 10:27:22 -04:00