]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoMerge pull request #31736 from SUSE/wip-42846-nautilus
Yuri Weinstein [Mon, 6 Jan 2020 23:15:57 +0000 (15:15 -0800)]
Merge pull request #31736 from SUSE/wip-42846-nautilus

nautilus: msg: async/net_handler.cc: Fix compilation

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32067 from smithfarm/wip-42899-nautilus
Yuri Weinstein [Mon, 6 Jan 2020 23:15:24 +0000 (15:15 -0800)]
Merge pull request #32067 from smithfarm/wip-42899-nautilus

nautilus: mgr/pg_autoscaler: only generate target_* health warnings if targets set

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31862 from smithfarm/wip-43012-nautilus
Yuri Weinstein [Mon, 6 Jan 2020 20:26:21 +0000 (12:26 -0800)]
Merge pull request #31862 from smithfarm/wip-43012-nautilus

nautilus: rgw: crypt: permit RGW-AUTO/default with SSE-S3 headers

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31684 from smithfarm/wip-42841-nautilus
Yuri Weinstein [Mon, 6 Jan 2020 20:25:54 +0000 (12:25 -0800)]
Merge pull request #31684 from smithfarm/wip-42841-nautilus

nautilus: rgw: fix an endless loop error when to show usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31298 from smithfarm/wip-42555-nautilus
Yuri Weinstein [Mon, 6 Jan 2020 20:25:23 +0000 (12:25 -0800)]
Merge pull request #31298 from smithfarm/wip-42555-nautilus

nautilus: rgw: prevent bucket reshard scheduling if bucket is resharding

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31289 from smithfarm/wip-42386-nautilus
Yuri Weinstein [Mon, 6 Jan 2020 20:25:04 +0000 (12:25 -0800)]
Merge pull request #31289 from smithfarm/wip-42386-nautilus

nautilus: rgw: fix compile errors with boost 1.70

5 years agoMerge pull request #31182 from croit/nautilus-rgw-bucket-stats-num-shards
Yuri Weinstein [Mon, 6 Jan 2020 20:24:18 +0000 (12:24 -0800)]
Merge pull request #31182 from croit/nautilus-rgw-bucket-stats-num-shards

nautilus: rgw: add num_shards to radosgw-admin bucket stats

5 years agoMerge pull request #32050 from joke-lee/rgw-sts-crash-token-not-base64-nautilus
Yuri Weinstein [Mon, 6 Jan 2020 20:23:39 +0000 (12:23 -0800)]
Merge pull request #32050 from joke-lee/rgw-sts-crash-token-not-base64-nautilus

nautilus: rgw: fix rgw crash when token is not base64 encode

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31844 from smithfarm/wip-42994-nautilus
Yuri Weinstein [Fri, 3 Jan 2020 20:22:03 +0000 (12:22 -0800)]
Merge pull request #31844 from smithfarm/wip-42994-nautilus

nautilus: mon: remove the restriction of address type in init_with_hosts

Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
5 years agoMerge pull request #31028 from smithfarm/wip-42197-nautilus
Yuri Weinstein [Fri, 3 Jan 2020 20:05:53 +0000 (12:05 -0800)]
Merge pull request #31028 from smithfarm/wip-42197-nautilus

nautilus: osd/PrimaryLogPG: skip obcs that don't exist during backfill scan_range

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31852 from sseshasa/wip-41810-nautilus
Yuri Weinstein [Fri, 3 Jan 2020 20:04:46 +0000 (12:04 -0800)]
Merge pull request #31852 from sseshasa/wip-41810-nautilus

nautilus: os/bluestore: Add config observer for osd memory specific options.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge pull request #31295 from smithfarm/wip-42537-nautilus
Jan Fajerski [Thu, 2 Jan 2020 10:27:00 +0000 (11:27 +0100)]
Merge pull request #31295 from smithfarm/wip-42537-nautilus

nautilus: ceph-volume/zfs: add the inventory command

5 years agoMerge pull request #32028 from smithfarm/wip-43140-nautilus
Yuri Weinstein [Mon, 23 Dec 2019 20:26:01 +0000 (12:26 -0800)]
Merge pull request #32028 from smithfarm/wip-43140-nautilus

nautilus: core: mon: keep v1 address type when explicitly set

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
5 years agoMerge pull request #31779 from rhcs-dashboard/wip-42900-nautilus
Laura Paduano [Fri, 20 Dec 2019 10:06:28 +0000 (11:06 +0100)]
Merge pull request #31779 from rhcs-dashboard/wip-42900-nautilus

