]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agomgr/prometheus: report per-pool pg states 33158/head
Aleksei Zakharov [Fri, 20 Dec 2019 10:40:44 +0000 (13:40 +0300)]
mgr/prometheus: report per-pool pg states

This commit adds per-pool pg states metrics
with unique 'pool_id' label.

Signed-off-by: Aleksei Zakharov <zakharov.a.g@yandex.ru>
(cherry picked from commit 8fb16e43e6a21989ee6f0a45551d65f740011595)

 Conflicts:
src/pybind/mgr/prometheus/module.py

5 years agoMerge PR #33130 into mimic
Sage Weil [Fri, 7 Feb 2020 19:53:34 +0000 (13:53 -0600)]
Merge PR #33130 into mimic

* refs/pull/33130/head:
mimic: common/config: parse --log-early but ignore it

5 years agomimic: common/config: parse --log-early but ignore it 33130/head
Sage Weil [Fri, 7 Feb 2020 17:48:02 +0000 (11:48 -0600)]
mimic: common/config: parse --log-early but ignore it

Ideally we woudl backport 933d5084cb66f299a7bf60f0a2a6382c0bd3cb2f, but
it does not apply cleanly to mimic.  Among other things, we modifies
behavior that changed in cd6a5b9c40779956629803f222c365bdb291a169 and
the related commits, which is non-trivial and not worth backporting.

We want this in mimic anyway because ceph_manager.py is now passing it
for all of the raw_cluster_cmds, and it would be even more awkward to
make that behavior conditional on version.

Fixes: https://tracker.ceph.com/issues/43946
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33124 from jan--f/wip-42897-mimic
Jan Fajerski [Fri, 7 Feb 2020 17:33:39 +0000 (18:33 +0100)]
Merge pull request #33124 from jan--f/wip-42897-mimic

mimic: ceph-volume: make get_devices fs location independent

5 years agoMerge pull request #32528 from jan--f/wip-42704-mimic
Jan Fajerski [Fri, 7 Feb 2020 15:11:56 +0000 (16:11 +0100)]
Merge pull request #32528 from jan--f/wip-42704-mimic

mimic: ceph-volume: reject disks smaller then 5GB in inventory

5 years agoMerge pull request #32557 from shyukri/wip-43023-mimic
Jan Fajerski [Fri, 7 Feb 2020 14:09:05 +0000 (15:09 +0100)]
Merge pull request #32557 from shyukri/wip-43023-mimic

mimic: ceph-volume: minor clean-up of "simple scan" subcommand help

5 years agoMerge pull request #32559 from shyukri/wip-43276-mimic
Jan Fajerski [Fri, 7 Feb 2020 14:08:26 +0000 (15:08 +0100)]
Merge pull request #32559 from shyukri/wip-43276-mimic

mimic: ceph-volume/test: patch VolumeGroups

5 years agoceph-volume: refactor tests for refactored get_devices 33124/head
Jan Fajerski [Mon, 11 Nov 2019 13:35:43 +0000 (14:35 +0100)]
ceph-volume: refactor tests for refactored get_devices

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

5 years agoceph-volume: refactor get_devices, don't use os.path.realpath
Jan Fajerski [Fri, 8 Nov 2019 15:36:30 +0000 (16:36 +0100)]
ceph-volume: refactor get_devices, don't use os.path.realpath

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

5 years agoceph-volume: reject disks smaller then 5GB in inventory 32528/head
Jan Fajerski [Mon, 15 Jul 2019 08:33:45 +0000 (10:33 +0200)]
ceph-volume: reject disks smaller then 5GB in inventory

Volumes smaller than 5GB won't be created anyway. This also guards
against drives with size 0, as can happen in mdraid setups.

Fixes: http://tracker.ceph.com/issues/40776
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 34bd75a942daff305789c9ccd378f99e05ae1434)

5 years agoMerge pull request #32544 from jan--f/c-v-backport-pr27282
Jan Fajerski [Tue, 21 Jan 2020 14:08:16 +0000 (15:08 +0100)]
Merge pull request #32544 from jan--f/c-v-backport-pr27282

mimic: ceph-volume: add utility functions

5 years agoMerge pull request #32598 from trociny/wip-43498-mimic
Yuri Weinstein [Mon, 20 Jan 2020 20:01:50 +0000 (12:01 -0800)]
Merge pull request #32598 from trociny/wip-43498-mimic

