Commit Graph

90609 Commits

Author SHA1 Message Date
Patrick Donnelly
6e028f3322
Merge PR #24232 into master
* refs/pull/24232/head:
	githubmap: update contributors

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-25 07:16:20 -07:00
Jason Dillaman
4ebcbc769c
Merge pull request #24248 from dillaman/wip-rbd-iscsi-docs
doc: ceph-iscsi-api ports should not be public facing

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
2018-09-25 08:36:31 -04:00
Sage Weil
a29103e894 Merge PR #24226 into master
* refs/pull/24226/head:
	osd/PG: fix not_ready_to_merge behavior for merge target

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-24 23:14:15 -05:00
Patrick Donnelly
08166e8d5a
Merge PR #24194 into master
* refs/pull/24194/head:
	mds: fix mds damaged due to unexpected journal length

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-09-24 15:01:52 -07:00
Patrick Donnelly
92f498fa28
Merge PR #24170 into master
* refs/pull/24170/head:
	libcephfs: expose CEPH_SETATTR_MTIME_NOW and CEPH_SETATTR_ATIME_NOW

Reviewed-by: Jeff Layton <jlayton@redhat.com>
2018-09-24 14:50:04 -07:00
Patrick Donnelly
0dd623c8aa
Merge PR #23187 into master
* refs/pull/23187/head:
	test: make rank argument mandatory when running journal_tool
	cephfs-journal-tool: make "--rank" argument mandatory
	cephfs-journal-tool: pass local arg vector for Journal actions
	cephfs-journal-tool: dump to per rank output file wherever necessary

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-24 14:46:14 -07:00
Patrick Donnelly
51b27b7e3d
Merge PR #23530 into master
* refs/pull/23530/head:
	qa/vstart_runner: fix daemons list
	PendingReleaseNotes: note multifs support in libcephfs
	test/cephfs: add pybind test for mount_root
	pybind/cephfs: enable passing filesystem name to mount
	libcephfs: add ceph_select_filesystem
	common: add doc strings to client_mds_namespace
	client: allow passing fs name to mount()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Conflicts:
    PendingReleaseNotes
2018-09-24 14:42:13 -07:00
Patrick Donnelly
b536ca8a52
Merge PR #24125 into master
* refs/pull/24125/head:
	mon: fix fs add_data_pool setting wrong pool metadata

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-24 14:40:34 -07:00
Patrick Donnelly
c0ba741a6e
Merge PR #24158 into master
* refs/pull/24158/head:
	cephfs: remove vestiges of mds deactivate

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
2018-09-24 14:39:45 -07:00
Sage Weil
0ae5e9a480 Merge PR #24234 into master
* refs/pull/24234/head:
	qa/suites/rados/thrash-old-clients/workloads/rbd_cls.yaml: skip parents test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-24 15:15:52 -05:00
Sage Weil
fcb1679eab osd/PG: fix not_ready_to_merge behavior for merge target
Track the *target* not being ready to merge independently from the source,
so that we do not have two PGs fighting over the state of
not_ready_ready_to_merge_source, and so that the map reflects the *source*
PGs readiness only.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-24 11:03:03 -05:00
Sage Weil
9054ed81da Merge PR #24225 into master
* refs/pull/24225/head:
	osd/ECBackend: suppress 'Error -2 reading object' if EC fast reads

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2018-09-24 11:01:22 -05:00
Sage Weil
757a94b980 qa/suites/rados/thrash-old-clients/workloads/rbd_cls.yaml: skip parents test
We can't (easily) build updated hammer packages, but all this sh script does
it run this one test binary with --gtest_filter arguments, so just do
it directly and skip the test explicitly here.  (Newer version of the .sh
understand the environemnt variable but the hammer version does not.)

Fixes: http://tracker.ceph.com/issues/36104
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-24 10:57:40 -05:00
Jason Dillaman
24beceef64 doc: ceph-iscsi-api ports should not be public facing
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-24 10:32:25 -04:00
Jason Dillaman
4b782613f7
Merge pull request #24078 from Songweibin/wip-rbd-trash-state
rbd: not allowed to restore an image when it is being deleted

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-24 10:19:13 -04:00
Jason Dillaman
762a7ae386
Merge pull request #23743 from trociny/wip-rbd-config-pool
librbd: pool and image level config overrides

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-24 10:19:01 -04:00
Lenz Grimmer
4d3f896c89
Merge pull request #23568 from rhcs-dashboard/wip-24573-landing-page
mgr/dashboard: New Landing Page

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kanika Murarka <kmurarka@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-09-24 15:32:48 +02:00
John Spray
194c17c04a
Merge pull request #23570 from jcsp/wip-rook-api
mgr/rook: update for v1beta1 API

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2018-09-24 12:12:10 +01:00
myoungwon oh
5ebda43522 githubmap: update contributors
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2018-09-24 12:14:20 +09:00
Sage Weil
a9816f31dd Merge PR #24133 into master
* refs/pull/24133/head:
	common/Finisher: convert to ceph::mutex etc
	common/ceph_mutex: ceph::{mutex,condition_variable,lock_guard}
	common/mutex_debug: take const char * to ctor, and require a name
	common/mutex_debug: add lockdep support for recursive_mutex_debug
	common/mutex_debug: fix whitespace
	common/mutex_debug: refactor to remove intermediate class
	common/lockdep: add recursive flag for _will_lock
	do_cmake.sh: default to Debug build
	.gitignore: ignore build.*/

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-23 11:17:03 -05:00
Sage Weil
9ef5a956cb osd/ECBackend: suppress 'Error -2 reading object' if EC fast reads
When fast reads are enabled, it's possible for the ordering of a shard
read to not be enforced with respect to writes that come after because
the read completes on the primary before all shards reply.  This can lead
to an ENOENT on the non-primary, and an ERR message in the cluster log,
even though everything is fine.  (The reply will go back to the primary
with the error but it will be ignored since the read has completed.)

