]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoclient: fix choose_target_mds for requests that do name lookup 23700/head
Yan, Zheng [Mon, 6 Aug 2018 06:51:09 +0000 (14:51 +0800)]
client: fix choose_target_mds for requests that do name lookup

There are two cases that a dirfrag is not recorded in CInode::fragmap.
One is that the dirfrag is not subtree root, another is that client does
not know which mds is dirfrag's auth mds. For the both cases, requests
that do name lookup are better to sent to dir inode's auth mds.

Fixes: http://tracker.ceph.com/issues/26860
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 436d1741e623748bc0dfd4e305d4c07cc602a093)

7 years agoMerge pull request #23226 from liewegas/wip-23220-mimic
Yuri Weinstein [Wed, 22 Aug 2018 20:46:01 +0000 (13:46 -0700)]
Merge pull request #23226 from liewegas/wip-23220-mimic

mimic: osd/OSDMap: CRUSH_TUNABLES5 added in jewel, not kraken

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #23259 from liewegas/wip-purge-new-mimic
Yuri Weinstein [Wed, 22 Aug 2018 20:45:30 +0000 (13:45 -0700)]
Merge pull request #23259 from liewegas/wip-purge-new-mimic

mimic: mon: add purge-new

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #23324 from cernceph/dvanders_mimic_chown
Yuri Weinstein [Wed, 22 Aug 2018 20:44:33 +0000 (13:44 -0700)]
Merge pull request #23324 from cernceph/dvanders_mimic_chown

mimic: rpm: silence osd block chown

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #23356 from wido/mimic-25191
Yuri Weinstein [Wed, 22 Aug 2018 20:43:29 +0000 (13:43 -0700)]
Merge pull request #23356 from wido/mimic-25191

mimic: mgr: Ignore daemon if no metadata was returned

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #23378 from dzafman/wip-24875-mimic
Yuri Weinstein [Wed, 22 Aug 2018 20:42:56 +0000 (13:42 -0700)]
Merge pull request #23378 from dzafman/wip-24875-mimic

mimic: osd: do_sparse_read(): Verify checksum earlier so we will try to repair

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge pull request #23453 from vumrao/wip-vumrao-mimic-25225
Yuri Weinstein [Wed, 22 Aug 2018 20:42:06 +0000 (13:42 -0700)]
Merge pull request #23453 from vumrao/wip-vumrao-mimic-25225

mimic: filestore: add pgid in filestore pg dir split log message

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #23463 from pdvian/wip-26837-mimic
Yuri Weinstein [Wed, 22 Aug 2018 20:41:25 +0000 (13:41 -0700)]
Merge pull request #23463 from pdvian/wip-26837-mimic

mimic: mgrc: enable disabling stats via mgr_stats_threshold

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #23583 from pdvian/wip-26912-mimic
Yuri Weinstein [Wed, 22 Aug 2018 20:40:50 +0000 (13:40 -0700)]
Merge pull request #23583 from pdvian/wip-26912-mimic

mimic: "balancer execute" only requires read permissions

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #23175 from smithfarm/wip-25032-mimic
Yuri Weinstein [Tue, 21 Aug 2018 20:23:43 +0000 (13:23 -0700)]
Merge pull request #23175 from smithfarm/wip-25032-mimic

mimic: spdk: compile with -march=core2 instead of -march=native

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #23203 from votdev/mimic_bug_25068
Yuri Weinstein [Tue, 21 Aug 2018 20:04:48 +0000 (13:04 -0700)]
Merge pull request #23203 from votdev/mimic_bug_25068

mimic: mgr/dashboard: RGW is not working if an URL prefix is defined

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agoMerge pull request #23358 from pdvian/wip-25083-mimic
Yuri Weinstein [Tue, 21 Aug 2018 19:58:54 +0000 (12:58 -0700)]
Merge pull request #23358 from pdvian/wip-25083-mimic

mimic: librbd: deep-copy should not write to objects that cannot exist

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #23490 from tchaikov/mimic-26880
Yuri Weinstein [Tue, 21 Aug 2018 19:57:48 +0000 (12:57 -0700)]
Merge pull request #23490 from tchaikov/mimic-26880

mimic: link against libstdc++ statically

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #23201 from smithfarm/wip-25073-mimic
Nathan Cutler [Mon, 20 Aug 2018 19:01:44 +0000 (21:01 +0200)]
Merge pull request #23201 from smithfarm/wip-25073-mimic

mimic: Boost system library is no longer required to compile and link example librados program

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #22339 from tchaikov/mimic-20924
Yuri Weinstein [Fri, 17 Aug 2018 21:10:31 +0000 (14:10 -0700)]
Merge pull request #22339 from tchaikov/mimic-20924

