]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoMerge PR #22136 into mimic 22238/head
Patrick Donnelly [Thu, 24 May 2018 19:12:11 +0000 (12:12 -0700)]
Merge PR #22136 into mimic

* refs/pull/22136/head:
client: avoid freeing inode when it contains TX buffer heads

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22137 into mimic
Patrick Donnelly [Thu, 24 May 2018 19:12:01 +0000 (12:12 -0700)]
Merge PR #22137 into mimic

* refs/pull/22137/head:
mds: properly setup client_need_snapflush for snap inode
Revert "mds: properly setup need_snapflush for snapped inode"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22138 into mimic
Patrick Donnelly [Thu, 24 May 2018 19:11:54 +0000 (12:11 -0700)]
Merge PR #22138 into mimic

* refs/pull/22138/head:
mds: reply session reject for open request from blacklisted client
qa/tasks/cephfs: add timeout parameter to kclient umount_wait

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22139 into mimic
Patrick Donnelly [Thu, 24 May 2018 19:11:48 +0000 (12:11 -0700)]
Merge PR #22139 into mimic

* refs/pull/22139/head:
client: delay dentry trimming until after cap traversal

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22140 into mimic
Patrick Donnelly [Thu, 24 May 2018 19:11:41 +0000 (12:11 -0700)]
Merge PR #22140 into mimic

* refs/pull/22140/head:
client: fix issue of revoking non-auth caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22141 into mimic
Patrick Donnelly [Thu, 24 May 2018 19:11:35 +0000 (12:11 -0700)]
Merge PR #22141 into mimic

* refs/pull/22141/head:
mds: broadcast quota to relevant clients when quota is explicitly set

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22153 into mimic
Patrick Donnelly [Thu, 24 May 2018 19:11:28 +0000 (12:11 -0700)]
Merge PR #22153 into mimic

* refs/pull/22153/head:
mon/MonClient: set configs via finisher

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #22154 into mimic
Patrick Donnelly [Thu, 24 May 2018 19:11:22 +0000 (12:11 -0700)]
Merge PR #22154 into mimic

* refs/pull/22154/head:
client: increase verbosity level for log messages in helper methods

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #22135 from tchaikov/mimic-24175
Sage Weil [Thu, 24 May 2018 13:45:16 +0000 (08:45 -0500)]
Merge pull request #22135 from tchaikov/mimic-24175

mimic: mgr/status: output to stdout, not stderr

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #22160 from liewegas/wip-24037-mimic
Sage Weil [Thu, 24 May 2018 13:44:41 +0000 (08:44 -0500)]
Merge pull request #22160 from liewegas/wip-24037-mimic

common: OpTracker doesn't visit TrackedOp when nref == 0.

7 years agoMerge pull request #22183 from tchaikov/mimic-24025
Kefu Chai [Thu, 24 May 2018 12:01:56 +0000 (20:01 +0800)]
Merge pull request #22183 from tchaikov/mimic-24025

mimic: cmake/modules/BuildRocksDB.cmake: enable compressions for rocksdb

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agocmake/modules/BuildRocksDB.cmake: enable compressions for rocksdb 22183/head
Kefu Chai [Wed, 23 May 2018 15:20:21 +0000 (23:20 +0800)]
cmake/modules/BuildRocksDB.cmake: enable compressions for rocksdb

we should enable them if they are found.

currently, we don't have bzip2 compressor plugin, so it's not detected
in the cmake script. we can always enable it for rocksdb in future.

Fixes: http://tracker.ceph.com/issues/24025
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 71462ddf05afa59bdaed8c471ee0617ee08dc71a)

7 years agoMerge pull request #22167 from dzafman/wip-test-fixes-mimic
Kefu Chai [Wed, 23 May 2018 07:11:38 +0000 (15:11 +0800)]
Merge pull request #22167 from dzafman/wip-test-fixes-mimic