nautilus: mgr/dashboard: show "Rename" in header & button when renaming RBD

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agonautilus: mgr/dashboard: fix RGW subuser auto-generate key. (#32240)
Lenz Grimmer [Thu, 19 Dec 2019 11:36:08 +0000 (11:36 +0000)]
nautilus: mgr/dashboard: fix RGW subuser auto-generate key. (#32240)

nautilus: mgr/dashboard: fix RGW subuser auto-generate key.

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #32216 from smithfarm/wip-43233-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 21:14:24 +0000 (13:14 -0800)]
Merge pull request #32216 from smithfarm/wip-43233-nautilus

nautilus: tests: radosgw-admin: remove dependency on bunch package

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31089 from smithfarm/wip-41634-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 21:14:04 +0000 (13:14 -0800)]
Merge pull request #31089 from smithfarm/wip-41634-nautilus

nautilus: rgw: add bucket permission verify when copy obj

5 years agoMerge pull request #30743 from smithfarm/wip-41978-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 21:13:23 +0000 (13:13 -0800)]
Merge pull request #30743 from smithfarm/wip-41978-nautilus

nautilus: rgw: fix list versions starts with version_id=null

5 years agoMerge pull request #30733 from less-is-morr/wip-41636-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 21:12:53 +0000 (13:12 -0800)]
Merge pull request #30733 from less-is-morr/wip-41636-nautilus

nautilus: rgw: gc remove tag after all sub io finish

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30741 from smithfarm/wip-41714-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 21:12:13 +0000 (13:12 -0800)]
Merge pull request #30741 from smithfarm/wip-41714-nautilus

nautilus: rgw: fix refcount tags to match and update object's idtag

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #31301 from smithfarm/wip-42134-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 19:49:10 +0000 (11:49 -0800)]
Merge pull request #31301 from smithfarm/wip-42134-nautilus

nautilus: core: auth/Crypto: fallback to /dev/urandom if getentropy() fails

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #31359 from smithfarm/wip-42203-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 19:45:05 +0000 (11:45 -0800)]
Merge pull request #31359 from smithfarm/wip-42203-nautilus

nautilus: osd: set affinity for *all* threads

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31735 from SUSE/wip-42739-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 19:38:14 +0000 (11:38 -0800)]
Merge pull request #31735 from SUSE/wip-42739-nautilus

nautilus: mgr/devicehealth: ensure we don't store empty objects

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31367 from jan--f/wip-42400-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 19:37:29 +0000 (11:37 -0800)]
Merge pull request #31367 from jan--f/wip-42400-nautilus

nautilus: ceph.in: check ceph-conf returncode

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #32283 from neha-ojha/wip-42913-nautilus
Yuri Weinstein [Wed, 18 Dec 2019 19:35:53 +0000 (11:35 -0800)]
Merge pull request #32283 from neha-ojha/wip-42913-nautilus