mimic: mds,osd,mon,msg: use intrusive_ptr for holding Connection::priv

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #23392 from alexandergraul/fix-ceph-disk
Yuri Weinstein [Fri, 17 Aug 2018 19:47:56 +0000 (12:47 -0700)]
Merge pull request #23392 from alexandergraul/fix-ceph-disk

mimic: ceph-disk: return a list instead of an iterator

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #23458 from badone/wip-OSDHealthMetric-race-mimic
Brad Hubbard [Thu, 16 Aug 2018 22:44:21 +0000 (08:44 +1000)]
Merge pull request #23458 from badone/wip-OSDHealthMetric-race-mimic

mimic: mgr/MgrClient: Protect daemon_health_metrics

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #23163 from smithfarm/wip-25055-mimic
Abhishek L [Thu, 16 Aug 2018 16:48:37 +0000 (18:48 +0200)]
Merge pull request #23163 from smithfarm/wip-25055-mimic

mimic: doc: http://docs.ceph.com/docs/mimic/rados/operations/pg-states/

Reviewed-By: Jan Fajerski <jfajerski@suse.com>
7 years agomgr: tweaks to command permissions 23583/head
John Spray [Thu, 2 Aug 2018 10:42:50 +0000 (11:42 +0100)]
mgr: tweaks to command permissions

Upgrade all selftest ops to rw, downgrade restful
cert list to r.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 7602f256c47fd9782e86ba21e6ef2edc8925b87e)

Conflicts:
src/pybind/mgr/selftest/module.py : Removed self-test commads

7 years agomgr: fix permissions on `balancer execute`
John Spray [Thu, 2 Aug 2018 10:42:21 +0000 (11:42 +0100)]
mgr: fix permissions on `balancer execute`

Fixes: http://tracker.ceph.com/issues/25345
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit f63ed1af4f4ed72419c21b1b1e39d1bd373f401d)

7 years agoMerge pull request #23337 from smithfarm/wip-qa-ceph-detect-init-alt
Nathan Cutler [Mon, 13 Aug 2018 11:47:39 +0000 (13:47 +0200)]
Merge pull request #23337 from smithfarm/wip-qa-ceph-detect-init-alt

mimic: qa: fix ceph-disk suite and add coverage for ceph-detect-init

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
7 years agodebian: strip "-Wl,-Bsymbolic-functions" from LDFLAGS 23490/head
Kefu Chai [Sun, 5 Aug 2018 19:50:59 +0000 (03:50 +0800)]
debian: strip "-Wl,-Bsymbolic-functions" from LDFLAGS

Fixes: http://tracker.ceph.com/issues/25209
Fixes: http://tracker.ceph.com/issues/26880
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 2063056f3ada7cf26d3c426385234e3a052193bf)

7 years agocmake: fix "WITH_STATIC_LIBSTDCXX"
Kefu Chai [Thu, 12 Jul 2018 09:17:44 +0000 (17:17 +0800)]
cmake: fix "WITH_STATIC_LIBSTDCXX"

- do not link libkv with ALLOC_LIBS, it turns out that if we link
tcmalloc *before* -static-libstdc++ -static-libgcc, libstdc++ and gcc
libs will show up in `ldd` output
- add `-static-libstdc++ -static-libgcc` to CMAKE_SHARED_LINKER_FLAGS
and CMAKE_EXE_LINKER_FLAGS instead of adding them to all shared
libraries and executable. simpler this way.
- link against libtcmalloc statically, because libtcmalloc is a C++
library, linking against it dynamically and linking against C++ runtime
statically will pull in depdencies on two versions of C++ runtime, which
will bring down the app at run-time.
- do not pass '-pie' to linker when building executable if
`WITH_STATIC_LIBSTDCXX` and tcmalloc is used, because the static tcmalloc
is not compiled with PIC.
- only apply '-pie' if ENABLE_SHARED is enabled.

Fixes: http://tracker.ceph.com/issues/26880
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d245ffb0e616d3f2dc954047389da69f7142c915)

7 years agomgrc: enable disabling stats via mgr_stats_threshold 23463/head
John Spray [Tue, 31 Jul 2018 16:49:00 +0000 (17:49 +0100)]
mgrc: enable disabling stats via mgr_stats_threshold

Because we had a min_max setting with CRIT the maximum,
it wasn't possible to actually turn off stats entirely.

Fixes: http://tracker.ceph.com/issues/25197
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 911fe5ce4fb5d0a7282dad87c2bfe6528c4f2fcf)

