]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agorun-make-check.sh: enable WITH_SEASTAR
Kefu Chai [Tue, 3 Jul 2018 06:58:21 +0000 (14:58 +0800)]
run-make-check.sh: enable WITH_SEASTAR

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agorpm,install-deps.sh: add --with-seastar option
Kefu Chai [Tue, 3 Jul 2018 09:06:47 +0000 (17:06 +0800)]
rpm,install-deps.sh: add --with-seastar option

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocrimson: include seastar headers with 'seastar/' prefix
Kefu Chai [Tue, 3 Jul 2018 06:54:39 +0000 (14:54 +0800)]
crimson: include seastar headers with 'seastar/' prefix

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #22877 into master
Sage Weil [Thu, 12 Jul 2018 03:02:02 +0000 (22:02 -0500)]
Merge PR #22877 into master

* refs/pull/22877/head:
common: fix races when visiting a TrackedOp.

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge PR #22946 into master
Sage Weil [Thu, 12 Jul 2018 03:01:57 +0000 (22:01 -0500)]
Merge PR #22946 into master

* refs/pull/22946/head:
os/bluestore: batch handle get_fragmentation.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge PR #22950 into master
Sage Weil [Thu, 12 Jul 2018 03:01:52 +0000 (22:01 -0500)]
Merge PR #22950 into master

* refs/pull/22950/head:
rpm: move make check-specific build deps to appropriate conditional block
rpm: remove universal requires from distro-specific conditional blocks

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #22972 into master
Sage Weil [Thu, 12 Jul 2018 03:01:47 +0000 (22:01 -0500)]
Merge PR #22972 into master

* refs/pull/22972/head:
os/bluestore: fix races on SharedBlob::coll in ~SharedBlob.

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #22974 into master
Sage Weil [Thu, 12 Jul 2018 03:01:42 +0000 (22:01 -0500)]
Merge PR #22974 into master

* refs/pull/22974/head:
qa/standalone/osd/ec-error-rollforward: reproduce bug 24597
qa/suites/rados/thrash-erasure-code: add many deletes workload
qa/standalone/osd/repro_long_log.sh: fix test
osd/PG: do not blindly roll forward to log.head

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoqa/standalone/osd/ec-error-rollforward: reproduce bug 24597 22974/head
Sage Weil [Wed, 11 Jul 2018 21:14:38 +0000 (16:14 -0500)]
qa/standalone/osd/ec-error-rollforward: reproduce bug 24597

This reproduces http://tracker.ceph.com/issues/24597

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados/thrash-erasure-code: add many deletes workload
Sage Weil [Wed, 11 Jul 2018 13:18:34 +0000 (08:18 -0500)]
qa/suites/rados/thrash-erasure-code: add many deletes workload

Having lots of deletes will mean deletes on objects that don't exist,
which will in turn mean error log entries and more coverage of the
append_log_entries_update_missing code.  Hopefully this will trigger
http://tracker.ceph.com/issues/24597

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/standalone/osd/repro_long_log.sh: fix test
Sage Weil [Wed, 11 Jul 2018 12:10:28 +0000 (07:10 -0500)]
qa/standalone/osd/repro_long_log.sh: fix test

The log trimming case wasn't quite right.  Before HEAD^ we were
rolling forward too aggressively and miscalculating the can_rollforward_to,
which affected the trim_to calculation.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: do not blindly roll forward to log.head
Sage Weil [Wed, 11 Jul 2018 01:22:49 +0000 (20:22 -0500)]
osd/PG: do not blindly roll forward to log.head

If we are told we can roll forward by the primary, we should only roll
forward as far as the primary says we can.

This probably came out of the similar case in append_log(), but notably
that roll_forward() only happens if !transaction_applied (i.e., backfill
target), and that condition is not checked here.

Fixes: http://tracker.ceph.com/issues/24597
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22989 from theanalyst/doc/releases/v10.2.11
Abhishek L [Wed, 11 Jul 2018 21:01:10 +0000 (23:01 +0200)]
Merge pull request #22989 from theanalyst/doc/releases/v10.2.11

doc: releases: release notes for v10.2.11 Jewel

Reviewed-By: Nathan Cutler <ncutler@suse.com>
7 years agoMerge PR #22908 into master
Sage Weil [Wed, 11 Jul 2018 14:50:46 +0000 (09:50 -0500)]
Merge PR #22908 into master

