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>

Merge PR #33126 into master

* refs/pull/33126/head:
doc/mgr/orchestrator_cli: update support table
mgr/deepsea: remove
mgr/ansible: remove

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #33136 into master

* refs/pull/33136/head:
cephadm: fix ceph version probe

Reviewed-by: Michael Fritch <mfritch@suse.com>

cephadm: fix ceph version probe

docker returns '<no value>' if the label isn't present, in which case we
still need to run ceph -v.

Also, don't probe non-ceph (e.g., monitoring) containers.

Also, only probe each image id once.

Add a simple test.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33133 into master

* refs/pull/33133/head:
qa/workunits/cephadm/test_cephadm.sh: make monitoring tests faster
qa/workunits/cephadm/test_cephadm: 2 OSDs is enough
cephadm: disable node-exporter cpu/memory limits for the time being

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #33134 into master

* refs/pull/33134/head:
qa/workunits/cephadm/test_repos: don't try to use the refspec

Reviewed-by: Michael Fritch <mfritch@suse.com>

doc/mgr/orchestrator_cli: update support table

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/deepsea: remove

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33117 into master

* refs/pull/33117/head:
qa/suites/upgrade/nautilus-x-singleton: ensure hit sets behave across upgrade
osd/PrimaryLogPG: use legacy timestamp rendering for hit_set objects
include/utime: allow legacy rendering of timestamp

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #32928 from ljishen/wip-rados-bench-latency

rados bench: fix the delayed checking of completed ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #32934 from rzarzynski/wip-bl-32bytes

include, common: make ceph::bufferlist 32 bytes long on x86

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #33099 from howard0su/wip_ceph_fix

ceph.in: print decoded output in interactive mode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #33101 from tchaikov/wip-thread-join

pybind/ceph_argparse: avoid int overflow

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #33068 from yuvalif/verify-pubsub-inc-sync

qa/rgw/pubsub: verify incremental sync is used in pubsub

Merge PR #32816 into master

* refs/pull/32816/head:
mds: check inode type when deciding if filelock should be in EXCL state
mds: don't delegate inos when handling replayed requests
mds: process re-sent async dir operations at clientreplay stage
mds: consider async dirops when checking directory empty
mds: always suppress issuing caps in Locker::issue_new_caps()
mds: try reconnect cap only when replayed request creates new inode
mds: set cap id to 1 for newly created inode

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

qa/workunits/cephadm/test_cephadm.sh: make monitoring tests faster

The sleep 90 was way overkill.

Signed-off-by: Sage Weil <sage@redhat.com>

qa/workunits/cephadm/test_cephadm: 2 OSDs is enough

Signed-off-by: Sage Weil <sage@redhat.com>

cephadm: disable node-exporter cpu/memory limits for the time being

Ubuntu 18.04 kernel does not support these.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33092 into master

* refs/pull/33092/head:
doc/rados/operations: adjust docs a bit
mon/OSDMonitor: accept 'autoscale_mode' argument to 'osd pool create'

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge PR #33094 into master

* refs/pull/33094/head:
mgr/telemetry: split entity_name only once (handle ids with dots)

Reviewed-by: Sage Weil <sage@redhat.com>

Merge PR #33037 into master

* refs/pull/33037/head:
osd/OSD: choose more heartbeat peers from different subtrees

Reviewed-by: yanjun <yan.jun8@zte.com.cn>

qa/workunits/cephadm/test_repos: don't try to use the refspec

This is usually a sha1, and we can't reliably find packages based on
that.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33132 into master

* refs/pull/33132/head:
qa/workunits/cephadm/test_repos: apt update
qa/workunits/cephadm/test_repos: fix subst
qa/suites/rados/cephadm/.../test_repos: run without ulimit and coverage tools
qa/tasks/workunit: accept coverage_and_limits: false
qa/suites/rados/cephadm: move ubuntu_18.04_podman to shared location
qa/suites/rados/cephadm: fix conflicts, missing .qa link

Reviewed-by: Michael Fritch <mfritch@suse.com>

qa/workunits/cephadm/test_repos: apt update

Signed-off-by: Sage Weil <sage@redhat.com>

qa/workunits/cephadm/test_repos: fix subst

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #33061 from tchaikov/wip-pybind-compiler-flags-patch

pybind: refactor monkey_with_compiler()

Reviewed-By: Adam Emersen <aemerson@redhat.com>

Merge PR #33098 into master

