* 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>
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>
`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>
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>
Also check for pg_num_target being set correctly, rather than pg_num,
so the test doesn't depend on merging/splitting speed.
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Normalize across pools so that it's simpler to use - this way you
don't have to adjust every other pool when you add one.
Handle pools with target_bytes by taking their capacity off the top,
and dividing the rest into the pools with a target_ratio.
If both target bytes and ratio are specified, ignore bytes. This
matches the docs and makes accounting simpler.
Fixes: https://tracker.ceph.com/issues/43947
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
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>
* 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>
This fixes the PG state summary seen in 'ceph -s' to reflect PG state bits
beyond 32 bits.
Fixes: https://tracker.ceph.com/issues/44052
Signed-off-by: Sage Weil <sage@redhat.com>
* 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>
The unit already has a ExecStop command that runs 'podman|docker stop',
so systemd should not *also* try to kill the process or else it may
screw up the container state
From https://www.redhat.com/sysadmin/podman-shareable-systemd-services
"Note: It’s important to set the kill mode to none. Otherwise, systemd
will start competing with Podman to stop and kill the container processes.
which can lead to various undesired side effects and invalid states."
Hopefully-fixes: https://tracker.ceph.com/issues/43883
Signed-off-by: Sage Weil <sage@redhat.com>