Suppress the error message so we don't see these ERR messages in the
cluster log during the normal course of events.

Fixes: http://tracker.ceph.com/issues/26972
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-22 10:42:20 -05:00
Sage Weil
f90edeb110 Merge PR #24202 into master
* refs/pull/24202/head:
	mon/MonClient: fix wait for monmap+config is non-cephx case

Reviewed-by: Mark Nelson <mnelson@redhat.com>
2018-09-22 10:28:39 -05:00
Sage Weil
47acd45476 Merge PR #24217 into master
* refs/pull/24217/head:
	osd/PG.cc: silence "-Wsign-compare" warnings

Reviewed-by: Erwan Velu <erwan@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-22 10:27:41 -05:00
Sage Weil
1ca7535a51 Merge PR #24220 into master
* refs/pull/24220/head:
	test/objectstore: set pool for fsck test

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-22 10:26:53 -05:00
Patrick Donnelly
9e9f3ead36
Merge PR #24157 into master
* refs/pull/24157/head:
	qa: cleanup parallel execution of fsstress

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-21 13:01:14 -07:00
Patrick Donnelly
1b7cabc732
githubmap: update contributors
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-21 13:01:13 -07:00
Patrick Donnelly
a5c572b13a
Merge PR #24207 into master
* refs/pull/24207/head:
	script/ptl-tool.py: fix BASE_PATH

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-21 11:55:42 -07:00
Patrick Donnelly
de824f74dd
qa: cleanup parallel execution of fsstress
Two instances of fsstress clobber each other. Just build it in the local sandbox.

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

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-21 11:34:20 -07:00
Sage Weil
8535965ba4 common/Finisher: convert to ceph::mutex etc
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 11:55:58 -05:00
Sage Weil
c3f70dc4a8 common/ceph_mutex: ceph::{mutex,condition_variable,lock_guard}
If CEPH_DEBUG_MUTEX is defined, use the [recursive_]mutex_debug classes
that implement lockdep and a bucnh of other random debug checks.  Also
typedef ceph::condition_variable to std::condition_variable_debug, which
adds addition assertions and debug checks.

If CEPH_DEBUG_MUTEX is not defined, then use the bare-bones C++ std::mutex
primitives... or as close as we can get to them.

Since the [recursive_]mutex_debug classes take a string argument for the
lockdep piece, define factory functions ceph::make_[recursive_]mutex that
either pass arguments to the debug implementations or toss them out.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 11:55:56 -05:00
Sage Weil
77acda7219 common/mutex_debug: take const char * to ctor, and require a name
Require a name, like Mutex.