* refs/pull/33098/head:
mgr/orch,cephadm: add 'host set-addr'
mgr/orch: include addr (and labels) in 'host ls'
mgr/cephadm: fix 'cephadm check-host'
mgr/cephadm: use addr to contact host
mgr/orch: pass HostSpec to add_host
mgr/orch: HostSpec -> HostPlacementSpec

Reviewed-by: Sebastian Wagner <swagner@suse.com>

qa/suites/rados/cephadm/.../test_repos: run without ulimit and coverage tools

Signed-off-by: Sage Weil <sage@redhat.com>

qa/tasks/workunit: accept coverage_and_limits: false

Allow workunits without teuthology tools (normally installed by ceph.py,
IIRC).

Signed-off-by: Sage Weil <sage@redhat.com>

qa/suites/rados/cephadm: move ubuntu_18.04_podman to shared location

Also set the registries.conf file so we can pull from docker.io.

Signed-off-by: Sage Weil <sage@redhat.com>

qa/suites/upgrade/nautilus-x-singleton: ensure hit sets behave across upgrade

Create a pool that generates hit sets before the upgrade, and ensure that
they (continue to) trim after the upgrade.

Signed-off-by: Sage Weil <sage@redhat.com>

osd/PrimaryLogPG: use legacy timestamp rendering for hit_set objects

These objects exist prior to octopus and we need to be consistent with
the naming.  Stick with the legacy form.

Fixes: https://tracker.ceph.com/issues/44024
Signed-off-by: Sage Weil <sage@redhat.com>

include/utime: allow legacy rendering of timestamp

In 79d8d761cf8fb6a5679d1925f92889c950dc2be4 and
ec3ddcb9886e3c74b78aa8521bc05e695f6aeeab
we switched to a strict ISO8660 rendering for timestamps.  In some cases,
we need to render the timestamp in the legacy form: ' ' instead of 'T',
and no time zone suffix.

Signed-off-by: Sage Weil <sage@redhat.com>

qa/suites/rados/cephadm: fix conflicts, missing .qa link

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33080 into master

* refs/pull/33080/head:
qa: specify random distros in multimds

Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge PR #33070 into master

* refs/pull/33070/head:
mgr/telemetry: use raise_for_status()
mgr/telemetry: factor post into helper
mgr/telemetry: catch exception during requests.put

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>

mgr/orch,cephadm: add 'host set-addr'

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/orch: include addr (and labels) in 'host ls'

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/cephadm: fix 'cephadm check-host'

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/cephadm: use addr to contact host

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/orch: pass HostSpec to add_host

Distinguish between the hostname and the addr (dns name or IP) to reach
the host.  Include labels here too since it's convenient to do so.

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/orch: HostSpec -> HostPlacementSpec

This object is about describing where to place a service on a host: it
includes a host name and either an IP or network and possibly even a name
for the service.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33118 into master

* refs/pull/33118/head:
orchestrator cli: change 'rgw update' params order
mgr/cephadm: fix minor typo

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

Merge PR #33062 into master

* refs/pull/33062/head:
qa/suites/rados/cephadm: collect all cephadm tests together here
qa/workunits/cephadm/test_repos: add test for the repo commands
cephadm: add '{add,rm}-repo', with initial centos/rhel/fedora/ubuntu support

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Merge PR #33119 into master

* refs/pull/33119/head:
mgr/upgrade: fix mgr self check
mgr/cephadm: fail upgrade if target image doesn't exist
mgr/cephadm: factor upgrade failure into helper
mgr/cephadm: refresh if we don't know a daemon's image_id
mgr/cephadm: refresh services in upgrade loop
mgr/cephadm: clean up upgrade messages a bit

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Merge pull request #33086 from guits/guits-fix_cv_rerun

ceph-volume: skip osd creation when already done

qa/suites/rados/cephadm: collect all cephadm tests together here

Signed-off-by: Sage Weil <sage@redhat.com>

qa/workunits/cephadm/test_repos: add test for the repo commands

This isn't a great test, but it is something.

Signed-off-by: Sage Weil <sage@redhat.com>

cephadm: add '{add,rm}-repo', with initial centos/rhel/fedora/ubuntu support

Other distros to follow.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33111 into master

* refs/pull/33111/head:
qa/suites/rados/cephadm[-smoke]: test podman on ubuntu 18.04

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Merge pull request #33128 from pponnuvel/fix_incorrect_link_documentation

coding-style: update a link and fix typos

Reviewed-by: Kefu Chai <kchai@redhat.com>

coding-style: update a link and fix typos.