mimic: rbd-mirror: make logrotate work

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32361 from dzafman/wip-41255-mimic
Yuri Weinstein [Mon, 20 Jan 2020 20:01:23 +0000 (12:01 -0800)]
Merge pull request #32361 from dzafman/wip-41255-mimic

mimic: osd: backfill_toofull seen on cluster where the most full OSD is at 1%

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31957 from dzafman/wip-balancer3-mimic
Yuri Weinstein [Mon, 20 Jan 2020 20:00:16 +0000 (12:00 -0800)]
Merge pull request #31957 from dzafman/wip-balancer3-mimic

mimic: mgr: Release GIL and Balancer fixes

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31847 from smithfarm/wip-42990-mimic
Yuri Weinstein [Mon, 20 Jan 2020 19:58:49 +0000 (11:58 -0800)]
Merge pull request #31847 from smithfarm/wip-42990-mimic

mimic: tests: kernel.sh: update for read-only changes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31557 from jan--f/wip-42765-mimic
Jan Fajerski [Mon, 20 Jan 2020 10:23:21 +0000 (11:23 +0100)]
Merge pull request #31557 from jan--f/wip-42765-mimic

mimic: mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or bluestore

5 years agologrotate: also sighup rbd-mirror 32598/head
Mykola Golub [Tue, 31 Dec 2019 10:01:31 +0000 (10:01 +0000)]
logrotate: also sighup rbd-mirror

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

Conflicts:
src/cephadm/cephadm (does not exist)

5 years agorbd-mirror: reopen all contexts logs on SIGHUP
Mykola Golub [Tue, 31 Dec 2019 09:57:15 +0000 (09:57 +0000)]
rbd-mirror: reopen all contexts logs on SIGHUP

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

Conflicts:
src/tools/rbd_mirror/Mirror.cc (std::lock_guard vs Mutex::Locker, ceph_abort_msgf does not exist)
src/tools/rbd_mirror/PoolReplayer.cc (std::lock_guard vs Mutex::Locker)

5 years agorbd-mirror: delay local/remote rados initialization until context created
Mykola Golub [Sun, 5 Jan 2020 09:10:24 +0000 (09:10 +0000)]
rbd-mirror: delay local/remote rados initialization until context created

We rely on that if a rados ref is initialized it contains the
valid context.

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

5 years agomgr: Change default upmap_max_deviation to 5 31957/head
David Zafman [Sat, 14 Dec 2019 01:43:44 +0000 (17:43 -0800)]
mgr: Change default upmap_max_deviation to 5

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

Conflicts:
src/pybind/mgr/balancer/module.py (default isn't in COMMANDS section)
        qa/standalone/mgr/balancer.sh (setting upmap_max_deviations to 1 differ)

5 years agoosdmaptool: Add --upmap-active to simulate active upmap balancing
David Zafman [Wed, 18 Dec 2019 19:27:02 +0000 (11:27 -0800)]
osdmaptool: Add --upmap-active to simulate active upmap balancing

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

Conflicts:
src/test/cli/osdmaptool/help.t (some options not present)
src/tools/osdmaptool.cc (ceph_assert is assert here)

5 years agodoc: Add upmap options to osdmaptool man page and give example
David Zafman [Wed, 18 Dec 2019 03:38:51 +0000 (19:38 -0800)]
doc: Add upmap options to osdmaptool man page and give example

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

5 years agotools: osdmaptool document non-upmap options that were missing
David Zafman [Wed, 18 Dec 2019 01:35:14 +0000 (17:35 -0800)]
tools: osdmaptool document non-upmap options that were missing

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

Conflicts:
doc/man/8/osdmaptool.rst (missing other options not part of this)

5 years agoceph-volume/test: patch VolumeGroups 32559/head
Jan Fajerski [Tue, 3 Dec 2019 15:42:18 +0000 (16:42 +0100)]
ceph-volume/test: patch VolumeGroups

In ceph_volume/tests/devices/lvm/strategies/test_bluestore.py the test
TestMixedType.test_filter_all_data_devs must patch VolumeGroups.

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

5 years agoceph-volume: minor clean-up of `simple scan` subcommand help 32557/head
Michael Fritch [Fri, 22 Nov 2019 18:56:29 +0000 (11:56 -0700)]
ceph-volume: minor clean-up of `simple scan` subcommand help

Fixes: https://tracker.ceph.com/issues/43017
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 0d7b61d20423aeba842e0685428c42aa9000a88a)