nautilus: os/bluestore: default bluestore_block_size 1T -> 100G

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agonautilus: mgr/dashboard: A block-manager can not access the po… (#31570)
Lenz Grimmer [Wed, 18 Dec 2019 15:48:28 +0000 (15:48 +0000)]
nautilus: mgr/dashboard: A block-manager can not access the po… (#31570)

nautilus: mgr/dashboard: A block-manager can not access the pool page

Reviewed-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge pull request #32254 from ideepika/wip-43316-nautilus
Nathan Cutler [Wed, 18 Dec 2019 11:22:19 +0000 (12:22 +0100)]
Merge pull request #32254 from ideepika/wip-43316-nautilus

nautilus: doc: wrong datatype describing crush_rule

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32035 from cbodley/wip-qa-rgw-swift-nautilus
Yuri Weinstein [Tue, 17 Dec 2019 20:19:16 +0000 (12:19 -0800)]
Merge pull request #32035 from cbodley/wip-qa-rgw-swift-nautilus

qa/rgw: add missing force-branch: ceph-nautilus for swift tasks

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #32229 from alimaredia/wip-s3-tests-branch-name-refactor-nautilus
Yuri Weinstein [Tue, 17 Dec 2019 20:18:05 +0000 (12:18 -0800)]
Merge pull request #32229 from alimaredia/wip-s3-tests-branch-name-refactor-nautilus

nautilus: update s3-test download code for s3-test tasks

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agonautilus: update s3-test download code for s3-test tasks 32229/head
Ali Maredia [Mon, 25 Nov 2019 02:30:03 +0000 (21:30 -0500)]
nautilus: update s3-test download code for s3-test tasks

Fixes: https://tracker.ceph.com/issues/43077
- Ensure the download code for all tasks running
s3-tests is consistent.
- Simplify download code to only use the config
variable 'force-branch' for the branch being
cloned.
- Make ceph-nautilus the force-branch for all
suites using s3-tests.
- Add force-branch to suites running s3readwrite
& s3roundtrip tasks

Signed-off-by: Ali Maredia <amaredia@redhat.com>
5 years agoos/bluestore: default bluestore_block_size 1T -> 100G 32283/head
Sage Weil [Thu, 5 Dec 2019 18:58:12 +0000 (12:58 -0600)]
os/bluestore: default bluestore_block_size 1T -> 100G

This makes vstart *way* faster.  This option is only really relevant
for dev test environments.  We bumped it up back in dbdd1d9b6ec286982b5e86d4c51f831cc16afc12
from 10G just to make ENOSPC less common in dev/test.  Let's see if 100G
is a better balance.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 57890fce7064811780823e298b31e7fced2fa0e3)

 Conflicts:
src/common/options.cc: we did not cherry-pick
        dbdd1d9b6ec286982b5e86d4c51f831cc16afc12 to nautilus, so we'll directly
        go from 10G->100G

5 years agonautilus: mgr/dashboard: Use serial RGW Admin OPS API calls (#31569)
Lenz Grimmer [Mon, 16 Dec 2019 12:57:39 +0000 (12:57 +0000)]
nautilus: mgr/dashboard: Use serial RGW Admin OPS API calls (#31569)

nautilus: mgr/dashboard: Use serial RGW Admin OPS API calls

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agonautilus: mgr/dashboard: Disable event propagation in the help… (#31566)
Lenz Grimmer [Mon, 16 Dec 2019 12:22:42 +0000 (12:22 +0000)]
nautilus: mgr/dashboard: Disable event propagation in the help… (#31566)

nautilus: mgr/dashboard: Disable event propagation in the helper icon

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agonautilus: mgr/dashboard: Remove title from sparkline tooltips (#31737)
Lenz Grimmer [Mon, 16 Dec 2019 10:19:44 +0000 (10:19 +0000)]
nautilus: mgr/dashboard: Remove title from sparkline tooltips (#31737)

nautilus: mgr/dashboard: Remove title from sparkline tooltips

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agodoc/rados/operations: crush_rule is a name 32254/head
Kefu Chai [Sat, 27 Jul 2019 13:35:37 +0000 (21:35 +0800)]
doc/rados/operations: crush_rule is a name

like
```
ceph osd pool set <pool-name> crush_rule <rule-name>
```
where `<rule-name>` is a string instead of a number.

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

5 years agoMerge pull request #32248 from neha-ojha/wip-32197-nautilus
Neha Ojha [Fri, 13 Dec 2019 19:11:38 +0000 (11:11 -0800)]
Merge pull request #32248 from neha-ojha/wip-32197-nautilus

nautilus: doc/_templates/page.html: redirect to etherpad

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agodoc/_templates/page.html: redirect to etherpad 32248/head
Neha [Thu, 12 Dec 2019 04:21:04 +0000 (04:21 +0000)]
doc/_templates/page.html: redirect to etherpad

This simplifies things for users who are not able to add cards to
https://github.com/ceph/ceph/projects/4 due to insufficient permissions.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 066981dedbca161fba85d368d86c8ca15bfe0fac)

5 years agoMerge pull request #31116 from smithfarm/wip-42462-nautilus
Nathan Cutler [Fri, 13 Dec 2019 16:14:54 +0000 (17:14 +0100)]
Merge pull request #31116 from smithfarm/wip-42462-nautilus

nautilus: doc/cephfs: improve add/remove MDS section

Reviewed-by: Jos Collin <jcollin@redhat.com>
5 years agonautilus: mgr/dashboard: Fix e2e chromedriver problem (#32241)
Lenz Grimmer [Fri, 13 Dec 2019 15:45:25 +0000 (15:45 +0000)]
nautilus: mgr/dashboard: Fix e2e chromedriver problem (#32241)

nautilus: mgr/dashboard: Fix e2e chromedriver problem

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Fix e2e chromedriver problem 32241/head
Tiago Melo [Thu, 12 Dec 2019 18:00:57 +0000 (17:00 -0100)]
mgr/dashboard: Fix e2e chromedriver problem

New version of Chrome/ChromeDriver seems to have a problem with insecure
certificates.

Since we use a vStart cluster with no real certificate,
we always face this problem when running e2e tests.

This will fix the current problem and hopefully any future problems related to
certificates.

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

5 years agomgr/dashboard: fix RGW subuser auto-generate key. 32240/head
Alfonso Martínez [Wed, 11 Dec 2019 16:53:01 +0000 (17:53 +0100)]
mgr/dashboard: fix RGW subuser auto-generate key.

Fixes: https://tracker.ceph.com/issues/43263
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 07a08aacea51aae04ba8607688ac4b75a8ee3b3f)

5 years agoMerge pull request #31810 from bk201/wip-42948-nautilus
Lenz Grimmer [Fri, 13 Dec 2019 11:34:03 +0000 (11:34 +0000)]
Merge pull request #31810 from bk201/wip-42948-nautilus

nautilus: mgr/dashboard: fix restored RBD image naming issue

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agonautilus: mgr/dashboard: Update translations nautilus (#31759) BRI-nautilus
Lenz Grimmer [Fri, 13 Dec 2019 09:07:01 +0000 (09:07 +0000)]
nautilus: mgr/dashboard: Update translations nautilus (#31759)

nautilus: mgr/dashboard: Update translations nautilus

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #31300 from smithfarm/wip-42259-nautilus
Neha Ojha [Fri, 13 Dec 2019 04:37:56 +0000 (20:37 -0800)]
Merge pull request #31300 from smithfarm/wip-42259-nautilus

nautilus: doc, qa: remove invalid option mon_pg_warn_max_per_osd

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoqa: radosgw-admin: remove dependency on bunch package 32216/head
Yehuda Sadeh [Sat, 7 Dec 2019 09:12:19 +0000 (01:12 -0800)]
qa: radosgw-admin: remove dependency on bunch package

Fixes: https://tracker.ceph.com/issues/43184
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 1bf21326aa7f8eaafd7049b44eb73aeb36bcc5d7)

5 years agorgw: fix rgw crash when token is not base64 encode 32050/head
yuliyang [Tue, 10 Dec 2019 08:12:57 +0000 (16:12 +0800)]
rgw: fix rgw crash when token is not base64 encode

Fixes: https://tracker.ceph.com/issues/43018
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit b8fca700b52683931052d1567aa259647f977b59)
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
5 years agoos/bluestore: Add config observer for osd memory specific options. 31852/head
Sridhar Seshasayee [Thu, 8 Aug 2019 10:58:01 +0000 (16:28 +0530)]
os/bluestore: Add config observer for osd memory specific options.

Add config observer to enable changes to the following osd memory specific
options at runtime,
 - osd_memory_target
 - osd_memory_base
 - osd_memory_cache_min
 - osd_memory_expected_fragmentation

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit 0d3609a2b7a88ae236335df9ea5d9854aa4de7ad)

 Conflicts:
src/os/bluestore/BlueStore.cc
- removed config changed detection of bluestore_max_defer_interval
  as it is not present in nautilus
src/os/bluestore/BlueStore.h
- removed declaration of max_defer_interval.

5 years ago14.2.5 v14.2.5
Jenkins Build Slave User [Fri, 6 Dec 2019 16:42:34 +0000 (16:42 +0000)]
14.2.5

5 years agoMerge pull request #32082 from liewegas/workaround-py2-strptime-nautilus
Sage Weil [Fri, 6 Dec 2019 15:55:00 +0000 (09:55 -0600)]
Merge pull request #32082 from liewegas/workaround-py2-strptime-nautilus

nautilus: mgr/devicehealth: import _strptime directly

5 years agomgr/devicehealth: import _strptime directly 32082/head
Sage Weil [Fri, 6 Dec 2019 14:30:53 +0000 (08:30 -0600)]
mgr/devicehealth: import _strptime directly

On some machines (in my case, ubuntu 18.04 with 2.7.15+), I see

MGR_MODULE_ERROR Module 'devicehealth' has failed: Failed to import _strptime because the import lockis held by another thread.
    Module 'devicehealth' has failed: Failed to import _strptime because the import lockis held by another thread.

This is apparently an issue with datetime on py2, see

https://www.raspberrypi.org/forums/viewtopic.php?t=166912

Doing the import explicitly is a simple workaround (and resolves the
warning in my test case).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/pg_autoscaler: only generate target_* health warnings if targets set 32067/head
Sage Weil [Thu, 14 Nov 2019 15:48:24 +0000 (09:48 -0600)]
mgr/pg_autoscaler: only generate target_* health warnings if targets set

We may get into a situation where the pool stats appear to exceed the
cluster capacity.  If that happens, don't generate confusing health
messages about the target_{ratio,bytes} pool settings when they aren't
actually set at all.

Fixes: https://tracker.ceph.com/issues/42301
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4e5c4cdeb4e88d034e2fed7d6de97a4322a57adc)

5 years agoMerge pull request #32045 from liewegas/fix-mon-autotune-leveldb-nautilus
Sage Weil [Thu, 5 Dec 2019 22:16:07 +0000 (16:16 -0600)]
Merge pull request #32045 from liewegas/fix-mon-autotune-leveldb-nautilus

nautilus: mon/OSDMonitor: make memory autotune disable itself if no rocksdb

5 years agomon/OSDMonitor: make memory autotune disable itself if no rocksdb 32045/head
Sage Weil [Thu, 5 Dec 2019 19:34:19 +0000 (13:34 -0600)]
mon/OSDMonitor: make memory autotune disable itself if no rocksdb

Currently, we crash (failed assertion). Instead, just disable autotuning.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 68eea44c118f862c752781bb20f75e6f51749329)

5 years agoMerge pull request #32018 from dzafman/wip-revert-verify-upmap-nautilus
Neha Ojha [Thu, 5 Dec 2019 18:07:09 +0000 (10:07 -0800)]
Merge pull request #32018 from dzafman/wip-revert-verify-upmap-nautilus

nautilus: Revert "crush: remove invalid upmap items"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoqa/rgw: add missing force-branch: ceph-nautilus for swift tasks 32035/head
Casey Bodley [Thu, 5 Dec 2019 16:30:38 +0000 (11:30 -0500)]
qa/rgw: add missing force-branch: ceph-nautilus for swift tasks

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agoceph-mon: keep v1 address type when explicitly set 32028/head
Ricardo Dias [Wed, 20 Nov 2019 10:42:18 +0000 (10:42 +0000)]
ceph-mon: keep v1 address type when explicitly set

Fixes: https://tracker.ceph.com/issues/42906
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit a97893e409050afcedb6e77c06e09d5b8a11b8d0)

5 years agoRevert "crush: remove invalid upmap items" 32018/head
David Zafman [Thu, 5 Dec 2019 00:13:42 +0000 (16:13 -0800)]
Revert "crush: remove invalid upmap items"

This reverts commit d6b3025a279c3876df035b02c7b8ec13e0590d7f.

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #31985 from liewegas/wip-fix-telemetry-log-typo-nautilus
Sage Weil [Tue, 3 Dec 2019 22:12:02 +0000 (16:12 -0600)]
Merge pull request #31985 from liewegas/wip-fix-telemetry-log-typo-nautilus

nautilus: mgr/telemetry: fix typo

5 years agomgr/telemetry: fix log typo 31985/head
Sage Weil [Tue, 3 Dec 2019 19:38:50 +0000 (13:38 -0600)]
mgr/telemetry: fix log typo

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 462aa8ff951ad746d096deef17b201c86b41741f)

5 years agoMerge pull request #31974 from liewegas/wip-fix-crash-sorting-nautilus
Sage Weil [Tue, 3 Dec 2019 19:33:48 +0000 (13:33 -0600)]
Merge pull request #31974 from liewegas/wip-fix-crash-sorting-nautilus

nautilus: mgr/crash: fix 'crash ls[-new]' sorting

5 years agoMerge pull request #31894 from smithfarm/wip-43030-nautilus
Nathan Cutler [Tue, 3 Dec 2019 18:13:55 +0000 (19:13 +0100)]
Merge pull request #31894 from smithfarm/wip-43030-nautilus

nautilus: doc: mention --namespace option in rados manpage

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agomgr/crash: fix 'crash ls[-new]' sorting 31974/head
Sage Weil [Tue, 3 Dec 2019 13:12:26 +0000 (07:12 -0600)]
mgr/crash: fix 'crash ls[-new]' sorting

Broken by c691f2f8763a9db081a0b61294c5eedf4e9c2cee

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6e2d917acabee8f0bad09c7aa0d4a9e8e02754b5)

5 years agodoc: mention --namespace option in rados manpage 31894/head
Nathan Cutler [Tue, 26 Nov 2019 07:04:17 +0000 (08:04 +0100)]
doc: mention --namespace option in rados manpage

Fixes: https://tracker.ceph.com/issues/43021
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 4353b5548e0a2a46a0f429afd1b82f4989e665ae)

5 years agoremove the restriction of address type in init_with_hosts when build initial monmap 31844/head
Hao Xiong [Sun, 17 Nov 2019 05:41:04 +0000 (13:41 +0800)]
remove the restriction of address type in init_with_hosts when build initial monmap

Signed-off-by: Hao Xiong <hxiaong@ebay.com>
(cherry picked from commit 0c2da4b21a4df379f580472dc418809eb7622ee0)

Conflicts:
src/mon/MonMap.cc
bf7490bf7c0e11e7f7630ddc4f0f831a42ba4c12 ("mon/MonMap: add weight to
  mon_info_t") will not be backported

5 years agorgw: crypt: permit RGW-AUTO/default with SSE-S3 headers 31862/head
Matt Benjamin [Thu, 5 Sep 2019 15:38:56 +0000 (11:38 -0400)]
rgw: crypt: permit RGW-AUTO/default with SSE-S3 headers

Permit the existing logic for encrypton by a global master key
to take effect when a client has requested AES256 server-side encryption
with S3 managed keys, as well as SSE-KMS.

Fixes: https://tracker.ceph.com/issues/41670
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 80bffd9ae12f6b5846cf8efbffda71e9f921e18f)

5 years agoMerge pull request #31833 from dillaman/wip-42891-nautilus
Yuri Weinstein [Mon, 25 Nov 2019 16:01:36 +0000 (08:01 -0800)]
Merge pull request #31833 from dillaman/wip-42891-nautilus

nautilus: cls/rbd: sanitize the mirror image status peer address after reading from disk

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #31822 from neha-ojha/wip-31657-nautilus
Sage Weil [Sun, 24 Nov 2019 02:33:20 +0000 (20:33 -0600)]
Merge pull request #31822 from neha-ojha/wip-31657-nautilus

nautilus: osd: release backoffs during merge

5 years agocls/rbd: sanitize the mirror image status peer address after reading from disk 31833/head
Jason Dillaman [Sat, 23 Nov 2019 15:36:31 +0000 (10:36 -0500)]
cls/rbd: sanitize the mirror image status peer address after reading from disk

RADOS upgrade tests were failing when OSDs were partially upgraded since the
entity_addr_t::type overload wasn't being recovered when re-read. Now we will
always sanitize the on-disk entity address after reading it to avoid such
issues of on-disk encoding/decoding.

Fixes: https://tracker.ceph.com/issues/42891
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1542d12e1b893166a5bc7b7a4c9a4474078a98be)