Signed-off-by: Ponnuvel Palaniyappan <pponnuvel@gmail.com>

mgr/ansible: remove

Signed-off-by: Sage Weil <sage@redhat.com>

ceph-volume: add unit test test_safe_prepare_osd_already_created

This commit adds a new unit test
`test_safe_prepare_osd_already_created()` in order to test when
`is_ceph_device()` returns `True` `RuntimeError` is well raised.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

ceph-volume: skip osd creation when already done

When rerunning ceph-volume lvm create on a device already prepared and
activated, ceph-volume should skip the creation.

This is a regression introduced by bb4de1a3fc238eaf9f717dc59c6bdf338ef6d657

Fixes: https://tracker.ceph.com/issues/43981
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

Merge PR #33042 into master

* refs/pull/33042/head:
cephadm: bootstrap: warn on fqdn hostname

Reviewed-by: Sebastian Wagner <swagner@suse.com>

pybind/ceph_argparse: avoid int overflow

in python 2.6.8, `thread.join(timeout)` tries to convert the given
timeout to PyTime, but turns out `2 << 32` overflows when python
runtime converts the timeout from sec to ns. that's why
the `lock.acquire()` call always fail in
`Thread._wait_for_tstate_lock()`.
and we end up with an alive thread after calling `thread.join()`.

Signed-off-by: Kefu Chai <kchai@redhat.com>

qa/suites/rados/cephadm[-smoke]: test podman on ubuntu 18.04

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/upgrade: fix mgr self check

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/cephadm: fail upgrade if target image doesn't exist

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/cephadm: factor upgrade failure into helper

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/cephadm: refresh if we don't know a daemon's image_id

This notably happens right after we deploy a fresh daemon.

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/cephadm: refresh services in upgrade loop

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/cephadm: clean up upgrade messages a bit

Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #32634 from jan--f/c-v-inventory-fixes

ceph-volume: finer grained availability notion in inventory.

Merge pull request #31978 from jan--f/c-v-batch-no-db-dev-drop

ceph-volume/batch: fail on filtered devices when non-interactive

Merge PR #33075 into master

* refs/pull/33075/head:
examples/librados: fix bufferlist::copy() in hello_world.cc.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

ceph-volume: add available property in target specific flavors

This adds two properties available_[lvm,raw] to device (and thus inventory).
The goal is to have different notions of availability based on the
intended use case. For example finding LVM structures make a drive
unavailable for the raw mode, but might be available for the lvm mode.

Fixes: https://tracker.ceph.com/issues/43400
Signed-off-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #33112 from jan--f/c-v-lvm-list-regression-31700

ceph-volume: fix regression and improve output in lvm list

Merge pull request #32985 from sebastian-philipp/mgr-progress-mypy

mgr/progress: Add integration to pybind/mgr/tox.ini

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge PR #32432 into master

* refs/pull/32432/head:
mds: Reorganize structure members in snap header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

orchestrator cli: change 'rgw update' params order

Fixes: https://tracker.ceph.com/issues/44029
First realm, then zone -- to be consistent with the other commands

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

mgr/cephadm: fix minor typo

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

Merge PR #33114 into master

* refs/pull/33114/head:
cephadm:Fix name argument parsing during image check for non-ceph components

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

cephadm:Fix name argument parsing during image check for non-ceph components

bug in parsing introduced in 97def7c
args.name may exist but will be none if flag is not used
check the value in addition to checking if it exists

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>

Merge PR #33109 into master

* refs/pull/33109/head:
cephadm: fix inspect-image

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #33089 into master

* refs/pull/33089/head:
cephadm: re-introduce the `podman logs` command

Reviewed-by: Sage Weil <sage@redhat.com>

Merge PR #33110 into master

* refs/pull/33110/head:
qa/distros: rhel and centos: whitelist cephadm logrotate selinux denial

Reviewed-by: Boris Ranto <branto@redhat.com>

ceph-volume: fix various lvm list issues

A single report on a non-lvm device now works.
Format was cleaned up, report lvm journal,wal, db only once.

Fixes: https://tracker.ceph.com/issues/44009
Signed-off-by: Jan Fajerski <jfajerski@suse.com>

ceph-volume: add get_device_lvs to easily retrieve all lvs per device

Also drop the sep argument from get_lvs and siblings, unused.
Introduce LV_CMD_OPTIONS to unify options to lvs.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>

cephadm: re-introduce the `podman logs` command

Fixes: https://tracker.ceph.com/issues/43973
Signed-off-by: Michael Fritch <mfritch@suse.com>

