]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agotest/librbd: fix 'Uninteresting mock function call' warning
Mykola Golub [Thu, 7 Feb 2019 15:35:20 +0000 (15:35 +0000)]
test/librbd: fix 'Uninteresting mock function call' warning

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 5a4526cc9f7a2434f1bb196d6031abda0c8db221)

5 years agolibrbd: properly handle potential object map failures
Jason Dillaman [Tue, 18 Sep 2018 18:37:12 +0000 (14:37 -0400)]
librbd: properly handle potential object map failures

Remove the "ceph_assert" statements and instead bubble any potential
error code up to the caller. The object map state machines should
attempt to return a 0 upon failure unless it was unable to flag the
object map as invalid.

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

Conflicts:
src/librbd/DeepCopyRequest.cc: trivial resolution
src/librbd/deep_copy/ObjectCopyRequest.cc: trivial resolution
src/librbd/deep_copy/SnapshotCopyRequest.cc: trivial resolution
src/librbd/exclusive_lock/PostAcquireRequest.cc: trivial resolution
src/librbd/exclusive_lock/PreReleaseRequest.cc: trivial resolution
src/librbd/image/RefreshRequest.cc: trivial resolution
src/librbd/io/CopyupRequest.cc: trivial resolution
src/librbd/io/ObjectRequest.cc: trivial resolution
src/librbd/object_map/InvalidateRequest.cc: trivial resolution
src/librbd/object_map/RefreshRequest.cc: trivial resolution
src/librbd/object_map/SnapshotRemoveRequest.cc: trivial resolution
src/librbd/operation/ResizeRequest.cc: trivial resolution
src/librbd/operation/SnapshotCreateRequest.cc: trivial resolution
src/librbd/operation/SnapshotRollbackRequest.cc: trivial resolution

5 years agoMerge pull request #28125 from dillaman/wip-39429-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:23:24 +0000 (08:23 -0700)]
Merge pull request #28125 from dillaman/wip-39429-mimic

mimic: rbd: librbd: async open/close should free ImageCtx before issuing callback

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #29294 from dillaman/wip-40234-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:22:54 +0000 (08:22 -0700)]
Merge pull request #29294 from dillaman/wip-40234-mimic

mimic: rbd/action: fix error getting positional argument

5 years agoMerge pull request #29565 from pdvian/wip-40881-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:22:20 +0000 (08:22 -0700)]
Merge pull request #29565 from pdvian/wip-40881-mimic

mimic: rbd: Reduce log level for cls/journal and cls/rbd expected errors

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #29872 from trociny/wip-41284-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:21:55 +0000 (08:21 -0700)]
Merge pull request #29872 from trociny/wip-41284-mimic

mimic: rbd-mirror: don't overwrite status error returned by replay

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #29873 from trociny/wip-41423-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:21:08 +0000 (08:21 -0700)]
Merge pull request #29873 from trociny/wip-41423-mimic

mimic: qa/workunits/rbd: stress test `rbd mirror pool status --verbose`

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30117 from smithfarm/wip-41438-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:20:36 +0000 (08:20 -0700)]
Merge pull request #30117 from smithfarm/wip-41438-mimic

mimic: rbd-mirror: ignore errors relating to parsing the cluster config file

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30121 from pdvian/wip-41622-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:20:04 +0000 (08:20 -0700)]
Merge pull request #30121 from pdvian/wip-41622-mimic

mimic: tools/rbd-ggate: close log before running postfork

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30176 from smithfarm/wip-39316-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:19:37 +0000 (08:19 -0700)]
Merge pull request #30176 from smithfarm/wip-39316-mimic

mimic: krbd: fix rbd map hang due to udev return subsystem unordered

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
5 years agoMerge pull request #30177 from smithfarm/wip-40380-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:18:53 +0000 (08:18 -0700)]
Merge pull request #30177 from smithfarm/wip-40380-mimic

mimic: rbd: librbd: avoid dereferencing an empty container during deep-copy

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30178 from smithfarm/wip-40500-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:18:11 +0000 (08:18 -0700)]
Merge pull request #30178 from smithfarm/wip-40500-mimic

mimic: rbd: use the ordered throttle for the export action

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30424 from smithfarm/wip-41543-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:16:57 +0000 (08:16 -0700)]
Merge pull request #30424 from smithfarm/wip-41543-mimic

mimic: test/librbd: set nbd timeout due to newer kernels defaulting it on

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30569 from pdvian/wip-41955-mimic
Yuri Weinstein [Tue, 8 Oct 2019 15:16:18 +0000 (08:16 -0700)]
Merge pull request #30569 from pdvian/wip-41955-mimic