7 years agomimic: mgr/MgrClient: Protect daemon_health_metrics 23458/head
Brad Hubbard [Thu, 2 Aug 2018 00:33:42 +0000 (10:33 +1000)]
mimic: mgr/MgrClient: Protect daemon_health_metrics

Without holding the lock update_daemon_health() can race with
send_report() corrupting the daemon_health_metrics vector.

Fixes: http://tracker.ceph.com/issues/23352
Signed-off-by: Kjetil Joergensen <kjetil@medallia.com>
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 4996506a6b4ab309110039ea29a075f14d09a379)

7 years agomimic: filestore: add pgid in filestore pg dir split log message 23453/head
Vikhyat Umrao [Thu, 12 Jul 2018 01:38:31 +0000 (18:38 -0700)]
mimic: filestore: add pgid in filestore pg dir split log message

Fixes: http://tracker.ceph.com/issues/25225
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit d62ea5cc05857bc1a1f9cf4a0e3d4df315bef8af)
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
7 years agoMerge pull request #23400 from alfredodeza/backport-mimic-rm25216
Andrew Schoen [Fri, 3 Aug 2018 16:29:54 +0000 (16:29 +0000)]
Merge pull request #23400 from alfredodeza/backport-mimic-rm25216

mimic: ceph-volume lvm.activate conditional mon-config on prime-osd-dir

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #23393 from alfredodeza/backport-mimic-rm24152
Alfredo Deza [Fri, 3 Aug 2018 10:58:09 +0000 (06:58 -0400)]
Merge pull request #23393 from alfredodeza/backport-mimic-rm24152

mimic: ceph-volume enable the ceph-osd during lvm activation

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume lvm.activate conditional mon-config on prime-osd-dir 23400/head
Alfredo Deza [Wed, 1 Aug 2018 21:01:31 +0000 (17:01 -0400)]
ceph-volume lvm.activate conditional mon-config on prime-osd-dir

The --no-mon-config should only be done in Mimic releaes and later

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 020d6b1e5555e4547e8a0a19bd29eea89e1b7a31)

7 years agoceph-volume tests patch __release__ to mimic always for stdin keys 23393/head
Alfredo Deza [Thu, 2 Aug 2018 17:51:22 +0000 (13:51 -0400)]
ceph-volume tests patch __release__ to mimic always for stdin keys

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 99c17ecbaf443824ea8e155e06c11b20a8603d76)

7 years agoceph-volume: enable ceph-osd during lvm activation
Dan van der Ster [Mon, 30 Jul 2018 12:55:38 +0000 (14:55 +0200)]
ceph-volume: enable ceph-osd during lvm activation

Enable the ceph-osd@<id> unit during lvm activate to link these
units to the ceph-osd.target.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Fixes: http://tracker.ceph.com/issues/24152
(cherry picked from commit 261d8ac94d0008f57ac194718e9277c126e096b5)

7 years agoceph-volume: optional systemd enable --runtime
Dan van der Ster [Mon, 30 Jul 2018 12:53:07 +0000 (14:53 +0200)]
ceph-volume: optional systemd enable --runtime

Allow units to be enabled but not persisted across a reboot,
and use this when enabling osds.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 3e6f387be13b209aa9f56f5069331e449615d316)

7 years agoceph-disk: return a list instead of an iterator 23392/head
Alexander Graul [Thu, 2 Aug 2018 10:31:47 +0000 (12:31 +0200)]
ceph-disk: return a list instead of an iterator

Python2 to Python3 changed the return of map() from a list to a
"map object" which is an interator. This commit turns the returned
"map object" of extract_parted_partition_numbers() back into a list.

Fixes: https://tracker.ceph.com/issues/26830
Signed-off-by: Alexander Graul <agraul@suse.com>
7 years agoosd: do_sparse_read(): On Checksum mismatch try to repair 23378/head
David Zafman [Wed, 1 Aug 2018 23:12:16 +0000 (16:12 -0700)]
osd: do_sparse_read(): On Checksum mismatch try to repair

Fixes: http://tracker.ceph.com/issues/24875
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 929f78ab895e63667c36e57cc44d14a1402f4f9d)

7 years agoosd: do_read(): Use actual bytes read to determine if CRC can be checked
David Zafman [Thu, 2 Aug 2018 00:14:59 +0000 (17:14 -0700)]
osd: do_read(): Use actual bytes read to determine if CRC can be checked

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 48d7448d72834810cf13eca1425e0cf0e8570c7a)

Conflicts:
src/osd/PrimaryLogPG.cc (trivial)