Merge PR #33093 into master

* refs/pull/33093/head:
build-integration-branch: don't fail on existing branch

Reviewed-by: Neha Ojha <nojha@redhat.com>

cephadm: fix inspect-image

This was broken by d8debba782cd4f40ed13db7f1af8ef43503ccec5
because the 'images' json output works with podman but not with
docker.  (Also, the inspect command is more explicit and cleaner.)

Signed-off-by: Sage Weil <sage@redhat.com>

qa/distros: rhel and centos: whitelist cephadm logrotate selinux denial

This is fixed in RHEL 8.1.1 (and by extension centos/rhel 8.2+).

No fix for el 7 yet

Partially-fixes: https://tracker.ceph.com/issues/43703
Signed-off-by: Sage Weil <sage@redhat.com>

doc/rados/operations: adjust docs a bit

Signed-off-by: Sage Weil <sage@redhat.com>

mon/OSDMonitor: accept 'autoscale_mode' argument to 'osd pool create'

Allow the autoscale mode to be set atomically with pool creation.

Fixes: https://tracker.ceph.com/issues/42638
Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33071 into master

* refs/pull/33071/head:
mgr/cephadm: remove item from cache when removing

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #33059 from tspmelo/wip-node-10-18-1

make-dist: Bump Node.js to v10.18.1

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #32546 from votdev/issue_43089_passwd_cmplx_config

mgr/dashboard: Make password policy check configurable

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>

ceph.in: print decoded output in interactive mode

Under ceph CLI interactive mode, the outbuf is
not decoded as utf-8 which causes the output
is not properly formatted.

Signed-off-by: Jun Su <howard0su@gmail.com>

Merge pull request #32881 from tchaikov/wip-43657

mgr/orchestrator: use deepcopy for copying exceptions

Reviewed-by: Sebastian Wagner <swagner@suse.com>

pybind: refactor monkey_with_compiler()

* remove `clang` global variable
* do not assume that `clang` is assigned before
  `filter_unsupported_flags()` is called.
* use a decorator-style function to do the monkey patch

Signed-off-by: Kefu Chai <kchai@redhat.com>

qa/tasks/cephadm: test "orchestrator host ls"

Signed-off-by: Kefu Chai <kchai@redhat.com>

qa/tasks: drop test_cephadm_orchestrator.py

this test will end with a failure like

```
2020-01-30T18:15:15.870 INFO:tasks.ceph.mgr.x.smithi042.stderr:Warning: Permanently added 'smithi042.front.sepia.ceph.com,172.21.15.42' (ECDSA) to the list of known hosts.
2020-01-30T18:15:15.925 INFO:tasks.ceph.mgr.x.smithi042.stderr:Permission denied, please try again.
2020-01-30T18:15:15.932 INFO:tasks.ceph.mgr.x.smithi042.stderr:Permission denied, please try again.
2020-01-30T18:15:15.939 INFO:tasks.ceph.mgr.x.smithi042.stderr:root@smithi042.front.sepia.ceph.com: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password).
```

because mgr is not able to establish an ssh connection to that host with "root".
please note, the teuthology worker is acting using the "ubuntu" account on the
test node, and by default, "root" does not have its pubkey. and actually
`qa/tasks/cephadm.py` does push the pubkey to all the managed hosts before
testing cephadm.

since `qa/tasks/cephadm.py` is a better test for cephadm, let's just
drop this one.

as suites/rados/cephadm already covers cephadm

Signed-off-by: Kefu Chai <kchai@redhat.com>

mgr/orchestrator: use deepcopy for copying exceptions

since rexec module has been removed in python3, we cannot use it
anymore.

Fixes: https://tracker.ceph.com/issues/43657
Signed-off-by: Kefu Chai <kchai@redhat.com>

build-integration-branch: don't fail on existing branch

This behavior is too annoying, and you can always get back to something
clobbered with 'git reflog'.

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #32946 into master

* refs/pull/32946/head:
qa/suites/rados: improve valgrind leak check
common/ceph_context: add an asok command to deliberately leak memory

Reviewed-by: Neha Ojha <nojha@redhat.com>

mgr/telemetry: use raise_for_status()

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/telemetry: factor post into helper

And use it for devices too

Signed-off-by: Sage Weil <sage@redhat.com>

Merge PR #33055 into master

* refs/pull/33055/head:
qa/tasks/mgr/test_orchestrator_cli: support multiple DriveGroups

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <swagner@suse.com>