Merge pull request #56178 from adk3798/cephadm-pub-net-config-check-out-of-date

mgr/cephadm: refresh public_network for config checks before checking

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56175 from asm0deuz/bootstrap_no_container

cephadm: bootstrap fails if no container engine installed

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56147 from adk3798/stopped-daemon-shell

cephadm: fix `cephadm shell --name <daemon-name>` for stopped/failed daemon

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56143 from insatomcat/timemaster

cephadm.py: add timemaster to timesync services list

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #56075 from phlogistonjohn/jjm-enable-black-cephadm

cephadm: enforce black formatting for cephadmlib

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #55883 from thegreenbear/ingress-haproxy-bind-ipv4v6

Ingress service: make HAProxy to listen on IPv4 and IPv6 …

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #55874 from adk3798/only-bind-to-network

mgr/cephadm: allow grafana and prometheus to only bind to specific network

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #55645 from ronen-fr/wip-rf-nextobj

osd: improved get_objects_by_prefixes() ergonomics

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #56109 from anthonyeleven/improve-monitoring

doc/cephadm/services: Improve monitoring.rst

Reviewed-by: Zac Dover <zac.dover@proton.me>

Merge pull request #55877 from adk3798/cephadm-pull-usage

cephadm: improve cephadm pull usage message

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #55615 from rhcs-dashboard/grafana-mount-dashboards

mgr/cephadm: mount grafana dashboards from the path

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>

Merge pull request #52760 from thotz/add-healthchecker-timeout-haproxy

cephadm: adjust the ingress ha proxy health check interval

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #56189 from rhcs-dashboard/fix-64913-main

mgr/dashboard: Allow DELETE method api request, X-TOTAL-COUNT header in CORS config in dashboard

Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #56250 from myoungwon/wip-laod-metadata-during-gc

crimson/os/seastore: cache metadata during trimming to prevent from disk read

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>

Merge pull request #56204 from zmc/do-cmake-args

do_cmake.sh: Use value of ARGS at runtime

osd/SnapMapper: add common logs

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit f302be018ebef365d8876d14185c4bdb246f22d8)

osd: improved get_objects_by_prefixes() ergonomics

Improved call signatures for get_next_objects_to_trim() &
get_objects_by_prefixes().

Also: as as get_next_objects_to_trim() has only a single
failure mode, we should not try to handle two distinct failures
in its callers' code.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #55846 from athanatos/sjust/for-review/wip-crimson-coroutine-support

crimson: add coroutine support for errorated and interruptible futures

Reviewed-by: Matan Breizman <mbreizma@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>

Merge pull request #56034 from tchaikov/wip-msgr-dont-panic-at-hot-unplug

msg: do not abort if driver->del_event() returns -ENOENT

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>

Merge pull request #55896 from ronen-fr/wip-rf-compactref

osd: avoid calling a virtual function in a ctor

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #55872 from aclamk/wip-aclamk-bs-fix-unused

os/bluestore: Mute warnings

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #54492 from Matan-B/wip-matanb-op-thread-timeout

qa/suites/rados/verify/validater/valgrind: increase op thread timeout

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #56240 from zdover23/wip-doc-2024-03-17-rados-config-common

doc/rados: update common.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/cephadm/services: Improve monitoring.rst

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

Merge pull request #56248 from nbalacha/wip-nbalacha-rbd-doc-man

doc/rbd: minor changes to the rbd man page

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

doc/rbd: minor changes to the rbd man page

Fixes typos and grammar for some commands. Adds
additional details for some commandds.

Signed-off-by: N Balachandran <nibalach@redhat.com>

crimson/os/seastore: cache metadata during trimming to prevent from disk read

I encountered continous disk reads during trimming even though there are sufficient
cache available, in 4K random write test with RBM (RBD).
This is because metadata is note cached if its source is background transaction
within touch_extent(). So, seastore, including the trimming process,  needs to
constantly retrieve metadata (e.g., BACKREF_LEAF).

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