* refs/pull/22908/head:
common: move ConfigValues out of md_config_t
common,rbd,rgw,osd: extract config values into ConfigValues

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge PR #22953 into master
Sage Weil [Wed, 11 Jul 2018 14:50:40 +0000 (09:50 -0500)]
Merge PR #22953 into master

* refs/pull/22953/head:
ceph-bluestore-tool: remove path_* support from prime-osd-dir

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge PR #22968 into master
Sage Weil [Wed, 11 Jul 2018 14:50:35 +0000 (09:50 -0500)]
Merge PR #22968 into master

* refs/pull/22968/head:
messages/MMDSMap: fix reencoding for older clients

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22969 into master
Sage Weil [Wed, 11 Jul 2018 14:50:27 +0000 (09:50 -0500)]
Merge PR #22969 into master

* refs/pull/22969/head:
qa/mgr: delete devicehealth pool after selftest

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc: releases: release notes for v10.2.11 22989/head
Abhishek Lekshmanan [Wed, 11 Jul 2018 12:39:21 +0000 (14:39 +0200)]
doc: releases: release notes for v10.2.11

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agomessages/MMDSMap: fix reencoding for older clients 22968/head
Sage Weil [Tue, 10 Jul 2018 15:36:38 +0000 (10:36 -0500)]
messages/MMDSMap: fix reencoding for older clients

This was broken by ea1481d08d561cdf0229e440b70b88fe336d3f89.

Fixes: http://tracker.ceph.com/issues/24819
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorpm: move make check-specific build deps to appropriate conditional block 22950/head
Nathan Cutler [Wed, 11 Jul 2018 11:56:49 +0000 (13:56 +0200)]
rpm: move make check-specific build deps to appropriate conditional block

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agorpm: remove universal requires from distro-specific conditional blocks
Nathan Cutler [Mon, 9 Jul 2018 11:18:11 +0000 (13:18 +0200)]
rpm: remove universal requires from distro-specific conditional blocks

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #22593 from wido/mgr-dashboard-ssl
Lenz Grimmer [Wed, 11 Jul 2018 09:25:16 +0000 (11:25 +0200)]
Merge pull request #22593 from wido/mgr-dashboard-ssl

mgr/dashboard: Add option to disable SSL

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agomgr/dashboard: Add option to disable SSL 22593/head
Wido den Hollander [Fri, 15 Jun 2018 14:39:09 +0000 (16:39 +0200)]
mgr/dashboard: Add option to disable SSL

Although is preferred and should be enabled by default users might
want to disable SSL as the dashboard might be running behind a proxy
which terminates the SSL.

Fixes: https://tracker.ceph.com/issues/24674
Signed-off-by: Wido den Hollander <wido@42on.com>
7 years agoos/bluestore: fix races on SharedBlob::coll in ~SharedBlob. 22972/head
Radoslaw Zarzynski [Tue, 10 Jul 2018 23:14:54 +0000 (01:14 +0200)]
os/bluestore: fix races on SharedBlob::coll in ~SharedBlob.

Example scenario:
  ```
  A: BlueStore::Collection::split_cache(src, dest)
  A: std::lock(src->cache->lock, dest->cache->lock)

  B: SharedBlob::~SharedBlob
  B: waits coll->cache->lock // coll == src

  A: sb->coll := dest
  A: unlocks both src and dest's cache mutexes

  C: // any locked operation on dest's cache
  C: acquires dest->cache->lock
  C: begins the op

  B: // with the src's cache mutex acquired
  B: BufferSpace::_clear(coll->cache) // coll == dest
  B: // oops, B operates on cache already locked by C
  ```

Fixes: http://tracker.ceph.com/issues/24859
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge PR #22784 into master
Patrick Donnelly [Tue, 10 Jul 2018 21:23:53 +0000 (14:23 -0700)]
Merge PR #22784 into master

* refs/pull/22784/head:
doc: fix Ceph FS
doc: new label and glossary url
doc: drop linking to itself

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22144 into master
Patrick Donnelly [Tue, 10 Jul 2018 20:24:33 +0000 (13:24 -0700)]
Merge PR #22144 into master

* refs/pull/22144/head:
cephfs-journal-tool: Fix purging when importing an zero-length journal.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22455 into master
Patrick Donnelly [Tue, 10 Jul 2018 20:24:27 +0000 (13:24 -0700)]
Merge PR #22455 into master

