Commit Graph

107759 Commits

Author SHA1 Message Date
Sage Weil
535d3d5ad1 Merge PR #33135 into master
* refs/pull/33135/head:
	mon: fix tell command registration
	ceph.in: fix -h/help behavior for tell commands
	ceph.in: remove '{osd,mds,mon} tell' deprecation warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-02-10 20:57:42 -06:00
Sage Weil
d760b2787b Merge PR #33190 into master
* refs/pull/33190/head:
	cephadm: report image name for stopped daemons
	cephadm: record the image name to unit.image

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-02-10 19:53:37 -06:00
Yuri Weinstein
b753947d8f
Merge pull request #33186 from yuriw/wip-yuriw-crontab-master
qa/tests: removed all runs for luminous - EOL
2020-02-10 16:16:13 -08:00
Sage Weil
6526203a66 Merge PR #33179 into master
* refs/pull/33179/head:
	mgr/orchestrator: Use `pickle` to pass exceptions across sub-interpreters

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-02-10 17:14:48 -06:00
Sage Weil
923df792dc Merge PR #33184 into master
* refs/pull/33184/head:
	qa/suites/rados/multimon/tasks/mon_clock_with_skews: whitelist MOST_DOWN
	qa/suites/rados/multimon/tasks/mon_clock_with_skews: disable ntpd etc

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-02-10 17:14:02 -06:00
Sage Weil
34fae12918 Merge PR #33043 into master
* refs/pull/33043/head:
	doc/releases: octopus draft notes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2020-02-10 14:49:35 -06:00
Jason Dillaman
68a2372af6
Merge pull request #32965 from Dmole/patch-3
doc: quick-rbd.rst de-duplicate

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2020-02-10 15:41:13 -05:00
Sage Weil
9243a502c8 Merge PR #33181 into master
* refs/pull/33181/head:
	qa/workunits/cephadm/test_cephadm: fix typo

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-02-10 13:29:08 -06:00
Sage Weil
a216baa83e doc/releases: octopus draft notes
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 12:56:13 -06:00
Sage Weil
279014ddc6 mgr/cephadm: fix redeploy (etc) of crash containers
When deploying a crash container, the crash keyring is the crash keyring,
and there is not additional crash_keyring for the implicit crash
container.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 12:41:00 -06:00
Sage Weil
724199dd87 cephadm: do not use special unit, naming for crash agent
Use the normal unit file, with crash.$hostname as the name.  This makes
the crash agent behave like all of the other services instead of being
special.  The exception is that the crash agent is still implicitly
deployed alongside other containers.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 12:41:00 -06:00
Sage Weil
9f842e0f66 cephadm: 'crash' is a ceph daemon
- we can run ceph -v inside
- we need to mount the crash dir

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 12:40:19 -06:00
Sage Weil
366d3fc33e Merge PR #33131 into master
* refs/pull/33131/head:
	mgr/orch: 'ceph orchestrator ...' -> 'ceph orch ...'

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-02-10 12:17:45 -06:00
Sage Weil
786aa2904a Merge PR #33162 into master
* refs/pull/33162/head:
	cephadm: KillMode=none in unit file
	cephadm: clean up unit string syntax a bit

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-02-10 12:17:17 -06:00
Sage Weil
a67f5afc59 cephadm: report image name for stopped daemons
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 12:04:16 -06:00
Sage Weil
5d14f6d72f cephadm: record the image name to unit.image
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 11:57:16 -06:00
Sage Weil
4332eeb694 qa/workunits/cephtool/test.sh: delete test_erasure pool
Other parts of this script leave OSDs reweighted, which can make this test
fail to go fully clean.

 0   ssd 0.08789         osd.0          up  0.63213 1.00000
 1   ssd 0.08789         osd.1          up  0.63213 1.00000
 2   ssd 0.08789         osd.2          up  1.00000 1.00000

35.0 raw ([2,1,2147483647], p2) up ([2,1,2147483647], p2) acting ([2,1,2], p2)