Merge pull request #56223 from guits/tracker_64951

node-proxy: support more Location value formats

Merge pull request #56247 from nbalacha/wip-nbalacha-rbd-doc-2

docs/rbd: fix typos in the rbd basic cmds documentation

Merge pull request #56198 from ivoalmeida/fix-nfs-attach-cmd

mgr/dashboard: fixed nfs attach command

Reviewed-by: Nizamudeen A <nia@redhat.com>

docs/rbd: typo in "retrieving image information"

Replace "for the image" with "of the image".

Signed-off-by: N Balachandran <nibalach@redhat.com>

docs/rbd: replace introspect with inspect

Replace "introspect" with "inspect" in the rbd basic commands
description.

Signed-off-by: N Balachandran <nibalach@redhat.com>

docs/rbd: fix typo in arg name

Replace "{image-}" with "{image-id}" in the "rbd trash rm"
command description.

Signed-off-by: N Balachandran <nibalach@redhat.com>

Merge pull request #56217 from xxhdx1985126/wip-seastore-remap-bug-fixes

test/crimson/sesastore/test_block: add constructor to construct

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

doc/rados: update common.rst

Clarify some overwritten paragraphs in
doc/rados/configuration/common.rst. Cf.
https://github.com/ceph/ceph/pull/50795/files#r1153897231.

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #56182 from zdover23/wip-doc-2024-03-14-glossary-librados

doc/glossary: add "librados" entry

Merge PR #56218 into main

* refs/pull/56218/head:
qa/crontab: use historically normal priorities for nightlies
doc/dev: update teuthology priority guidance

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

Merge pull request #56177 from lbausch/docs-typo-replace-osd

doc: cephadm/services/osd: fix typo

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Zac Dover <zac.dover@proton.me>

mgr/cephadm: refresh public_network for config checks before checking

The place it was being run before meant it would only grab the
public_network setting once at startup of the module. This meant
if a user changed the setting, which they are likely to do if they
get the warning, cephadm would ignore the change and continue
reporting that the hosts don't match up with the old setting
for the public_network. This moves the call to refresh the
setting to right before we actually run the checks. It does
mean we'll do the `ceph config dump --format json` call
each serve loop iteration, but I've found that only tends
to take a few milliseconds, which is nothing compared to
the time to refresh other things we check during the serve
loop.

I additionally modified the use of this option to use
the attribute on the mgr, rather than calling
`get_module_option`. This was just to get it more in
line with how we tend to handle other config options

Fixes: https://tracker.ceph.com/issues/64902
Signed-off-by: Adam King <adking@redhat.com>

cephadm: fix `cephadm shell --name <daemon-name>` for stopped/failed daemon

This previously would always try to use 'podman
inspect' on the running container of the daemon,
but this doesn't work if the daemon is stopped
or failed. Doing this for stopped/failed daemons
is a valid use case as we recommend cephadm shell
with --name for running debugging tools (often
for OSDs)

Fixes: https://tracker.ceph.com/issues/64879
Signed-off-by: Adam King <adking@redhat.com>

cephadm: allow list_daemons for only a specific daemon

At the moment, my thoughts are to use this internally
in the binary for when we need infor from list_daemons
but only for a specific daemon. I could also see wanting
this just on the command line to get info on a certain
daemon, so I've added it as a flag for `cephadm ls` as well

Signed-off-by: Adam King <adking@redhat.com>

Merge pull request #55796 from kchheda3/wip-fix-filterrule-json

rgw/notification: Fix the notification FilterRule to emit unique key name in json & Log successful delivery of notification event.

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>

Merge pull request #56179 from cbodley/wip-doc-rgw-notification_v2

doc/rgw: document the notification_v2 zone feature

Reviewed-by: Krunal Chheda <kchheda3@bloomberg.net>
Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>

node-proxy: support more Location value formats