7 years agoMerge pull request #23272 from dzafman/wip-25085-mimic
Josh Durgin [Wed, 1 Aug 2018 23:04:38 +0000 (16:04 -0700)]
Merge pull request #23272 from dzafman/wip-25085-mimic

mimic: Fix 25085 and 24949

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #23368 from alfredodeza/mimic-rm25173
Andrew Schoen [Wed, 1 Aug 2018 20:36:51 +0000 (20:36 +0000)]
Merge pull request #23368 from alfredodeza/mimic-rm25173

mimic ceph-volume do not use stdin in luminous

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume tests verify that luminous doesn't use stdin 23368/head
Alfredo Deza [Tue, 31 Jul 2018 20:47:05 +0000 (16:47 -0400)]
ceph-volume tests verify that luminous doesn't use stdin

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a97a63540290c93e05857ac175f3c9c45a4602c6)

7 years agoceph-volume util do not use stdin for luminous
Alfredo Deza [Tue, 31 Jul 2018 20:46:41 +0000 (16:46 -0400)]
ceph-volume util do not use stdin for luminous

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e03be24a4ff9b882d4329059fd1f04963d9ba2c5)

7 years agomimic: qa/ceph-disk: fixes for OVH and add ceph-detect-init subsuite 23337/head
Nathan Cutler [Sun, 29 Jul 2018 16:24:48 +0000 (18:24 +0200)]
mimic: qa/ceph-disk: fixes for OVH and add ceph-detect-init subsuite

With the move to OVH and the addition of RHEL as a supported distro, the
ceph-disk/basic suite was no longer green. This commit brings it back into
a green state.

Also, although ceph-disk/basic presumably exercises ceph-detect-init, it
seemed prudent to add a test case that runs it explicitly.

Can not be cherry-picked because ceph-disk and ceph-detect-init are no longer
present in master.

Reverts: 230c030fad091ae9c136a421e6206d3e8c9378f8
Fixes: https://tracker.ceph.com/issues/25031
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agolibrbd: deep-copy should not write to objects that cannot exist 23358/head
Jason Dillaman [Thu, 19 Jul 2018 16:34:59 +0000 (12:34 -0400)]
librbd: deep-copy should not write to objects that cannot exist

If an image has a snapshot and is subsequently shrunk, ensure that
discard ops are not sent to the deep-copy objects beyond the bounds
of the image at a given snapshot/HEAD. Only a remove op should be
expected in such cases.

Fixes: http://tracker.ceph.com/issues/25000
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit fbd6ea1ffd4befe0b13213be9bc17808ff89a85e)

7 years agomgr: Ignore daemon if no metadata was returned 23356/head
Wido den Hollander [Mon, 2 Jul 2018 14:36:52 +0000 (16:36 +0200)]
mgr: Ignore daemon if no metadata was returned

It can happen that the Mgr does not return any metadata for a given
daemon as it might not be available at that moment.

None is returned by the get_metadata() method at that moment and both
the Influx and Telegraf module should then ignore the daemon in their
statistics and continue on to the next daemon.

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 02569c88341a6dcc8aee5626f10ac2927c2cf064)

7 years agoMerge pull request #23349 from ceph/backport-mimic-23348
Alfredo Deza [Tue, 31 Jul 2018 16:41:55 +0000 (12:41 -0400)]
Merge pull request #23349 from ceph/backport-mimic-23348

mimic: ceph-volume: adds test for `ceph-volume lvm list /dev/sda`

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume: adds a unit test for `lvm list /dev/sda` 23349/head
Andrew Schoen [Mon, 30 Jul 2018 18:52:37 +0000 (13:52 -0500)]
ceph-volume: adds a unit test for `lvm list /dev/sda`

This test is to prove that the issue from
http://tracker.ceph.com/issues/24957 was fixed
by http://tracker.ceph.com/issues/24784

When running lvm list against a raw device it should handle
gracefully the situation where there are multiple PVs with the
name of the given device.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit ef10886f1e061d4273d3c0763ab0827e7e58e9d7)

7 years agoceph-volume: move pvolumes fixture into conftest.py
Andrew Schoen [Tue, 31 Jul 2018 13:26:57 +0000 (08:26 -0500)]
ceph-volume: move pvolumes fixture into conftest.py

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 37ed1be08b226a5b3a7a5bb70c4d5d1fd22db5d1)

7 years agoMerge pull request #23303 from smithfarm/wip-qa-ceph-detect-init
Nathan Cutler [Tue, 31 Jul 2018 10:30:33 +0000 (12:30 +0200)]
Merge pull request #23303 from smithfarm/wip-qa-ceph-detect-init