5 years agoceph-volume: add test for create_lv using a PV 32544/head
Mohamad Gebai [Tue, 2 Apr 2019 10:51:14 +0000 (06:51 -0400)]
ceph-volume: add test for create_lv using a PV

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 90d296b302e74b59fc67c395b4d08537e2d37a1e)

5 years agoceph-volume: add tests for tags
Mohamad Gebai [Tue, 2 Apr 2019 10:44:10 +0000 (06:44 -0400)]
ceph-volume: add tests for tags

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit c88a6a8ad38410c60ea4945b46da6b3d458c0ff6)

5 years agoceph-volume: add tests for reduce_vg()
Mohamad Gebai [Mon, 1 Apr 2019 23:27:41 +0000 (19:27 -0400)]
ceph-volume: add tests for reduce_vg()

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 1f07776615b7bba5eacf34a8c9fa62c06a57eb4b)

5 years agoceph-volume: add tests for size_from_human_readable()
Mohamad Gebai [Mon, 1 Apr 2019 23:24:42 +0000 (19:24 -0400)]
ceph-volume: add tests for size_from_human_readable()

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 6e3b5306140a433667d1be95df2eba0b57d95ae9)

5 years agoceph-volume: add function to convert from a readable string to Size
Mohamad Gebai [Sun, 31 Mar 2019 17:06:43 +0000 (13:06 -0400)]
ceph-volume: add function to convert from a readable string to Size

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 50428062175623d561be01a8124e010a61221845)

5 years agoMerge pull request #32530 from jan--f/wip-42754-mimic
Jan Fajerski [Wed, 8 Jan 2020 08:59:28 +0000 (09:59 +0100)]
Merge pull request #32530 from jan--f/wip-42754-mimic

mimic: ceph-volume: allow to skip restorecon calls

5 years agoMerge pull request #32529 from jan--f/wip-42752-mimic
Jan Fajerski [Wed, 8 Jan 2020 08:56:04 +0000 (09:56 +0100)]
Merge pull request #32529 from jan--f/wip-42752-mimic

mimic: ceph-volume: add proper size attribute to partitions

5 years agoceph-volume tests validate restorecon skip calls 32530/head
Alfredo Deza [Tue, 5 Nov 2019 16:51:35 +0000 (11:51 -0500)]
ceph-volume tests validate restorecon skip calls

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

5 years agoceph-volume util.system allow skipping restorecon calls
Alfredo Deza [Tue, 5 Nov 2019 16:51:16 +0000 (11:51 -0500)]
ceph-volume util.system allow skipping restorecon calls

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

5 years agoceph-volume: add proper size attribute to partitions 32529/head
Jan Fajerski [Fri, 8 Nov 2019 16:54:00 +0000 (17:54 +0100)]
ceph-volume: add proper size attribute to partitions

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

5 years agoMerge pull request #31552 from jan--f/wip-42740-mimic
Jan Fajerski [Tue, 7 Jan 2020 15:34:02 +0000 (16:34 +0100)]
Merge pull request #31552 from jan--f/wip-42740-mimic

mimic: ceph-volume: use fsync for dd command

5 years agoceph-volume: use fsync for dd command 31552/head
Rishabh Dave [Fri, 8 Nov 2019 07:04:27 +0000 (12:34 +0530)]
ceph-volume: use fsync for dd command

fsync makes sure that data and metadata is actually written to device
being zapped before finishing.

Fixes: https://tracker.ceph.com/issues/39156
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 060f54960c3d2d800b28525ba8774a60578f67a8)

5 years agoMerge pull request #31407 from smithfarm/wip-42533-mimic
Jan Fajerski [Tue, 7 Jan 2020 08:46:45 +0000 (09:46 +0100)]
Merge pull request #31407 from smithfarm/wip-42533-mimic

mimic: ceph-volume: rearrange api/lvm.py

5 years agoMerge pull request #31406 from smithfarm/wip-42534-mimic
Jan Fajerski [Tue, 7 Jan 2020 08:46:29 +0000 (09:46 +0100)]
Merge pull request #31406 from smithfarm/wip-42534-mimic

mimic: ceph-volume: mokeypatch calls to lvm related binaries

5 years agoosd: Rename backfill reservation reject names to reflect too full use 32361/head
David Zafman [Fri, 23 Aug 2019 15:54:28 +0000 (08:54 -0700)]
osd: Rename backfill reservation reject names to reflect too full use