After some tests, it turns out that depending on the hardware,
the header 'Location' which is returned by the server after logged can be different.
I could notice the following:

either:

Location: scheme://address:port/redfish/v1/SessionService/Session

or

Location: /redfish/v1/SessionService/Session

a previous tracker [1] was opened because I thought only the first one existed, which is wrong.

[1] https://tracker.ceph.com/issues/64894

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

Merge pull request #56132 from ronen-fr/wip-rf-unreserve

osd/scrub: handle 'release' events sent during 'scrub abort'

Reviewed-by: Samuel Just <sjust@redhat.com>

PendingReleaseNotes: announce the notification_v2 feature and its migration

Signed-off-by: Casey Bodley <cbodley@redhat.com>

doc/radosgw: document the notification_v2 zone feature

Signed-off-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #55503 from smanjara/wip-x-amz-replicated-at

rgw/multisite: add x-rgw-replicated-at header to replicated objects

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #54152 from linuxbox2/wip-new-noncurrent

rgwlc: implement NewerNoncurrentVersions and ObjectSizeGreater(Less)Than

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

test/crimson/sesastore/test_block: add constructor to construct
non-fully-loaded TestBlocks

Before this commit, all TestBlocks are fully-loaded whether they do have
data or not.

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

Merge pull request #56172 from guits/tracker_64898

ceph-volume: add missing import

Merge PR #55833 into main

* refs/pull/55833/head:
qa: Add multifs root_squash testcase

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #56188 from zdover23/wip-doc-2024-03-14-rbd-encryption

doc/rbd: add clone mapping command

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

do_cmake.sh: Use value of ARGS at runtime

The "Building Ceph" section of README.md instructs the user to run:

    ARGS="-DCMAKE_C_COMPILER=gcc-7" ./do_cmake.sh

But, very early on do_cmake.sh was doing ARGS="-GNinja", ignoring the existing
 value.

Signed-off-by: Zack Cerza <zack@redhat.com>

rgw/notification: Fix the filter_rules to be array vs dict in json output.

FilterRules when processed as dict in json, emits samy key name for prefix, suffix causing failure while parsing the json notification output.
So change the type FilterRules from JsonDict to Array while dumping in json.

Signed-off-by: kchheda3 <kchheda3@bloomberg.net>

doc/rbd: add clone mapping command

Add a command that explains how to map a formatted clone when the parent
image and the formatted clone have different encryption types.

Signed-off-by: Zac Dover <zac.dover@proton.me>

qa/crontab: use historically normal priorities for nightlies

Stop using --force-priority except when necessary.

Squid still gets elevated priority due to the increased attention with the
imminent release.

I've differentiated the priorities some in that release branches should get
higher priority than the main branch and that older release branches should be
prioritized over newer ones. Finally, upgrade tests should be prioritized over
other nightlies.

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

doc/dev: update teuthology priority guidance

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

mgr/dashboard: fixed nfs attach command

Fixes: https://tracker.ceph.com/issues/64933
Signed-off-by: Ivo Almeida <ialmeida@redhat.com>

Merge pull request #55720 from rzarzynski/wip-refactor-ec-get_chunk_size

ec: rename object_size -> stripe_width in get_chunk_size()

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #55469 from Matt1360/main

blk: threaded discard support

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #53858 from ushitora-anqou/add-metadata-for-mon

mon: add created_at and ceph_version_when_created meta

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #56165 from guits/fix-node-proxy-logout

node-proxy: fix RedFishClient.logout() method

rgwlc: implement Filter size limit checks

i.e., this implements ObjectSizeGreaterThan and ObjectSizeLessThan
for supported expiration and transition actions.

Fixes: https://tracker.ceph.com/issues/63304
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

rgwlc: implement NewerNoncurrentVersions

Per AWS doc, this value controls "how many noncurrent versions
Amazon S3 will retain." [1]  We understand this to mean, retain
NewerNoncurrentVersions of any object, regardless of expiration.