mimic: tools/ceph-detect-init: support RHEL as a platform

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotools/ceph-detect-init: support RHEL as a platform 23303/head
Nathan Cutler [Sun, 29 Jul 2018 18:43:23 +0000 (20:43 +0200)]
tools/ceph-detect-init: support RHEL as a platform

12d94cae2a06fd2ae39379e233588be99bff91de introduced a regression in that it
started returning '' as the codename for most supported distros, and also
(apparently) changed the distro string returned on Red Hat Enterprise Linux (to
"rhel"). As a result, ceph-detect-init began throwing an UnsupportedPlatform
exception on RHEL.

Can not be cherry-picked because ceph-disk and ceph-detect-init are no longer
present in master.

Fixes: 12d94cae2a06fd2ae39379e233588be99bff91de
Fixes: http://tracker.ceph.com/issues/18163
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #23327 from ceph/backport-mimic-23234
Alfredo Deza [Mon, 30 Jul 2018 19:00:41 +0000 (15:00 -0400)]
Merge pull request #23327 from ceph/backport-mimic-23234

mimic: ceph-volume: PVolumes.get() should return one PV when using name or uuid

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #23333 from alfredodeza/wip-rm25169
Andrew Schoen [Mon, 30 Jul 2018 16:14:36 +0000 (16:14 +0000)]
Merge pull request #23333 from alfredodeza/wip-rm25169

mimic: ceph-volume add a __release__ string, to help version-conditional calls

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume add a __release__ string, to help version-conditional calls 23333/head
Alfredo Deza [Mon, 30 Jul 2018 16:03:51 +0000 (12:03 -0400)]
ceph-volume add a __release__ string, to help version-conditional calls

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume: PVolumes.get() should return one PV when using name or uuid 23327/head
Andrew Schoen [Wed, 25 Jul 2018 16:47:27 +0000 (11:47 -0500)]
ceph-volume: PVolumes.get() should return one PV when using name or uuid

It is possible to get duplicated pv entires from the 'pvs' lvm command.
If we're using PVolumes.get() with either pv_name or pv_uuid we can
safely return a single PVolume object. However, if we use pv_tags with
PVolumes.get() we must still raise a MultiplePVsError if many pvs
are found that have the tags, because they are not guaranteed to be the
same pv, as would be the case with pv_name or pv_uuid.

Fixes: http://tracker.ceph.com/issues/24784
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit e5e866e8ecaf0522f3ebac83fa6fbc5a666acd58)

7 years agorpm: silence osd block chown 23324/head
Dan van der Ster [Mon, 30 Jul 2018 09:12:31 +0000 (11:12 +0200)]
rpm: silence osd block chown

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Fixes: http://tracker.ceph.com/issues/25152
7 years agoMerge pull request #23239 from alfredodeza/mimic-rm24993
Andrew Schoen [Mon, 30 Jul 2018 13:42:09 +0000 (13:42 +0000)]
Merge pull request #23239 from alfredodeza/mimic-rm24993

mimic ceph-volume process.call with stdin in Python 3 fix

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #23295 from b-ranto/wip-volume-selinux-mimic
Alfredo Deza [Sun, 29 Jul 2018 13:20:48 +0000 (09:20 -0400)]
Merge pull request #23295 from b-ranto/wip-volume-selinux-mimic

[mimic] ceph-volume: Restore SELinux context

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #23301 from yuriw/wip-yuriw-p2p-mimic
Yuri Weinstein [Sat, 28 Jul 2018 21:21:30 +0000 (14:21 -0700)]
Merge pull request #23301 from yuriw/wip-yuriw-p2p-mimic

qa/tests:  added OBJECT_MISPLACED to the whitelist

7 years agoqa/tests: added OBJECT_MISPLACED to the whitelist 23301/head
Yuri Weinstein [Sat, 28 Jul 2018 14:50:23 +0000 (07:50 -0700)]
qa/tests:  added OBJECT_MISPLACED to the whitelist

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoceph-volume: Restore SELinux context 23295/head
Boris Ranto [Tue, 10 Jul 2018 20:52:38 +0000 (22:52 +0200)]
ceph-volume: Restore SELinux context

We need to reset the root context of the file system after mounting it.
Otherwise, the SELinux policy rules will not be preserved.

Fixes: https://tracker.ceph.com/issues/24785
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 61dbf4ac2af7d1e9da927bbc4006c9fbccb55478)

7 years agoceph-volume tests.util verify as_bytes behavior 23239/head
Alfredo Deza [Fri, 27 Jul 2018 15:16:19 +0000 (11:16 -0400)]
ceph-volume tests.util verify as_bytes behavior

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 1802c386da3bf1e77f20d8a5456edd810a631c6f)