test: Whitelist corrections

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotest: Whitelist corrections 22167/head
David Zafman [Tue, 22 May 2018 15:37:22 +0000 (08:37 -0700)]
test: Whitelist corrections

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ee4acb6e1ff7458ceaefdb288cbcb158c6a3bed3)

7 years agocommon: OpTracker doesn't visit TrackedOp when nref == 0. 22160/head
Radoslaw Zarzynski [Tue, 22 May 2018 13:50:44 +0000 (15:50 +0200)]
common: OpTracker doesn't visit TrackedOp when nref == 0.

The patch fixes a race condition that happens between
`unregister_inflight_op` and `visit_ops_in_flight` of
`OpTracker`. When a callable passed to the former one
turns the plain reference it gets into `TrackedOpRef`,
an almost-to-terminate `TrackedOp` (with `nref == 0`)
can be resurrected (`nref++`). This will be reflected
in extra call to `unregister_inflight_op` for same op
leading to e.g. use-after-free. For more details see:
https://tracker.ceph.com/issues/24037#note-5.

The fix deals with the problem by ensuring there will
be no call to the visitor for ops with zeroized `nref`.

Fixes: http://tracker.ceph.com/issues/24037
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 574aeb8130926fab5632d9f7a6ac0b132c6a60b8)

7 years agoMerge pull request #22152 from tspmelo/fix-rbd-task-metadata-mimic
Lenz Grimmer [Tue, 22 May 2018 20:24:28 +0000 (22:24 +0200)]
Merge pull request #22152 from tspmelo/fix-rbd-task-metadata-mimic

mimic: mgr/dashboard: Fix RBD task metadata

Reviewed-by: Ricardo Marques <rimarques@suse.com>
7 years agoMerge PR #21860 into mimic
Sage Weil [Tue, 22 May 2018 18:35:50 +0000 (13:35 -0500)]
Merge PR #21860 into mimic

* refs/pull/21860/head:
qa/rgw: tests target ceph-mimic branches
qa: add ragweed to luminous-x upgrade suite
qa/rgw: remove rgw/upgrade suite

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge PR #21907 into mimic
Sage Weil [Tue, 22 May 2018 18:35:44 +0000 (13:35 -0500)]
Merge PR #21907 into mimic

* refs/pull/21907/head:
radosgw-admin: add pretty 'bucket sync status' command
rgw: expose struct bucket_index_marker_info in header
rgw: rgw_bucket_sync_status takes bucket info
radosgw-admin: rename 'bucket sync status' to 'bucket sync markers'

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agogithubmap: update contributors
Sage Weil [Tue, 22 May 2018 18:35:43 +0000 (13:35 -0500)]
githubmap: update contributors

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoclient: increase verbosity level for log messages in helper methods 22154/head
Rishabh Dave [Mon, 14 May 2018 07:38:47 +0000 (07:38 +0000)]
client: increase verbosity level for log messages in helper methods

Fixes: http://tracker.ceph.com/issues/21014
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit e276fdaaa8b737ea845e19388796796ca30d2162)

7 years agomon/MonClient: set configs via finisher 22153/head
Sage Weil [Mon, 14 May 2018 17:56:59 +0000 (12:56 -0500)]
mon/MonClient: set configs via finisher

The config observers may want to take locks that are ordered relative
to monc_lock.

We could simply drop monc_lock for this call, but that would implicitly
rely on a single-threaded dispatch to avoid having two incoming MConfig
messages get reordered.  Explicitly putting it on a finisher is safer.
Note that we adjust the get_monmap_and_config() to start, drain, and stop
the finisher to ensure we have incoming config processed and applied
before returning.

Fixes: http://tracker.ceph.com/issues/24118
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 02a92360171240be9a66d1939c019b3427ed825d)

7 years agomgr/dashboard: Fix RBD task metadata 22152/head
Tiago Melo [Fri, 18 May 2018 15:08:37 +0000 (16:08 +0100)]
mgr/dashboard: Fix RBD task metadata