* refs/pull/22455/head:
qa/ceph-volume: add a test for put_object_versioned()
ceph-volume-client: allow atomic updates for RADOS objects

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22543 into master
Patrick Donnelly [Tue, 10 Jul 2018 20:24:20 +0000 (13:24 -0700)]
Merge PR #22543 into master

* refs/pull/22543/head:
qa/tasks/cephfs: add test for ceph_abort_conn()
libcephfs: introduce ceph_get_instance_id()
client: introduce ceph_abort_conn()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22961 into master
Patrick Donnelly [Tue, 10 Jul 2018 19:55:42 +0000 (12:55 -0700)]
Merge PR #22961 into master

* refs/pull/22961/head:
doc/cephfs: make scary DR bits less prominent

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa/mgr: delete devicehealth pool after selftest 22969/head
John Spray [Tue, 10 Jul 2018 16:53:46 +0000 (12:53 -0400)]
qa/mgr: delete devicehealth pool after selftest

This prevents tests getting hung up on the health
warnings from its very low pg count.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #22921 from ceph/wip-default-ceph-volume
vasukulkarni [Tue, 10 Jul 2018 16:37:34 +0000 (09:37 -0700)]
Merge pull request #22921 from ceph/wip-default-ceph-volume

qa/tests: remove ceph-disk tests from ceph-deploy and default all tests to use ceph-volume

7 years agocommon: fix races when visiting a TrackedOp. 22877/head
Radoslaw Zarzynski [Thu, 5 Jul 2018 12:39:31 +0000 (14:39 +0200)]
common: fix races when visiting a TrackedOp.

Before the commit following race can happen:
  ```
  A           : OpTracker::visit_ops_in_flight(..., callable leaking TrackedOpRef outside)
  A           : Mutex::Locker::Locker(sdata->ops_in_flight_lock_sharded)
  A with lock : (nref > 0) == true

  B           : TrackedOp::put(), nref := 0 // updating the counter is done without the lock
  B           : OpTracker::unregister_inflight_op()
  B           : Mutex::Locker::Locker(sdata->ops_in_flight_lock_sharded)

  A with lock : visit() -> TrackedOp::get(), nref := 1
  A with lock : Mutex::Locker::~Locker()

  B with lock : boost::intrusive::list::iterator_to(op)
  B with lock : boost::intrusive::list::erase(iter)
  B with lock : Mutex::Locker::~Locker()

  A           : TrackedOp::put(), nref := 0
  A           : OpTracker::unregister_inflight_op()
  A           : Mutex::Locker::Locker(sdata->ops_in_flight_lock_sharded)
  A with lock : boost::intrusive::list::iterator_to(op) // oops as op doesn't belong to the list anymore
  ```

Fixes: https://tracker.ceph.com/issues/24664
Related-To: https://tracker.ceph.com/issues/24037
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agocommon: move ConfigValues out of md_config_t 22908/head
Kefu Chai [Fri, 6 Jul 2018 15:08:00 +0000 (23:08 +0800)]
common: move ConfigValues out of md_config_t

by moving ConfigValues out of md_config_t, we are able to point
md_config_t to a new ConfigValues instance at runtime, without
destroying the old one.

also remove ConfigReader, because all md_config_obs_t will be updated
with ConfigProxy now. as md_config_t is not able to offer the *data*
anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocommon,rbd,rgw,osd: extract config values into ConfigValues
Kefu Chai [Fri, 6 Jul 2018 09:20:32 +0000 (17:20 +0800)]
common,rbd,rgw,osd: extract config values into ConfigValues

this change introduce three classes: ConfigValues, ConfigProxy and
ConfigReader. in seastar port of OSD, each CPU shard will hold its own
reference of configuration, and upon changes of settings, each
shard will be updated with the new setting in async. so this forces us
to be able to keep two set of configuration at the same time. so we
need to extract the changeable part of md_config_t out. so we can
replace the old one with new one on demand, and let different shards
share the same unchanged part, amon the other things, the Options map
and the lookup tables. that's why we need ConfigValues. we will add
a policy template for this class, so we can specialize for Seastar
implementation to allow different ConfigProxy instances to point
md_config_impl<> to different ConfigValues.

because the observer interface is still using md_config_t, to minimise
the impact of this change, handle_conf_change() and
handle_subsys_change() are not changed. but as it accepts a `const
md_config_t`, which cannot be used to create/reference the ConfigProxy
holding it, we need to introduce ConfigReader for reading the updated
setting from md_config_t in a simpler way, without exposing the
internal "values" member variable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #22940 into master
Sage Weil [Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)]
Merge PR #22940 into master