7 years agoceph-volume tests catch utf-8 encoded stdin errors
Alfredo Deza [Fri, 27 Jul 2018 15:15:58 +0000 (11:15 -0400)]
ceph-volume tests catch utf-8 encoded stdin errors

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 31f565e90bb346c2be982f7daba31431b5368677)

7 years agoceph-volume process use the as_bytes util for stdin
Alfredo Deza [Fri, 27 Jul 2018 15:14:13 +0000 (11:14 -0400)]
ceph-volume process use the as_bytes util for stdin

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 6a9368c1db468e05944607f9814f19053de80b6b)

7 years agoceph-volume util create a helper for converting to bytes
Alfredo Deza [Fri, 27 Jul 2018 15:13:19 +0000 (11:13 -0400)]
ceph-volume util create a helper for converting to bytes

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit fb518165445479cf08eefc8a2755ad78dcafd07f)

7 years agoceph-volume tests validate the new utils for prompts
Alfredo Deza [Mon, 16 Jul 2018 13:23:14 +0000 (09:23 -0400)]
ceph-volume tests validate the new utils for prompts

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 2d988337a96fe6cc8fffb37e4641c86cd47e1139)

7 years agoceph-volume tests verify str_to_int utility
Alfredo Deza [Fri, 13 Jul 2018 12:55:46 +0000 (08:55 -0400)]
ceph-volume tests verify str_to_int utility

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 56b1bf633d3d16cf335043450df95f191e2907a4)

7 years agoceph-volume util create prompt helpers
Alfredo Deza [Mon, 16 Jul 2018 13:22:50 +0000 (09:22 -0400)]
ceph-volume util create prompt helpers

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 0283fcc38b13c2d090b1d25be732e6f5f43b834c)

7 years agoceph-volume util move the str_to_int utility out of lvm
Alfredo Deza [Fri, 13 Jul 2018 12:54:33 +0000 (08:54 -0400)]
ceph-volume util move the str_to_int utility out of lvm

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit cb5b30ab43f37adc45fb6114452b37722c65501e)

7 years agoceph-volume tests run to log_descriptors, verifying utf-8
Alfredo Deza [Wed, 25 Jul 2018 12:40:53 +0000 (08:40 -0400)]
ceph-volume tests run to log_descriptors, verifying utf-8

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume process decode to utf-8 when logging descriptors
Alfredo Deza [Wed, 25 Jul 2018 12:39:16 +0000 (08:39 -0400)]
ceph-volume process decode to utf-8 when logging descriptors

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.process ensure that stdin works on py3 and py2.7
Alfredo Deza [Fri, 20 Jul 2018 13:49:59 +0000 (09:49 -0400)]
ceph-volume tests.process ensure that stdin works on py3 and py2.7

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume process encode stdin with utf-8 to prevent bytes TypeError
Alfredo Deza [Fri, 20 Jul 2018 13:48:38 +0000 (09:48 -0400)]
ceph-volume process encode stdin with utf-8 to prevent bytes TypeError

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #23218 from yuriw/wip-yuriw-25086-mimic
Yuri Weinstein [Fri, 27 Jul 2018 19:33:36 +0000 (12:33 -0700)]
Merge pull request #23218 from yuriw/wip-yuriw-25086-mimic

qa/tests: added v13.2.1 to the mix

7 years agoMerge branch 'mimic' of github.com:ceph/ceph into mimic
Alfredo Deza [Fri, 27 Jul 2018 13:47:25 +0000 (09:47 -0400)]
Merge branch 'mimic' of github.com:ceph/ceph into mimic

7 years agoMerge pull request #22965 from ceph/backport-mimic-22764
Alfredo Deza [Fri, 27 Jul 2018 12:11:03 +0000 (08:11 -0400)]
Merge pull request #22965 from ceph/backport-mimic-22764

mimic: ceph-volume: refuse to zap mapper devices

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc/rados/operations/pg-states: fix PG state names, part 2 23163/head
Nathan Cutler [Sat, 21 Jul 2018 18:52:36 +0000 (20:52 +0200)]
doc/rados/operations/pg-states: fix PG state names, part 2

Follow-up on 7f8b40fc4664856998d204adcf092c16cbc933dd

References: https://tracker.ceph.com/issues/24923
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 8cede1c4b1420266de19186bd917aeab159de446)

7 years agodoc/rados/operations/pg-states: fix PG state names
Jan Fajerski [Thu, 19 Apr 2018 10:34:28 +0000 (12:34 +0200)]
doc/rados/operations/pg-states: fix PG state names