Error message template for RBD copy was trying to read
an unexistent property of the returned metada.

Metadata for RBD edit was missing the new image name.
The new name should be displayed, instead of the old one,
when the user tries to use an existent image name.

Fixes: https://tracker.ceph.com/issues/24171
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 27d4d3d5694b475fb59d285ab48b9e3507a42cef)

7 years agomds: broadcast quota to relevant clients when quota is explicitly set 22141/head
Zhi Zhang [Wed, 16 May 2018 03:21:48 +0000 (11:21 +0800)]
mds: broadcast quota to relevant clients when quota is explicitly set

Try to broadcast quota to relevant clients proactively if quota is
explicitly set by someone, in case that client won't get quota update
for a long time.

Fixes: http://tracker.ceph.com/issues/24133
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit b2a7643b102dbbb8221dcb8a785db5e4276ac284)

7 years agomds: properly setup client_need_snapflush for snap inode 22137/head
Yan, Zheng [Mon, 14 May 2018 03:34:42 +0000 (11:34 +0800)]
mds: properly setup client_need_snapflush for snap inode

MDCache::cow_inode() checks "cap->issued() & CEPH_CAP_ANY_WR" to decide
if it needs to setup client_need_snapflush for the new snap inode. If
cap message flushes dirty caps and releases the same caps, cap->issued()
may have no WR caps when MDCache::cow_inode() gets called. The solution
is temporarily setting NEEDSNAPFLUSH on Capability::state.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 9fb61cd65895dbdb92cb46d24be8bf79ce57409d)

7 years agoRevert "mds: properly setup need_snapflush for snapped inode"
Yan, Zheng [Mon, 14 May 2018 02:48:16 +0000 (10:48 +0800)]
Revert "mds: properly setup need_snapflush for snapped inode"

commit de3f3d88b3e make Locker::_do_cap_update() get called before
adjusting wanted caps. This is wrong because Locker::_do_cap_update()
need uptodate wanted caps to calculate max size.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24111
(cherry picked from commit 4b13d3ffe260fa4539e2d341604c34d2e8df7c94)

7 years agomds: reply session reject for open request from blacklisted client 22138/head
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)

7 years agoqa/tasks/cephfs: add timeout parameter to kclient umount_wait
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)

7 years agoclient: delay dentry trimming until after cap traversal 22139/head
Patrick Donnelly [Fri, 18 May 2018 00:06:52 +0000 (17:06 -0700)]
client: delay dentry trimming until after cap traversal

Fixes: http://tracker.ceph.com/issues/24137
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 9199179799b41d9534b27bcceefc1bc9f2763bac)

7 years agoclient: fix issue of revoking non-auth caps 22140/head
Yan, Zheng [Fri, 18 May 2018 06:26:32 +0000 (14:26 +0800)]
client: fix issue of revoking non-auth caps

when non-auth mds revokes caps, Fcb caps can still be issued by auth
auth mds. It's wrong to flush buffer or invalidate cache when non-auth
mds revokes other caps. This bug can cause client to not respond the
revoke.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24172
(cherry picked from commit 341a9114e0726e1a7cbb7e6f22adb54c2024c506)

7 years agoclient: avoid freeing inode when it contains TX buffer heads 22136/head
YunfeiGuan [Tue, 8 May 2018 11:35:32 +0000 (19:35 +0800)]
client: avoid freeing inode when it contains TX buffer heads

ObjectCacher::discard_set() prematurely delete TX buffer heads. But
the pending writebacks still pin parent objects of these buffer heads.
Assertion "oset.objects.empty()" gets triggered if inode with pending
writebacks get freed.

Fixes: http://tracker.ceph.com/issues/23837
Signed-off-by: Guan yunfei <yunfei.guan@xtaotech.com>
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 8a03757ca0ab493c6c2ea4fa4307e053e8ebc944)

