Commit Graph

96330 Commits

Author SHA1 Message Date
Kefu Chai
c7247eb30a
Merge pull request #27004 from tchaikov/wip-crimson-osdmap
crimson/osd: crimson/osd: do not load fullmap.0

Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-03-19 20:07:27 +08:00
Mykola Golub
022705ae44 librbd: fix typo in deep_copy::ObjectCopyRequest::compute_read_ops
The second arg for interval_set insert method is the inserting
interval lenth, while the end position was provided. It still
worked correctly, because the end position value is always larger
than the truncated length.

Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-03-19 12:04:23 +00:00
Radoslaw Zarzynski
31fffbe411 rgw: drop unused rgw_decode_pki_token().
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-03-19 13:03:13 +01:00
Nathan Cutler
282a6b0675 rpm: refrain from building ceph-resource-agents on SLE
Fixes: https://tracker.ceph.com/issues/38812
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-03-19 12:22:32 +01:00
Nathan Cutler
03c6e135c2
Merge pull request #26973 from smithfarm/wip-nautilus-backports
script: enable nautilus in backport scripts

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-03-19 12:16:24 +01:00
Nathan Cutler
b0da2371c1 rpm: fix "rhel <= 7" conditional
We do not build for RHEL 6 and below, so "rhel == 7" is just as good, while
also avoiding the bug.

In addition, "rhel == 7" is the conditional we are using everywhere else in the
spec file for this purpose.

Fixes: https://tracker.ceph.com/issues/38810
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-03-19 12:11:56 +01:00
Roman Penyaev
2292120ffd EventEpoll: refactor del_event() a bit
The main purpose of the patch is to set 'ee' members only on EPOLL_CTL_MOD
path, deletion path does not requie any of the members set.

This will make code a bit better.

Signed-off-by: Roman Penyaev <rpenyaev@suse.de>
2019-03-19 12:00:08 +01:00
Roman Penyaev
c415b9fed4 EventEpoll: set EPOLLET flag on del_event()
When new fd is being added to epoll fd EPOLLET (edge triggered) flag
is set, i.e. we assume that in and out works in edge triggered mode.

But on del_event(), when eventually epoll_ctl(EPOLL_CTL_MOD) is
invoked, EPOLLET flag is cleared, i.e. level triggered mode is
enabled.

Do not lose EPOLLET.

Signed-off-by: Roman Penyaev <rpenyaev@suse.de>
2019-03-19 12:00:08 +01:00
Ilya Dryomov
a337cc58cd qa: add krbd_discard_granularity.t test
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2019-03-19 11:49:19 +01:00
Sage Weil
2203c4d07a Merge PR #27019 into master
* refs/pull/27019/head:
	doc/releases/nautilus: add reference to msgr2 config update section
	doc/cephfs/nfs: update ceph.conf example
	doc/releases/nautilus: final upgrade note updates

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-19 05:38:11 -05:00
guodan1
faaca31e53 mgr/dashboard: Add date range and log search functionality
Fixes: http://tracker.ceph.com/issues/37387t st

Signed-off-by: guodan1 <guodan1@lenovo.com>
2019-03-19 18:28:45 +08:00
Sebastian Wagner
fc974ad979
Merge pull request #26772 from sebastian-philipp/orchestrator-rm-stateful-rule
mgr/orchestrator: Remove `(add|test|remove)_stateful_service_rule`

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
2019-03-19 10:10:52 +01:00
Sage Weil
665e60edee Merge tag 'v14.2.0'
v14.2.0
2019-03-19 03:08:21 -05:00
Kefu Chai
9ca1b70678 messages,osd: remove MPGStats::had_map_for
MPGStats::had_map_for was added back in 7844d0e5, the last release that
still checks this field was mimic -- monitor sends OSD incremental
osdmaps if the monitor finds that the pg_stats' had_map_for is greater
than 30 and the epoch is less than that of latest osdmap.