mimic: rbd/tests: avoid hexdump skip and length options in krbd test

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30718 from smithfarm/wip-epel-release-snafu-mimic 30786/head
Yuri Weinstein [Mon, 7 Oct 2019 19:46:22 +0000 (12:46 -0700)]
Merge pull request #30718 from smithfarm/wip-epel-release-snafu-mimic

mimic: build/ops: backport miscellaneous install-deps.sh and ceph.spec.in fixes from master

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #29241 from smithfarm/wip-38206-mimic
Yuri Weinstein [Mon, 7 Oct 2019 19:31:15 +0000 (12:31 -0700)]
Merge pull request #29241 from smithfarm/wip-38206-mimic

mimic: core: osds allows to partially start more than N+2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #29225 into mimic
Patrick Donnelly [Mon, 7 Oct 2019 19:30:10 +0000 (12:30 -0700)]
Merge PR #29225 into mimic

* refs/pull/29225/head:
common/secret.c: fix key parsing when doing a remount

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agorbd: use the ordered throttle for the export action 30178/head
Jason Dillaman [Wed, 19 Jun 2019 15:09:54 +0000 (11:09 -0400)]
rbd: use the ordered throttle for the export action

This allows exports to STDOUT to use multiple concurrent operations
and also fixes a potential race condition with concurrent callbacks
and file seeking.

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

Conflicts:
src/tools/rbd/action/Export.cc
- mimic has g_conf->get_val and int64_t "rbd_concurrent_management_ops"

5 years agoMerge pull request #30291 from tchaikov/wip-mimic-41447
Yuri Weinstein [Mon, 7 Oct 2019 19:26:08 +0000 (12:26 -0700)]
Merge pull request #30291 from tchaikov/wip-mimic-41447

mimic: osd/PrimaryLogPG: Avoid accessing destroyed references in finish_degr…

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #30447 from tchaikov/wip-mimic-37866
Yuri Weinstein [Mon, 7 Oct 2019 19:25:38 +0000 (12:25 -0700)]
Merge pull request #30447 from tchaikov/wip-mimic-37866

mimic: mgr/localpool: pg_num is an int arg to 'osd pool create'

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #30481 from pdvian/wip-41863-mimic
Yuri Weinstein [Mon, 7 Oct 2019 19:25:03 +0000 (12:25 -0700)]
Merge pull request #30481 from pdvian/wip-41863-mimic

mimic: mon: ensure prepare_failure() marks no_reply on op

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #30485 from sobelek/wip-41922-mimic
Yuri Weinstein [Mon, 7 Oct 2019 19:24:03 +0000 (12:24 -0700)]
Merge pull request #30485 from sobelek/wip-41922-mimic

mimic: mon: show pool id in pool ls command

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30543 from smithfarm/wip-39317-mimic
Yuri Weinstein [Mon, 7 Oct 2019 19:22:14 +0000 (12:22 -0700)]
Merge pull request #30543 from smithfarm/wip-39317-mimic

mimic: mgr/dashboard: RGW proxy can't handle self-signed SSL certificates

Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #30275 from pdvian/wip-41704-mimic
Yuri Weinstein [Mon, 7 Oct 2019 19:21:29 +0000 (12:21 -0700)]
Merge pull request #30275 from pdvian/wip-41704-mimic

 mimic: osd/PrimaryLogPG: update oi.size on write op implicitly truncating ob…

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoceph.spec.in: fix Cython package dependency for Fedora 30718/head
Jeff Layton [Thu, 26 Sep 2019 11:50:28 +0000 (07:50 -0400)]
ceph.spec.in: fix Cython package dependency for Fedora

Fedora distros do not have python3?-Cython packages, but they do have
python3-Cython ones. Fix the BuildRequires so that we only use the
python3_version_nodots based version string for RHEL.

Fixes: https://tracker.ceph.com/issues/42032
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 40c5a18f81c67c96f6a35e592ac3141b87c19701)

5 years agoceph.spec.in: s/pkgversion/version_nodots/
Kefu Chai [Fri, 30 Aug 2019 11:49:28 +0000 (19:49 +0800)]
ceph.spec.in: s/pkgversion/version_nodots/

`python3_pkgversion` is now defined as 3, while we don't have packages
like python3-Cython yet in EPEL7. but we do have `python36-Cython`. so
let's use `python3_version_nodots` instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 6d2f66846d1b84595cfdf8ac13a7ed4e1ae608ce)

5 years agorpm: make Python build deps somewhat less confusing
Nathan Cutler [Tue, 15 Jan 2019 14:34:42 +0000 (15:34 +0100)]
rpm: make Python build deps somewhat less confusing

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0b79741a770acb5cee6de2dd88022cd2c5d15ef5)