The only reason for a reject is in a too full condition.  Now that we
have two types of revoke, let's make this clearer.

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

Conflicts:
src/osd/PeeringEvent.h
- file does not exist in nautilus due to refactoring: made the changes manually to src/osd/PGPeeringEvent.h
src/osd/PeeringState.cc
src/osd/PeeringState.h
- files do not exist in nautilus due to refactoring: made the changes manually to src/osd/PG.{cc,h}
  by doing:
      s/RejectRemoteReservation/RejectTooFullRemoteReservation/g
      s/RemoteReservationRejected/RemoteReservationRejectedTooFull/g

5 years agoosd: Rename MBackfillReserve::TOOFULL to what it does in particular (revoke)
David Zafman [Thu, 22 Aug 2019 17:30:01 +0000 (10:30 -0700)]
osd: Rename MBackfillReserve::TOOFULL to what it does in particular (revoke)

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

Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus due to refactoring: made the changes manually
  to src/osd/PG.cc

5 years agoosd: Don't set backfill_toofull in RemoteReservationRevoked path
David Zafman [Fri, 23 Aug 2019 15:52:39 +0000 (08:52 -0700)]
osd: Don't set backfill_toofull in RemoteReservationRevoked path

We shouldn't set backfill_toofull when a revoke occurs in the non-toofull
case.

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

Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus due to refactoring: made the changes manually
  to src/osd/PG.cc
- no "DECLARE_LOCALS" in nautilus

5 years agoMerge pull request #32214 from smithfarm/wip-43235-mimic
Yuri Weinstein [Wed, 18 Dec 2019 19:40:14 +0000 (11:40 -0800)]
Merge pull request #32214 from smithfarm/wip-43235-mimic

mimic: tests: radosgw-admin: remove dependency on bunch package

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #32255 from ideepika/wip-43315-mimic
Nathan Cutler [Wed, 18 Dec 2019 11:22:44 +0000 (12:22 +0100)]
Merge pull request #32255 from ideepika/wip-43315-mimic

mimic: doc: wrong datatype describing crush_rule

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32228 from alimaredia/wip-s3-tests-branch-name-refactor-mimic
Yuri Weinstein [Tue, 17 Dec 2019 20:21:45 +0000 (12:21 -0800)]
Merge pull request #32228 from alimaredia/wip-s3-tests-branch-name-refactor-mimic

mimic: update s3-test download code for s3-test tasks

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agomimic: update s3-test download code for s3-test tasks 32228/head
Ali Maredia [Mon, 25 Nov 2019 02:30:03 +0000 (21:30 -0500)]
mimic: update s3-test download code for s3-test tasks

Fixes: https://tracker.ceph.com/issues/43077
- Ensure the download code for all tasks running
s3-tests is consistent.
- Simplify download code to only use the config
variable 'force-branch' for the branch being
cloned.
- Make ceph-mimic the force-branch for all
suites using s3-tests.
- Add force-branch to suites running s3readwrite
& s3roundtrip tasks

Signed-off-by: Ali Maredia <amaredia@redhat.com>
5 years agodoc/rados/operations: crush_rule is a name 32255/head
Kefu Chai [Sat, 27 Jul 2019 13:35:37 +0000 (21:35 +0800)]
doc/rados/operations: crush_rule is a name

like
```
ceph osd pool set <pool-name> crush_rule <rule-name>
```
where `<rule-name>` is a string instead of a number.

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

5 years agoMerge pull request #32249 from neha-ojha/wip-32197-mimic
Neha Ojha [Fri, 13 Dec 2019 19:12:05 +0000 (11:12 -0800)]
Merge pull request #32249 from neha-ojha/wip-32197-mimic

mimic: doc/_templates/page.html: redirect to etherpad

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agodoc/_templates/page.html: redirect to etherpad 32249/head
Neha [Thu, 12 Dec 2019 04:21:04 +0000 (04:21 +0000)]
doc/_templates/page.html: redirect to etherpad

This simplifies things for users who are not able to add cards to
https://github.com/ceph/ceph/projects/4 due to insufficient permissions.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 066981dedbca161fba85d368d86c8ca15bfe0fac)

5 years ago13.2.8 v13.2.8
Jenkins Build Slave User [Thu, 12 Dec 2019 21:09:43 +0000 (21:09 +0000)]
13.2.8