Most callers are passing a C string.  This may avoid a std::string
copy?

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 11:52:56 -05:00
Sage Weil
27c6d283e9 common/mutex_debug: add lockdep support for recursive_mutex_debug
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 11:52:08 -05:00
Sage Weil
5900c60623 common/mutex_debug: fix whitespace
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 11:51:09 -05:00
Sage Weil
3ae9e7ad06 common/mutex_debug: refactor to remove intermediate class
I don't see any purpose for this, and it prevents us from knowing whether
the mutex is recursive when _will_lock() is called.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 11:51:09 -05:00
Sage Weil
a02ae950b7 common/lockdep: add recursive flag for _will_lock
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 11:51:09 -05:00
Sage Weil
7e6a57bd26 do_cmake.sh: default to Debug build
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 10:27:04 -05:00
Sage Weil
98d25409a2 .gitignore: ignore build.*/
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-21 10:27:04 -05:00
Laura Paduano
3db50d5aca
Merge pull request #24219 from p-na/fix-test-scrub
mgr/dashboard: Possible fix for some dashboard timing issues

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
2018-09-21 17:24:32 +02:00
Mykola Golub
b4e3935eb8
Merge pull request #24179 from dillaman/wip-36074
librbd: properly handle potential object map failures

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-09-21 18:15:09 +03:00
Neha Ojha
57e006b7cc script/ptl-tool.py: fix BASE_PATH
Signed-off-by: Neha Ojha <nojha@redhat.com>
2018-09-21 07:07:38 -07:00
Patrick Nawracay
8daffe86a6 mgr/dashboard: Fix for some dashboard timing issues
Specifically fixes the recurringly occurring `test_osd.py` error on the
`test_scrub` method. But this change should also prevent other issues of
the same kind. Issues of "same kind" are issues which occurr due to
tests which do not immediately result in a clean cluster status and
aren't manually programmed to wait for it.

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

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2018-09-21 16:01:24 +02:00
Sage Weil
9bf7c810a7 Merge PR #23985 into master
* refs/pull/23985/head:
	ceph-objectstore-tool: add back pool dne check
	qa/suites/rados/singleton/reg11184: remove old test
	ceph-objectstore-tool: import pg at original epoch
	osd: handle null pg slot on startup
	ceph-objectstore-tool: drop support for ancient export files
	osd: avoid dropping osd_lock when pg osdmaps are not laggy
	qa/standalone/osd/pg-merge.sh: add merge vs pg import test

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-09-21 08:21:53 -05:00
Sage Weil
e496446034 Merge PR #24064 into master
* refs/pull/24064/head:
	osd: simplify init of fabricated pg
	osd/PG: inherit pg history from merge source, if necessary
	osd/osd_types: increasing pg_num_pending is also an interval change
	osd: cancel pg merge if PGs are undersized
	mon/OSDMonitor: handle ready_to_merge message that cancels the merge
	osd/PG: only signal ready_to_merge if we have all replicas
	osd/PG: move all mark_clean-ish activity into try_mark_clean()
	osd/PG: use last_epoch_clean from ReadyToMerge point in time for fabricated history
	osd: send last_epoch_clean when indicating PG is ready to merge
	osd/osd_types: rename pg_num_pending_dec_epoch -> pg_num_dec_last_epoch_clean
	osd,mon: stop setting pg_num_pending_dec_epoch

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-21 08:21:33 -05:00
Kefu Chai
67c05144bb osd/PG.cc: silence "-Wsign-compare" warnings
/ceph/src/osd/PG.cc: In member function 'void
PG::choose_async_recovery_ec(const std::map<pg_shard_t, pg_info_t>&,
const pg_info_t&, std::vector<int>*, std::set<pg_shard_t>*) const':
/ceph/src/osd/PG.cc:1572:32: warning: comparison of integer expressions
of different signedness: 'long int' and 'long unsigned int'
[-Wsign-compare]
     if (approx_missing_objects > cct->_conf.get_val<uint64_t>(
         ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         "osd_async_recovery_min_cost")) {
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/ceph/src/osd/PG.cc: In member function 'void
PG::choose_async_recovery_replicated(const std::map<pg_shard_t,
pg_info_t>&, const pg_info_t&, std::vector<int>*, std::set<pg_shard_t>*)
const':
/ceph/src/osd/PG.cc:1625:33: warning: comparison of integer expressions
of different signedness: 'long int' and 'long unsigned int'
[-Wsign-compare]
     if (approx_missing_objects  > cct->_conf.get_val<uint64_t>(
         ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         "osd_async_recovery_min_cost")) {
         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 21:04:52 +08:00
Kefu Chai
8a814b2eb6 test/objectstore: set pool for fsck test
since 0bd2546eac, we check the pool id
of object when performing fsck to ensure we are looking at the right
collection, but the test is still using the pool id set by the
constructor of hobject_t. so all objects we created in that test belong
to the POOL_META. while the collection is created with the pool id of
`555`. hence the test fails.

Fixes: http://tracker.ceph.com/issues/36099
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-21 19:59:39 +08:00
Venky Shankar
f65193d955 test: make rank argument mandatory when running journal_tool
Also, fix a bunch of quirky journal_tool invocations that pass
"--rank" argument as the command argument rather than passing it
as function argument.

Fixes: https://tracker.ceph.com/issues/24780
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2018-09-21 06:09:39 -04:00
Venky Shankar
5e4702e303 cephfs-journal-tool: make "--rank" argument mandatory
... and do not silenty act on the default filesystem.
Force users to specify the filesystem name and rank.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2018-09-21 06:09:39 -04:00
Venky Shankar
d5e482a6c2 cephfs-journal-tool: pass local arg vector for Journal actions
Some helper functions clobber the passed in arg vector. This
causes operations on all but the first rank to fail as the
operations for the first rank tampers with the arg vector.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2018-09-21 06:09:39 -04:00
Venky Shankar
cb19db75c7 cephfs-journal-tool: dump to per rank output file wherever necessary
cephfs-journal-tool supports operations on all ranks. Operations
such as dump/export do not write to distinct filenames hence
overwriting the data dumped or exported for the previous rank.

With this change (and further commits), for operations on all
ranks, dump/export would write to distinct filenames suffixed
by the mds rank (.0, .1, etc..). For operations on a single rank
or if there exist a single rank, the passed in filename is used
as it is.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
2018-09-21 06:09:39 -04:00
Kefu Chai
f3bc838894
Merge pull request #24139 from tchaikov/wip-fix-typos
*/: fix typos in docs,messages,logs,comments

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ricardo Dias <rdias@suse.com>
2018-09-21 16:56:31 +08:00