Conflicts:
src/cls/rbd/cls_rbd(_types).[h|cc]: the MirrorImageStatusOnDisk struct has moved

5 years agoMerge pull request #31812 from jan--f/wip-42965-nautilus
Alfredo Deza [Fri, 22 Nov 2019 20:04:50 +0000 (15:04 -0500)]
Merge pull request #31812 from jan--f/wip-42965-nautilus

nautilus: ceph-volume: check if we run in an selinux environment

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoosd: release backoffs during merge 31822/head
Sage Weil [Thu, 14 Nov 2019 14:49:32 +0000 (08:49 -0600)]
osd: release backoffs during merge

When we merge PGs, ensure that backoffs release messages are sent to
the client before the victim PG is destroyed.  This is /almost/ handled
by on_shutdown(), except that the shutdown code is aggressive about
tearing down backoff state in order to manage the PGRef lifecycle
carefully--and because in the shutdown (or normal PG/pool deletion) case
it doesn't matter what (if anything) we tell the client.

Fix this by simply queuing the backoff release prior to shutting down the
merge source PG.

An alternative appraoch would be to rejigger the PGRef release timing, but
that code is very fragile and this is a more targetted fix for this issue.
We might consider a more careful look in the future... or not!

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f75d8327277012db70c2ca00991decacf29b1b6a)