Conflicts:
ceph.spec.in

5 years agorpm: Install python2-Cython in python2 environment
Brad Hubbard [Mon, 4 Mar 2019 02:38:25 +0000 (12:38 +1000)]
rpm: Install python2-Cython in python2 environment

do_cmake.sh tests for Cython module version in python2

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 6de7111e735683f2c73d4c013d9611fc02b68985)

Conflicts:
ceph.spec.in

5 years agoinstall-deps: do not install if rpm already installed
Kefu Chai [Fri, 27 Sep 2019 02:26:54 +0000 (10:26 +0800)]
install-deps: do not install if rpm already installed

there is chance that the system already have epel-release-latest-7.noarch.rpm
installed, in that case, install-deps.sh should not fail.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 45a4173bcfe15a9bf56f6aeb6e6c35386a00d1c5)

5 years agoinstall-deps.sh: add EPEL repo for non-x86_64 archs as well
Nathan Cutler [Tue, 24 Sep 2019 19:48:27 +0000 (21:48 +0200)]
install-deps.sh: add EPEL repo for non-x86_64 archs as well

Fixes: https://tracker.ceph.com/issues/42023
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 49d740118f9a0ee6b6bb82954630c654946f1751)

5 years agoinstall-deps.sh: extract munge_debian_control()
Kefu Chai [Wed, 13 Feb 2019 11:56:00 +0000 (19:56 +0800)]
install-deps.sh: extract munge_debian_control()

this function will uncomment necessary dependencies on demand.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4fd179654e3c37c837899372859959283479cee6)

Conflicts:
install-deps.sh

5 years agoinstall-deps.sh: use latest setuptools
Kefu Chai [Sat, 26 Jan 2019 17:20:53 +0000 (01:20 +0800)]
install-deps.sh: use latest setuptools

this change reverts "install-deps.sh: workaround setuptools' dependency on six"

This reverts commit 30ce5e55460e333e1240704112a16fae68b3325f.

tl;dr: this change addresses the failures of "make check" runs on arm64
builders when they try to build `mgr-dashboard-test-venv` target.

long story: without this change, we will fail to pull in
setuptools >= 36, and as a result pip will fail to import
`setuptools.build_meta` in `pip/_vendor/pep517/_in_process.py`. and will
a `BackendUnavailable` exception thrown by `_call_hook()` in
`pip/_vendor/pep517/wrappers.py`. since the issue addressed by 30ce5e55
has been addressed since setuptools >= 36.0.1, we should be safe to
upgrade to the latest setuptools now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8b55b47cc75e43ef683cd230f792cd92f1c46fa7)

5 years agoinstall-deps.sh: skip unavailable repos
Kefu Chai [Wed, 19 Dec 2018 08:37:55 +0000 (16:37 +0800)]
install-deps.sh: skip unavailable repos

as centos-sclo-rh-source leads us to 404 at this moment. and we are not
using the source repo for building ceph. so we can just skip any
unavailable repo.

Fixes: http://tracker.ceph.com/issues/37707
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit aa2b9e9a643441d9a2891e17920677a7725754c4)

5 years agoinstall-deps.sh: correct gcc version info as major.minor.patch
Changcheng Liu [Fri, 26 Oct 2018 06:32:09 +0000 (14:32 +0800)]
install-deps.sh: correct gcc version info as major.minor.patch

On ubuntu 18.04, "gcc -dumpversion" output "7", it result in
that below check will return false:
    dpkg --compare-versions 7 ge 7.0
Then, this script will install other gcc.

Actully, the full gcc version "gcc -dumpfullversion" output is
"7.3.0", than below check will turn true:
    dpkg --compare-version 7.3.0 ge 7.0
So, there's no need to install other gcc.

In case of hitting error on ubuntu16.04, use below parameter:
   gcc -dumpfullversion -dumpversion

Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
(cherry picked from commit ab7344e61755b357c558aef3630e1479d5dcc7b3)

5 years agoinstall-deps: install setuptools before upgrading virtualenv
Kefu Chai [Sat, 10 Nov 2018 21:33:43 +0000 (13:33 -0800)]
install-deps: install setuptools before upgrading virtualenv

this should address the failures when running install-deps.sh, like

Downloading/unpacking virtualenv
  Running setup.py egg_info for package virtualenv
    /usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown
distribution option: 'python_requires'
      warnings.warn(msg)
    error in virtualenv setup command: 'extras_require' must be a
dictionary whose values are strings or lists of strings containing valid
project/version requirement specifiers.
    Complete output from command python setup.py egg_info:
    /usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown
distribution option: 'python_requires'

  warnings.warn(msg)