5 years agoqa: radosgw-admin: remove dependency on bunch package 32214/head
Yehuda Sadeh [Sat, 7 Dec 2019 09:12:19 +0000 (01:12 -0800)]
qa: radosgw-admin: remove dependency on bunch package

Fixes: https://tracker.ceph.com/issues/43184
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 1bf21326aa7f8eaafd7049b44eb73aeb36bcc5d7)

5 years agorelease note: Add pending release notes for already merged code
David Zafman [Thu, 5 Dec 2019 17:52:04 +0000 (09:52 -0800)]
release note: Add pending release notes for already merged code

Follow on to https://github.com/ceph/ceph/pull/31774

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

5 years agoMerge pull request #32087 from yuriw/wip-yuriw-p2p-mimic
Yuri Weinstein [Sat, 7 Dec 2019 20:59:20 +0000 (12:59 -0800)]
Merge pull request #32087 from yuriw/wip-yuriw-p2p-mimic

qa/tests: added missing ponit release versions

5 years agoqa/tests: added missing pnoit release versions 32087/head
Yuri Weinstein [Fri, 6 Dec 2019 15:30:33 +0000 (07:30 -0800)]
qa/tests: added missing pnoit release versions

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #32033 from cbodley/wip-qa-swift-mimic
Yuri Weinstein [Thu, 5 Dec 2019 20:37:51 +0000 (12:37 -0800)]
Merge pull request #32033 from cbodley/wip-qa-swift-mimic

qa/rgw: add missing force-branch: ceph-mimic for swift tasks

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #32000 from smithfarm/wip-43119-mimic
Yuri Weinstein [Thu, 5 Dec 2019 20:15:57 +0000 (12:15 -0800)]
Merge pull request #32000 from smithfarm/wip-43119-mimic

mimic: osd: fix sending incremental map messages (more)

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoqa/rgw: add missing force-branch: ceph-mimic for swift tasks 32033/head
Casey Bodley [Thu, 5 Dec 2019 16:21:49 +0000 (11:21 -0500)]
qa/rgw: add missing force-branch: ceph-mimic for swift tasks

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agotest: Fix test to use -gt instead of creating an empty file "0"
David Zafman [Sat, 18 Aug 2018 00:25:38 +0000 (17:25 -0700)]
test: Fix test to use -gt instead of creating an empty file "0"

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

5 years agotest balancer: Backport specific fixes
David Zafman [Tue, 3 Dec 2019 18:13:46 +0000 (10:13 -0800)]
test balancer: Backport specific fixes

Add "ceph balancer sleep" command to set balancer sleep_interval for testing
Remove unavailable "ceph balancer pool" part of testing
Remove setting of nonexistant osd_pool_default_pg_autoscale_mode
Improve balancer module log message
Fix log message test (no pg merging)
Pool balancing isn't grouped by rule, so results different here

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoqa/standalone/ceph-helpers.sh: fix mgr module path
Noah Watkins [Fri, 17 Aug 2018 22:21:57 +0000 (15:21 -0700)]
qa/standalone/ceph-helpers.sh: fix mgr module path

callers of get_python_path were not passing in a $1 parameter, so
ceph_lib was an empty string resulting in an invalid path to the built
cython modules. assume this is called from the `lib` parent directory.

pass path to the manager modules when starting ceph-mgr.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>
(cherry picked from commit 7d3fa9bda3b0160c872e388c9f75cd1cabf9d4b5)

5 years agoosd: do not send peers really old maps 32000/head
Sage Weil [Fri, 15 Feb 2019 14:43:23 +0000 (08:43 -0600)]
osd: do not send peers really old maps

We may receive a message that sat in a queue for a while with a low
priority and is tagged with an older epoch.  Don't send a bunch of old
maps that we have already sent the peer.

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

5 years agoosd: build_incremental_map_msg: recover if we are missing an incremental
Sage Weil [Fri, 15 Feb 2019 14:28:07 +0000 (08:28 -0600)]
osd: build_incremental_map_msg: recover if we are missing an incremental

If we are building a history and are missing an incremental, continue with
a full map in its place.

Generally speaking, an OSD should *always* have a full map stored, but
may not have the corresponding incremental for various reasons.

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

5 years agoosd: build_incremental_map_msg: behave if we have latest full but not incremental
Sage Weil [Fri, 15 Feb 2019 14:25:19 +0000 (08:25 -0600)]
osd: build_incremental_map_msg: behave if we have latest full but not incremental