but DaemonServer as the new consumer of MPGStats does not check
had_map_for anymore -- it simply updates the cluster state with the
pg_stats reported by OSD. and we directs OSD to mgr for sending pg_stats
since mimic. so, we can safely drop the support of had_map_for in
octopus, as it has been 2 releases.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-19 14:46:30 +08:00
Kefu Chai
01abe61539
Merge pull request #26977 from p-na/wip-pna-fix-tox-env-vars
mgr/dashboard: Fix env vars of `run-tox.sh`

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-19 11:16:18 +08:00
Matt Benjamin
affb7d396f
Merge pull request #26095 from bbc/s3secretcache
rgw: Added caching for S3 credentials retrieved from keystone
2019-03-18 17:35:04 -04:00
Casey Bodley
cab4169677
Merge pull request #26564 from theanalyst/wip-reshard-lc-fixes
rgw: LC: handle resharded buckets

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-03-18 15:13:06 -04:00
Casey Bodley
bd71147dd2
Merge pull request #27001 from linuxbox2/wip-rgw-delimchar
rgw: fix signed char truncation in delimiter check

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-03-18 15:04:37 -04:00
Casey Bodley
db1a74b274 test/rgw: RGWReshardWait uses std::chrono::steady_clock
the synchronous wait() call uses std::condition_variable::wait_for(),
which is based on std::chrono::steady_clock. this changes the asynchronous
waits (along with timing in the unit test) to use that same clock

should resolve this test failure:

[ RUN      ] ReshardWait.wait_yield
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/rgw/test_rgw_reshard_wait.cc:78:
Failure
Expected: (wait_duration) <= (elapsed), actual: 0.01s vs 0.00835688s
[  FAILED  ] ReshardWait.wait_yield (8 ms)

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2019-03-18 14:54:53 -04:00
Ilya Dryomov
481b6c2146 qa: update and rename krbd_discard_1b.t
Passing 1 for alloc_size is no longer allowed.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2019-03-18 19:17:44 +01:00
Sage Weil
b298aa972d Merge remote-tracking branch 'gh/nautilus' 2019-03-18 12:10:50 -05:00
Kefu Chai
1033746e42
Merge pull request #26457 from mogeb/osd-stop-steady-clock
osd: use steady clock in prepare_to_stop()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-19 00:00:37 +08:00
Patrick Nawracay
5dee0b6a87 mgr/dashboard: Fix env vars of run-tox.sh
Fixes: http://tracker.ceph.com/issues/38798

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2019-03-18 15:19:11 +01:00
Patrick Nawracay
29d53f8d29 mgr/dashboard: "1 osds exist in the crush map but not in the osdmap" breaks OSD page
Fixes: http://tracker.ceph.com/issues/36086

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2019-03-18 14:55:20 +01:00
Jan Fajerski
12712256b6 pybind/mgr/prometheus: remove scrape_duration metric
Prometheus itself adds this metric to every scrape target.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-03-18 14:28:49 +01:00
Patrick Nawracay
f7cd7b025f mgr/dashboard: Clean up of Osd::list()
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2019-03-18 12:33:40 +00:00
Sebastian Wagner
315bc1a9ee doc/rados/api/python: Add documentation for mon_command
Co-authored-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-03-18 11:55:56 +01:00
Jenkins Build Slave User
3a54b2b6d1 14.2.0 2019-03-18 10:08:29 +00:00
Sage Weil
dac96a4c0e doc/releases/nautilus: add reference to msgr2 config update section
Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-18 03:14:24 -05:00
Sage Weil
08e2b6ada2 doc/cephfs/nfs: update ceph.conf example
and reference 'ceph config generate-minimal-conf'

Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-17 23:16:49 -05:00
Sage Weil
cbcad6325c Merge PR #26956 into nautilus
* refs/pull/26956/head:
	doc/releases/nautilus: more detail around ceph-volume step

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-03-17 23:09:34 -05:00
Brad Hubbard
9c024bafa3
Merge pull request #27013 from badone/wip-nautilus-CA-change
qa/ceph-ansible: Move to Nautilus

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
2019-03-18 07:07:46 +10:00
Kefu Chai
6f1fd44bbc
Merge pull request #27011 from liewegas/wip-redirect-mimic
qa/suites/upgrade/mimic-x/parallel: enable all classes

Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-18 01:22:44 +08:00
Kefu Chai
6401e0f35b
Merge pull request #27018 from liewegas/wip-38294
qa/suites/upgrade/luminous-x: disable c-o-t import/export tests between versions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-18 01:22:01 +08:00
Sage Weil
2dc0993b47 Merge PR #26960 into nautilus
* refs/pull/26960/head:
	ceph_release: nautilus is will be 'stable' for v14.2.0

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2019-03-17 08:32:11 -05:00
Sage Weil
8aa07a764c Merge PR #27017 into master
* refs/pull/27017/head:
	osd: transpose two wait lists in comment

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-17 08:19:54 -05:00
Sage Weil
c529925e2f doc/releases/nautilus: final upgrade note updates
Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-17 05:29:27 -05:00
Sage Weil
b71a766d19 qa/suitse/upgrade/luminous-x/stress-split-erasure-code: disable c-o-t tests
The stress-split thrasher already had this off, but the ec variant did
not.  We don't support ceph-objectstore-tool exports/imports between major
versions.