error in virtualenv setup command: 'extras_require' must be a dictionary
whose values are strings or lists of strings containing valid
project/version requirement specifiers.

this only happens on very old virtualenv shipped with RHEL7.4

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 95386752ab2635f56e1d38b50de7144e2135b323)

5 years agoinstall-deps.sh: dashboard frontend needs git
Sebastian Wagner [Wed, 10 Oct 2018 12:21:04 +0000 (14:21 +0200)]
install-deps.sh: dashboard frontend needs git

Running `npm install` for the dashboard pulls dependenies with git.
Under some setups, git was not installed when building the frontend.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d8de543b7e8f815f46e6a967fb5df4620f1cfbc4)

5 years agoinstall-deps: do not specify unknown options
Kefu Chai [Fri, 28 Sep 2018 03:45:03 +0000 (11:45 +0800)]
install-deps: do not specify unknown options

per apt.conf(5), and
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550564,
"Acquire::Translation" is not documented and will be deprecated. it
would be better to use "Acquire::Languages" solely. and it's consistent
with https://github.com/ceph/ceph-build/pull/1137 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3911a7c7d068fde7c1ea7b1a2af0063e1249d697)

5 years agobuild/ops: unify command substitution in install-deps.sh
Nathan Cutler [Wed, 1 Aug 2018 10:33:58 +0000 (12:33 +0200)]
build/ops: unify command substitution in install-deps.sh

The $() form is preferable to `` because folks (like me) might be using
` as a keyboard shortcut to GNU Screen, causing havoc to ensue whenever
copy-pasting the ` character.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e0042dd617269934bf51efee5bab7e4485875576)

5 years agoinstall-deps.sh: import ubuntu-toolchain-r's key without keyserver
Kefu Chai [Tue, 10 Jul 2018 12:23:48 +0000 (20:23 +0800)]
install-deps.sh: import ubuntu-toolchain-r's key without keyserver

we are running into following error recently

gpg: requesting key BA9EF27F from hkp server keyserver.ubuntu.com
gpgkeys: key 1E9377A2BA9EF27F can't be retrieved
gpg: no valid OpenPGP data found.
gpg: Total number processed: 0
gpg: keyserver communications error: keyserver helper general error
gpg: keyserver communications error: unknown pubkey algorithm
gpg: keyserver receive failed: unknown pubkey algorithm

so use the local copy of the pubkey instead

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b94e3790c88d599821b71bc76b20755c9580c081)

5 years agoinstall-deps: check the exit status for the $builddepcmd
Yunchuan Wen [Sun, 24 Jun 2018 01:48:50 +0000 (09:48 +0800)]
install-deps: check the exit status for the $builddepcmd

in some case, the $builddepcmd will failed without any "error:" output.
so we should check the exit status to handle it.

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
(cherry picked from commit 46e33d15a4132772a6bd11cd49f4181081bcdd55)

5 years agoinstall-deps: fix installing gcc on ubuntu when no old compiler
Tomasz Setkowski [Sat, 14 Apr 2018 15:23:58 +0000 (15:23 +0000)]
install-deps: fix installing gcc on ubuntu when no old compiler

Signed-off-by: Tomasz Setkowski <tom@ai-traders.com>
(cherry picked from commit 0d8d0cf6f7594f4f97677a2069998331998bdfa9)

5 years agoinstall-deps.sh: support install gcc7 in xenial aarch64
Yunchuan Wen [Thu, 7 Jun 2018 07:51:31 +0000 (15:51 +0800)]
install-deps.sh: support install gcc7 in xenial aarch64

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
(cherry picked from commit f92f256f4503d19f41b7c300a4df46b189e81a9b)

5 years agoinstall-deps: nuke wheelhouse if it's stale
Kefu Chai [Wed, 16 May 2018 11:41:52 +0000 (19:41 +0800)]
install-deps: nuke wheelhouse if it's stale

otherwise, if we update *requirements.txt, and the wheelhouse fails to
offer the newly added dependency, the setup-virtualenv.sh will fail the
build.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ed0ca70707439f44779ca7093461182d73db1a77)

5 years agoinstall-deps.sh: Fixes for RHEL 7
Zack Cerza [Fri, 1 Feb 2019 00:36:17 +0000 (00:36 +0000)]
install-deps.sh: Fixes for RHEL 7

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit a1a3e7960cf2c792ac8c9c71e68caa0ebada8933)

Conflicts:
install-deps.sh

5 years agoMerge pull request #29242 from smithfarm/wip-38277-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:45:27 +0000 (16:45 -0700)]
Merge pull request #29242 from smithfarm/wip-38277-mimic

mimic: core: mon,osd: limit MOSDMap messages by size as well as map count

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #29249 from smithfarm/wip-38852-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:39:33 +0000 (16:39 -0700)]
Merge pull request #29249 from smithfarm/wip-38852-mimic