Fixes 47a3f63ef71522d6b9572e81674598dd3e19df9d and
follow-on 57a13adc8d0e34b4bb1a4022eacbb3de2636df53

Fixes: http://tracker.ceph.com/issues/38330
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e861f03b943653a1b3f595d31e1f25a482a9482b)

5 years agotools/osdmaptool.cc: do not use deprecated std::random_shuffle()
Kefu Chai [Wed, 4 Dec 2019 00:06:40 +0000 (16:06 -0800)]
tools/osdmaptool.cc: do not use deprecated std::random_shuffle()
the use of `std::random_shuffle()` was introduced by
b946308 .

in this change, it is replaced using `std::shuffle()`.

Fixes: https://tracker.ceph.com/issues/43084
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 30dfef208d859a67c1f1b13c314735861c536e85)

Conflicts:
src/tools/osdmaptool.cc (randomizing pools here instead of rules)

5 years agotest: Add test case based on Xie script in commit comment
David Zafman [Wed, 27 Nov 2019 18:50:01 +0000 (10:50 -0800)]
test: Add test case based on Xie script in commit comment

Other test fixes to reflect changes

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

Conflict:
src/test/cli/osdmaptool/upmap-out.t (older output format)
src/test/cli/osdmaptool/upmap.t (older output format)

5 years agoosd: ceph_pg_upmaps() use any overfull when there are still underfull
David Zafman [Wed, 27 Nov 2019 18:48:30 +0000 (10:48 -0800)]
osd: ceph_pg_upmaps() use any overfull when there are still underfull

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

5 years agoosd: Create more_underfull with below target that aren't in underfull
David Zafman [Tue, 26 Nov 2019 23:19:01 +0000 (15:19 -0800)]
osd: Create more_underfull with below target that aren't in underfull

Use more_underfull for finding remaps for overfull OSDs

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

5 years agoosd/OSDMap.cc: don't output over/underfull messages to lderr
Neha Ojha [Mon, 11 Nov 2019 21:32:15 +0000 (13:32 -0800)]
osd/OSDMap.cc: don't output over/underfull messages to lderr

There can be cases where overfull and underfull(see example in
https://tracker.ceph.com/issues/42756) will be empty, which is not
necessarily an error. These error messages can end up spamming
the ceph-mgr log.

Fixes: https://tracker.ceph.com/issues/42756
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 3cf28f09a2ebdd922fc5c1d29c65469f8331e741)

5 years agoosd: calc_pg_upmaps() pick most overfull remap from try_pg_upmap()
David Zafman [Tue, 26 Nov 2019 05:38:16 +0000 (21:38 -0800)]
osd: calc_pg_upmaps() pick most overfull remap from try_pg_upmap()

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

5 years agoosd: ceph_pg_upmaps() use max_deviation to determine perfect distribution
David Zafman [Fri, 15 Nov 2019 05:10:28 +0000 (21:10 -0800)]
osd: ceph_pg_upmaps() use max_deviation to determine perfect distribution

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

Conflicts:
src/pybind/mgr/balancer/module.py (upmap_max_deviation config option
   handled differently)

5 years agotools: osdmaptool: Perform upmap calculation as ceph-mgr does
David Zafman [Thu, 7 Nov 2019 04:32:48 +0000 (20:32 -0800)]
tools: osdmaptool: Perform upmap calculation as ceph-mgr does

This is the backportable commit that works with older balancer module.py

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

5 years agoosd: For balancer crush needs the rule passed to get_parent_of_type()
David Zafman [Wed, 20 Nov 2019 06:21:00 +0000 (22:21 -0800)]
osd: For balancer crush needs the rule passed to get_parent_of_type()

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

5 years agoosdmaptool: Match default max value of 10
David Zafman [Thu, 7 Nov 2019 04:31:21 +0000 (20:31 -0800)]
osdmaptool: Match default max value of 10

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

5 years agotools: odsmaptool truncate target upmap file
David Zafman [Wed, 20 Nov 2019 19:55:15 +0000 (11:55 -0800)]
tools: odsmaptool truncate target upmap file

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

5 years agomgr: Improve balancer module status
David Zafman [Thu, 24 Oct 2019 00:00:14 +0000 (17:00 -0700)]
mgr: Improve balancer module status

