Commit Graph

83978 Commits

Author SHA1 Message Date
Kefu Chai
a6c271e2be
Merge pull request #20703 from xiexingguo/wip-balancer-01
osd/OSDMap: ignore PGs from pools of failure-domain OSD

Reviewed-by: Sage Weil <sage@redhat.com>
2018-03-08 23:12:27 +08:00
Kefu Chai
6e420093b0
Merge pull request #20644 from jcsp/wip-23166
mgr/prometheus: skip OSD output if missing from CRUSH devices

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-08 23:11:47 +08:00
Jason Dillaman
26df7ff329
Merge pull request #20773 from idryomov/wip-krbd-include-sysmacros
krbd: include sys/sysmacros.h for major, minor and makedev

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-03-08 08:48:55 -05:00
Ilya Dryomov
a048b5e612
Merge pull request #20750 from idryomov/wip-krbd-whole-object-discard-test
qa: krbd whole-object-discard test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-03-08 12:52:56 +01:00
John Spray
a0a001a8df
Merge pull request #20755 from LenzGr/mgr-dashboard-documentation
doc: Updated dashboard v2 feature list

Reviewed-by: John Spray <john.spray@redhat.com>
2018-03-08 10:56:51 +00:00
Ilya Dryomov
070ce41f0b
Merge pull request #20792 from yangdongsheng/krbd_osd_request_timeout
rbd: support osd_request_timeout in rbd map command

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2018-03-08 11:31:49 +01:00
Dongsheng Yang
f37ae96fa7 rbd: support osd_request_timeout in rbd map command
Default of osd_request_timeout in krbd is 0 means no timeout,
but we sometimes need to set this value by rbd command. then
pass osd_request_timeout to kernel rbd in rbd mapping.

Fixes: http://tracker.ceph.com/issues/23073
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2018-03-08 04:12:41 -05:00
Mykola Golub
9ffbac6fc5
Merge pull request #20729 from dillaman/wip-22738
qa/suites/rbd: segregated v1 image format tests

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-03-07 22:53:12 +02:00
Patrick Donnelly
a1c5a552b8
Merge PR #20705 into master
* refs/pull/20705/head:
	doc: Fix -d description in ceph-fuse

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-07 11:27:58 -08:00
Casey Bodley
cf52fc5ab9
Merge pull request #20693 from cbodley/wip-rgw-s3website-redirect
rgw: s3website error handler uses original object name

Reviewed-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-03-07 07:57:57 -05:00
Ilya Dryomov
8d8390ff95 qa: krbd whole-object-discard test
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-03-07 12:06:33 +01:00
Ilya Dryomov
fbc97f5565 krbd: include sys/sysmacros.h for major, minor and makedev
Previously we got these through sys/types.h, but that's now deprecated:

  warning: In the GNU C Library, "major" is defined
   by <sys/sysmacros.h>. For historical compatibility, it is
   currently defined by <sys/types.h> as well, but we plan to
   remove this soon. To use "major", include <sys/sysmacros.h>
   directly. If you did not intend to use a system-defined macro
   "major", you should undefine it after including <sys/types.h>.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-03-07 11:42:38 +01:00
Kefu Chai
480f078c14
Merge pull request #20768 from tchaikov/wip-cmake-dashboard
cmake,test/mgr: restructure dashboard tests and cmake related fixes

Reviewed-by: Ricardo Dias <rdias@suse.com>
2018-03-07 18:39:22 +08:00
Kefu Chai
59221274cb test/mgr: restructure dashboard tests
* restructure dashboard tests so they follow the model of other tests
  based on ceph-helpers.sh. i.e. extract the TEST_* out of run()
  function.
* expose mon-host using CEPH_ARGS env variable.
* mgr-dashboard_v2-smoke.sh: do not export CEPH_ARGS in a subshell, so
  the run_mgr() and ceph cli can also have access to the updated
  CEPH_ARGS, and hence they will be able to locate the mon. and because
  auth-supported=none is populated using CEPH_ARGS, this test won't fail
  because of missing keyring.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-03-07 17:27:36 +08:00
Kefu Chai
aedbbe791f test: run 'npm' command in a directory specified by absolute path
in case developer wants to run the test in "./build" or some random
directory.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-03-07 17:27:36 +08:00
Kefu Chai
ad0d7c89a1 cmake: check for "npm" before using it
and allows use to specify the path in which npm is installed. in my
case, if $HOME/.npmrc points "prefix" to ${HOME}/.npm-packages, i will
be able to run

NPM_ROOT=${HOME}/.npm-packages cmake ..

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-03-07 17:23:49 +08:00
Volker Theile
b96dfb5b84
Merge pull request #20742 from votdev/perf_counter_units
mgr/dashboard v2: Add units to performance counters
2018-03-07 08:41:27 +01:00
Volker Theile
1a23d0cf22
Merge pull request #20744 from votdev/fix_loading_indicator
mgr/dashboard v2: Display loading indicator in datatables during first load
2018-03-07 08:40:29 +01:00
Volker Theile
2e68d9bffa
Merge pull request #20746 from votdev/datatable_selection
mgr/dashboard v2: Introduce CdTableSelection model
2018-03-07 08:39:55 +01:00
Jos Collin
7a574be986 doc: Fix -d description in ceph-fuse
Fixes: http://tracker.ceph.com/issues/23214
Signed-off-by: Jos Collin <jcollin@redhat.com>
2018-03-07 08:47:15 +05:30
Patrick Donnelly
fd1e57c2de
Merge PR #20472 into master
* refs/pull/20472/head:
	mds: add DUMP_DIRFRAGS to CInode and DUMP_ITEMS to CDir
	mds: Enhance dump_tree performance by traversing the tree directly

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:29:09 -08:00
Patrick Donnelly
0ea9e05e58
Merge PR #20502 into master
* refs/pull/20502/head:
	test: cap waits in delegation tests at 60s
	tests: add a test for doing a getattr while caps are recalled but before returned
	client: allow getattr, lookup, fstatx, and readdir to use implemented caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-03-06 15:28:59 -08:00