* refs/pull/22940/head:
mon/OSDMonitor: add 'osd repeer <pgid>' command

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge PR #22949 into master
Sage Weil [Tue, 10 Jul 2018 13:42:22 +0000 (08:42 -0500)]
Merge PR #22949 into master

* refs/pull/22949/head:
cmake: cleanup FindCython.cmake

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge PR #22954 into master
Sage Weil [Tue, 10 Jul 2018 13:42:17 +0000 (08:42 -0500)]
Merge PR #22954 into master

* refs/pull/22954/head:
global/global_init: fix stdout/stderr/stdin closing for daemonization

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #22931 from tchaikov/wip-find-py-interp-for-gtest-parallel
Kefu Chai [Tue, 10 Jul 2018 13:29:54 +0000 (21:29 +0800)]
Merge pull request #22931 from tchaikov/wip-find-py-interp-for-gtest-parallel

cmake: find a python2 interpreter for gtest-parallel

Reviewed-by: Erwan Velu <erwan@redhat.com>
7 years agodoc/cephfs: make scary DR bits less prominent 22961/head
John Spray [Tue, 10 Jul 2018 09:41:52 +0000 (10:41 +0100)]
doc/cephfs: make scary DR bits less prominent

I'm sure people will still find them, but let's at least
force people to click through one more time to get to the
commands that can damage your cluster.

Also, the ".. danger" directive at the top of the page
wasn't actually getting special formatting, so I changed
it to a ".. warning" which is red.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #22944 from falcon78921/wip-doc-rbdcmds
Lenz Grimmer [Tue, 10 Jul 2018 08:09:21 +0000 (10:09 +0200)]
Merge pull request #22944 from falcon78921/wip-doc-rbdcmds

doc: fixed grammar in restore rbd image section

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agomon/OSDMonitor: add 'osd repeer <pgid>' command 22940/head
Sage Weil [Sun, 8 Jul 2018 16:00:12 +0000 (11:00 -0500)]
mon/OSDMonitor: add 'osd repeer <pgid>' command

Selecting force peering on a single PG.  In reality this probably induces
*2* interval changes.

Note that in the case of a single OSD cluster we can't actually force a
repeer on a single PG because the pg_temp code is pretty robust about
filtering out redundant or meaningless changes, so we can't pg_temp our
way into a new interval if there are no other OSDs to switch to and the
code also prevents an empty pg_temp.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22711 from fghaas/wip-doc-mimic-upgrade-prereq
Lenz Grimmer [Mon, 9 Jul 2018 18:56:34 +0000 (20:56 +0200)]
Merge pull request #22711 from fghaas/wip-doc-mimic-upgrade-prereq

 doc: Mention PURGED_SNAPDIRS and RECOVERY_DELETES in Mimic release notes

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoglobal/global_init: fix stdout/stderr/stdin closing for daemonization 22954/head
Sage Weil [Mon, 9 Jul 2018 18:26:39 +0000 (13:26 -0500)]
global/global_init: fix stdout/stderr/stdin closing for daemonization

The global_init_postfork/prefork helpers close stdout/stdin/stderr on
fork and reopen /dev/null in their place.  This ensures that if later
code writes to those descriptors (e.g., a stray cout or cerr usage) the
output/input will go nowhere instead of interfering with some other open
fd.

However, with the use of preforker, there are other threads running when
these helpers are run, which means we can race with, say, filestore
opening an object file and end up sending log output there.

Fix by atomically replacing the fds with the dup2(2) syscall, which
will implicitly close and reopen the target fd in an atomic fashion.  This
behavior is present on both Linux and FreeBSD.

Fixes: http://tracker.ceph.com/issues/23492
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph-bluestore-tool: remove path_* support from prime-osd-dir 22953/head
Sage Weil [Mon, 9 Jul 2018 17:31:28 +0000 (12:31 -0500)]
ceph-bluestore-tool: remove path_* support from prime-osd-dir

The path_ fields have been removed, and ceph-volume populates these.

See ef510e43f0ee14b49e99beed9ae8feda6db3429a.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge remote-tracking branch 'private/wip-mon-snap-caps'
Sage Weil [Mon, 9 Jul 2018 13:29:32 +0000 (08:29 -0500)]
Merge remote-tracking branch 'private/wip-mon-snap-caps'