Add balancer status fields so that slow optimizations can be detected

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

5 years agotest: Test balancer module commands
David Zafman [Wed, 23 Oct 2019 23:38:48 +0000 (16:38 -0700)]
test: Test balancer module commands

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

5 years agomgr: Release GIL before calling OSDMap::calc_pg_upmaps()
David Zafman [Tue, 22 Oct 2019 22:24:05 +0000 (15:24 -0700)]
mgr: Release GIL before calling OSDMap::calc_pg_upmaps()

Prevent optimize and execute commands from running with active balancer

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

Conflicts:
src/pybind/mgr/balancer/module.py (trivial)
src/test/cli-integration/balancer/misplaced.t (doesn't exist)

5 years agoqa: kernel.sh: update for read-only changes 31847/head
Ilya Dryomov [Mon, 18 Nov 2019 17:15:10 +0000 (18:15 +0100)]
qa: kernel.sh: update for read-only changes

Snapshot existence validation code was removed from krbd.  It was racy
and relied on having watch established for snapshots.

Fixes: https://tracker.ceph.com/issues/42916
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 6fb544045e743c5dc73dac2f62aeeb964dcd62bc)

5 years ago13.2.7 v13.2.7
Jenkins Build Slave User [Wed, 20 Nov 2019 17:36:35 +0000 (17:36 +0000)]
13.2.7

5 years agoMerge pull request #31659 from neha-ojha/wip-29704-mimic
Neha Ojha [Fri, 15 Nov 2019 19:01:02 +0000 (11:01 -0800)]
Merge pull request #31659 from neha-ojha/wip-29704-mimic

mimic: ceph-objectstore-tool: return 0 if incmap is sane

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31640 from yuriw/wip-yuriw-42802-mimic
Yuri Weinstein [Fri, 15 Nov 2019 14:59:17 +0000 (06:59 -0800)]
Merge pull request #31640 from yuriw/wip-yuriw-42802-mimic

qa/tests: Removed s3tests !

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoceph-objectstore-tool: return 0 if incmap is sane 31659/head
Kefu Chai [Fri, 16 Aug 2019 11:09:24 +0000 (19:09 +0800)]
ceph-objectstore-tool: return 0 if incmap is sane

this change addresses the regression introduced by 2e2414b3

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

5 years agoqa/tests: Removed s3tests ! 31640/head
Yuri Weinstein [Thu, 14 Nov 2019 15:56:43 +0000 (07:56 -0800)]
qa/tests: Removed s3tests !

Fixes: https://tracker.ceph.com/issues/42802
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #31615 from jan--f/wip-42801-mimic
Alfredo Deza [Wed, 13 Nov 2019 16:26:13 +0000 (11:26 -0500)]
Merge pull request #31615 from jan--f/wip-42801-mimic

mimic: ceph-volume: assume msgrV1 for all branches containing mimic

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoceph-volume: assume msgrV1 for all branches containing mimic 31615/head
Jan Fajerski [Wed, 13 Nov 2019 09:13:01 +0000 (10:13 +0100)]
ceph-volume: assume msgrV1 for all branches containing mimic

With nautilus and newer OSDs listen on v1 ports and v2 ports. Assume
that if mimic (or luminous) occur in the branch name, the OSDs are
running msgrv1 only.

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

5 years agoMerge pull request #31485 from smithfarm/wip-42702-mimic
Nathan Cutler [Tue, 12 Nov 2019 16:12:05 +0000 (17:12 +0100)]
Merge pull request #31485 from smithfarm/wip-42702-mimic

mimic: test/cls_rbd: removed mirror peer pool test cases

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agomgr/prometheus: initializing osd_dev_node = None 31557/head
jiahuizeng [Fri, 25 Oct 2019 09:45:09 +0000 (17:45 +0800)]
mgr/prometheus: initializing osd_dev_node = None

Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit d7e84a0be1d6113d527a3b525647041775f643e2)

5 years agomgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or...
jiahuizeng [Tue, 24 Sep 2019 03:01:20 +0000 (11:01 +0800)]
mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or bluestore

Fixes: https://tracker.ceph.com/issues/42017
Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit f5b51a35930bda5499531c75f0c80816afe4ab24)

5 years agoMerge pull request #31461 from smithfarm/wip-fix-get-mons-mimic2
Yuri Weinstein [Fri, 8 Nov 2019 21:21:59 +0000 (13:21 -0800)]
Merge pull request #31461 from smithfarm/wip-fix-get-mons-mimic2