Fix by just deleting this pool when we're done.

Fixes: https://tracker.ceph.com/issues/44067
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 11:25:51 -06:00
Kefu Chai
9fe6b76043
Merge pull request #33185 from tchaikov/wip-44063
pybind/mgr: bump six to 1.14

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-02-11 01:01:25 +08:00
Jason Dillaman
57d373fa99 qa/workunits/rbd: override CEPH_ARGS when initializing the site name
The mirroring site name is stored in the MON config which requires
higher privledges than the standard "client.mirror" user.

Fixes: https://tracker.ceph.com/issues/44066
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-02-10 11:39:24 -05:00
Yuri Weinstein
e59705618e qa/tests: removed all runs for luminous - EOL
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2020-02-10 08:20:59 -08:00
Tim
3f367ce718 doc: quick-rbd.rst de-duplicate
Remove code duplication from the dependency.

Signed-off-by: Tim <elatllat@gmail.com>
2020-02-10 10:44:14 -05:00
Kefu Chai
363809a219 pybind/mgr: bump six to 1.14
otherwise some packages which uses six.ensure_text will fail, as it
was introduced by 1.12. and 1.14 is the latest stable version of
six. so let's use it instead.

Fixes: https://tracker.ceph.com/issues/44063
Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-02-10 23:30:37 +08:00
Jason Dillaman
b829c34ab7 test/pybind: fix expectations for mirror snapshots
When snapshot-based mirroring is enabled, the primary image
should always have at least one mirror-based snapshot to help
distinguish it from an incomplete non-primary image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-02-10 10:25:04 -05:00
Sage Weil
9169a037d9 Merge PR #33137 into master
* refs/pull/33137/head:
	mon/PGMap: fix digest summary of PGs by state
	mon/PGMap: fix compat encoding of num_pg_by_state

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-02-10 08:54:51 -06:00
Nathan Cutler
3de3797bba ceph-backport.sh: use Basic Authentication instead of access_token
Address "Deprecation notice for authentication via URL query parameters"
and other recent GitHub API behavior changes.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2020-02-10 15:29:48 +01:00
Sage Weil
2f17cd47b5 mon: fix tell command registration
Pass full cmddesc, not just prefix.

Broken by 3394b70ba1

Fixes: https://tracker.ceph.com/issues/44050
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 08:24:44 -06:00
Sage Weil
013a5cc3f8 ceph.in: fix -h/help behavior for tell commands
- add "Tell $type commands" heading
- 'ceph tell mon.a -h' now works
- 'ceph tell mon.a prefix -h' also works

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-10 08:24:44 -06:00
Kefu Chai
956c6f3e50 pybind: check arguments also when searching for "clang"
if "ccache" is used, compiler[0] would be "ccache", and compiler[1]
would be "clang", in this case, we should search for "clang" until
an argument starting with "-" is found. it signals be the first
cflag passed to the compiler.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-02-10 22:10:04 +08:00
Kefu Chai
c35ac57e27 pybind: convert filterfalse to list before returning
distutils expects a list not an iterator

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-02-10 22:10:04 +08:00
Kefu Chai
54bcc1603b pybind: customize compiler before checking cflags
otherwise we are always looking at the default compiler on 'unix' --
'cc'. and will fail to filter cflags not supported by clang, if we
are compiling the python bindings using clang.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-02-10 22:10:03 +08:00
Jason Dillaman
00a354859f librbd: corrected error code from image_snapshot_create API
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-02-10 08:37:14 -05:00
Sebastian Wagner
5a32ffcfc3 mgr/orchestrator: Use pickle to pass exceptions across sub-interpreters
`copy.deepcopy` doesn't work to cross sub-interpreter boundaries.

Fixes: https://tracker.ceph.com/issues/43913
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-02-10 14:20:25 +01:00
Nathan Cutler
2e78b3fdca ceph-backport.sh/PR quoting: eliminate unwanted newlines
Sometimes the PR body has multiple newlines which do not need
to be quoted. Also, the way we interact with the GitHub API, we
were getting some newline duplication.

