]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Yan, Zheng [Fri, 11 May 2018 06:55:12 +0000 (14:55 +0800)]
mds: reply session reject for open request from blacklisted client
Kernel client and old version libcephfs do not check if themselves
are blacklisted. They can be stuck at opening session after getting
blacklisted. The session reject message can avoid this.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24054
(cherry picked from commit
b7c6cd8a54f094acb58603b8c6bae9e570a73e27 )
Yan, Zheng [Fri, 11 May 2018 12:26:43 +0000 (20:26 +0800)]
qa/tasks/cephfs: add timeout parameter to kclient umount_wait
Just make caller happy. there is no easy way to support timeout.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24053
(cherry picked from commit
e7d0b41deae7ec99ddf0a1f5f30ea82683b7b474 )
Sage Weil [Tue, 22 May 2018 02:42:23 +0000 (21:42 -0500)]
Merge pull request #22120 from liewegas/wip-24167-mimic
mimic: crush: update choose_args on bucket removal
Sage Weil [Tue, 22 May 2018 02:42:00 +0000 (21:42 -0500)]
Merge pull request #22125 from liewegas/wip-old-clients-mimic
qa/suites/rados/thrash-old-clients: only centos and 16.04
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Josh Durgin [Tue, 22 May 2018 01:14:12 +0000 (18:14 -0700)]
Merge pull request #22075 from dzafman/wip-parens-mimic
mimic: test: Need to escape parens in log-whitelist for grep
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Alfredo Deza [Mon, 21 May 2018 21:18:52 +0000 (17:18 -0400)]
Merge branch 'mimic' of github.com:ceph/ceph into mimic
Sage Weil [Mon, 21 May 2018 18:36:17 +0000 (13:36 -0500)]
Merge pull request #22113 from tchaikov/mimic-24174
mimic: osd/PrimaryLogPG: fix try_flush_mark_clean write contention case
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 21 May 2018 18:35:53 +0000 (13:35 -0500)]
Merge pull request #22117 from tchaikov/mimic-qa-test_envlibrados_for_rocksdb
mimic: qa/workunits/rados/test_envlibrados_for_rocksdb: install g++ not g++-4.7
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Mon, 21 May 2018 18:35:11 +0000 (13:35 -0500)]
Merge pull request #22107 from liewegas/wip-unit-spaces-mimic
mimic: include/types: space between number and units
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
David Zafman [Sat, 19 May 2018 03:15:41 +0000 (20:15 -0700)]
test: Add CACHE_POOL_NO_HIT_SET to whitelist for mon/pool_ops.sh
Ignore
cluster [WRN] Health check failed: 1 cache pools are missing hit_sets (CACHE_POOL_NO_HIT_SET)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
4fad800043d44024a496f78869e9bb02a16af063 )
David Zafman [Fri, 18 May 2018 00:30:32 +0000 (17:30 -0700)]
test: Need to escape parens in log-whitelist for grep
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
918921ab2f939c8b52c43a10bf0266347a2bdcf3 )
Sage Weil [Sun, 20 May 2018 14:38:02 +0000 (09:38 -0500)]
qa/suites/rados/thrash-old-clients: only centos and 16.04
We don't have old client builds for the newer distros.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
dd46ae1006e580b4f25d190732e7b4b400501955 )
Jenkins Build Slave User [Mon, 21 May 2018 16:19:10 +0000 (16:19 +0000)]
13.1.1
Sage Weil [Fri, 18 May 2018 18:11:57 +0000 (13:11 -0500)]
crush: update choose_args on bucket removal
The specific bug I see is that a bucket no longer exists but its
choose_args still does. However, I'm also taking the opportunity to
verify that the choose_args agrees with the bucket sizes and position
counts everywhere else, too. Check for
- ids or weight_sets for buckets that don't exist or aren't straw2
- weight_set_positions that don't match the choose_args
- don't fix this, just warn. i'm not sure how it would happen. :/
- weight_set sizes that don't match the bucket size
Fixes: http://tracker.ceph.com/issues/24167
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
a75ffcd17cc171a383315ec9738865de6c455086 )
Sage Weil [Fri, 18 May 2018 18:11:57 +0000 (13:11 -0500)]
crush: update choose_args on bucket removal, resize, or position mismatch
The specific bug I see is that a bucket no longer exists but its
choose_args still does. However, I'm also taking the opportunity to
verify that the choose_args agrees with the bucket sizes and position
counts everywhere else, too. Check for
- ids or weight_sets for buckets that don't exist or aren't straw2
- weight_set_positions that don't match the choose_args
- weight_set sizes that don't match the bucket size
Fixes: http://tracker.ceph.com/issues/24167
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
564ef28a4014cb5d9959b1925154bbf7863fd0d4 )
Sage Weil [Fri, 18 May 2018 22:10:14 +0000 (17:10 -0500)]
crush: create weight-set on demand when doing a choose-args reweight
If we try to reweight an item in a choose-args set for a given item
but the bucket doesn't have a weight_set yet, create it on the fly, and
populate it with the canonical bucket weights.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
d8d08b8cbf5b0ad3646dd1e177a1418e96273244 )
Sage Weil [Fri, 18 May 2018 22:10:47 +0000 (17:10 -0500)]
test/cli/crushtool: use straw2 buckets for choose-args test
Choose-args only works for straw2 so it is misleading to test using a
map with straw buckets.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
7bfebfacfaf830fa9cb420b9d3e1d008e9891b3c )
Sage Weil [Fri, 18 May 2018 17:30:21 +0000 (12:30 -0500)]
crush: weight_set_size -> weight_set_positions
This naming was confusing! This is the number of positions we
have weight_sets for.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
c173a275dff3f5fc050832cb10f75bda51e653c5 )
Mykola Golub [Mon, 21 May 2018 12:43:23 +0000 (15:43 +0300)]
Merge pull request #22105 from dillaman/wip-rbd-mirror-policy-mimic
mimic: rbd-mirror: optionally support active/active replication
Reviewed-by: Mykola Golub <mgolub@suse.com>
Kefu Chai [Sun, 20 May 2018 08:52:53 +0000 (16:52 +0800)]
qa/workunits/rados/test_envlibrados_for_rocksdb: use cmake not make
* so we just rely on a single build system instead of two of them, the
other place we use cmake is cmake/modules/BuildRockDB.cmake.
* disable gflags when building rocksdb, it's optional and does not help
in the sense of testing librados support.
* disable prompts when installing on debian, to silence warnings like:
debconf: unable to initialize frontend: Dialog
* drop --force-yes option, as it is deprecated, and is replaced with
--allow-downgrades, --allow-remove-essential,
--allow-change-held-packages, but none of them apply in our case.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
f8d47223e2e67871d5155406af4c4cda1451f521 )
Kefu Chai [Sun, 20 May 2018 08:29:49 +0000 (16:29 +0800)]
qa/workunits/rados/test_envlibrados_for_rocksdb: install g++ not g++-4.7
since fog now deploys ubuntu 18.04 where g++-4.7 is not available
anymore, so g++ is good enough.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
63a35625a3416ee4c210530fd38d38585b6eca95 )
Sage Weil [Fri, 18 May 2018 14:24:48 +0000 (09:24 -0500)]
osd/PrimaryLogPG: fix try_flush_mark_clean write contention case
Release ctx *after* we dereference it to queue up the other flush waiters.
This was a dumb mistake in the recent fix from
41609ba1b24e5384494c7959494e19302b5a2429
Fixes: http://tracker.ceph.com/issues/24174
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6d6cf388b245e21cc78be00d838e8b214b1e9497 )
Kefu Chai [Mon, 21 May 2018 06:25:33 +0000 (14:25 +0800)]
Merge pull request #22099 from liewegas/wip-pgmap-digest-decode-mimic
mon/PGMap: fix PGMapDigest decode
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 21 May 2018 06:20:19 +0000 (14:20 +0800)]
Merge pull request #22104 from tchaikov/mimic-24180
mimic: mon/LogMonitor: call no_reply() on ignored log message
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 18 May 2018 18:53:04 +0000 (13:53 -0500)]
qa/workunits/cephtool/test.sh: update unit formatting
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
0b956ef37db1f4bad1cc75cc2a78852832ab7b65 )
Sage Weil [Thu, 17 May 2018 16:14:13 +0000 (11:14 -0500)]
qa/workunits/rbd/import_export: update unit formatting
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
c6a747d1d801e8d1b3a9af0bc91770cf8544e85e )
Sage Weil [Thu, 17 May 2018 16:13:31 +0000 (11:13 -0500)]
qa/workunits/rbd/cli_generic: update unit formatting
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
ddd3095bc0ab324b37ee0ed8cfb40dfe7c1c0a3f )
Sage Weil [Mon, 21 May 2018 02:28:28 +0000 (21:28 -0500)]
test/cli-integration/rbd: update unit formatting
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
35ae9acc322a272c9d02d5610822c7455721e730 )
# Conflicts:
# src/test/cli-integration/rbd/formatted-output.t
[adjacent snapshot lines aren't in mimic]
Sage Weil [Thu, 17 May 2018 15:04:18 +0000 (10:04 -0500)]
include/types: space between number and units
not
client: 504B/s rd, 10.6MiB/s wr, 0op/s rd, 30op/s wr
but
client: 504 B/s rd, 10.6 MiB/s wr, 0 op/s rd, 30 op/s wr
This was changed as part of
d3cecebacdcebcf475808a6204de22dfa94d729d .
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
9cbd283bc60c35f84458a343421f513508ae0f04 )
Kefu Chai [Sun, 20 May 2018 12:30:08 +0000 (20:30 +0800)]
Merge pull request #22051 from b-ranto/wip-mgr-restarts
mimic: Fix ceph-mgr restarts
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reveiwed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Sage Weil [Fri, 18 May 2018 20:44:09 +0000 (15:44 -0500)]
mon/LogMonitor: call no_reply() on ignored log message
If we're dropping it on the floor, we need to tell the mon that, so that
it can tell the forwarding mon to discard its state.
Fixes: https://tracker.ceph.com/issues/24180
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
9661fa08ccc500587d35d7af8a905916167d8314 )
Sage Weil [Sat, 19 May 2018 17:36:21 +0000 (12:36 -0500)]
Merge pull request #22101 from liewegas/wip-mimic-upgrades-mimic
mimic: qa/suites/upgrade/luminous-x fixes
Sage Weil [Fri, 18 May 2018 19:01:33 +0000 (14:01 -0500)]
qa/suites/thrashosds-health: whitelist REQUEST_SLOW
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
459b33e146d85cf4c03c07bea0718248a0403e0a )
Sage Weil [Fri, 18 May 2018 19:01:19 +0000 (14:01 -0500)]
qa/suites/upgrade/luminous-x: whitelist SLOW_OPS
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
59fe5dc5ce86f4f936a6be8a1f8014a184f5d33c )
Sage Weil [Fri, 18 May 2018 19:01:01 +0000 (14:01 -0500)]
qa/suites/upgrade/luminous-x: more cinder volumes
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
5a5e74e89c1296b156a4a2a1fa9f54fa5c535fe2 )
Yuri Weinstein [Sat, 19 May 2018 14:08:47 +0000 (07:08 -0700)]
Merge pull request #22068 from yuriw/wip-yuriw-mimic-backport-21895-mimic
mimic: tests/qa: adding rados/.. dirs
Jason Dillaman [Wed, 16 May 2018 20:14:36 +0000 (16:14 -0400)]
cls/rbd: fixed last read key for interrupted mirror_image_map_list
Previously, the image map would only return a maximum of 64 mappings.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3cbe0cedcd3057066cee88e98ccf8a19dbdf52d2 )
Jason Dillaman [Mon, 14 May 2018 18:58:40 +0000 (14:58 -0400)]
qa/suites/rbd: reduce runtime of rbd-mirror fsx test case
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
61e94e6905ca6bc6931782277dfd63478f281898 )
Jason Dillaman [Thu, 3 May 2018 16:49:51 +0000 (12:49 -0400)]
qa/suites/rbd: added active/active rbd-mirror tests
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
e2d5f8441aae08dccded6ec740181efc54bde19a )
Jason Dillaman [Tue, 15 May 2018 20:13:16 +0000 (16:13 -0400)]
qa/workunits/rbd: fixed rbd-mirror snapshot comparison loop
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
917f8a037cf2e9e8795fd4bedeffc8655b515bac )
Jason Dillaman [Mon, 14 May 2018 15:11:08 +0000 (11:11 -0400)]
qa/workunits/rbd: fixed missing error code on trap handler
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
02e32fe45a3c6c922feeb09fd1e6b95f90278674 )
Jason Dillaman [Mon, 14 May 2018 12:35:57 +0000 (08:35 -0400)]
qa/workunits/rbd: skip rbd-mirror start/stop cases when thrashing daemons
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3086f29b64adef963ce9d9292cc5275b91d85952 )
Jason Dillaman [Wed, 9 May 2018 17:31:39 +0000 (13:31 -0400)]
qa/workunits/rbd: rbd-mirror admin socket commands should retry
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a6a8c8a2abfe19b10f9315946eb48f0c1cf630f4 )
Jason Dillaman [Mon, 7 May 2018 16:00:02 +0000 (12:00 -0400)]
qa/workunits/rbd: don't override rbd-mirror logs if running under teuthology
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
1bb6d4fd89c6434de9441581f125eb8ef55c6d07 )
Jason Dillaman [Thu, 3 May 2018 16:04:55 +0000 (12:04 -0400)]
qa/workunits/rbd: append rbd-mirror instance number for all-daemon asok command
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
15a197ed06ce80dd0a42d2467595908095cf648e )
Jason Dillaman [Mon, 14 May 2018 18:57:23 +0000 (14:57 -0400)]
test/rbd: fsx should utilize the default image features
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
c1e111e9855047d69762d06bb9094f93c6c12139 )
Jason Dillaman [Thu, 10 May 2018 16:43:00 +0000 (12:43 -0400)]
test/rbd_mirror: fix race condition with image map timer callbacks
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
2534e5e4558b624eb62639a1f620dfb42b21044c )
Jason Dillaman [Tue, 15 May 2018 19:07:21 +0000 (15:07 -0400)]
librbd: deep-copy should remove parent metadata if overlap updated
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
af4298464d6809969eb35382b3cbbb1ea0b3bd1e )
Jason Dillaman [Tue, 15 May 2018 19:55:04 +0000 (15:55 -0400)]
librbd: journal replay should no-op out-of-bounds IO
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9a1fcef5edbfdfc77293c4b60c9e038db49abf1f )
Jason Dillaman [Thu, 10 May 2018 12:54:41 +0000 (08:54 -0400)]
librbd: don't assert if parent pool doesn't exist
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
88436b58bca5b271403f583f6b95e1d30ea81f8f )
Jason Dillaman [Tue, 15 May 2018 18:07:35 +0000 (14:07 -0400)]
rbd-mirror: image create should lookup local parent snapshot id
A recent code change associated with a librbd cleanup incorrectly started
using the remote parent image's snapshot id.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
02afa2a5b41074c651e62a5475ed4828df982ed4 )
Jason Dillaman [Mon, 14 May 2018 14:34:28 +0000 (10:34 -0400)]
rbd-mirror: do not propagate image map instance updates when shutting down
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4525b7a597ccfa6e966243e24bd9e9662c994a41 )
Jason Dillaman [Wed, 9 May 2018 14:33:03 +0000 (10:33 -0400)]
rbd-mirror: propagate image delete if leader was offline
In an active/active scenario, if the leader was offline while mirroring for
a remote image was disabled, the assigned replayer instance may not detect
the image removal.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
b3acc569837985590fad2705ae2dcd7f148667a5 )
Jason Dillaman [Wed, 9 May 2018 14:25:22 +0000 (10:25 -0400)]
rbd-mirror: avoid sending duplicate re-acquire messages upon leader startup
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a9d335d8399984b338d7cfe2b7d49e1f67940ebf )
Jason Dillaman [Wed, 9 May 2018 14:00:12 +0000 (10:00 -0400)]
rbd-mirror: reduce unnecessary logging for periodic start image replayer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d7cb5db188faf133904ec4532620bbd210cb60e5 )
Jason Dillaman [Tue, 8 May 2018 21:09:58 +0000 (17:09 -0400)]
rbd-mirror: cancel image replayer status timer task at shut down
Also avoid attempting to send status using an invalid librados::IoCtx
handle due to a deleted pool.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
e2a00887c1a2c08cab8566d930dede1dac186b9b )
Jason Dillaman [Tue, 8 May 2018 20:25:42 +0000 (16:25 -0400)]
rbd-mirror: policy map shouldn't default to first instance if dead
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
524f08cef697c94b331d52b2077c09a0b3ff9d2e )
Jason Dillaman [Mon, 7 May 2018 21:43:13 +0000 (14:43 -0700)]
rbd-mirror: prevent blacklisting of local instance after failover/back
If the leader role is manually released, upon failback the instance
will have removed its local instance object, preventing RPC
messaging.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
ce974305893c4262b62547ce184d514578358218 )
Jason Dillaman [Fri, 4 May 2018 17:49:10 +0000 (13:49 -0400)]
rbd-mirror: instantly remove instances without associated images
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
bce5328a328f3f9b98674d9e4611a2a40bdf3ddb )
Jason Dillaman [Thu, 3 May 2018 16:03:01 +0000 (12:03 -0400)]
rbd-mirror: instance replayer now respects manual stop command
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
06e1244ee53640edbbab0168d3050152d048d681 )
Jason Dillaman [Thu, 3 May 2018 13:56:14 +0000 (09:56 -0400)]
rbd-mirror: support optionally enabling active/active mirroring
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
53b87b9d22b268e57c293e977aa8220bc2b1fddf )
Sage Weil [Thu, 17 May 2018 15:51:46 +0000 (10:51 -0500)]
mon/PGMap: fix PGMapDigest decode
The compat path wasn't clearing the map before filling in new entries.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
42bdb066bb0397dbb84a2ca60ec4640cdd0afdef )
Sage Weil [Fri, 18 May 2018 14:30:52 +0000 (09:30 -0500)]
Merge pull request #22004 from tchaikov/mimic-22420
mon,osd: dump "compression_algorithms" in "mon metadata"
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Fri, 18 May 2018 14:30:18 +0000 (09:30 -0500)]
Merge pull request #22005 from batrick/i23768-mimic
mimic: MDSMonitor: clean up use of pending fsmap in uncommitted ops
Sage Weil [Fri, 18 May 2018 14:29:57 +0000 (09:29 -0500)]
Merge pull request #22013 from wido/mimic-telegraf
mimic: mgr/telegraf: Telegraf module for Ceph Mgr
Sage Weil [Fri, 18 May 2018 14:29:41 +0000 (09:29 -0500)]
Merge pull request #22041 from dzafman/wip-24045-mimic
mimic: osd: Don't evict even when preemption has restarted with smaller chunk
Reviewed-by: Sage Weil <sage@redhat.com>
Alfredo Deza [Fri, 18 May 2018 14:12:42 +0000 (10:12 -0400)]
Merge pull request #22079 from LenzGr/mgr-dashboard-documentation-mimic
mimic: doc: Updated dashboard documentation (features, SSL config)
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Lenz Grimmer [Thu, 17 May 2018 15:34:36 +0000 (17:34 +0200)]
doc: Updated dashboard documentation (features, SSL config)
Updated Ceph manager dashboard documentation: added SSL to the
feature overview, added new section about configuring SSL certificates.
Rearranged installation instructions for setting host name and port.
Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
(cherry picked from commit
32e0660556ee0566b340b29cb9dbd2fdb8c17bfd )
Lenz Grimmer [Fri, 18 May 2018 10:33:38 +0000 (12:33 +0200)]
Merge pull request #22052 from tspmelo/wip-momentjs
mimic: mgr/dashboard: Fix moment.js deprecation warning
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Yuri Weinstein [Thu, 17 May 2018 17:31:27 +0000 (10:31 -0700)]
Merge pull request #22070 from yuriw/wip-yuriw-mimic-backport-21932-mimic
mimic: tests/qa: Adding $ distro mix - rgw
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 10 May 2018 15:58:37 +0000 (08:58 -0700)]
tests/qa: Adding $ distro mix - rgw
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit
7ce916394881a0e8db2a160f246af0d907aedb19 )
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Tue, 8 May 2018 21:31:56 +0000 (14:31 -0700)]
tests/qa: adding rados/.. dirs
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit
9f2c485942746bdef532f762d7bc27b21533d218 )
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Tue, 8 May 2018 20:43:16 +0000 (13:43 -0700)]
tests/qa: trying $ distro mix
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit
2618aa5325d49f52be6c9b78300dab6d5db4fdc4 )
Lenz Grimmer [Thu, 17 May 2018 14:56:05 +0000 (16:56 +0200)]
Merge pull request #21979 from votdev/bug_24097_mimic
mimic: mgr/dashboard: Navbar dropdown button does not respond for mobile browsers
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Lenz Grimmer [Thu, 17 May 2018 14:54:22 +0000 (16:54 +0200)]
Merge pull request #22032 from votdev/fix_deletion_dialog_mimic
mimic: mgr/dashboard: Deletion dialog falsely executes deletion when pressing 'Cancel'
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Lenz Grimmer [Thu, 17 May 2018 14:49:14 +0000 (16:49 +0200)]
Merge pull request #22029 from votdev/fix_deletion_mimic
mimic: mgr/dashboard: Handle errors during deletion
Reviewed-by: Tiago Melo <tmelo@suse.com>
Sage Weil [Thu, 17 May 2018 13:40:46 +0000 (08:40 -0500)]
Merge pull request #22048 from tchaikov/mimic-23653
mimic: cmake: do not check for aligned_alloc() anymore
Reviewed-by: Sage Weil <sage@redhat.com>
Tiago Melo [Mon, 14 May 2018 15:24:58 +0000 (16:24 +0100)]
mgr/dashboard: Fix moment.js deprecation warning
Fixes: https://tracker.ceph.com/issues/24115
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit
89ae2577303a6b48b8822cddd3ec4fc255b6ff1f )
Boris Ranto [Thu, 17 May 2018 09:02:29 +0000 (11:02 +0200)]
dashboard: Fix dashboard shutdown/restart
The dashboard serve method uses block which it should not as it can
cause several problems when shutting down (restarting) ceph-mgr. As a
result the restart of the ceph-mgr module will block until time-out if
the dashboard module is enabled. This fixes the problem by using a
simple simple shutdown_event instead of block() and stopping the server
afterwards.
Signed-off-by: Boris Ranto <branto@redhat.com>
Boris Ranto [Mon, 30 Apr 2018 23:06:50 +0000 (01:06 +0200)]
prometheus: Fix prometheus shutdown/restart
The prometheus serve method uses block which it should not as it can
cause several problems when shutting down (restarting) ceph-mgr. As a
result the restart of the ceph-mgr module will block until time-out if
the prometheus module is enabled. This fixes the problem by using a
simple simple shutdown_event instead of block() and stopping the server
afterwards.
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit
a662caa79b8fc30e36df0da93f368b470d26564e )
Kefu Chai [Thu, 17 May 2018 02:30:33 +0000 (10:30 +0800)]
cmake: do not check for aligned_alloc() anymore
this reverts
16f0a67d
Fixes: http://tracker.ceph.com/issues/23653
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
4d646ef579ee2f820a1cb0a7b0bd99b9a6cf20ea )
Jason Dillaman [Wed, 16 May 2018 23:25:55 +0000 (19:25 -0400)]
Merge pull request #22038 from dillaman/wip-22787-mimic
mimic: librbd: deep copy optionally support flattening cloned image
Reviewed-by: Mykola Golub <mgolub@suse.com>
Jason Dillaman [Wed, 16 May 2018 23:25:41 +0000 (19:25 -0400)]
Merge pull request #22039 from dillaman/wip-24141-mimic
mimic: rbd-mirror: potential deadlock when running asok 'flush' command
Reviewed-by: Mykola Golub <mgolub@suse.com>
David Zafman [Wed, 16 May 2018 00:32:50 +0000 (17:32 -0700)]
osd: Clear part of cleaned_meta_map in case of a restarted smaller chunk
This can not happen at the primary because scrub_compare_maps() is only
called once per chunk start.
Preemption causes a smaller chunk from start to be processed again at
replicas. We clear any of the previous chunk's information.
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
9e0ac797c602a088447679b04e14ec0cfaf9dd7b )
David Zafman [Thu, 10 May 2018 00:32:39 +0000 (17:32 -0700)]
osd: Don't evict even when preemption has restarted with smaller chunk
Fixes: https://tracker.ceph.com/issues/24045
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
818b59fa95ee60e86991276f18c4dee405dc79b1 )
Mykola Golub [Wed, 16 May 2018 07:40:29 +0000 (10:40 +0300)]
rbd-mirror: make 'flush' asok command asynchronous
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
6fce4cabe7874efef780c7adce8479db8571afe7 )
Mykola Golub [Wed, 16 May 2018 07:34:50 +0000 (10:34 +0300)]
rbd-mirror: don't reregister asok hook in process entry thread
It might get stuck if the asok is busy executing a command.
Instead kick status update, which will call reregister on finish.
Fixes: http://tracker.ceph.com/issues/24141
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
43e50bd582ba2d1b66f55d7f8d2b7f030da99ee6 )
Mykola Golub [Wed, 25 Apr 2018 21:02:57 +0000 (00:02 +0300)]
rbd: deep copy option to copy clone parent data
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
e387f9195545522351306ce420bd758b888dc774 )
Mykola Golub [Thu, 26 Apr 2018 08:30:03 +0000 (11:30 +0300)]
librbd: deep copy optionally support flattening cloned image
Fixes: http://tracker.ceph.com/issues/22787
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
0d43d2faceca158cc9cf2177802b80dda2b554c9 )
Mykola Golub [Thu, 10 May 2018 18:25:17 +0000 (21:25 +0300)]
librbd/deep_copy: adjust in-memory overlap if set_size updated it on disk
so set_parent won't be called when overlap is changed due to image
size change.
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
ca0893c4d9f54e3d80cf7ea90c8b4431d1f5a4f0 )
Mykola Golub [Tue, 8 May 2018 13:52:50 +0000 (16:52 +0300)]
librbd: hide parent object when deep copying empty child
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
3d884eaee89d39570f0dbe9bf1f25f7d27bcd907 )
Mykola Golub [Tue, 8 May 2018 12:29:38 +0000 (15:29 +0300)]
librbd: fix deep copy clone to destination with larger object size
When assembling a destination object from source objects we need to
read from parent if some (but not all) of assembles do not exist.
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
947993a8d36f60bde05bc7b9a49c333dd51da4c5 )
Conflicts:
src/test/librbd/deep_copy/test_mock_ImageCopyRequest.cc: trivial resolution
Mykola Golub [Tue, 8 May 2018 12:27:25 +0000 (15:27 +0300)]
test/librbd: add deep copy clone tests
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
928540272f16911e3e0867db606ac5be40f49c27 )
Sage Weil [Wed, 16 May 2018 15:52:19 +0000 (10:52 -0500)]
Merge pull request #21836 from tchaikov/mimic-23962
mimic: pybind/ceph_daemon: expand the order of magnitude of
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 16 May 2018 15:51:47 +0000 (10:51 -0500)]
Merge pull request #21862 from cbodley/wip-gcc-8-mimic
mimic: cmake,common,filestore: silence gcc-8 warnings/errors
Sage Weil [Wed, 16 May 2018 15:51:09 +0000 (10:51 -0500)]
Merge pull request #21958 from tchaikov/mimic-24000
mimic: osdc: self-managed snapshot helper should catch decode exception
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Wed, 16 May 2018 15:50:30 +0000 (10:50 -0500)]
Merge pull request #21959 from tchaikov/mimic-23899
mimic: osd: clean up smart probe
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 16 May 2018 15:50:03 +0000 (10:50 -0500)]
Merge pull request #21974 from tchaikov/mimic-22302
mimic: selinux: Allow ceph to execute ldconfig
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Volker Theile [Wed, 16 May 2018 12:34:34 +0000 (14:34 +0200)]
mgr/dashboard: Handle errors during deletion
- Take care that the deletion dialog gets notified about errors to stop the progress spinner and enable the delete button again.
- Prettify JS code.
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
b2fa819fdfee93e6951666198720bce44c37b95d )
Volker Theile [Wed, 16 May 2018 13:51:32 +0000 (15:51 +0200)]
mgr/dashboard: Deletion dialog falsely executes deletion when pressing 'Cancel'
If a deletion fails and the 'Cancel' button is pressed to close the dialog, then the deletion process is triggered again.
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
0473b02872f9dbc1993ec5d6686484c24986e85c )