Patrick Donnelly
eb7732b735
Merge PR #20541 into master
* refs/pull/20541/head:
	ceph-mds: exit if invalid id

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:28:50 -08:00
Patrick Donnelly
ed71e0e570
Merge PR #20575 into master
* refs/pull/20575/head:
	mds: set journaler iohint correctly when mds daemon going to active

Reviewed-by: dongdong tao <tdd21151186@gmail.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:28:43 -08:00
Patrick Donnelly
757c2f4cdb
githubmap: update contributors
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:28:42 -08:00
Patrick Donnelly
44e286362f
Merge PR #20583 into master
* refs/pull/20583/head:
	cephfs-journal-tool: add event time output

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:24:11 -08:00
Patrick Donnelly
54e9ac6c7a
Merge PR #20615 into master
* refs/pull/20615/head:
	mds: modify help info of dump_historic_ops and dump_historic_ops_by_duration
	mds:fix typo in MDSRank

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:24:04 -08:00
Sage Weil
d7692a24c7
Merge pull request #20172 from liewegas/wip-config
mon: centralized config

Reviewed-by: John Spray <john.spray@redhat.com>
2018-03-06 15:24:23 -06:00
Sage Weil
a5597f0b2b common/config: normalize key name for get_val (external) variants
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
6eba775965 vstart.sh: -c to ceph cli
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
6d13ab2d9a mon/ConfigMonitor: process subs from update_from_paxos
This is what OSDMonitor and MDSMonitor do.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
148db39cf9 mon/MonClient: fix auth timeout vs error race
It's possible that we successfully set active_con *and* time out the
cond WaitUntil.  Only set the error if we don't have a connection; if we
set it *and* time out then let's call it success.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
b349fbe2e4 mon/ConfigMonitor: fix dump when by_type is missing an item
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
59ee2e8d3b common/common_init: use unique admin_socket path for unprivileged daemons
These qualify as 'daemon', but their path is usually not unique.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
91e8da1431 common/config: intercept "keyfile", translate into "key"
The keyfile arg might be - (stdin), which we can only read once.  Ensure
that we consume it once by intercepting the CLI value early and inserting
the value into the 'key' option.

This robs future code of the knowledge that the key came from --keyfile
and not --key, but avoids the issue of multiple users (notably, KeyRing.cc
and the OSD mkfs code).

Remove the - special case from OSD at the same time, since it can no
longer be reached (unless something other than the CLI specified '-', but
neither ceph.conf nor the mon config make sense here).

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
9aeced33ee librados: fix common_init_finish timing
Common_init_finish does start_service_thread and does
set_safe_to_start_threads() on the cct, which switches us to 'runtime'
mode where we can't accept many config options. Do that *after* we fetch
our config from the mon so that we can accept+set runtime options (and
not complain to stderr about it).

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
12062e7d87 common/config: check against raw value (no meta) to detect unchanged option
If we are looking at a new value from the mon and comparing it to what we
already have active, compare the non-meta-substituted form.  This way a
value from the mon that can't update at runtime but we have already set to
the same value will not be falsely flagged as ignored.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
3d0b38aff5 mon/ConfigMonitor: add missing #include, tweak types
Seems to resolve a build error on some compilers!  Meh.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
250be6db7c test/cli/ceph-conf: fix test
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
9c42d88743 qa/tasks/rebuild_mondb.py: --no-mon-config to ceph-objectstore-tool
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
2bc34bb882 common/config: add --mon-config option (opposite of --no-mon-config)
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
3c2b30e4c5 mon/MonClient: apply timeout while fetching config
The normal timeouts automatically apply during the authenticate() stage,
but not to the explicit wait for a config.  If we don't get that quickly
we shoudl retry another monitor because it is possible we will connect to
an out-of-quorum (or otherwise unresponsive) mon.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
bee6ced276 mon/MonClient: tolerate pre-mimic mons
Return success if the mons are pre-mimic (and thus have no config).

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
a095ec8b0f ceph-disk: --no-mon-config
Some of these cases make sense to fetch mon configs, but we are deprecating
ceph-disk anyway, and the tests currently make use of ceph-disk in places
that do not have a mon_host defined via a ceph.conf or other environment.
This avoids breaking those test cases without any real impact on users
(which will either use ceph-volume or presumably remain in a legacy config
environment).

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
11e287c137 qa/workunits/cephtool/test.sh: fix mon_caps
Pass --no-mon-config so we don't get

 failed to fetch mon config (--no-mon-config to skip)

instead.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
c9e974800f qa: --no-mon-config for ceph-objectstore-tool --op mkfs ..
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
4a1d198c4f ceph-objectstore-tool: infer osd id to authenticate
In order to get mon configs we need to authenticate as somebody.
Infer it from the data directory.

Note that this won't work for --op mkfs.  Those users need to pass
--no-mon-config or -n.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
148105046d global/global_init: send startup errors to cerr, not log
(Flush the log, too, as something that has useful error messages.)

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
e44e10d6e0 qa/tasks/ceph.py: --no-mon-config during ceph-osd mkfs
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
902f3987de vstart.sh: use assimilate-conf to ingest config options quickly
Separate 'config set' commands is slow.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00