7 years agoMerge pull request #22867 from smithfarm/wip-ccache-tweak
Nathan Cutler [Mon, 9 Jul 2018 13:20:01 +0000 (15:20 +0200)]
Merge pull request #22867 from smithfarm/wip-ccache-tweak

run-make-check.sh: ccache goodness for everyone

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Erwan Velu <erwan@redhat.com>
7 years agoMerge remote-tracking branch 'gh/master'
Sage Weil [Mon, 9 Jul 2018 13:18:14 +0000 (08:18 -0500)]
Merge remote-tracking branch 'gh/master'

7 years agocmake: find python2 interpreter for gtest-parallel 22931/head
Kefu Chai [Sat, 7 Jul 2018 09:10:23 +0000 (17:10 +0800)]
cmake: find python2 interpreter for gtest-parallel

gtest-parallel only supports python2 at this moment, so find it
a python2 interpreter if it is enabled.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge remote-tracking branch 'private/wip-cx'
Sage Weil [Mon, 9 Jul 2018 13:07:29 +0000 (08:07 -0500)]
Merge remote-tracking branch 'private/wip-cx'

 Conflicts:
src/include/ceph_features.h
src/msg/async/AsyncConnection.cc
src/msg/async/AsyncConnection.h

- SERVER_NAUTLIUS feature recently added to default
- msgr2 bool
- ceph::shared_ptr -> std::shared_ptr

7 years agoMerge pull request #22778 from trociny/wip-mock-warnings
Jason Dillaman [Mon, 9 Jul 2018 13:04:20 +0000 (09:04 -0400)]
Merge pull request #22778 from trociny/wip-mock-warnings

test/librbd: fix gmock warning in TestMockIoImageRequestWQ.AcquireLockError

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #22903 from tspmelo/fix-e2e-script
Lenz Grimmer [Mon, 9 Jul 2018 12:37:32 +0000 (14:37 +0200)]
Merge pull request #22903 from tspmelo/fix-e2e-script

mgr/dashboard: Fix e2e script

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
7 years agorun-make-check.sh: fill in missing DRY_RUN and add doc hint 22867/head
Nathan Cutler [Mon, 9 Jul 2018 11:06:44 +0000 (13:06 +0200)]
run-make-check.sh: fill in missing DRY_RUN and add doc hint

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agorun-make-check.sh: reset trap after sourcing install-deps.sh
Nathan Cutler [Mon, 9 Jul 2018 10:40:46 +0000 (12:40 +0200)]
run-make-check.sh: reset trap after sourcing install-deps.sh

Since we source install-deps.sh, it replaces our trap with its own,
so we have to reinstate our trap after it finishes.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agocleanup: run-make-check.sh: no space between -D and name of cmake option
Nathan Cutler [Sat, 7 Jul 2018 08:27:07 +0000 (10:27 +0200)]
cleanup: run-make-check.sh: no space between -D and name of cmake option

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agorun-make-check.sh: gtest-parallel only with Python 2
Nathan Cutler [Sat, 7 Jul 2018 07:04:39 +0000 (09:04 +0200)]
run-make-check.sh: gtest-parallel only with Python 2

Fixes: http://tracker.ceph.com/issues/24817
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agorun-make-check.sh: inform user of make -j setting
Nathan Cutler [Fri, 6 Jul 2018 22:29:04 +0000 (00:29 +0200)]
run-make-check.sh: inform user of make -j setting

This can help the user figure out why the build is so slow.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agodoc: cleanup: wordsmith a comment in run-make-check.sh
Nathan Cutler [Thu, 5 Jul 2018 08:18:45 +0000 (10:18 +0200)]
doc: cleanup: wordsmith a comment in run-make-check.sh

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agorun-make-check.sh: ccache goodness for everyone
Nathan Cutler [Thu, 5 Jul 2018 08:16:59 +0000 (10:16 +0200)]
run-make-check.sh: ccache goodness for everyone

Since run-make-check.sh already ensures that ccache is installed,
it makes sense to let everyone benefit from the ccache
tweaks introduced by 4cb5a590537a9caaf61db42ce8ea123d2ab961f3

Note 1: The previous solution using "date" would cause build tools to reset
their timestamps after 24 hours, on subsequent runs of run-make-check.sh.
In order to maximize ccache effectiveness, this commit sets SOURCE_DATE_EPOCH
to a fixed value: the number of seconds elapsed since the Unix epoch as at
January 1, 2000 (chosen to commemorate Y2K armageddon).