7 years agoMerge pull request #22081 from smithfarm/wip-gcc-8-silence
Kefu Chai [Tue, 22 May 2018 02:51:07 +0000 (10:51 +0800)]
Merge pull request #22081 from smithfarm/wip-gcc-8-silence

mimic: silence various warnings to enable GCC-8 build

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomgr/status: output to stdout, not stderr 22135/head
John Spray [Fri, 18 May 2018 15:44:34 +0000 (16:44 +0100)]
mgr/status: output to stdout, not stderr

I think this was just me forgetting the order
of the arguments when writing the return statements.

Fixes: http://tracker.ceph.com/issues/24175
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit c18db575ca87906faa201c4d3bde75b99148d18f)

7 years agoMerge pull request #22120 from liewegas/wip-24167-mimic
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

7 years agoMerge pull request #22125 from liewegas/wip-old-clients-mimic
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>
7 years agoMerge pull request #22075 from dzafman/wip-parens-mimic
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>
7 years agoMerge branch 'mimic' of github.com:ceph/ceph into mimic
Alfredo Deza [Mon, 21 May 2018 21:18:52 +0000 (17:18 -0400)]
Merge branch 'mimic' of github.com:ceph/ceph into mimic

7 years agoMerge pull request #22113 from tchaikov/mimic-24174
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>
7 years agoMerge pull request #22117 from tchaikov/mimic-qa-test_envlibrados_for_rocksdb
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>
7 years agoMerge pull request #22107 from liewegas/wip-unit-spaces-mimic
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>
7 years agotest: Add CACHE_POOL_NO_HIT_SET to whitelist for mon/pool_ops.sh 22075/head
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)

7 years agotest: Need to escape parens in log-whitelist for grep
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)

7 years agoqa/suites/rados/thrash-old-clients: only centos and 16.04 22125/head
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)

7 years ago13.1.1 v13.1.1
Jenkins Build Slave User [Mon, 21 May 2018 16:19:10 +0000 (16:19 +0000)]
13.1.1

7 years agocrush: update choose_args on bucket removal 22120/head
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)

7 years agocrush: update choose_args on bucket removal, resize, or position mismatch
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)

7 years agocrush: create weight-set on demand when doing a choose-args reweight
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)

7 years agotest/cli/crushtool: use straw2 buckets for choose-args test
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)

7 years agocrush: weight_set_size -> weight_set_positions
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)

7 years agoMerge pull request #22105 from dillaman/wip-rbd-mirror-policy-mimic
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>
7 years agoqa/workunits/rados/test_envlibrados_for_rocksdb: use cmake not make 22117/head
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)

7 years agoqa/workunits/rados/test_envlibrados_for_rocksdb: install g++ not g++-4.7
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)

7 years agoosd/PrimaryLogPG: fix try_flush_mark_clean write contention case 22113/head
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)

7 years agoMerge pull request #22099 from liewegas/wip-pgmap-digest-decode-mimic
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>
7 years agoMerge pull request #22104 from tchaikov/mimic-24180
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>
7 years agoqa/workunits/cephtool/test.sh: update unit formatting 22107/head
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)

7 years agoqa/workunits/rbd/import_export: update unit formatting
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)

7 years agoqa/workunits/rbd/cli_generic: update unit formatting
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)

7 years agotest/cli-integration/rbd: update unit formatting
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]

7 years agoinclude/types: space between number and units
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)

7 years agoMerge pull request #22051 from b-ranto/wip-mgr-restarts
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>
7 years agomon/LogMonitor: call no_reply() on ignored log message 22104/head
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)

7 years agoMerge pull request #22101 from liewegas/wip-mimic-upgrades-mimic
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

7 years agoqa/suites/thrashosds-health: whitelist REQUEST_SLOW 22101/head
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)