5 years agoceph-volume: add mock dependency to tox.ini 31812/head
Jan Fajerski [Fri, 22 Nov 2019 16:45:31 +0000 (17:45 +0100)]
ceph-volume: add mock dependency to tox.ini

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years ago ceph-volume: python2 raises OSError on Popen with missing binary.
Jan Fajerski [Fri, 22 Nov 2019 14:51:00 +0000 (15:51 +0100)]
 ceph-volume: python2 raises OSError on Popen with missing binary.

For compatibility alias FileNotFoundError to OSError.

Fixes: 72b79f71fa84fe0d56b2fd1745f5bb130380cc38
Fixes: https://tracker.ceph.com/issues/42967
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 12c5f89ddb51a1db9399e03591e1db6c429b9c9e)

5 years agoceph-volume: py2 compatibility for selinux test
Jan Fajerski [Fri, 22 Nov 2019 14:49:41 +0000 (15:49 +0100)]
ceph-volume: py2 compatibility for selinux test

Fixes: af30c7f956380beb3bc4021d60b9229a82bda4e2
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 114aa57df28107c2d14caacdfb3f0423b244075d)

5 years agoceph-volume: don't assume SELinux
Jan Fajerski [Fri, 22 Nov 2019 09:46:05 +0000 (10:46 +0100)]
ceph-volume: don't assume SELinux