Note 2: this commit introduces "set -e". This was actually in effect
before, via "source install-deps.sh". Better to make it explicit.

Fixes: http://tracker.ceph.com/issues/24777
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agorun-make-check.sh: drop workaround for undeclared jq build dependency
Nathan Cutler [Mon, 9 Jul 2018 08:41:11 +0000 (10:41 +0200)]
run-make-check.sh: drop workaround for undeclared jq build dependency

jq build dependency is properly declared now.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #22898 from majianpeng/bluestore-remove-redundant-fault-range
Kefu Chai [Mon, 9 Jul 2018 11:38:11 +0000 (19:38 +0800)]
Merge pull request #22898 from majianpeng/bluestore-remove-redundant-fault-range

os/bluestore: remove redundant fault_range.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22893 from jcsp/wip-misc
Kefu Chai [Mon, 9 Jul 2018 11:36:50 +0000 (19:36 +0800)]
Merge pull request #22893 from jcsp/wip-misc

mgr: Miscellaneous small mgr fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21962 from socketpair/perf
Kefu Chai [Mon, 9 Jul 2018 11:36:02 +0000 (19:36 +0800)]
Merge pull request #21962 from socketpair/perf

osd: Additional fields for osd "bench" command

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoos/bluestore: batch handle get_fragmentation. 22946/head
Jianpeng Ma [Mon, 9 Jul 2018 10:35:23 +0000 (18:35 +0800)]
os/bluestore: batch handle get_fragmentation.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agocmake: cleanup FindCython.cmake 22949/head
Kefu Chai [Mon, 9 Jul 2018 09:13:21 +0000 (17:13 +0800)]
cmake: cleanup FindCython.cmake

print out error message if cython module is not found.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #22836 into master
Patrick Donnelly [Mon, 9 Jul 2018 04:07:31 +0000 (21:07 -0700)]
Merge PR #22836 into master

* refs/pull/22836/head:
qa: remove unused distro dir

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoMerge PR #22741 into master
Patrick Donnelly [Mon, 9 Jul 2018 04:06:26 +0000 (21:06 -0700)]
Merge PR #22741 into master

* refs/pull/22741/head:
qa: fix ffsb cd argument
qa: fix cd argument during iogen unpack

Reviewed-by: Neha Ojha <nojha@redhat.com>
7 years agogithubmap: update contributors
Patrick Donnelly [Mon, 9 Jul 2018 04:06:25 +0000 (21:06 -0700)]
githubmap: update contributors

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22766 into master
Patrick Donnelly [Mon, 9 Jul 2018 04:05:29 +0000 (21:05 -0700)]
Merge PR #22766 into master

* refs/pull/22766/head:
mds: refactor const ref return to avoid mem alloc

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
7 years agogithubmap: update contributors
Patrick Donnelly [Mon, 9 Jul 2018 04:05:28 +0000 (21:05 -0700)]
githubmap: update contributors

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22740 into master
Patrick Donnelly [Mon, 9 Jul 2018 03:56:09 +0000 (20:56 -0700)]
Merge PR #22740 into master

* refs/pull/22740/head:
qa: create common conf for all cephfs suites
qa: remove wrongly created random distro conf

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agodoc: fixed grammar in restore rbd image section 22944/head
James McClune [Mon, 9 Jul 2018 02:53:59 +0000 (22:53 -0400)]
doc: fixed grammar in restore rbd image section

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
7 years agoMerge pull request #22922 from smithfarm/wip-argparse-py3
Nathan Cutler [Sat, 7 Jul 2018 07:52:04 +0000 (09:52 +0200)]
Merge pull request #22922 from smithfarm/wip-argparse-py3

tests: make test_ceph_argparse.py pass on py3-only systems

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22912 from tchaikov/wip-cmake-cleanup
Kefu Chai [Sat, 7 Jul 2018 06:38:54 +0000 (14:38 +0800)]
Merge pull request #22912 from tchaikov/wip-cmake-cleanup

cmake: remove workarounds for supporting cmake 2.x

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agodoc: fix Ceph FS 22784/head
Jos Collin [Sat, 7 Jul 2018 01:26:54 +0000 (06:56 +0530)]
doc: fix Ceph FS

s/Ceph FS/CephFS

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: new label and glossary url
Jos Collin [Sun, 1 Jul 2018 13:46:14 +0000 (19:16 +0530)]
doc: new label and glossary url