mimic: core: .mgrstat failed to decode mgrstat state; luminous dev version?

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #29247 from smithfarm/wip-38437-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:37:50 +0000 (16:37 -0700)]
Merge pull request #29247 from smithfarm/wip-38437-mimic

mimic: core: crc cache should be invalidated when posting preallocated rx buffers

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
5 years agoMerge pull request #29593 from pdvian/wip-40884-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:37:05 +0000 (16:37 -0700)]
Merge pull request #29593 from pdvian/wip-40884-mimic

mimic: mon/MgrMonitor: fix null deref when invalid formatter is specified

5 years agoMerge pull request #29732 from pdvian/wip-40949-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:36:34 +0000 (16:36 -0700)]
Merge pull request #29732 from pdvian/wip-40949-mimic

mimic: Better default value for osd_snap_trim_sleep

5 years agoMerge pull request #29741 from smithfarm/wip-41287-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:35:57 +0000 (16:35 -0700)]
Merge pull request #29741 from smithfarm/wip-41287-mimic

mimic: core: ceph daemon mon.a config set mon_health_to_clog false cause leader mon assert

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #29976 from dzafman/wip-38450
Yuri Weinstein [Thu, 3 Oct 2019 23:35:17 +0000 (16:35 -0700)]
Merge pull request #29976 from dzafman/wip-38450

mimic: osd: make project_pg_history handle concurrent osdmap publish

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #30081 from pdvian/wip-41595-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:34:50 +0000 (16:34 -0700)]
Merge pull request #30081 from pdvian/wip-41595-mimic

mimic: ceph-objectstore-tool can't remove head with bad snapset

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #30180 from smithfarm/wip-40083-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:34:18 +0000 (16:34 -0700)]
Merge pull request #30180 from smithfarm/wip-40083-mimic

mimic: osd: Better error message when OSD count is less than osd_pool_default_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #30181 from smithfarm/wip-40732-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:32:39 +0000 (16:32 -0700)]
Merge pull request #30181 from smithfarm/wip-40732-mimic

mimic: mon/AuthMonitor: fix initial creation of rotating keys

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30182 from smithfarm/wip-41291-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:32:11 +0000 (16:32 -0700)]
Merge pull request #30182 from smithfarm/wip-41291-mimic

mimic: os/filestore: assure sufficient leaves in pre-split

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #30183 from smithfarm/wip-41351-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:31:35 +0000 (16:31 -0700)]
Merge pull request #30183 from smithfarm/wip-41351-mimic

mimic: cmake,run-make-check.sh: disable SPDK by default

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30214 from smithfarm/wip-41490-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:31:10 +0000 (16:31 -0700)]
Merge pull request #30214 from smithfarm/wip-41490-mimic

mimic: osd/OSDCap: Check for empty namespace

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30222 from smithfarm/wip-41502-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:30:38 +0000 (16:30 -0700)]
Merge pull request #30222 from smithfarm/wip-41502-mimic

mimic: osd/PeeringState: do not complain about past_intervals constrained by oldest epoch

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #30243 from smithfarm/wip-41442-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:30:06 +0000 (16:30 -0700)]
Merge pull request #30243 from smithfarm/wip-41442-mimic

mimic: core: osd: clear PG_STATE_CLEAN when repair object

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #30391 from pdvian/wip-41805-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:29:28 +0000 (16:29 -0700)]
Merge pull request #30391 from pdvian/wip-41805-mimic

mimic: mgr: do not reset reported if a new metric is not collected

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #29253 from smithfarm/wip-40464-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:27:05 +0000 (16:27 -0700)]
Merge pull request #29253 from smithfarm/wip-40464-mimic

mimic: core: osd beacon sometimes has empty pg list

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #29245 from smithfarm/wip-38351-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:25:52 +0000 (16:25 -0700)]
Merge pull request #29245 from smithfarm/wip-38351-mimic

mimic: tests: Limit loops waiting for force-backfill/force-recovery to happen

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #29250 from smithfarm/wip-38856-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:23:55 +0000 (16:23 -0700)]
Merge pull request #29250 from smithfarm/wip-38856-mimic

mimic: core: should set EPOLLET flag on del_event()

5 years agoMerge pull request #29251 from smithfarm/wip-40179-mimic
Yuri Weinstein [Thu, 3 Oct 2019 23:23:23 +0000 (16:23 -0700)]
Merge pull request #29251 from smithfarm/wip-40179-mimic