Expect selinux related binaries to not be present.

Fixes: 33c8a64a54d9ea8962091caf8564cea3f603c5f5
Fixes: https://tracker.ceph.com/issues/42957
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 72b79f71fa84fe0d56b2fd1745f5bb130380cc38)

5 years agoceph-volume: fix test test_selinuxenabled_doesnt_exist
Jan Fajerski [Fri, 22 Nov 2019 10:09:22 +0000 (11:09 +0100)]
ceph-volume: fix test test_selinuxenabled_doesnt_exist

Popen does not open a shell by default, so A FileNotFoundError is
raised instead of returning a 127 return code.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit af30c7f956380beb3bc4021d60b9229a82bda4e2)

5 years agomgr/dashboard: fix restored RBD image naming issue 31810/head
Kiefer Chang [Wed, 13 Nov 2019 06:37:00 +0000 (14:37 +0800)]
mgr/dashboard: fix restored RBD image naming issue

The new image name in the POST data should not be URL encoded.

Fixes: https://tracker.ceph.com/issues/42785
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit b0013cd30ac31a7caf5dac0d671e5355b6e1323c)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.ts
        - Dashboard support of RBD namespace feature is not available in nautilus

5 years agomgr/dashboard: Update translation 31759/head
Sebastian Krah [Wed, 20 Nov 2019 10:40:29 +0000 (11:40 +0100)]
mgr/dashboard: Update translation