Change pg state names according to osd/osd_types.cc as this is what
ceph -s and the prometheus exporter will present to users.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 7f8b40fc4664856998d204adcf092c16cbc933dd)

7 years agotest: Add test for automatic repair during scrub when distrust set 23272/head
David Zafman [Tue, 24 Jul 2018 22:12:15 +0000 (15:12 -0700)]
test: Add test for automatic repair during scrub when distrust set

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b576f6b7d7ac26c9596bcbedadeb116e7f78cfef)

7 years agoosd: Even when we are distrust data_digest, go ahead and set it when we can
David Zafman [Tue, 24 Jul 2018 20:30:09 +0000 (13:30 -0700)]
osd: Even when we are distrust data_digest, go ahead and set it when we can

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3b72d1a116ff7e45f35465db1397f648fb148876)

Conflicts:
src/osd/PrimaryLogPG.cc (trivial)

7 years agoosd: Fix digest if osd_distrust_data_digest set and replicas match each other
David Zafman [Wed, 25 Jul 2018 12:35:19 +0000 (05:35 -0700)]
osd: Fix digest if osd_distrust_data_digest set and replicas match each other

Fixes: https://tracker.ceph.com/issues/24949
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 91a098bcfab089b853dc5543900e53102367a614)

7 years agoosd: be_select_auth_object() gives chksum objectstore priority if osd_distrust_data_d...
David Zafman [Fri, 20 Jul 2018 15:09:52 +0000 (08:09 -0700)]
osd: be_select_auth_object() gives chksum objectstore priority if osd_distrust_data_digest true

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 4df59f8735afe7585803da4130e7e93e9f4946d3)

7 years agotest: Add test for repair of bad object info data_digest on all copies
David Zafman [Tue, 24 Jul 2018 16:40:24 +0000 (09:40 -0700)]
test: Add test for repair of bad object info data_digest on all copies

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 67d9e44de6b52673a3e23d7fd7f2d66566f2268a)

7 years agoosd: Fix pg repair to handle object info data_digest mismatched, but replicas match...
David Zafman [Mon, 23 Jul 2018 23:02:25 +0000 (16:02 -0700)]
osd: Fix pg repair to handle object info data_digest mismatched, but replicas match each other.

Fixes: https://tracker.ceph.com/issues/25085
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 61e995b2c1b866768151a405641463de067c210c)

7 years agotools: Add testing feature "corrupt-info" to ceph-objectstore-tool
David Zafman [Fri, 20 Jul 2018 19:31:56 +0000 (12:31 -0700)]
tools: Add testing feature "corrupt-info" to ceph-objectstore-tool

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 8e9c08524da0cf465553f99b2e160e59abc8e84b)

Conflicts:
src/tools/ceph_objectstore_tool.cc (use begin() instead of cbegin())

7 years agolvm zap: refuse to zap mapper devices 22965/head
Andrew Schoen [Thu, 26 Jul 2018 19:14:00 +0000 (14:14 -0500)]
lvm zap: refuse to zap mapper devices

Fixes: http://tracker.ceph.com/issues/24504
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 8e602d52657d50888a83963148334deb1f8d4e1c)

7 years agoadds the util.disk.is_mapper_device method
Andrew Schoen [Thu, 28 Jun 2018 17:14:12 +0000 (12:14 -0500)]
adds the util.disk.is_mapper_device method

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 852a466fdfa29c91f266ec122dcd5b01b8d1fca5)

7 years agoMerge pull request #23149 from alfredodeza/mimic-rm24952
Andrew Schoen [Thu, 26 Jul 2018 20:46:54 +0000 (20:46 +0000)]
Merge pull request #23149 from alfredodeza/mimic-rm24952

mimic: ceph-volume lvm.listing only include devices if they exist

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoosd: Improve logic in be_compare_scrubmaps()
David Zafman [Wed, 25 Jul 2018 19:10:57 +0000 (12:10 -0700)]
osd: Improve logic in be_compare_scrubmaps()

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 135d5d0209fd6441a470fd2301c6c0e2ec803091)

7 years agoMerge pull request #23101 from ceph/backport-mimic-23093
Alfredo Deza [Thu, 26 Jul 2018 18:01:00 +0000 (14:01 -0400)]
Merge pull request #23101 from ceph/backport-mimic-23093

mimic: ceph-volume: an OSD ID must exist and be destroyed before reuse

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume lvm.listing only include devices if they exist 23149/head
Alfredo Deza [Wed, 18 Jul 2018 20:50:25 +0000 (16:50 -0400)]
ceph-volume lvm.listing only include devices if they exist

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 37565f81634f47c389926d300ed5f92b223bddea)