7 years agoqa/suites/upgrade/luminous-x: whitelist SLOW_OPS
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)

7 years agoqa/suites/upgrade/luminous-x: more cinder volumes
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)

7 years agoMerge pull request #22068 from yuriw/wip-yuriw-mimic-backport-21895-mimic
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

7 years agocls/rbd: fixed last read key for interrupted mirror_image_map_list 22105/head
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)

7 years agoqa/suites/rbd: reduce runtime of rbd-mirror fsx test case
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)

7 years agoqa/suites/rbd: added active/active rbd-mirror tests
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)

7 years agoqa/workunits/rbd: fixed rbd-mirror snapshot comparison loop
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)

7 years agoqa/workunits/rbd: fixed missing error code on trap handler
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)

7 years agoqa/workunits/rbd: skip rbd-mirror start/stop cases when thrashing daemons
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)

7 years agoqa/workunits/rbd: rbd-mirror admin socket commands should retry
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)

7 years agoqa/workunits/rbd: don't override rbd-mirror logs if running under teuthology
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)

7 years agoqa/workunits/rbd: append rbd-mirror instance number for all-daemon asok command
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)

7 years agotest/rbd: fsx should utilize the default image features
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)

7 years agotest/rbd_mirror: fix race condition with image map timer callbacks
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)

7 years agolibrbd: deep-copy should remove parent metadata if overlap updated
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)

7 years agolibrbd: journal replay should no-op out-of-bounds IO
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)

7 years agolibrbd: don't assert if parent pool doesn't exist
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)

7 years agorbd-mirror: image create should lookup local parent snapshot id
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)

7 years agorbd-mirror: do not propagate image map instance updates when shutting down
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)

7 years agorbd-mirror: propagate image delete if leader was offline
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)

7 years agorbd-mirror: avoid sending duplicate re-acquire messages upon leader startup
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)

7 years agorbd-mirror: reduce unnecessary logging for periodic start image replayer
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)

7 years agorbd-mirror: cancel image replayer status timer task at shut down
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)

7 years agorbd-mirror: policy map shouldn't default to first instance if dead
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)

7 years agorbd-mirror: prevent blacklisting of local instance after failover/back
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)

7 years agorbd-mirror: instantly remove instances without associated images
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)

7 years agorbd-mirror: instance replayer now respects manual stop command
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)

7 years agorbd-mirror: support optionally enabling active/active mirroring
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)

7 years agomon/PGMap: fix PGMapDigest decode 22099/head
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)

7 years agoMerge pull request #22004 from tchaikov/mimic-22420
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>
7 years agoMerge pull request #22005 from batrick/i23768-mimic
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

7 years agoMerge pull request #22013 from wido/mimic-telegraf
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

7 years agoMerge pull request #22041 from dzafman/wip-24045-mimic
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>
7 years agoMerge pull request #22079 from LenzGr/mgr-dashboard-documentation-mimic
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>
7 years agobuild: Remove -Wno-invalid-offsetof 22081/head
Adam C. Emerson [Wed, 9 May 2018 02:34:44 +0000 (22:34 -0400)]
build: Remove -Wno-invalid-offsetof

Since C++17 relaxed the rules for using offsetof, this is no longer needed.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit f9c5e28225cd145f28484ba15f7582716de5a98c)

7 years agotools: Do not memset uuid_d
Adam C. Emerson [Wed, 9 May 2018 01:54:21 +0000 (21:54 -0400)]
tools: Do not memset uuid_d

It is perfectly able to default initialize itself.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit c876618931afe8206fe98bedee59a27ed0c40ef0)

7 years agotest/rbd/fsx: Disable overflow-format warning
Adam C. Emerson [Wed, 9 May 2018 01:25:28 +0000 (21:25 -0400)]
test/rbd/fsx: Disable overflow-format warning

No return type or other way to react to it.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit ff189df08fc7250dfcc334502598cfbc4d2d4cb7)