Updates the following translations:

- Czech
- German
- Spanish
- French
- Indonesian
- Italian
- Japanese
- Korean
- Polish
- Portuguese (Brazil)
- Chinese (China)
- Chinese (Taiwan)

I committed directly to the nautilus branch, because the differences of the
translation files between master and nautilus is too huge. We also track the
translations for each ceph version as a seperate resource on transifex.

Signed-off-by: Sebastian Krah <skrah@suse.com>
5 years agomgr/dashboard: show Rename in modal header & button when renaming RBD snapshot 31779/head
Alfonso Martínez [Thu, 21 Nov 2019 08:18:00 +0000 (09:18 +0100)]
mgr/dashboard: show Rename in modal header & button when renaming RBD snapshot

Fixes: https://tracker.ceph.com/issues/42762
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit fa478ce4aed66013cee10864546715b1ce8d93a1)

5 years agoMerge PR #30521 into nautilus
Patrick Donnelly [Thu, 21 Nov 2019 01:34:26 +0000 (17:34 -0800)]
Merge PR #30521 into nautilus

* refs/pull/30521/head:
qa: have kclient tests use new mount.ceph functionality
doc: document that the kcephfs mount helper will search keyring files for secrets
mount.ceph: fork a child to get info from local configuration
mount.ceph: track mon string and path inside ceph_mount_info
mount.ceph: add name and secret to ceph_mount_info
mount.ceph: add ceph_mount_info structure
mount.ceph: clean up debugging output and error messages
mount.ceph: clean up return codes
mount.ceph: add comment explaining why we need to modprobe
mount.ceph: use bools for flags
common: have read_secret_from_file return negative error codes

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #31733 from epuertat/wip-42677-nautilus
Yuri Weinstein [Wed, 20 Nov 2019 21:14:15 +0000 (13:14 -0800)]
Merge pull request #31733 from epuertat/wip-42677-nautilus

nautilus: mgr/dashboard: Fix grafana dashboards

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #30229 from vumrao/wip-vumrao-bluefs-shared-alloc-with-log-level...
Yuri Weinstein [Wed, 20 Nov 2019 20:06:54 +0000 (12:06 -0800)]
Merge pull request #30229 from vumrao/wip-vumrao-bluefs-shared-alloc-with-log-level-change-nautilus

nautilus: os/bluestore: apply shared_alloc_size to shared device with log level change

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge pull request #31704 from smithfarm/wip-42858-nautilus
Yuri Weinstein [Wed, 20 Nov 2019 20:05:12 +0000 (12:05 -0800)]
Merge pull request #31704 from smithfarm/wip-42858-nautilus

nautilus: mon/PGMap: fix incorrect pg_pool_sum when delete pool

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31676 from tchaikov/nautilus-42832
Yuri Weinstein [Wed, 20 Nov 2019 20:04:50 +0000 (12:04 -0800)]
Merge pull request #31676 from tchaikov/nautilus-42832

nautilus: ceph.in: do not preload ASan unless necessary

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #31526 from ricardoasmarques/wip-42730-nautilus
Yuri Weinstein [Wed, 20 Nov 2019 20:03:42 +0000 (12:03 -0800)]
Merge pull request #31526 from ricardoasmarques/wip-42730-nautilus

nautilus: mgr/dashboard: tasks: only unblock controller thread after TaskManager thread

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #30910 from rjfd/wip-42283-nautilus
Yuri Weinstein [Wed, 20 Nov 2019 20:03:02 +0000 (12:03 -0800)]
Merge pull request #30910 from rjfd/wip-42283-nautilus

nautilus: mgr/dashboard: internationalization support with AOT enabled

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge pull request #30685 from ifed01/wip-ifed-fast-fsck-nau
Yuri Weinstein [Wed, 20 Nov 2019 20:01:28 +0000 (12:01 -0800)]
Merge pull request #30685 from ifed01/wip-ifed-fast-fsck-nau

nautilus: os/bluestore: shallow fsck mode and legacy statfs auto repair.

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31742 from smithfarm/wip-42836-nautilus
Nathan Cutler [Tue, 19 Nov 2019 16:51:20 +0000 (17:51 +0100)]
Merge pull request #31742 from smithfarm/wip-42836-nautilus

nautilus: rgw: Silence warning: control reaches end of non-void function

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agorgw: drop getting list-type when get_data is false 31742/head
Jos Collin [Wed, 3 Jul 2019 04:44:21 +0000 (10:14 +0530)]
rgw: drop getting list-type when get_data is false

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit ae56a918174cc6899bf7384004560ea57036b009)

5 years agorgw: Silence warning: control reaches end of non-void function
Jos Collin [Mon, 1 Jul 2019 09:02:33 +0000 (14:32 +0530)]
rgw: Silence warning: control reaches end of non-void function