mimic: tests: qa/standalone/scrub/osd-scrub-snaps.sh sometimes fails

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #29765 from smithfarm/wip-40130-mimic
Nathan Cutler [Wed, 2 Oct 2019 13:13:13 +0000 (15:13 +0200)]
Merge pull request #29765 from smithfarm/wip-40130-mimic

mimic: doc: Document behaviour of fsync-after-close

Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge pull request #30687 from smithfarm/wip-42104-mimic
Nathan Cutler [Wed, 2 Oct 2019 12:33:56 +0000 (14:33 +0200)]
Merge pull request #30687 from smithfarm/wip-42104-mimic

mimic: build/ops: admin/build-doc: use python3

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoadmin/build-doc: use python3 (follow-on fix) 30687/head
Nathan Cutler [Wed, 2 Oct 2019 10:05:47 +0000 (12:05 +0200)]
admin/build-doc: use python3 (follow-on fix)

Unfortunately, a5127318cf2feb12b5fd61aeed35b48bc31b4e34 (first attempt to
cherry-pick ace8cb15a600daf5261c0ab349b43010a238a1d9) was incomplete.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(partial manual cherry-pick of ace8cb15a600daf5261c0ab349b43010a238a1d9)

5 years agodoc: fix urls in posix.rst 29765/head
Jos Collin [Thu, 25 Jul 2019 04:33:12 +0000 (10:03 +0530)]
doc: fix urls in posix.rst

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit c5c5f031f77f778af73f8659b01695b88f158807)

5 years agodoc: cephfs: add section on fsync error reporting to posix.rst
Jeff Layton [Wed, 29 May 2019 18:35:11 +0000 (14:35 -0400)]
doc: cephfs: add section on fsync error reporting to posix.rst

Fixes: http://tracker.ceph.com/issues/24641
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit b52d85c2a71950db222e3649d5265e5891368ba1)

5 years agoMerge pull request #30663 from smithfarm/wip-fix-docs-build-check-mimic
Nathan Cutler [Tue, 1 Oct 2019 15:54:30 +0000 (17:54 +0200)]
Merge pull request #30663 from smithfarm/wip-fix-docs-build-check-mimic

mimic: build/ops: admin/build-doc: use python3

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30131 from smithfarm/wip-40736-mimic
Nathan Cutler [Tue, 1 Oct 2019 13:15:30 +0000 (15:15 +0200)]
Merge pull request #30131 from smithfarm/wip-40736-mimic

mimic: doc/rgw: document use of 'realm pull' instead of 'period pull'

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30099 from smithfarm/wip-40673-mimic
Nathan Cutler [Tue, 1 Oct 2019 13:14:27 +0000 (15:14 +0200)]
Merge pull request #30099 from smithfarm/wip-40673-mimic

mimic: docs: fix rgw_ldap_dnattr username token

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoadmin/build-doc: use python3 30663/head
Kefu Chai [Wed, 7 Aug 2019 09:46:13 +0000 (17:46 +0800)]
admin/build-doc: use python3

to address https://github.com/sphinx-doc/sphinx/issues/3620, we need to
use sphinx with its fix at
https://github.com/sphinx-doc/sphinx/commit/e049f86b2de1cfdf8a74c88dc9593d047c85d5cb
in other words, we need to use sphinx v2.0.0 and up. but sphinx 2.0
requires python >= 3.5, so we have to use python3 for building the
documents.

in this change:

* doc-requirements.txt: install python3 packages on debian derivatives
* build-doc: install python3.6 packages from EPEL7, and use python3
  venv for using sphinx2
* doc-requirements.txt: bump up all python packages to latest
  stable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ace8cb15a600daf5261c0ab349b43010a238a1d9)

Conflicts:
admin/doc-requirements.txt

5 years agoMerge pull request #30070 from smithfarm/wip-40139-mimic
Nathan Cutler [Tue, 1 Oct 2019 12:36:34 +0000 (14:36 +0200)]
Merge pull request #30070 from smithfarm/wip-40139-mimic

mimic: doc: describe metadata_heap cleanup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29039 from dcasier/wip-40100-mimic
Alfredo Deza [Tue, 1 Oct 2019 11:42:49 +0000 (07:42 -0400)]
Merge pull request #29039 from dcasier/wip-40100-mimic

mimic: ceph-volume: lvm.activate: Return an error if WAL/DB devices absent

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agorbd: fixed memory leak in 'rbd mirror pool' multi-image actions 28125/head
Jason Dillaman [Thu, 18 Apr 2019 17:20:17 +0000 (13:20 -0400)]
rbd: fixed memory leak in 'rbd mirror pool' multi-image actions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ba52f4297f4ad96e8b4db5d24e2e73e4b303fda9)

