]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agocrush: fix device_class_clone for unpopulated/empty weight-sets 22169/head
Sage Weil [Mon, 21 May 2018 18:24:25 +0000 (13:24 -0500)]
crush: fix device_class_clone for unpopulated/empty weight-sets

If the bucket is empty or does not have weight-set weights yet, avoid
crashing when populating the parent bucket.

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

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 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)

7 years agotest/libcephfs: Expand buffer slightly
Adam C. Emerson [Wed, 9 May 2018 01:03:29 +0000 (21:03 -0400)]
test/libcephfs: Expand buffer slightly

So the snprintf output isn't truncated.

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

7 years agorgw: There is no point in const return values
Adam C. Emerson [Tue, 8 May 2018 23:54:50 +0000 (19:54 -0400)]
rgw: There is no point in const return values

Pointer-to-const or reference-to-const yes. Const value, no.

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

7 years agorgw: Catch exceptions at const references
Adam C. Emerson [Tue, 8 May 2018 23:53:19 +0000 (19:53 -0400)]
rgw: Catch exceptions at const references

/Never/ by value.

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

7 years agorgw: Remove extra 'const' from cast
Adam C. Emerson [Tue, 8 May 2018 23:43:33 +0000 (19:43 -0400)]
rgw: Remove extra 'const' from cast

Casting to pointer-to-const makes sense. Casting to a const
value (even a const pointer) doesn't.

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

7 years agordma: Silence qualifier warnings
Adam C. Emerson [Tue, 8 May 2018 23:29:41 +0000 (19:29 -0400)]
rdma: Silence qualifier warnings

No point in reinterpret_casting something const anyway, you can always
assign non-const to const.

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

7 years agomsg/rdma/infiniband: Silence memset warning
Adam C. Emerson [Tue, 8 May 2018 23:26:28 +0000 (19:26 -0400)]
msg/rdma/infiniband: Silence memset warning

Though it may be better in the long-run to replace the malloc-like
interface with an Allocator type interface.

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

7 years agorgw: Exceptions should be caught by const reference
Adam C. Emerson [Tue, 8 May 2018 23:23:02 +0000 (19:23 -0400)]
rgw: Exceptions should be caught by const reference

/Not/ by value.

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

7 years agoFuseStore: Expand buffers to prevent overflow
Adam C. Emerson [Tue, 8 May 2018 22:58:12 +0000 (18:58 -0400)]
FuseStore: Expand buffers to prevent overflow

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

7 years agoperfglue: Silence truncation warning
Adam C. Emerson [Tue, 8 May 2018 21:19:38 +0000 (17:19 -0400)]
perfglue: Silence truncation warning

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

7 years agomount: Enlarge buffer to fix overflow warning
Adam C. Emerson [Tue, 8 May 2018 20:50:02 +0000 (16:50 -0400)]
mount: Enlarge buffer to fix overflow warning

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

7 years agomon: Remove unused variable
Adam C. Emerson [Tue, 8 May 2018 20:47:38 +0000 (16:47 -0400)]
mon: Remove unused variable

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

7 years agoblkdev: Check return of snprintf and error on truncation
Adam C. Emerson [Tue, 8 May 2018 20:42:56 +0000 (16:42 -0400)]
blkdev: Check return of snprintf and error on truncation

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

7 years agoblkdev: Get rid of get_device_by_uuid
Adam C. Emerson [Tue, 8 May 2018 20:31:25 +0000 (16:31 -0400)]
blkdev: Get rid of get_device_by_uuid

This function's interface is bad, in that it takes char*s with no
sizes. Also nobody calls it.

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

7 years agotest: Enlarge a few buffers
Adam C. Emerson [Mon, 7 May 2018 20:36:42 +0000 (16:36 -0400)]
test: Enlarge a few buffers

To get rid of overflow warnings.

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

7 years agomds: Do not memset fnode_t
Adam C. Emerson [Mon, 7 May 2018 20:24:17 +0000 (16:24 -0400)]
mds: Do not memset fnode_t

fnode_t can initialize itself.

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

7 years agoauto: Catch exceptions by const reference
Adam C. Emerson [Mon, 7 May 2018 20:13:18 +0000 (16:13 -0400)]
auto: Catch exceptions by const reference

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

7 years agoclient: Do not memset frag_info_t and inode_t
Adam C. Emerson [Mon, 7 May 2018 20:11:12 +0000 (16:11 -0400)]
client: Do not memset frag_info_t and inode_t

They do a perfectly good job of initializing themselves.

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

7 years agotest: Increase buffer to prevent possible truncation
Adam C. Emerson [Mon, 7 May 2018 20:03:21 +0000 (16:03 -0400)]
test: Increase buffer to prevent possible truncation

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

7 years agorgw: Fix uninitialized value warning
Adam C. Emerson [Mon, 7 May 2018 20:00:45 +0000 (16:00 -0400)]
rgw: Fix uninitialized value warning

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

7 years agotest: silence -Wformat-truncation= warnings
Kefu Chai [Mon, 7 May 2018 07:19:37 +0000 (15:19 +0800)]
test: silence -Wformat-truncation= warnings

this change silences following warnings:

: warning: ‘%s’ directive output may be truncated writing up to 127
bytes into a region of size between 109 and 119 [-W
format-truncation=]
     snprintf(m_id_str, SysTestRunnable::ID_STR_SZ, "process_%d%s",
m_id, extra);
                                                    ^~~~~~~~~~~~~~
~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit ba3f82a46c7e6862d31b162ee2badd4773c00bb9)

7 years agoauth: silence -Wparentheses warning
Kefu Chai [Mon, 7 May 2018 07:18:40 +0000 (15:18 +0800)]
auth: silence -Wparentheses warning

this change silences following warning:

warning: unnecessary parentheses in declaration of ‘os’ [-Wparentheses]
   std::ostringstream(os);
                     ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b6fe1fec148cf5bcd9a8d780c993dbebc83b860d)

7 years agomds,messages: silence -Wclass-memaccess warnings
Kefu Chai [Mon, 7 May 2018 06:42:52 +0000 (14:42 +0800)]
mds,messages: silence -Wclass-memaccess warnings

this change silences warnings like:

warning: ‘void* memset(void*, int, size_t)’ writing to an object of
non-trivial type ‘struct uuid_d’; use assignment instead [-Wcla
ss-memaccess]
   memset(&z.cluster_fsid, 1, sizeof(z.cluster_fsid));
                                                    ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4b99f88fac67d652fe9b7e790236899794ea6c1a)

7 years agodoc: Updated dashboard documentation (features, SSL config) 22079/head
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)

7 years agoMerge pull request #22052 from tspmelo/wip-momentjs
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>
7 years agoMerge pull request #22070 from yuriw/wip-yuriw-mimic-backport-21932-mimic
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>
7 years agotests/qa: Adding $ distro mix - rgw 22070/head
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>
7 years agotests/qa: adding rados/.. dirs 22068/head
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>
7 years agotests/qa: trying $ distro mix
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)

7 years agoMerge pull request #21979 from votdev/bug_24097_mimic
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>
7 years agoMerge pull request #22032 from votdev/fix_deletion_dialog_mimic
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>