Build shows:
[ 53%] Building CXX object src/mds/CMakeFiles/mds.dir/JournalPointer.cc.o
ceph/src/rgw/rgw_rest_s3.cc: In member function ‘RGWOp* RGWHandler_REST_Bucket_S3::get_obj_op(bool)’:
ceph/src/rgw/rgw_rest_s3.cc:3588:5: warning: control reaches end of non-void function [-Wreturn-type]
   }   }
     ^
Fixes: 4ffc765c4c5debc665ade7769c4647c3a7278fd2
Fixes: http://tracker.ceph.com/issues/40747
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit abb2451dd5164e6b610589207b900a6464e21282)

5 years agoMerge pull request #31522 from ricardoasmarques/wip-42729-nautilus
Laura Paduano [Tue, 19 Nov 2019 15:57:17 +0000 (16:57 +0100)]
Merge pull request #31522 from ricardoasmarques/wip-42729-nautilus

nautilus: mgr/dashboard: RBD tests must use pools with power-of-two pg_n…

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #31516 from rhcs-dashboard/42694-filter-non-pool-fields
Laura Paduano [Tue, 19 Nov 2019 15:56:34 +0000 (16:56 +0100)]
Merge pull request #31516 from rhcs-dashboard/42694-filter-non-pool-fields

nautilus: mgr/dashboard: do not show non-pool data in pool details

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #31413 from smithfarm/wip-41980-nautilus
Laura Paduano [Tue, 19 Nov 2019 15:55:55 +0000 (16:55 +0100)]
Merge pull request #31413 from smithfarm/wip-41980-nautilus

nautilus: mgr/dashboard: do not log tokens

5 years agoMerge pull request #31375 from tspmelo/wip-42150-nautilus
Laura Paduano [Tue, 19 Nov 2019 15:55:14 +0000 (16:55 +0100)]
Merge pull request #31375 from tspmelo/wip-42150-nautilus

nautilus: mgr/dashboard: Configuring an URL prefix does not work as expected

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #31349 from rhcs-dashboard/42589-edit-image-after-data-received
Laura Paduano [Tue, 19 Nov 2019 15:29:26 +0000 (16:29 +0100)]
Merge pull request #31349 from rhcs-dashboard/42589-edit-image-after-data-received

nautilus: mgr/dashboard: edit/clone/copy rbd image after its data is received

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #31263 from ricardoasmarques/wip-42295-nautilus
Laura Paduano [Tue, 19 Nov 2019 15:02:32 +0000 (16:02 +0100)]
Merge pull request #31263 from ricardoasmarques/wip-42295-nautilus

nautilus: mgr/dashboard: Provide the name of the object being deleted

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #31160 from Exotelis/wip-42482-nautilus
Laura Paduano [Tue, 19 Nov 2019 15:00:42 +0000 (16:00 +0100)]
Merge pull request #31160 from Exotelis/wip-42482-nautilus

nautilus: mgr/dashboard: Add transifex-i18ntool

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoos/bluestore/BlueFS: Move bluefs alloc size initialization log message to log level 1 30229/head
Vikhyat Umrao [Thu, 22 Aug 2019 16:45:40 +0000 (09:45 -0700)]
os/bluestore/BlueFS: Move bluefs alloc size initialization log message to log level 1
Fixes: https://tracker.ceph.com/issues/41399
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit 96d48af3252f0ec2c1864383ad5eee993ecfeb4f)

5 years agoos/bluestore/BlueFS: apply shared_alloc_size to shared device
Sage Weil [Wed, 7 Aug 2019 17:41:33 +0000 (12:41 -0500)]
os/bluestore/BlueFS: apply shared_alloc_size to shared device

Keep an alloc_size vector so that we have this value handy at all times.
Allow bluestore to fetch this value directly instead of looking at the
bluefs_* config options since this encapsulates things a bit better, and
also isn't vulnerable to the config setting changing at runtime.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e8b5a458c306dfe166b09239fc9f57c04fa47ead)

5 years agoos/bluestore/BlueFS: fix device_migrate_to_* to handle varying alloc sizes
Sage Weil [Thu, 8 Aug 2019 18:30:59 +0000 (13:30 -0500)]
os/bluestore/BlueFS: fix device_migrate_to_* to handle varying alloc sizes

The previous implementation moved extents individually.  This caused
problems when moving an extent with a small alloc_size that wasn't
a multiple of the target device's alloc_size.

Instead, identify files with extents that need to be moved, and then read
the file in its entirety and rewrite it in its entirety.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 94269741959a4280225b6330dfb015f1799fd1f2)

5 years agoos/bluestore: whitespace
Sage Weil [Wed, 7 Aug 2019 15:54:42 +0000 (10:54 -0500)]
os/bluestore: whitespace

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 99c56559d17fac4fde65ef38a82ac6cab090dafb)