5 years agolibrbd: async open/close should free ImageCtx before issuing callback
Jason Dillaman [Thu, 18 Apr 2019 17:17:56 +0000 (13:17 -0400)]
librbd: async open/close should free ImageCtx before issuing callback

The destructor for ImageCtx attempts to access librados::IoCtx objects
that might have been destroyed immediately after the async open (failure)
and close actions completed.

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

Conflicts:
src/librbd/io/AioCompletion.cc: assert->ceph_assert confict

5 years agoMerge pull request #29257 from smithfarm/wip-39602-mimic
Nathan Cutler [Tue, 1 Oct 2019 11:27:50 +0000 (13:27 +0200)]
Merge pull request #29257 from smithfarm/wip-39602-mimic

mimic: doc: rgw: CreateBucketConfiguration for s3 PUT Bucket request

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30555 from alfredodeza/mimic-guits-41392
Alfredo Deza [Mon, 30 Sep 2019 13:24:01 +0000 (09:24 -0400)]
Merge pull request #30555 from alfredodeza/mimic-guits-41392

mimic ceph-volume: do not fail when trying to remove crypt mapper

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #30096 from jan--f/wip-41612-mimic
Alfredo Deza [Fri, 27 Sep 2019 14:45:02 +0000 (10:45 -0400)]
Merge pull request #30096 from jan--f/wip-41612-mimic

mimic: ceph-volume: minor optimizations related to class Volumes's use

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoqa: avoid hexdump skip and length options 30569/head
Ilya Dryomov [Fri, 20 Sep 2019 19:01:09 +0000 (21:01 +0200)]
qa: avoid hexdump skip and length options

On Debian-based distros, hexdump(1) comes from FreeBSD in bsdmainutils
package (other distros ship a Linux version from util-linux).  It turns
out that '-s skip' for anything but a regular file has been broken for
ages in FreeBSD -- instead of calling fseek(), it consumed the input
byte by byte with getchar().  This was fixed in commit 7cd5ae492557
"hexdump(1): Speed up -s flag on devices" last year, but it hasn't made
it to the Debian world yet.

bsdmainutils_9.0.6ubuntu3 in xenial had a custom patch for that, but
it's no longer there in bsdmainutils_11.1.2ubuntu1 in bionic.  hexdump
-s <large offset> is now a fancy infinite loop!

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d1b69136b04a20e9b4a481f0dfbe281f9cf61b1c)

5 years agoceph-volume: do not fail when trying to remove crypt mapper 30555/head
Guillaume Abrioux [Fri, 20 Sep 2019 12:57:58 +0000 (14:57 +0200)]
ceph-volume: do not fail when trying to remove crypt mapper

In a containerized context, at some point, need to run `simple scan` on a device
from a separate container (not the existing and running corresponding container
to that device), but this can't work because when it tries to remove the
mapper which is still in use by the corresponding running osd container,
it fails.
This can be a bit more permissive and simply throw a warning.

Closes: https://tracker.ceph.com/issues/41392
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 80d3e4ca054b4d1334c2fb99fede46ab54ca4305)

5 years agomgr/dashboard: RGW proxy can't handle self-signed certificates 30543/head
Volker Theile [Fri, 3 Aug 2018 06:48:00 +0000 (08:48 +0200)]
mgr/dashboard: RGW proxy can't handle self-signed certificates

Fixes tracker.ceph.com/issues/24677

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 670522ee310cd9ac816e4db9e204498901bd7590)

5 years agoMerge pull request #30303 from alfredodeza/mimic-ceph-volume-zap-fix
Alfredo Deza [Mon, 23 Sep 2019 18:48:00 +0000 (14:48 -0400)]
Merge pull request #30303 from alfredodeza/mimic-ceph-volume-zap-fix

mimic ceph-volume lvm.zap fix cleanup for db partitions

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
5 years agomon: show pool id in pool ls command 30485/head
Chang Liu [Tue, 11 Jun 2019 11:33:23 +0000 (19:33 +0800)]
mon: show pool id in pool ls command

Fixes: http://tracker.ceph.com/issues/40287
Signed-off-by: Chang Liu <liuchang0812@gmail.com>
(cherry picked from commit 0b44a2d22bfee66dcdedfb77fffdccf7eb9e39b8)

5 years agomon: ensure prepare_failure() marks no_reply on op 30481/head
Joao Eduardo Luis [Mon, 20 May 2019 12:18:35 +0000 (13:18 +0100)]
mon: ensure prepare_failure() marks no_reply on op

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
(cherry picked from commit 75ec26d78dfff1ce3b668e08d6a6a3cf05fe07de)

5 years agoMerge pull request #30334 from jan--f/wip-disjoint-device-lists-mimic
Alfredo Deza [Thu, 19 Sep 2019 20:49:59 +0000 (16:49 -0400)]
Merge pull request #30334 from jan--f/wip-disjoint-device-lists-mimic