Fixes: http://tracker.ceph.com/issues/38294
Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-17 04:59:36 -05:00
Kefu Chai
253b8734c1 osd: transpose two wait lists in comment
see PrimaryLogPG::do_request(), we check for

1. is_peered(), then
2. flushes_in_progress, then
3. is_active()
4. scrubber.is_chunky_scrub_active() && write_blocked_by_scrub(head) in
   PrimaryLogPG::do_op() which is called by PrimaryLogPG::do_request().

while in PrimaryLogPG::on_change()

we requeue the waiting request in the reversed order,

1. requeue_ops(waiting_for_peered);
2. requeue_ops(waiting_for_flush);
3. requeue_ops(waiting_for_active);

so the comment is not in sync with the code. in this change,
"waiting_for_active" and "waiting_for_flush" are transposed in the
comment explaining blocked request wait lists.

also, sync the pre-conditions of "waiting_for_peered" and
"waiting_for_flush" with "PrimaryLogPG::do_request()"

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-17 16:36:47 +08:00
Sage Weil
04dad6beaf Merge PR #26822 into master
* refs/pull/26822/head:
	osd/PG: adjust pg history on fabricated merge target if necessary

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-03-16 17:15:33 -05:00
Sage Weil
c2e1ddfe5e ceph_test_rados_api_tier_cxx: remove mimic checks
These checks don't work when the cluster is newer than mimic.

Instead, let's just try not to run this test on a pre-mimic cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-16 17:12:01 -05:00
Sage Weil
5d1f6044d9 Merge PR #27002 into nautilus
* refs/pull/27002/head:
	mgr/telemetry: check for errors when sending report

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-16 15:47:29 -05:00
Sage Weil
bfd0581c5f qa/suites/upgrade/mimic-x/parallel: enable all classes
This fixes the redirect tiering tests, which need the 'cas' class.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-16 15:27:29 -05:00
Sage Weil
eb29743a95 ceph_test_rados_api_tier_cxx: remove luminous check
It was a flawed check, since it would fail for anything newer than
luminous.  And in any case, we don't need it anymore.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-16 15:21:37 -05:00
Sage Weil
0c6840e219 mon/OSDMonitor: allow 'osd pool set pgp_num_actual'
Normally we let the mgr control pgp_num_actual for us in a nice, safe, controlled
way.  However, it is very conservative, and only makes changes if all PGs are healthy.
There are situations where the user wants to be move aggressive than this.

For example, if you have a pool with many PGs (say, 4096) and set pg_num_target to a
small number like 4, the mgr will adjust pgp_num way down.  This can lead to an OSD
hitting max_pgs_per_osd.  That prevents the PGs from being active+clean, however,
which prevents the mgr adjusting pgp_num back up even if the user sets the target to
a larger value.

This patch lets the user directly adjust pgp_num_actual.  Note that we still do
not expose access to pg_num_actual, since there are much stricter conditions that
must be true in order to safely make downward adjustments.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-16 15:06:00 -05:00
Sage Weil
896b7f3ea9 Merge PR #27000 into nautilus
* refs/pull/27000/head:
	osd: stringify as int

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-16 13:03:54 -05:00
Xie Xingguo
578d8b82c8
Merge pull request #26975 from xiexingguo/wip-mon-pri-lost
mon/MonMap: always set mon priority; add it to dump

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-16 19:49:37 +08:00
Xie Xingguo
8c8c8f84e8
Merge pull request #26903 from xiexingguo/wip-ds-auth
mgr/DaemonServer: handle caps more carefully

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-16 19:48:11 +08:00
Kefu Chai
c74afcd9d2 crimson/osd: do not load fullmap.0
fullmap.0 is an empty map, it used when we try to rebase inc_map.1.

Signed-off-by: chunmei Liu <chunmei.liu@intel.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-16 15:30:36 +08:00
Kefu Chai
cf5d5e62f9 crimson/osd: reuse load_map() in store_maps()
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-16 15:30:27 +08:00