Removed unused RGWLifecycleConfiguration::has_same_action() (cleanup)

[1] https://docs.aws.amazon.com/AmazonS3/latest/API/API_NoncurrentVersionExpiration.html.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #55770 from rosinL/wip-fix-64587

CMakeLists: disable Seastar_IO_URING to fix seastar unittest timeout

Merge pull request #55870 from rhcs-dashboard/cephfs-auth

mgr/dashboard: ceph authenticate user from fs

Reviewed-by: Ankush Behl <cloudbehl@gmail.com>
Reviewed-by: ivoalmeida <NOT@FOUND>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge PR #55922 into main

* refs/pull/55922/head:
mds: disable `defer_client_eviction_on_laggy_osds' by default

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>

Merge PR #55813 into main

* refs/pull/55813/head:
qa: Add test for first damage of lost+found
tools/cephfs: Fix first-damage to include missing dirs

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

Merge PR #55412 into main

* refs/pull/55412/head:
mds: ensure snapclient is synced before corruption check

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #55837 into main

* refs/pull/55837/head:
qa: enhance labeled perf counters test for cephfs-mirror

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #55994 into main

* refs/pull/55994/head:
cephfs_mirror, qa: fix typo in current_syncing_snap status

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>

Merge pull request #56064 from idryomov/wip-63770

librbd: account for discards that truncate in ObjectListSnapsRequest

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge pull request #55306 from rzarzynski/wip-bug-64050

common/dout: fix FTBFS on GCC 14

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
Reviewed-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

Allow DELETE method api request, X-TOTAL-COUNT header in CORS config in dashboard

Fixes: https://tracker.ceph.com/issues/64913
Signed-off-by: Aashish Sharma <aasharma@redhat.com>

Merge pull request #56160 from nbalacha/wip-nbalacha-rbd-doc

doc/rbd: Add map information for clone images to rbd-encryption.rst

Reviewed-by: Zac Dover <zac.dover@proton.me>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

Merge pull request #56026 from rhcs-dashboard/disable-applitools-check

mgr/dashboard: disable applitools e2e

Reviewed-by: Aashish Sharma <aasharma@redhat.com>

doc/glossary: add "librados" entry

Add a "librados" entry to the glossary.

Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #56133 from ivancich/wip-restore-bucket-index-tempdir

rgw: rgw-restore-bucket-index -- sort uses specified temp dir

Reviewed-by: Michael Kidd <linuxkidd@gmail.com>

Merge PR #55930 into main

* refs/pull/55930/head:
mgr/vol: don't import IndexException since it's unused

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #56141 into main

* refs/pull/56141/head:
mds: Locker.cc: removing an unused variable

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>

Merge pull request #55947 from xxhdx1985126/wip-seastore-coll-move-rename

crimson/os/seastore: handle OP_COLL_MOVE_RENAME

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

doc/radosgw: generalize description of Zone Features

so they make sense outside of multisite configurations

Signed-off-by: Casey Bodley <cbodley@redhat.com>

doc/radosgw: move the Zone Features section to its own page

Signed-off-by: Casey Bodley <cbodley@redhat.com>

cephadm: bootstrap fails if no container engine installed

When boostrapping a new cluster, if no container engine is present,
the process stops asking to install one. One of the bootstrap steps,
is to run command_prepare_host which takes care of installing the
missing dependencies but it didn't reach this step.

Fixes: https://tracker.ceph.com/issues/64899
Signed-off-by: Teoman ONAY <tonay@ibm.com>

doc: cephadm/services/osd: fix typo

Signed-off-by: Lorenz Bausch <info@lorenzbausch.de>

doc/rbd: add map information for clone images to rbd-encryption.rst

Add information on the arguments required when mapping the
formatted clone of an encrypted parent image.

Co-authored-by: Zac Dover <zac.dover@proton.me>
Signed-off-by: N Balachandran <nibalach@redhat.com>

ceph-volume: add missing import

This adds the missing import `List` (from typing).

Probably missed by 36c83bf54243.

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

node-proxy: fix RedFishClient.logout() method

the endpoint passed down to util.query() is wrong:
is passes the full url (scheme://addr:port/path) where it should only
pass the path. The cause is that RedFishClient.login() basically stores
the value of the Location header in `self.location`.

The consequence of this is that it makes the client unable to properly logout.

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

Merge PR #54485 into main

* refs/pull/54485/head:
mds/quiesce-db: keep the db thread alive until shutdown
mds/quiesce-db: incorporate review comments
mds/quiesce: declare QuiesceDbPeerListing and QuiesceDbPeerAck
mds/quiesce: resolve the quiesce cluster at the mds monitor
include/types: add an I/O helper for std::unordered_map
messages: avoid using mutable members in MMDSQuiesce*
mds/quiesce-db: incorporate review comments
doc/cephfs/fs-volumes: doc fixes and updates
pybind/mgr: correct type hints for `get_quiesce_leader_info`
mds/quiesce: only use ACTIVE daemons for the quiesce cluster
mds,messages: quiesce db inter-rank messaging
mds/quiesce: MDSRankQuiesce - integration of the quiesce db manager
doc/cephfs/fs-volumes: Add info about the quiesce command
doc: fixes for local dev builds
mgr/volumes: support for `fs subvolume quiesce`
mgr/volumes: use `volume_exception_to_retval` as a decorator
pybind/mgr: add a `one-shot` parameter to send_command
mds/quiesce: QuiesceAgent implementation and unit tests
mds/quiesce: QuiesceDb.h and QuiesceDbManager with tests
common/Timer.cc: improve debug messages from the timer_thread
mds: MDSRank.cc: return status from `send_message_mds`
encoding: add emplace variants for map dencoders
common/Cond: make C_SaferCond private members protected to facilitate inheritance
qa/tasks/cephfs: give the tests more time to run heavy fs workloads

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

Merge pull request #55952 from yuvalif/wip-yuval-64710

rgw/kafka: set message timeout to 5 seconds

reviewed-by: kchheda3

Merge pull request #56124 from ivoalmeida/fix-snap-schedule-time-format

mgr/dashboard: fix snap schedule time format

Reviewed-by: Nizamudeen A <nia@redhat.com>

qa: Add test for first damage of lost+found

Fixes: https://tracker.ceph.com/issues/64615
Signed-off-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #56028 from cyx1231st/wip-seastore-cleanup-lba

crimson/os/seastore: cleanups around lba parent-child pointer

Reviewed-by: Xuehan Xu <xuxuehan@qianxin.com>

Merge pull request #55644 from linuxbox2/wip-rgw-dtexpire

rgw_lc:  replace strftime w/fmt and chrono:calendar

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #55764 from sseshasa/wip-fix-ec-inconsisten-hinfo-wrn

qa: Add benign cluster warning from ec-inconsistent-hinfo test to ignorelist

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>

Merge pull request #55455 from sseshasa/wip-fix-cluster-log-level-str

common/LogEntry: Add log level to str helper for fmt::formatter<LogEntry>

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #49730 from pdvian/wip-clog-fix

common/LogEntry: Reintroduce human readable log level for clog messages

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>

cephadm.py: add timemaster to timesync services list

On debian/ubuntu, if you need PTP, it's possible to use the linuxptp package for time-synchonization.
In that case the systemd service is called timemaster and is a wrapper for chrony/ntpd/phc2sys/ptp4l.

Signed-off-by: Florent Carli <florent.carli@rte-france.com>

rgw: rgw-restore-bucket-index -- sort uses specified temp dir

The sort command sometimes makes use of temporary files. When the user
specifies a directory to be used for temp files, have the sort command
use that same directory.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>