Let the other docs link Ceph Filesystem glossary from outside.
If the user wants then let him visit the Ceph Filesystem doc(s)
from the glossary.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: drop linking to itself
Jos Collin [Sun, 1 Jul 2018 13:38:00 +0000 (19:08 +0530)]
doc: drop linking to itself

drop unnecessary linking to its own smaller definition.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agotests: make test_ceph_argparse.py pass on py3-only systems 22922/head
Nathan Cutler [Fri, 6 Jul 2018 22:47:34 +0000 (00:47 +0200)]
tests: make test_ceph_argparse.py pass on py3-only systems

On systems that do not have Python 2 installed, this test fails to
import StringIO.

Fixes: http://tracker.ceph.com/issues/24816
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoqa/tests: remove ceph-disk tests and default all tests to use ceph-volume 22921/head
Vasu Kulkarni [Fri, 6 Jul 2018 22:03:17 +0000 (15:03 -0700)]
qa/tests: remove ceph-disk tests and default all tests to use ceph-volume

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agodoc: Fix minor documentation issues in Mimic release notes 22711/head
Florian Haas [Tue, 26 Jun 2018 12:27:13 +0000 (14:27 +0200)]
doc: Fix minor documentation issues in Mimic release notes

Small grammar glitches, typos, minor style issues.

Signed-off-by: Florian Haas <florian@citynetwork.eu>
7 years agodoc: Mention PURGED_SNAPDIRS and RECOVERY_DELETES in Mimic release notes
Florian Haas [Tue, 26 Jun 2018 12:26:06 +0000 (14:26 +0200)]
doc: Mention PURGED_SNAPDIRS and RECOVERY_DELETES in Mimic release notes

71d1dcbb98bf1b3c7953c13a1165ba1cac7e7fd0 started enforcing the
PURGED_SNAPDIRS osdmap flag before am upgraded Mon could join the
quorum.

9b80b14783ef895390b4153320078661627f373d extended that check to also
include RECOVERY_DELETES. The Mimic release notes do not mention these
flags as prerequisites for an upgrade beyond Luminous. That creates an
obvious issue for users who skipped Luminous in production, and now
want to upgrade from Jewel to Mimic in, say, a weekend.

Update the release notes to include those flags as prerequisites for a
Luminous to Mimic upgrade, explain how users can make sure that they
are set, and also give users a one-liner to fix up their PGs in a
pinch, if they need to.

Signed-off-by: Florian Haas <florian@citynetwork.eu>
7 years agoMerge PR #22863 into master
Sage Weil [Fri, 6 Jul 2018 18:51:30 +0000 (13:51 -0500)]
Merge PR #22863 into master

* refs/pull/22863/head:
rgw: fix gc may cause a large number of read traffic

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #20779 from oritwas/wip-rgw-23257
Yuri Weinstein [Fri, 6 Jul 2018 18:49:00 +0000 (11:49 -0700)]
Merge pull request #20779 from oritwas/wip-rgw-23257

rgw: radogw-admin reshard status command should print text for reshard status

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #22721 from linuxbox2/wip-rgw-23099
Yuri Weinstein [Fri, 6 Jul 2018 18:46:13 +0000 (11:46 -0700)]
Merge pull request #22721 from linuxbox2/wip-rgw-23099

rgw: escape markers in RGWOp_Metadata_List::execute

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge PR #22745 into master
Sage Weil [Fri, 6 Jul 2018 18:43:15 +0000 (13:43 -0500)]
Merge PR #22745 into master

* refs/pull/22745/head:
debian/control: require sudo
ceph.spec: require sudo
ceph.spec: install etc/sudoers.d/ceph-osd-smartctl
debian: install etc/sudoers.d/ceph-osd-smartctl
sudoers.d/ceph-osd-smartctl: allow user ceph to run smartctl as root

Reviewed-by: Erwan Velu <erwan@redhat.com>
7 years agoMerge PR #22858 into master
Sage Weil [Fri, 6 Jul 2018 18:43:03 +0000 (13:43 -0500)]
Merge PR #22858 into master

* refs/pull/22858/head:
osd/PrimaryLogPG: rebuild attrs from clients

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge PR #22870 into master
Sage Weil [Fri, 6 Jul 2018 18:42:58 +0000 (13:42 -0500)]
Merge PR #22870 into master