7 years agoceph-volume: do not pin the testinfra version for the simple tests
Andrew Schoen [Thu, 26 Jul 2018 17:41:15 +0000 (12:41 -0500)]
ceph-volume: do not pin the testinfra version for the simple tests

For testinfra to work with a 2.6.x version of ansible it must use the
latest version.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 70b86012b56fd4b66fc0c7ce88a6cfbe895a0702)

7 years agoMerge pull request #23269 from ceph/backport-mimic-23263
Alfredo Deza [Thu, 26 Jul 2018 17:49:48 +0000 (13:49 -0400)]
Merge pull request #23269 from ceph/backport-mimic-23263

mimic: ceph-volume: update version of ansible to 2.6.x for simple tests

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume: update version of ansible to 2.6.x for simple tests 23269/head
Andrew Schoen [Thu, 26 Jul 2018 15:09:17 +0000 (10:09 -0500)]
ceph-volume: update version of ansible to 2.6.x for simple tests

ceph-ansible now requires a 2.5.x or 2.6.x version of ansible if you're
using the master branch. This updates our functional tests for the
simple subcommand to use a 2.6.x version of ansible.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 654578928dd840801967c5409b5b19ad6cf90317)

7 years ago13.2.1 v13.2.1
Jenkins Build Slave User [Thu, 26 Jul 2018 17:39:56 +0000 (17:39 +0000)]
13.2.1

7 years agoMerge pull request #23262 from liewegas/wip-mimic-p2p
Sage Weil [Thu, 26 Jul 2018 16:31:44 +0000 (11:31 -0500)]
Merge pull request #23262 from liewegas/wip-mimic-p2p

mimic: qa/suites/upgrade/mimic-p2p: allow target version to apply

7 years agoqa/suites/upgrade/mimic-p2p: allow target version to apply 23262/head
Sage Weil [Thu, 26 Jul 2018 13:07:54 +0000 (08:07 -0500)]
qa/suites/upgrade/mimic-p2p: allow target version to apply

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #23246 into mimic
Sage Weil [Thu, 26 Jul 2018 13:47:28 +0000 (08:47 -0500)]
Merge PR #23246 into mimic

* refs/pull/23246/head:
rpm,deb: fix chown to use -h
rpm,deb: chown bluestore block* links to ceph.ceph on install/upgrade

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agogithubmap: update contributors
Sage Weil [Thu, 26 Jul 2018 13:47:28 +0000 (08:47 -0500)]
githubmap: update contributors

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #23250 into mimic
Sage Weil [Thu, 26 Jul 2018 13:47:17 +0000 (08:47 -0500)]
Merge PR #23250 into mimic

* refs/pull/23250/head:
osd/OSDMap: fix CEPHX_V2 osd requirement to nautilus, not mimic

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agomon: destroy-new -> purge-new 23259/head
Sage Weil [Fri, 15 Jun 2018 19:05:20 +0000 (14:05 -0500)]
mon: destroy-new -> purge-new

What we actually want is a purge, not a destroy.  Destroy leaves the OSD
ID in used and allows it to be recreated.  What ceph-volume wants is to
purge all trace of the failed OSD setup.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 761f68dc0d261120d26a41d958e9688b3fed7057)

7 years agomon/OSDMonitor: fix NEW flag adjustment in destroy[-new]
Sage Weil [Fri, 15 Jun 2018 18:51:03 +0000 (13:51 -0500)]
mon/OSDMonitor: fix NEW flag adjustment in destroy[-new]

Only set the NEW flag if it isn't already set.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 13393f6108a89973e0415caa61c6025c760a3930)

7 years agomon: add 'osd destroy-new' command that only destroys NEW osd slots
Sage Weil [Tue, 5 Jun 2018 22:30:14 +0000 (17:30 -0500)]
mon: add 'osd destroy-new' command that only destroys NEW osd slots

ceph-volume may run into a problem and want to clean up, but we do not
want to give it blanket access to the 'osd destroy' command.  Instead,
make an 'osd destroy-new' that can only create new OSDs (ones that are
in the process of being created but have never booted yet).

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 547d96dc01cd913f6543528eb75bb5015e00e893)

7 years agomon/MonCap: allow 'osd destroy-new' with bootstrap-osd caps
Sage Weil [Tue, 5 Jun 2018 22:30:39 +0000 (17:30 -0500)]
mon/MonCap: allow 'osd destroy-new' with bootstrap-osd caps

This let's ceph-volume use the new command.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d106ff4668aae445dd3ff53d10b54f970a5fa36a)