Sage Weil [Fri, 14 Feb 2020 19:13:10 +0000 (13:13 -0600)]
qa/tasks/cephadm: deploy node-exporter
Signed-off-by: Sage Weil <sage@redhat.com>
Patrick Seidensal [Wed, 5 Feb 2020 15:17:52 +0000 (16:17 +0100)]
mgr/orch: deploy node-exporter
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
Laura Paduano [Wed, 19 Feb 2020 12:58:28 +0000 (13:58 +0100)]
Merge pull request #32895 from tspmelo/wip-sidebar-notification-v2
mgr/dashboard: Improve Notification sidebar
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Sebastian Wagner [Wed, 19 Feb 2020 12:39:43 +0000 (13:39 +0100)]
Merge pull request #33410 from capri1989/docs-fix
doc/mgr/orchestrator.rst: updated current implementation status
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sage Weil [Wed, 19 Feb 2020 12:33:59 +0000 (06:33 -0600)]
Merge PR #33249 into master
* refs/pull/33249/head:
mgr/cephadm: move cutoff calc inside helper
mgr/orch: clean up service_action, remove_service
mgr/cephadm: move into DaemonCache class
mgr/cephadm: fix tests
mgr/cephadm: implete hacky 'refresh=True' path
mgr/cephadm: raise health alert when scrape fails
mgr/cephadm: persist cached daemon state
mgr/orch: serialize DaemonDescription last_refresh
mgr/cephadm: move _get_daemons() impl into list_daemons
mgr/cephadm: replace remaining _get_daemons() with daemon cache
mgr/cephadm: use daemon map for service|daemon removal
mgr/cephadm: avoid _get_daemons for service|daemon actions
mgr/cephadm: replace daemon_cache with an explicit set of dicts
mgr/cephadm: move DaemonDescription construction into helper
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Kefu Chai [Wed, 19 Feb 2020 11:35:42 +0000 (19:35 +0800)]
Merge pull request #33408 from tchaikov/wip-crimson-editor-prop
crimson: add editor properties header
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Kai Wagner [Wed, 19 Feb 2020 11:07:50 +0000 (12:07 +0100)]
doc/mgr/orchestrator.rst updated current implementation status
Signed-off-by: Kai Wagner <kwagner@suse.com>
Lenz Grimmer [Wed, 19 Feb 2020 09:51:10 +0000 (09:51 +0000)]
Merge pull request #33060 from votdev/issue_39252_rgw_beast
mgr/dashboard: RGW port autodetection does not support "Beast" RGW frontend
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Sage Weil [Wed, 19 Feb 2020 04:10:50 +0000 (22:10 -0600)]
Merge PR #33395 into master
* refs/pull/33395/head:
cephadm: error out on filestore OSDs
Reviewed-by: Michael Fritch <mfritch@suse.com>
Kefu Chai [Wed, 19 Feb 2020 03:08:16 +0000 (11:08 +0800)]
Merge pull request #33396 from liewegas/fix-cephadm-upgrade-test
qa/suites/rados/cephadm/upgrade: fix initial version
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 19 Feb 2020 02:56:54 +0000 (20:56 -0600)]
Merge PR #32949 into master
* refs/pull/32949/head:
cephadm: separate out require files in config-json
cephadm: add alertmanager deployment feature
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Sage Weil [Wed, 19 Feb 2020 01:44:01 +0000 (19:44 -0600)]
Merge PR #33370 into master
* refs/pull/33370/head:
mgr/orchestrator_cli: sort host list
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Sage Weil [Mon, 17 Feb 2020 13:54:06 +0000 (07:54 -0600)]
mgr/cephadm: move cutoff calc inside helper
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Feb 2020 13:50:50 +0000 (07:50 -0600)]
mgr/orch: clean up service_action, remove_service
Standardize on service_name argument that looks like 'mgr', 'mds.fsname',
'mds', or some other daemon name prefix. Avoid the ambiguously-named
service_type+service_name combinations.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Feb 2020 13:37:58 +0000 (07:37 -0600)]
mgr/cephadm: move into DaemonCache class
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Feb 2020 18:50:32 +0000 (12:50 -0600)]
mgr/cephadm: fix tests
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Feb 2020 18:50:23 +0000 (12:50 -0600)]
mgr/cephadm: implete hacky 'refresh=True' path
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Feb 2020 18:20:27 +0000 (12:20 -0600)]
mgr/cephadm: raise health alert when scrape fails
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Feb 2020 18:07:13 +0000 (12:07 -0600)]
mgr/cephadm: persist cached daemon state
- load cached state on startup
- persist state after a scrape only
- scrape everything after startup
Note that we modify our in-memory cache when we add or remove a service
and then immediately trigger a scrape, but we do not invalidate the
persisted state, since it's simpler (and presumably a good idea) to
simply re-scrape everything after a mgr restart.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Feb 2020 18:00:57 +0000 (12:00 -0600)]
mgr/orch: serialize DaemonDescription last_refresh
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Feb 2020 17:13:03 +0000 (11:13 -0600)]
mgr/cephadm: move _get_daemons() impl into list_daemons
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Feb 2020 17:08:18 +0000 (11:08 -0600)]
mgr/cephadm: replace remaining _get_daemons() with daemon cache
New function _get_daemons_by_type() returns immediately with a result
from the cache.
Remove the with_daemons decorator.
Push daemon list fetch into _add_new_daemon.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 12 Feb 2020 22:44:56 +0000 (16:44 -0600)]
mgr/cephadm: use daemon map for service|daemon removal
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 12 Feb 2020 22:39:53 +0000 (16:39 -0600)]
mgr/cephadm: avoid _get_daemons for service|daemon actions
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Feb 2020 16:49:37 +0000 (10:49 -0600)]
mgr/cephadm: replace daemon_cache with an explicit set of dicts
- Cache DaemonDescription explicitly
- explicit timestamp for the host
- serve() scrapes inventory based on that timestamp
For the moment, persistence is broken, and --refresh is broken.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 12 Feb 2020 22:30:41 +0000 (16:30 -0600)]
mgr/cephadm: move DaemonDescription construction into helper
Signed-off-by: Sage Weil <sage@redhat.com>
Patrick Donnelly [Tue, 18 Feb 2020 20:04:52 +0000 (12:04 -0800)]
Merge PR #33390 into master
* refs/pull/33390/head:
mds: remove dead get_commands code
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Tue, 18 Feb 2020 19:54:28 +0000 (13:54 -0600)]
Merge PR #33336 into master
* refs/pull/33336/head:
osd: fix racy accesses to OSD::osdmap.
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Feb 2020 19:27:26 +0000 (13:27 -0600)]
qa/suites/ardos/cephadm/upgrade: fix initial version
Switch initial version to one with the renamed orchestrator module.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 15 Feb 2020 14:55:16 +0000 (08:55 -0600)]
cephadm: error out on filestore OSDs
We do not currently support filestore OSDs.
Signed-off-by: Sage Weil <sage@redhat.com>
Volker Theile [Tue, 4 Feb 2020 14:04:08 +0000 (15:04 +0100)]
mgr/dashboard: RGW port autodetection does not support "Beast" RGW frontend
* Improve regular expressions to support more configuration variations.
* Modify error message. It includes the config line to be parsed. This should help to debug errors much easier.
* If there are multiple (ssl_)ports/(ssl_)endpoints options, then the first found option will be returned.
Fixes: https://tracker.ceph.com/issues/39252
Signed-off-by: Volker Theile <vtheile@suse.com>
Patrick Donnelly [Tue, 18 Feb 2020 15:48:01 +0000 (07:48 -0800)]
mds: remove dead get_commands code
Left over from #31255,
d8c0bde04b88cb3ad96855bd0948ae10072c9da7.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Tue, 18 Feb 2020 15:29:11 +0000 (09:29 -0600)]
Merge PR #33369 into master
* refs/pull/33369/head:
cephadm: check for both chrony service names
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sebastian Wagner [Tue, 18 Feb 2020 14:14:03 +0000 (15:14 +0100)]
Merge pull request #33360 from liewegas/fix-prom
qa/suites/rados/cephadm/smoke: disable rgw role for now
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sage Weil [Mon, 17 Feb 2020 14:59:38 +0000 (08:59 -0600)]
mgr/orchestrator_cli: sort host list
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Tue, 18 Feb 2020 13:46:37 +0000 (21:46 +0800)]
crimson: add editor properties header
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sebastian Wagner [Tue, 18 Feb 2020 09:05:30 +0000 (10:05 +0100)]
Merge pull request #32817 from sebastian-philipp/rename-orchestrator_cli-orchestrator
pybind/mgr: Rename orchestrator_cli to orchestrator
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Tue, 18 Feb 2020 01:17:42 +0000 (09:17 +0800)]
Merge pull request #33167 from tchaikov/wip-formatter-string_view
common,mgr,osd: pass string_view as "name"
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
Patrick Donnelly [Tue, 18 Feb 2020 00:41:37 +0000 (16:41 -0800)]
Merge PR #33227 into master
* refs/pull/33227/head:
mds: remove unused CDir members
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 18 Feb 2020 00:41:05 +0000 (16:41 -0800)]
Merge PR #33197 into master
* refs/pull/33197/head:
mount.ceph: fix incorrect options parsing
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Patrick Donnelly [Tue, 18 Feb 2020 00:40:20 +0000 (16:40 -0800)]
Merge PR #33180 into master
* refs/pull/33180/head:
mds: add scrub_info_t into mempool
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 18 Feb 2020 00:39:32 +0000 (16:39 -0800)]
Merge PR #33104 into master
* refs/pull/33104/head:
client: Fixes for missing consts SEEK_DATA and SEEK_HOLE on alpine linux
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 18 Feb 2020 00:38:34 +0000 (16:38 -0800)]
Merge PR #33005 into master
* refs/pull/33005/head:
mds: fix 'can wrlock' check in Locker::acquire_locks()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 18 Feb 2020 00:35:14 +0000 (16:35 -0800)]
Merge PR #32435 into master
* refs/pull/32435/head:
mds: Reorganize structure and class members in mdstypes header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Kefu Chai [Tue, 18 Feb 2020 00:33:33 +0000 (08:33 +0800)]
Merge pull request #33344 from athanatos/sjust/wip-errorator-handlers
errorator: improve general error handlers
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Daniel Gryniewicz [Mon, 17 Feb 2020 18:11:25 +0000 (13:11 -0500)]
Merge pull request #31001 from rosinL/wip-set-radosgw-cpu-affinity
rgw/rgw_main: auto set radosgw's cpu affinity according to numa_node configuration
Sage Weil [Mon, 17 Feb 2020 03:26:03 +0000 (21:26 -0600)]
qa/suites/rados/cephadm/smoke: remove rgw
Fixes: https://tracker.ceph.com/issues/44168
Signed-off-by: Sage Weil <sage@redhat.com>
Lenz Grimmer [Mon, 17 Feb 2020 16:36:25 +0000 (16:36 +0000)]
Merge pull request #33206 from rhcs-dashboard/44075-rgw-user-system-field
mgr/dashboard: show correct RGW user 'system' info
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Kefu Chai [Mon, 17 Feb 2020 16:05:56 +0000 (00:05 +0800)]
Merge pull request #33125 from yaarith/telemetry-add-last-report-to-status
mgr/telemetry: add 'last_upload' to status
Reviewed-by: Kefu Chai <kchai@redhat.com>
Lenz Grimmer [Mon, 17 Feb 2020 15:34:11 +0000 (15:34 +0000)]
Merge pull request #33013 from s0nea/wip-dashboard-43912
mgr/dashboard: wait for PG unknown state to be cleared
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Lenz Grimmer [Mon, 17 Feb 2020 14:48:45 +0000 (14:48 +0000)]
Merge pull request #33107 from votdev/cleanup_code
mgr/dashboard: Cleanup code
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Sage Weil [Mon, 17 Feb 2020 14:36:33 +0000 (08:36 -0600)]
cephadm: check for both chrony service names
Signed-off-by: Sage Weil <sage@redhat.com>
Daniel Gryniewicz [Mon, 17 Feb 2020 14:16:06 +0000 (09:16 -0500)]
Merge pull request #31901 from matthewoliver/rgw-admin-user-add-modify
rgw: make radosgw-admin user create and modify distinct
Kefu Chai [Mon, 17 Feb 2020 09:31:25 +0000 (17:31 +0800)]
Merge pull request #32632 from cyx1231st/rfc-seastar-test-socket-nevermove
crimson/net: configure seastar to accept on a fixed core
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sebastian Wagner [Wed, 12 Feb 2020 16:18:32 +0000 (17:18 +0100)]
mgr/dashboard: add pyyaml to requirements.txt
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 12:00:47 +0000 (13:00 +0100)]
doc: rename orchestrator_cli -> orchestrator
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 13:15:44 +0000 (14:15 +0100)]
doc: add prettytable to admin/doc-requirements.txt
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 12:03:00 +0000 (13:03 +0100)]
mon: always_on_modules: Rename orchestrator_cli to orchestrator
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 12:02:33 +0000 (13:02 +0100)]
debian,spec: Rename orchestrator_cli to orchestrator
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 12:02:04 +0000 (13:02 +0100)]
.github: Rename orchestrator_cli to orchestrator
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 13:10:24 +0000 (14:10 +0100)]
mgr/dashboard: add prettytable to requirmenets.txt
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 12:01:21 +0000 (13:01 +0100)]
mgr/dashboard: Fix doc urls to orchestrator
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Wed, 12 Feb 2020 15:21:05 +0000 (16:21 +0100)]
mgr/orchestrator: Use CLICommand, except it's global variable
`CLICommand.COMMANDS` is a global varialbe that prevents
anyone from importing other modules, as the `COMMANS` are then
merged together. Let's use a meta class instead of a global variable.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 11:59:11 +0000 (12:59 +0100)]
pybind/mgr: orchestrator_cli rename: fix imports
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 11:58:21 +0000 (12:58 +0100)]
mgr/orchestsrator: make parse_host_specs a classmethod
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Fri, 24 Jan 2020 12:08:02 +0000 (13:08 +0100)]
mgr/orchestrator_cli: rename to mgr/orchestrator
* Move `mgr/orchestrator.py` to `orchestrator/_interface.py`
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Kefu Chai [Mon, 17 Feb 2020 09:15:35 +0000 (17:15 +0800)]
Merge pull request #33361 from bk201/wip-44164
ceph.spec.in: fix python coverage dependency for non-rhel distros
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yingxin Cheng [Mon, 10 Feb 2020 09:00:31 +0000 (17:00 +0800)]
crimson/net: remove duplicated error codes and conditions
The duplicated error codes and conditions were originally introduced to
match connection errors with both system category (thrown by seastar)
and generic category (thrown by standard library). Since error_code
with system category can be matched by error_condition with generic
category (see std::errc and
system_error_category::default_error_condition(int)), our duplicated
counterparts are not needed actually.
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Kefu Chai [Mon, 17 Feb 2020 04:38:13 +0000 (12:38 +0800)]
Merge pull request #33358 from howard0su/nvme1
os/bluestore: allocate Task on stack
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kiefer Chang [Mon, 17 Feb 2020 04:09:46 +0000 (12:09 +0800)]
ceph.spec.in: fix python coverage dependency for non-rhel distros
The coverage package under openSUSE (and other distros) are named as
python{major_version}-coverage (without minor version).
Fixes: https://tracker.ceph.com/issues/44164
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
Matthew Oliver [Fri, 10 Jan 2020 03:17:11 +0000 (03:17 +0000)]
rgw: make radosgw-admin user create and modify distinct
Currently if you run 'radosgw-admin user create ..' when the user
already exists and you happen to specify, at least, '--uid' and
'--display-name' that match the existing user, radowgw-admin will
actaully go modify the existing user.
This behaviour is a little confusing, hence the bug this patch is
fixing. This patch instead simplifies the tool to make
'create' create and 'modify' modify.
Meaning when you go 'create' a user that already exists, you'll get an
error, as expected. If you want to modify a user, you actually have to
use 'modify'.
For exapmle, now:
$ radosgw-admin user create --uid="test-user" --display-name="test user"
could not create user: unable to create user, user: test-user exists
Signed-off-by: Matthew Oliver <moliver@suse.com>
Fixes: https://tracker.ceph.com/issues/38619
Sage Weil [Mon, 17 Feb 2020 03:51:27 +0000 (21:51 -0600)]
Merge PR #33342 into master
* refs/pull/33342/head:
cephadm: expose `timeout` for `is_available` check
cephadm: add `--retry` arg
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Feb 2020 02:23:27 +0000 (20:23 -0600)]
qa/tasks/cephadm: fix prometheus shutdown
Signed-off-by: Sage Weil <sage@redhat.com>
Jun Su [Sun, 16 Feb 2020 14:26:44 +0000 (22:26 +0800)]
osd/bluestore: Avoid allocate Task on Heap
When the I/O is synced, we can allocate the task object
on stack to avoid malloc calls.
Signed-off-by: Jun Su <howard0su@gmail.com>
Kefu Chai [Sun, 16 Feb 2020 17:26:03 +0000 (01:26 +0800)]
Merge pull request #33357 from tchaikov/wip-crimson-asok
crimson: clean up and refactor asok
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 11:05:09 +0000 (19:05 +0800)]
crimson/admin: no need to check for '\n'
as we don't need to mimic the behavior of classic OSD, what we need to
to fulfill the needs of ceph cli. see `admin_socket()` in
`src/pybind/ceph_daemon.py`, which sends a `\0` to indicate the end of a
command.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 10:03:24 +0000 (18:03 +0800)]
crimson/asok: disconnect client when shutdown
track the established connection as well, please note, the current asok
implementation only allows a single connection at the same time, even
though unix domain socket allows multiple concurrent clients. so there
is no need to track multiple clients at this moment.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 08:40:04 +0000 (16:40 +0800)]
crimson/asok: do not assume the order of param eval
* do not assume the order of parameter evaluation, before this change,
we have `do_with(cn.input(), cn.output(), std::move(cn) ...)`, see
https://en.cppreference.com/w/cpp/language/eval_order,
> side effects of the initialization of every parameter are
> indeterminately sequenced with respect to value computations and side
> effects of any other parameter.
we cannot move `cn` out and then call its member functions. so
introduce a struct for capturing its input and output.
* move `do_until_gate()` into `start()`, no need to check if
gate is stopped in `safe_action`, as `sestar::do_until()` will do
this for us.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 08:39:26 +0000 (16:39 +0800)]
crimson: register commands separately
so we can do command registration in the same place, in future, we can
move all of them into another place if necessary
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 02:03:36 +0000 (10:03 +0800)]
crimson: refactor asok command
* do not define another iterator type, use `map::const_iterator`
directly
* do not register hooks/commands with server block, register them
one by one, much simpler this way.
* encapsulate the hook metadata in `AdminSocketHook`, so each
`AdminSocketHook` instance is self-contained in the sense that
we don't need to use an extra type for keeping track of them.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 06:12:37 +0000 (14:12 +0800)]
crimson/osd/pg_map: add 'PGMap::get_pgs() const'
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 06:11:18 +0000 (14:11 +0800)]
crimson/osd: send beacon only if active
mimic the behavior of classic osd, and this behavior does make sense.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 06:10:25 +0000 (14:10 +0800)]
crimson/osd: add OSD::dump_status()
so it can be used by asock command
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 01:00:47 +0000 (09:00 +0800)]
crimson/osd: refactor OSD::stop_asok_admin()
the comment does not apply anymore, since `admin` and `asok` are
created in the constructor.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 00:58:51 +0000 (08:58 +0800)]
cmake: s/thread/Threads::Threads/
Threads::Threads is cmake's way to present thread library. see
https://cmake.org/cmake/help/v3.1/module/FindThreads.html
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 Feb 2020 00:54:32 +0000 (08:54 +0800)]
crimson: remove unused include and forward decl
and add those used
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sun, 16 Feb 2020 15:29:44 +0000 (09:29 -0600)]
Merge PR #33339 into master
* refs/pull/33339/head:
osd/PeeringState: require SERVER_OCTOPUS to respond to RenewLease
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 15 Feb 2020 17:40:08 +0000 (11:40 -0600)]
cephadm: separate out require files in config-json
- Put files in a subsection of the config-json.
- Also, consolidate the sanity checks into one place (command_deploy)
instead of duplicating them in create_daemon_dirs.
Signed-off-by: Sage Weil <sage@redhat.com>
Paul Cuzner [Wed, 29 Jan 2020 03:10:37 +0000 (16:10 +1300)]
cephadm: add alertmanager deployment feature
Deploy now accepts a daemon_type of alertmanager. Since alertmanager
is a cluster aware service, the monitoring metadata has been updated to
allow a daemon to use multiple ports. In addition, when config_json is
received, any 'key' prefixed by '_' is skipped when creating files in the
daemons etc directory. Keys that use the '_' prefix hold config data that
can be used elsewhere. In the case of the alertmanager a _peers parameter
is required which is used to add --cluster.peer=<ip>:<port> to the
container command to form the alertmanager cluster
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
Sage Weil [Sat, 15 Feb 2020 14:42:10 +0000 (08:42 -0600)]
Merge PR #33289 into master
* refs/pull/33289/head:
qa/tasks/cephadm: deploy rgw daemons too
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Sat, 15 Feb 2020 14:37:41 +0000 (08:37 -0600)]
Merge PR #32775 into master
* refs/pull/32775/head:
ceph.spec.in: fix python3 dependencies in centos7
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 15 Feb 2020 14:37:13 +0000 (08:37 -0600)]
Merge PR #33129 into master
* refs/pull/33129/head:
osd/PeeringState: do not start renewing leases until PG is activated
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Sat, 15 Feb 2020 14:36:43 +0000 (08:36 -0600)]
Merge PR #33163 into master
* refs/pull/33163/head:
msg/Policy: limit unregistered anon connections to mon
Reviewed-by: Neha Ojha <nojha@redhat.com>
Kefu Chai [Sat, 15 Feb 2020 14:17:47 +0000 (22:17 +0800)]
Merge pull request #33350 from rzarzynski/wip-crimson-clang-watchnotify
crimson/osd: fix the Clang build in create_watch_info().
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 15 Feb 2020 14:16:50 +0000 (22:16 +0800)]
Merge pull request #33347 from tchaikov/wip-orch-addr
mgr/orchestrator: "addr" is optional for constructing InventoryNode
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Kefu Chai [Sat, 15 Feb 2020 12:48:50 +0000 (20:48 +0800)]
Merge pull request #33349 from ronen-fr/clang-5
crimson/osd: remove unneeded captures - pg.cc
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Radoslaw Zarzynski [Sat, 15 Feb 2020 12:20:47 +0000 (13:20 +0100)]
crimson/osd: fix the Clang build in create_watch_info().
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Kefu Chai [Sat, 15 Feb 2020 10:46:51 +0000 (18:46 +0800)]
Merge pull request #33325 from tchaikov/wip-super-setup
qa/tasks: call super class's setUp()
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Kefu Chai [Sat, 15 Feb 2020 10:43:32 +0000 (18:43 +0800)]
Merge pull request #33348 from tchaikov/wip-rbd-mirror-test
mgr/dashboard: s/fsid/mirror_uuid/
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Sat, 15 Feb 2020 03:36:08 +0000 (11:36 +0800)]
mgr/orchestrator: "addr" is optional for constructing InventoryNode
this addresses a regression introduced by
5276871e15
Signed-off-by: Kefu Chai <kchai@redhat.com>