* refs/pull/22870/head:
mgr: replace iteritems with six.iteritems (mgr_module.py)
mgr: replace iteritems with six.iteritems (crash)
mgr: replace iteritems with six.iteritems (telegraf)
mgr: replace iteritems with six.iteritems (status)
mgr: replace iteritems with six.iteritems (restful)
mgr: replace iteritems with six.iteritems (influx)
mgr: replace iteritems with six.iteritems (balancer)

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agogithubmap: update contributors
Sage Weil [Fri, 6 Jul 2018 18:42:57 +0000 (13:42 -0500)]
githubmap: update contributors

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #22871 into master
Sage Weil [Fri, 6 Jul 2018 18:42:38 +0000 (13:42 -0500)]
Merge PR #22871 into master

* refs/pull/22871/head:
deb/rpm: add python-six as build-time and run-time dependency

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
7 years agoMerge PR #22873 into master
Sage Weil [Fri, 6 Jul 2018 18:42:34 +0000 (13:42 -0500)]
Merge PR #22873 into master

* refs/pull/22873/head:
os/bluestore: fix incomplete faulty range marking when doing compression

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agocmake: remove workarounds for supporting cmake 2.x 22912/head
Kefu Chai [Fri, 6 Jul 2018 17:23:58 +0000 (01:23 +0800)]
cmake: remove workarounds for supporting cmake 2.x

and bump up the required cmake version to 3.5.1

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #22896 from tchaikov/wip-cmake3
Kefu Chai [Fri, 6 Jul 2018 16:46:16 +0000 (00:46 +0800)]
Merge pull request #22896 from tchaikov/wip-cmake3

deb,rpm,do_cmake: switch to cmake3

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
7 years agoos/bluestore: remove redundant fault_range. 22898/head
Jianpeng Ma [Fri, 6 Jul 2018 15:37:01 +0000 (23:37 +0800)]
os/bluestore: remove redundant fault_range.

In fact, _do_read already did fault_range for the same offset and
length.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoMerge pull request #22619 from zhangsw/fix-rgw-deletemarker-bug
Yuri Weinstein [Fri, 6 Jul 2018 14:43:05 +0000 (07:43 -0700)]
Merge pull request #22619 from zhangsw/fix-rgw-deletemarker-bug

rgw: The delete markers generated by object expiration should have owner attribute.

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agoMerge pull request #22145 from Jeegn-Chen/wip-issue-24223
Yuri Weinstein [Fri, 6 Jul 2018 14:02:06 +0000 (07:02 -0700)]
Merge pull request #22145 from Jeegn-Chen/wip-issue-24223

rgw: reject invalid methods in validate_cors_rule_method

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22452 from theanalyst/wip-placement-target-warn
Yuri Weinstein [Fri, 6 Jul 2018 14:00:55 +0000 (07:00 -0700)]
Merge pull request #22452 from theanalyst/wip-placement-target-warn

rgw: warn if zone doesn't contain all zg's placement targets

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #22614 from tianshan/fix_24563
Yuri Weinstein [Fri, 6 Jul 2018 14:00:21 +0000 (07:00 -0700)]
Merge pull request #22614 from tianshan/fix_24563

rgw: fix copy response header etag format not correct

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #22623 from zhangsw/fix-rgw-lifecycle-rule-num
Yuri Weinstein [Fri, 6 Jul 2018 13:58:07 +0000 (06:58 -0700)]
Merge pull request #22623 from zhangsw/fix-rgw-lifecycle-rule-num

rgw: Limit the number of lifecycle rules on one bucket.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #22635 from zhangsw/fix-rgw-admin-objectexpire-bug
Yuri Weinstein [Fri, 6 Jul 2018 13:57:10 +0000 (06:57 -0700)]
Merge pull request #22635 from zhangsw/fix-rgw-admin-objectexpire-bug

rgw: "radosgw-admin objects expire" always returns ok even if the process fails.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agomgr/dashboard: Fix e2e script 22903/head
Tiago Melo [Fri, 6 Jul 2018 12:32:44 +0000 (13:32 +0100)]
mgr/dashboard: Fix e2e script

Angular 6 changed the cli and how you can configure the e2e cmd.

Signed-off-by: Tiago Melo <tmelo@suse.com>
7 years agomgr: reduce log spam 22893/head
John Spray [Tue, 3 Jul 2018 12:17:09 +0000 (13:17 +0100)]
mgr: reduce log spam

Several things at level 1 that shouldn't have been, especially
the big dump of all possible commands every time we handle one.

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