mimic: tests: make get_mon_status use mon addr

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agotest/cls_rbd: removed mirror peer pool test cases 31485/head
Jason Dillaman [Wed, 16 Oct 2019 00:42:29 +0000 (20:42 -0400)]
test/cls_rbd: removed mirror peer pool test cases

The mirror peer pool id has never been used and has been dropped
from the Octopus release. This will fix the breakage in the test
cases where the pool id was tested.

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

Conflicts:
src/cls/rbd/cls_rbd_client.cc
src/cls/rbd/cls_rbd_client.h
- I could not find the reason for the conflicts; it seems that git
  got confused. Cherry-picked the changes in these two files manually.

5 years agoqa/tasks/ceph: keep mon addrs in ctx namespace 31461/head
Sage Weil [Wed, 19 Dec 2018 03:18:31 +0000 (21:18 -0600)]
qa/tasks/ceph: keep mon addrs in ctx namespace

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

5 years agoqa/tasks/mon_seesaw: make get_mon_status use mon addr
Nathan Cutler [Thu, 7 Nov 2019 12:37:09 +0000 (13:37 +0100)]
qa/tasks/mon_seesaw: make get_mon_status use mon addr

We don't have the 'mon addr' config property any more.

This commit cannot be cherry-picked from master because qa/tasks/mon_seesaw.py
was dropped in nautilus.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoqa/tasks/ceph_manager: make get_mon_status use mon addr
Sage Weil [Wed, 19 Dec 2018 03:18:57 +0000 (21:18 -0600)]
qa/tasks/ceph_manager: make get_mon_status use mon addr

We don't have the 'mon addr' config property any more.

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

5 years agoMerge pull request #31324 from idryomov/wip-krbd-lvcreate-args-mimic
Yuri Weinstein [Wed, 6 Nov 2019 15:58:34 +0000 (07:58 -0800)]
Merge pull request #31324 from idryomov/wip-krbd-lvcreate-args-mimic

mimic: qa: krbd_msgr_segments.t: filter lvcreate output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31322 from idryomov/wip-krbd-udev-fixes-mimic
Yuri Weinstein [Wed, 6 Nov 2019 15:32:27 +0000 (07:32 -0800)]
Merge pull request #31322 from idryomov/wip-krbd-udev-fixes-mimic

mimic: krbd: avoid udev netlink socket overrun and retry on transient errors from udev_enumerate_scan_devices()

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31424 from smithfarm/wip-fix-get-mons-mimic
Nathan Cutler [Wed, 6 Nov 2019 13:24:43 +0000 (14:24 +0100)]
Merge pull request #31424 from smithfarm/wip-fix-get-mons-mimic

mimic: tests: qa/tasks/ceph.py: pass cluster_name to get_mons

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoqa/tasks/ceph.py/create_simple_monmap: use split_role 31424/head
Nathan Cutler [Wed, 6 Nov 2019 07:00:45 +0000 (08:00 +0100)]
qa/tasks/ceph.py/create_simple_monmap: use split_role

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoqa/tasks/ceph.py: pass cluster_name to get_mons
Nathan Cutler [Tue, 5 Nov 2019 18:10:15 +0000 (19:10 +0100)]
qa/tasks/ceph.py: pass cluster_name to get_mons

This cannot be cherry-picked from master because it fixes an issue that was
introduced directly into mimic by a bad backport.

Fixes: 276c2b80fd9ce58c5249001bfc98fd84249782cb
Fixes: https://tracker.ceph.com/issues/42658
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoceph-volume: make get_pv() accepts list of PVs 31407/head
Rishabh Dave [Sat, 12 Oct 2019 11:32:33 +0000 (17:02 +0530)]
ceph-volume: make get_pv() accepts list of PVs

...so that the code calling it can pass its copy which would prevent
creating a new one within get_pv().

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 2cdf467f76ab3331c04bec2b9f0e198ff67dd2dd)

5 years agoceph-volume: make get_vg() accepts list of VGs
Rishabh Dave [Sat, 12 Oct 2019 11:29:57 +0000 (16:59 +0530)]
ceph-volume: make get_vg() accepts list of VGs

...so that the code calling it can pass its copy which would prevent
creating a new one within get_vg().

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit cde092f4c7e89a67b6c94dcedd41525c11987ef3)