mimic: ceph-volume: ensure device lists are disjoint

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoMerge pull request #30333 from jan--f/wip-41762-mimic
Alfredo Deza [Thu, 19 Sep 2019 16:36:43 +0000 (12:36 -0400)]
Merge pull request #30333 from jan--f/wip-41762-mimic

mimic: ceph-volume: implement __format__ in Size to format sizes in py3

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agomgr/localpool: pg_num is an int arg to 'osd pool create' 30447/head
Sage Weil [Wed, 8 Aug 2018 01:43:49 +0000 (20:43 -0500)]
mgr/localpool: pg_num is an int arg to 'osd pool create'

In bd565bca3f42d7946c392b2833bb3d9982a8ac5d we start returning EINVAL if
the pg_num argument is not valid, whereas before it was silently ignored.

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

5 years agomgr: do not reset reported if a new metric is not collected 30391/head
Ilsoo Byun [Tue, 10 Sep 2019 09:13:02 +0000 (18:13 +0900)]
mgr: do not reset reported if a new metric is not collected

Fixes: https://tracker.ceph.com/issues/41741
Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit 02cc60f6935a5005aa461da183c6c4332503be83)

5 years agoMerge pull request #30295 from alfredodeza/mimic-rm41378-2
Alfredo Deza [Thu, 12 Sep 2019 10:54:59 +0000 (06:54 -0400)]
Merge pull request #30295 from alfredodeza/mimic-rm41378-2

mimic ceph-volume: pre-install python-apt and its variants before test runs

5 years agoMerge pull request #30301 from alfredodeza/mimic-rm41660
Alfredo Deza [Thu, 12 Sep 2019 10:54:22 +0000 (06:54 -0400)]
Merge pull request #30301 from alfredodeza/mimic-rm41660

mimic ceph-volume: fix stderr failure to decode/encode when redirected

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #30306 from alfredodeza/mimic-rm40664
Jan Fajerski [Thu, 12 Sep 2019 10:05:39 +0000 (12:05 +0200)]
Merge pull request #30306 from alfredodeza/mimic-rm40664

mimic ceph-volume  zap always skips block.db, leaves them around

5 years agoceph-volume: don't keep device lists as sets 30334/head
Jan Fajerski [Thu, 15 Aug 2019 10:20:00 +0000 (12:20 +0200)]
ceph-volume: don't keep device lists as sets

This was introduced by #27754. The explicit device lists were cast to
sets but other parts of the code where not updated accordingly. To avoid
touching all code places, only cast to sets for disjoint test and keep
lists otherwise.

Fixes: https://tracker.ceph.com/issues/41292
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 0534cf188a671096d5ddb9d48cdae3dccc6c0b18)

5 years agoceph-volume: batch ensure device lists are disjoint
Jan Fajerski [Thu, 11 Apr 2019 14:58:32 +0000 (16:58 +0200)]
ceph-volume: batch ensure device lists are disjoint

Fixes: https://tracker.ceph.com/issues/41018
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 8fcdb4d628f3a55e4783f0a3df7ac7c0a36eaa43)

5 years agoceph-volume: implement __format__ in Size to format sizes in py3 30333/head
Jan Fajerski [Wed, 13 Feb 2019 12:48:55 +0000 (13:48 +0100)]
ceph-volume: implement __format__ in Size to format sizes in py3

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

5 years agoceph-volume tests: verify that wipefs tries several times 30306/head
Alfredo Deza [Thu, 11 Jul 2019 15:56:07 +0000 (11:56 -0400)]
ceph-volume tests: verify that wipefs tries several times

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

5 years agoceph-volume lvm.zap: retry wipefs several times to prevent race condition failures
Alfredo Deza [Thu, 11 Jul 2019 13:34:10 +0000 (09:34 -0400)]
ceph-volume lvm.zap: retry wipefs several times to prevent race condition failures

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

5 years agoceph-volume lvm.zap fix cleanup for db partitions 30303/head
Dominik Csapak [Tue, 28 May 2019 14:29:21 +0000 (16:29 +0200)]
ceph-volume lvm.zap fix cleanup for db partitions

this uses the correct type 'db' for db type partitions, else
a block.db parition does not get cleaned up by ceph-volume zap

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
(cherry picked from commit 140af8a7eee8d230ac9d94ba100320a20c137a12)

5 years agoceph-volume tests create a test file for checking unicode output 30301/head
Alfredo Deza [Mon, 9 Sep 2019 22:55:13 +0000 (18:55 -0400)]
ceph-volume tests create a test file for checking unicode output

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