This patch reduces all clumps of multiple blank lines down to a single
blank line.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2020-02-10 13:06:34 +01:00
Sebastian Wagner
453f70bbab mgr/cephadm: Add some more type annotations
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-02-10 12:11:52 +01:00
Sebastian Wagner
80a2a70893 mgr/orchestrator: unify StatelessServiceSpec and StatefulServiceSpec
Both classes are essentially equal. Keeping both just makes thigs
more compicated.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-02-10 12:11:52 +01:00
Nathan Cutler
c1cdd785d6 ceph-backport.sh: bump version number
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2020-02-10 12:06:12 +01:00
Juan Miguel Olmo Martínez
17e08ec3e2
mgr/rook: Fix error creating OSD's
Fixes: https://tracker.ceph.com/issues/43972

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
2020-02-10 11:51:21 +01:00
Kefu Chai
d352315e52 Merge pull request #33035 from jdurgin/wip-target-ratio
mgr/pg_autoscaler: treat target ratios as weights

Reviewed-by: Sage Weil <sage@redhat.com>
2020-02-10 18:41:07 +08:00
Kefu Chai
75f4765f2f doc: update mondb recovery script
to note that we also need to add mgr's key to monitor's keyring

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-02-10 17:38:28 +08:00
Kefu Chai
a5bfeca64f ceph-monstore-tool: correct the key for storing mgr_command_descs
Fixes: https://tracker.ceph.com/issues/43582
Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-02-10 17:38:28 +08:00
Kefu Chai
4b3df5a850 ceph-monstore-tool: rename mon-ids in initial monmap
when ceph-mon starts, it checks to see if it's listed in the monmap, if
not it complains
```
no public_addr or public_network specified, and mon.a not present in
monmap or ceph.conf.
```
then bails out. normally, the monitor will try to rename its name in
monmap when performing "mkfs", but in our case, we are merely using the
"mkfs" monmap for passing the monmap built by ceph-monstore-tools, and
we don't actually go through the "mkfs" process. so, ceph-mon won't
rename when booting up.

in this change, user is allowed to specify the mon-ids in command line
when rebuilding mondb, the default mon-ids would be a,b,c,... if not
specified.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-02-10 17:38:28 +08:00
Josh Durgin
fff3b704de mgr/pg_autoscaler: add unit tests for effective_target_ratio
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 13:00:00 +08:00
Josh Durgin
63f2a06568 mgr/pg_autoscaler: remove unused imports
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 10:08:36 +08:00
Josh Durgin
37519d26bb mgr/pg_autoscaler: cleanup pool_id type
Keep it as an int so we don't have to cast back and forth.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 10:08:36 +08:00
Josh Durgin
2050cc2a09 mgr/pg_autoscaler: correct and simplify progress tracking
Reset the progress each time we make an adjustment, and track progress
from that initial state to that new target. Previously we were also
using the wrong target: the current pg_num_target, not the new value
(pg_num_final) that we set.

Look up the pool by name, not id, in _maybe_adjust(), since that is how it is
retrieved by osdmap.get_pools_by_name().

Dedupe some logic into PgAdjustmentProgress to simplify things.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 10:08:36 +08:00
Josh Durgin
9118065c4c PendingReleaseNotes: mention target_size_ratio change
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 10:08:36 +08:00
Josh Durgin
0a29cf7d6c doc: update autoscaler docs for target ratio
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 10:08:36 +08:00
Josh Durgin
9758197afa mgr/pg_autoscaler: include effective target ratio in status
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 10:08:36 +08:00
Josh Durgin
772d7c1d3c mgr/pg_autoscaler: add warning when target bytes and ratio are both set
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 10:08:36 +08:00
Josh Durgin
d62c121ee3 mgr/pg_autoscaler: remove target ratio warning
Since the ratios are normalized, they cannot exceed 1.0 or overcommit
combined with target_bytes.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2020-02-10 10:08:36 +08:00