]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agorgw: fix data sync start delay if remote haven't init data_log 30393/head
Tianshan Qu [Mon, 16 Sep 2019 05:59:31 +0000 (13:59 +0800)]
rgw: fix data sync start delay if remote haven't init data_log

Fixes: https://tracker.ceph.com/issues/41839
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
6 years agoMerge pull request #28227 from sseshasa/monCachePriority
Josh Durgin [Fri, 9 Aug 2019 21:23:39 +0000 (14:23 -0700)]
Merge pull request #28227 from sseshasa/monCachePriority

mon/OSDMonitor: Use generic priority cache tuner for mon caches

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #29540 from cbodley/wip-rgw-user-rename
Casey Bodley [Fri, 9 Aug 2019 20:57:25 +0000 (16:57 -0400)]
Merge pull request #29540 from cbodley/wip-rgw-user-rename

rgw: followup for 'user rename'

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoMerge pull request #29558 from theanalyst/rgw-cache-lock
Casey Bodley [Fri, 9 Aug 2019 17:03:35 +0000 (13:03 -0400)]
Merge pull request #29558 from theanalyst/rgw-cache-lock

rgw: fix unlock of shared lock in RGWCache

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: fix unlock of shared lock in RGWCache 29558/head
Abhishek Lekshmanan [Thu, 8 Aug 2019 15:38:43 +0000 (17:38 +0200)]
rgw: fix unlock of shared lock in RGWCache

similar to https://github.com/ceph/ceph/pull/29538/ we unlock a shared_lock with
unlock causing a crash. Also scope the single line if statements to make the
code more concise

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge PR #29292 into master
Sage Weil [Fri, 9 Aug 2019 15:40:45 +0000 (10:40 -0500)]
Merge PR #29292 into master

* refs/pull/29292/head:
os/bluestore: warn on no per-pool omap
os/bluestore: fsck: warning (not error) by default on no per-pool omap
os/bluestore: fsck: int64_t for error count
os/bluestore: default size of 1 TB for testing
os/bluestore: behave if we *do* set PGMETA and PERPOOL flags
os/bluestore: do not set both PGMETA_OMAP and PERPOOL_OMAP
os/bluestore: fsck: only generate 1 error per omap_head
os/bluestore: make fsck repair convert to per-pool omap
os/bluestore: teach fsck to tolerate per-pool omap
os/bluestore: ondisk format change to 3 for per-pool omap
mon/PGMap: add data/omap breakouts for 'df detail' view
osd/osd_types: separate get_{user,allocated}_bytes() into data and omap variants
mon/PGMap: fix stored_raw calculation
mon/PGMap: add in actual omap usage into per-pool stats
osd: report per-pool omap support via store_statfs_t
os/bluestore: set per_pool_omap key on mkfs
osd/osd_types: count per-pool omap capable OSDs
os/bluestore: report omap_allocated per-pool
os/bluestore: add pool prefix to omap keys
kv/KeyValueDB: take key_prefix for estimate_prefix_size()
os/bluestore: fix manual omap key manipulation to use Onode::get_omap_key()
os/bluestore: make omap key helpers Onode methods
os/bluestore: add Onode::get_omap_prefix() helper
os/bluestore: change _do_omap_clear() args

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #29528 from tchaikov/wip-build-doc-with-python3
Alfredo Deza [Fri, 9 Aug 2019 15:17:19 +0000 (11:17 -0400)]
Merge pull request #29528 from tchaikov/wip-build-doc-with-python3

admin/build-doc: use python3

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #29560 from linuxbox2/wip-rgwf-advance
Matt Benjamin [Fri, 9 Aug 2019 14:01:03 +0000 (10:01 -0400)]
Merge pull request #29560 from linuxbox2/wip-rgwf-advance

rgw_file: dont deadlock in advance_mtime()

6 years agoos/bluestore: warn on no per-pool omap 29292/head
Sage Weil [Thu, 8 Aug 2019 21:57:22 +0000 (16:57 -0500)]
os/bluestore: warn on no per-pool omap

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #29400 from wjwithagen/wjw-fix-do_freeBSD.sh
Kefu Chai [Fri, 9 Aug 2019 06:09:42 +0000 (14:09 +0800)]
Merge pull request #29400 from wjwithagen/wjw-fix-do_freeBSD.sh

do_freebsd.sh: update build scripts to resemble Jenkins scripts

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #29495 from ifed01/wip-ifed-finisher-improve
Kefu Chai [Fri, 9 Aug 2019 04:24:28 +0000 (12:24 +0800)]
Merge pull request #29495 from ifed01/wip-ifed-finisher-improve

common/Finisher: remove some lock acquisitions.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #29477 from tchaikov/wip-osd-pg-as-mutex
Kefu Chai [Fri, 9 Aug 2019 04:22:26 +0000 (12:22 +0800)]
Merge pull request #29477 from tchaikov/wip-osd-pg-as-mutex

osd: pg as a mutex

Reviewed-by: Greg Farnum gfarnum@redhat.com
Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agoMerge pull request #29486 from runsisi/wip-fix-verbose
Kefu Chai [Fri, 9 Aug 2019 04:21:29 +0000 (12:21 +0800)]
Merge pull request #29486 from runsisi/wip-fix-verbose

ceph.in: fix verbose print

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #29465 from penglaiyxy/wip_bluestore_caculated_revert
Kefu Chai [Fri, 9 Aug 2019 04:20:46 +0000 (12:20 +0800)]
Merge pull request #29465 from penglaiyxy/wip_bluestore_caculated_revert

os/bluestore: no need to add tail length (revert PR#29185)

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agoMerge pull request #29488 from majianpeng/bluestore-remove-lock
Kefu Chai [Fri, 9 Aug 2019 04:19:27 +0000 (12:19 +0800)]
Merge pull request #29488 from majianpeng/bluestore-remove-lock

os/bluestore: no need protected by OpSequencer::qlock.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agoMerge pull request #29385 from kamoltat/wip-qa-tasks-mgr-test-progress-bug-fix
Kefu Chai [Fri, 9 Aug 2019 04:18:40 +0000 (12:18 +0800)]
Merge pull request #29385 from kamoltat/wip-qa-tasks-mgr-test-progress-bug-fix

qa/tasks/mgr/test_progress.py: fix bug in 9b4dbf0

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #29365 from liewegas/wip-telemetry-post
Dan Mick [Thu, 8 Aug 2019 23:32:15 +0000 (16:32 -0700)]
Merge pull request #29365 from liewegas/wip-telemetry-post

telemetry/server: misc fixes

6 years agorgw_file: dont deadlock in advance_mtime() 29560/head
Matt Benjamin [Thu, 8 Aug 2019 20:21:24 +0000 (16:21 -0400)]
rgw_file: dont deadlock in advance_mtime()

Fixes: https://tracker.ceph.com/issues/41173
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoos/bluestore: fsck: warning (not error) by default on no per-pool omap
Sage Weil [Thu, 8 Aug 2019 21:56:07 +0000 (16:56 -0500)]
os/bluestore: fsck: warning (not error) by default on no per-pool omap

Unconditionally error if the global per_pool_omap was set, though!

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: fsck: int64_t for error count
Sage Weil [Thu, 8 Aug 2019 21:31:01 +0000 (16:31 -0500)]
os/bluestore: fsck: int64_t for error count

Just to be on the safe side.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: default size of 1 TB for testing
Sage Weil [Tue, 6 Aug 2019 14:07:35 +0000 (09:07 -0500)]
os/bluestore: default size of 1 TB for testing

Less ENOSPC from vstart.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: behave if we *do* set PGMETA and PERPOOL flags
Sage Weil [Mon, 5 Aug 2019 17:53:29 +0000 (12:53 -0500)]
os/bluestore: behave if we *do* set PGMETA and PERPOOL flags

pgmeta trumps perpool.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: do not set both PGMETA_OMAP and PERPOOL_OMAP
Sage Weil [Mon, 5 Aug 2019 17:52:56 +0000 (12:52 -0500)]
os/bluestore: do not set both PGMETA_OMAP and PERPOOL_OMAP

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: fsck: only generate 1 error per omap_head
Sage Weil [Mon, 5 Aug 2019 17:08:17 +0000 (12:08 -0500)]
os/bluestore: fsck: only generate 1 error per omap_head

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: make fsck repair convert to per-pool omap
Sage Weil [Tue, 30 Jul 2019 00:43:53 +0000 (19:43 -0500)]
os/bluestore: make fsck repair convert to per-pool omap

- error if objects not per-pool
- error if per_pool_omap not set
- convert as we go, and set the flag at the end

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #29541 from yuriw/wip-yuriw-upgrade-rbd-master
Yuri Weinstein [Thu, 8 Aug 2019 22:22:48 +0000 (15:22 -0700)]
Merge pull request #29541 from yuriw/wip-yuriw-upgrade-rbd-master

qa/tests: added rbd task on ec

6 years agoMerge PR #27542 into master
Sage Weil [Thu, 8 Aug 2019 20:52:58 +0000 (15:52 -0500)]
Merge PR #27542 into master

* refs/pull/27542/head:
qa/tasks: Fix ambiguous store_thrash, thrash_store

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #29493 into master
Sage Weil [Thu, 8 Aug 2019 20:52:45 +0000 (15:52 -0500)]
Merge PR #29493 into master

* refs/pull/29493/head:
qa/tasks/mgr/mgr_test_case: get mgrmap from 'mgr dump', not status
qa/tasks/ceph_manager: no newlines in 'ceph -s' output
mon: make mon summary more concise in 'ceph -s'
mon/MgrStatMonitor: set initial service_map 'modified' to cluster mkfs
mon: remove double-nesting of "osdmap" for ceph status
mon/MgrMap: make print_summary (used by 'ceph -s') more concise

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #29511 into master
Sage Weil [Thu, 8 Aug 2019 20:49:29 +0000 (15:49 -0500)]
Merge PR #29511 into master

* refs/pull/29511/head:
common/config: respect POD_MEMORY_REQUEST *and* POD_MEMORY_LIMIT env vars
common/config: let diff show non-build defaults
common/config: do no include multiple 'default' values

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge PR #29517 into master
Sage Weil [Thu, 8 Aug 2019 20:49:17 +0000 (15:49 -0500)]
Merge PR #29517 into master

* refs/pull/29517/head:
osd: include PastInterals in pg_notify_t

Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agoMerge pull request #29559 from adamemerson/wip-putobj-crash
Adam C. Emerson [Thu, 8 Aug 2019 19:14:03 +0000 (15:14 -0400)]
Merge pull request #29559 from adamemerson/wip-putobj-crash

rgw: Move upload_info declaration out of conditional

Reviewed-By: Casey Bodley <cbodley@redhat.com>
6 years agorgw: Move upload_info declaration out of conditional 29559/head
Adam C. Emerson [Fri, 19 Jul 2019 20:10:30 +0000 (16:10 -0400)]
rgw: Move upload_info declaration out of conditional

That way we don't deconstruct it right after assigning a reference to
part of it.

Fixes: https://tracker.ceph.com/issues/41172
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
6 years agoMerge pull request #29449 from cbodley/wip-vstart-client-rgw
Casey Bodley [Thu, 8 Aug 2019 15:33:52 +0000 (11:33 -0400)]
Merge pull request #29449 from cbodley/wip-vstart-client-rgw

vstart: move common rgw config to [client.rgw]

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoqa/tests: added rbd task on ec 29541/head
Yuri Weinstein [Wed, 7 Aug 2019 20:36:29 +0000 (13:36 -0700)]
qa/tests: added rbd task on ec

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoosd: include PastInterals in pg_notify_t 29517/head
Sage Weil [Tue, 6 Aug 2019 19:30:53 +0000 (14:30 -0500)]
osd: include PastInterals in pg_notify_t

We use a pair<pg_notify_t,PastIntervals> everywhere a pg_notify_t is used.
This is silly; just make it a member instead.

Include some minor compat cruft so we can speak to pre-octopus OSDs.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #29538 from cbodley/wip-rgw-data-changes-shared-unlock
Casey Bodley [Thu, 8 Aug 2019 14:11:29 +0000 (10:11 -0400)]
Merge pull request #29538 from cbodley/wip-rgw-data-changes-shared-unlock

rgw: fix unlock of shared lock in RGWDataChangesLog

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #29468 from dillaman/wip-41032
Mykola Golub [Thu, 8 Aug 2019 13:32:33 +0000 (16:32 +0300)]
Merge pull request #29468 from dillaman/wip-41032

pybind/mgr/rbd_support: use image ids to detect duplicate tasks

Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #29514 into master
Sage Weil [Thu, 8 Aug 2019 13:24:33 +0000 (08:24 -0500)]
Merge PR #29514 into master

* refs/pull/29514/head:
mgr/hello: typos
mgr/hello: a better command example
mgr/hello: boilerplate for handling config options
mgr/hello: fully document our options

Reviewed-by: Tim Serong <tserong@suse.com>
6 years agoqa/tasks/mgr/mgr_test_case: get mgrmap from 'mgr dump', not status 29493/head
Sage Weil [Thu, 8 Aug 2019 13:17:04 +0000 (08:17 -0500)]
qa/tasks/mgr/mgr_test_case: get mgrmap from 'mgr dump', not status

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #29546 into master
Sage Weil [Thu, 8 Aug 2019 13:12:53 +0000 (08:12 -0500)]
Merge PR #29546 into master

* refs/pull/29546/head:
mgr/telemetry: clear the event after being awaken by it

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agomgr/dashboard: Prevent clone when layering not enabled on pare… (#29317)
Lenz Grimmer [Thu, 8 Aug 2019 12:38:58 +0000 (14:38 +0200)]
mgr/dashboard: Prevent clone when layering not enabled on pare… (#29317)

mgr/dashboard: Prevent clone when layering not enabled on parent image

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agomgr/dashboard: fix RBD snapshot protected label (#29534)
Lenz Grimmer [Thu, 8 Aug 2019 12:34:17 +0000 (14:34 +0200)]
mgr/dashboard: fix RBD snapshot protected label (#29534)

mgr/dashboard: fix RBD snapshot protected label

Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Verify fields on Crush map page (#29452)
Lenz Grimmer [Thu, 8 Aug 2019 12:01:49 +0000 (14:01 +0200)]
mgr/dashboard: Verify fields on Crush map page (#29452)

mgr/dashboard: Verify fields on Crush map page

Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Verify fields on Monitors page (#29450)
Lenz Grimmer [Thu, 8 Aug 2019 12:00:52 +0000 (14:00 +0200)]
mgr/dashboard: Verify fields on Monitors page (#29450)

mgr/dashboard: Verify fields on Monitors page

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: E2E Dashboard Page Test Suite (#29432)
Lenz Grimmer [Thu, 8 Aug 2019 11:59:42 +0000 (13:59 +0200)]
mgr/dashboard: E2E Dashboard Page Test Suite (#29432)

mgr/dashboard: E2E Dashboard Page Test Suite

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Verify manager modules have editing functionali… (#29407)
Lenz Grimmer [Thu, 8 Aug 2019 11:58:51 +0000 (13:58 +0200)]
mgr/dashboard: Verify manager modules have editing functionali… (#29407)

mgr/dashboard: Verify manager modules have editing functionality

Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/telemetry: clear the event after being awaken by it 29546/head
Kefu Chai [Thu, 8 Aug 2019 04:24:53 +0000 (12:24 +0800)]
mgr/telemetry: clear the event after being awaken by it

otherwise telemetry will have a busy-loop once it's signaled.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #29494 from dzafman/wip-scrub-test
David Zafman [Thu, 8 Aug 2019 01:30:31 +0000 (18:30 -0700)]
Merge pull request #29494 from dzafman/wip-scrub-test

test: Bump sleep time for slower machines

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agorgw: add rename_swift_keys for user rename 29540/head
Casey Bodley [Wed, 7 Aug 2019 14:09:29 +0000 (10:09 -0400)]
rgw: add rename_swift_keys for user rename

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: consolidate RGWUser::execute_rename
Casey Bodley [Tue, 6 Aug 2019 15:19:16 +0000 (11:19 -0400)]
rgw: consolidate RGWUser::execute_rename

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: user rename calls update() to write final user
Casey Bodley [Tue, 6 Aug 2019 15:09:03 +0000 (11:09 -0400)]
rgw: user rename calls update() to write final user

this calls remove_old_indexes() to clean up the uid and buckets index
objects, and also sets 'old_info = user_info' so that radosgw-admin
dumps the json output of the renamed user instead of the old user

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: user rename overwrites new user with --yes-i-really-mean-it
Casey Bodley [Tue, 6 Aug 2019 14:35:19 +0000 (10:35 -0400)]
rgw: user rename overwrites new user with --yes-i-really-mean-it

if a previous rename attempt fails to complete, it can be restarted with
--yes-i-really-mean-it to overwrite the 'stub' user created previously

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: user rename operates on 'stub' user
Casey Bodley [Tue, 6 Aug 2019 14:32:15 +0000 (10:32 -0400)]
rgw: user rename operates on 'stub' user

user rename creates a 'stub' user and links all buckets to that before
modifying the existing user. once everything succeeds, the stub user is
updated to match the existing user and all index objects are updated to
point at it

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: add rgw_remove_user_buckets_index
Casey Bodley [Tue, 6 Aug 2019 14:24:06 +0000 (10:24 -0400)]
rgw: add rgw_remove_user_buckets_index

helper function to remove the user:buckets object.
rgw_remove_uid_index() now omits the object version tracker argument to
avoid reading the user info

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: simplify bucket chown
Casey Bodley [Tue, 6 Aug 2019 14:21:48 +0000 (10:21 -0400)]
rgw: simplify bucket chown

removes unused 'attrs' argument, and takes uid + display name instead
of RGWUserInfo

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #28813 from smanjara/wip-user-rename-working
Casey Bodley [Wed, 7 Aug 2019 20:05:07 +0000 (16:05 -0400)]
Merge pull request #28813 from smanjara/wip-user-rename-working

rgw : Bucket mv, bucket chown and user rename utilities

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoMerge pull request #29425 from aclamk/wip-bluestore-monitor-allocations
Neha Ojha [Wed, 7 Aug 2019 18:37:34 +0000 (11:37 -0700)]
Merge pull request #29425 from aclamk/wip-bluestore-monitor-allocations

[bluestore][tools] Inspect allocations in bluestore

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agorgw: fix unlock of shared lock in RGWDataChangesLog 29538/head
Casey Bodley [Wed, 7 Aug 2019 17:55:03 +0000 (13:55 -0400)]
rgw: fix unlock of shared lock in RGWDataChangesLog

std::shared_mutex expects a call to unlock_shared() after lock_shared().
use the std::shared_lock guard to make it more obviously correct

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agodoc/rados/operations/health-checks: document BlueStore fragmentation and BlueFS space... 29425/head
Adam Kupczyk [Wed, 7 Aug 2019 09:52:29 +0000 (11:52 +0200)]
doc/rados/operations/health-checks: document BlueStore fragmentation and BlueFS space available features

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
6 years agomgr/dashboard: fix RBD snapshot protected label 29534/head
Tatjana Dehler [Wed, 7 Aug 2019 15:45:10 +0000 (17:45 +0200)]
mgr/dashboard: fix RBD snapshot protected label

Fixes: https://tracker.ceph.com/issues/41153
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
6 years agoMerge pull request #29438 from wjwithagen/wjw-fix-ceph-backport.sh-https-tracker
Nathan Cutler [Wed, 7 Aug 2019 15:04:13 +0000 (17:04 +0200)]
Merge pull request #29438 from wjwithagen/wjw-fix-ceph-backport.sh-https-tracker

script/ceph-backport.sh: Use secure access for tracker.ceph.com

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agomgr/hello: typos 29514/head
Sage Weil [Mon, 5 Aug 2019 21:23:57 +0000 (16:23 -0500)]
mgr/hello: typos

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/hello: a better command example
Sage Weil [Mon, 5 Aug 2019 21:23:48 +0000 (16:23 -0500)]
mgr/hello: a better command example

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/hello: boilerplate for handling config options
Sage Weil [Mon, 5 Aug 2019 19:46:40 +0000 (14:46 -0500)]
mgr/hello: boilerplate for handling config options

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/dashboard: E2E Dashboard Page Test Suite 29432/head
Rafael Quintero [Wed, 31 Jul 2019 17:31:28 +0000 (13:31 -0400)]
mgr/dashboard: E2E Dashboard Page Test Suite

Fixes: https://tracker.ceph.com/issues/40549
Fixes: https://tracker.ceph.com/issues/40550
Fixes: https://tracker.ceph.com/issues/40561
Signed-off-by: Adam King <adking@redhat.com>
Signed-off-by: Rafael Quintero <rquinter@redhat.com>
6 years agoadmin/build-doc: use python3 29528/head
Kefu Chai [Wed, 7 Aug 2019 09:46:13 +0000 (17:46 +0800)]
admin/build-doc: use python3

to address https://github.com/sphinx-doc/sphinx/issues/3620, we need to
use sphinx with its fix at
https://github.com/sphinx-doc/sphinx/commit/e049f86b2de1cfdf8a74c88dc9593d047c85d5cb
in other words, we need to use sphinx v2.0.0 and up. but sphinx 2.0
requires python >= 3.5, so we have to use python3 for building the
documents.

in this change:

* doc-requirements.txt: install python3 packages on debian derivatives
* build-doc: install python3.6 packages from EPEL7, and use python3
  venv for using sphinx2
* doc-requirements.txt: bump up all python packages to latest
  stable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #29525 from tchaikov/wip-mgr/dashboard/run-backend-api-tests.sh 29710/head
Kefu Chai [Wed, 7 Aug 2019 09:29:22 +0000 (17:29 +0800)]
Merge pull request #29525 from tchaikov/wip-mgr/dashboard/run-backend-api-tests.sh

mgr/dashboard: add python-common to $PYTHONPATH

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
6 years agoMerge pull request #29451 from rhcs-dashboard/wip-41047-master
Lenz Grimmer [Wed, 7 Aug 2019 09:14:08 +0000 (11:14 +0200)]
Merge pull request #29451 from rhcs-dashboard/wip-41047-master

github: Add CODEOWNERs for designated code-owner reviews

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agomgr/dashboard: fix HACKING.rst is not rendered on github (#29521)
Lenz Grimmer [Wed, 7 Aug 2019 08:53:06 +0000 (10:53 +0200)]
mgr/dashboard: fix HACKING.rst is not rendered on github (#29521)

mgr/dashboard: fix HACKING.rst is not rendered on github

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
6 years agoMerge pull request #29461 from tchaikov/wip-mgr/dashboard/test_mgr_module
Kefu Chai [Wed, 7 Aug 2019 08:34:08 +0000 (16:34 +0800)]
Merge pull request #29461 from tchaikov/wip-mgr/dashboard/test_mgr_module

qa/tasks/mgr/dashboard/test_mgr_module: sync w/ telemetry

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoqa/tasks/mgr/dashboard/test_mgr_module: sync w/ telemetry 29461/head
Kefu Chai [Wed, 7 Aug 2019 07:23:19 +0000 (15:23 +0800)]
qa/tasks/mgr/dashboard/test_mgr_module: sync w/ telemetry

* use primitive types instead of `JLeaf(the_type)` as they are
  equivalent in this context
* remove fields which are added only if certain channels are
  activated.
* allow unknown fields, as we are including various stuff
  in the report, for instance, osdmap, usage, crash info, etc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/dashboard: add python-common to $PYTHONPATH 29525/head
Kefu Chai [Wed, 7 Aug 2019 07:00:09 +0000 (15:00 +0800)]
mgr/dashboard: add python-common to $PYTHONPATH

fix the regression introduced by 8c50be5df6, so ceph-mgr's python
modules are able to import python-common.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #29382 from MI-OSiRIS/prometheus_scrape_interval
Jan Fajerski [Wed, 7 Aug 2019 06:05:43 +0000 (08:05 +0200)]
Merge pull request #29382 from MI-OSiRIS/prometheus_scrape_interval

mgr/prometheus: Cast collect_timeout (scrape_interval) to float

6 years agomgr/dashboard: fix HACKING.rst is not rendered on github 29521/head
Kiefer Chang [Wed, 7 Aug 2019 03:19:13 +0000 (11:19 +0800)]
mgr/dashboard: fix HACKING.rst is not rendered on github

The file is not rendered because of inconsistent section markers.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
6 years agoMerge PR #29116 into master
Sage Weil [Tue, 6 Aug 2019 21:22:14 +0000 (16:22 -0500)]
Merge PR #29116 into master

* refs/pull/29116/head:
osd: move heartbeat connection cleanup to helper
osd: break con<->session cycle when removing heartbeat peers
osd: mark down heartbeat connections on shutdown
crimson/: move get_mnow() to ShardServices, pass to heartbeat
crimson/osd: stubs for get_mnow, get_hbstamps
crimson/osd/heartbeat: adapt to new MOSDPing fields
crimson/osdmap_service: add get_mnow(), get_up_epoch()
osd/PeeringState: take HeartbeatStamps refs for current interval
osd: track clock delta between peer OSDs
osd: add get_mnow() interface to OSDService, PG, PeeringState
osd: record startup_time
osd: some minor refactoring/cleanup in handle_osd_ping

Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agoMerge PR #29498 into master
Sage Weil [Tue, 6 Aug 2019 21:21:58 +0000 (16:21 -0500)]
Merge PR #29498 into master

* refs/pull/29498/head:
qa/tasks/ceph_manager: remove race from all_active_or_peered()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoscript/ceph-backport.sh: Use secure access for tracker.ceph.com 29438/head
Willem Jan Withagen [Wed, 31 Jul 2019 21:43:56 +0000 (23:43 +0200)]
script/ceph-backport.sh: Use secure access for tracker.ceph.com

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
6 years agoMerge PR #29509 into master
Patrick Donnelly [Tue, 6 Aug 2019 20:23:23 +0000 (13:23 -0700)]
Merge PR #29509 into master

* refs/pull/29509/head:
doc: indicate imperative mood for commit titles

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agodoc: indicate imperative mood for commit titles 29509/head
Patrick Donnelly [Tue, 6 Aug 2019 14:20:47 +0000 (07:20 -0700)]
doc: indicate imperative mood for commit titles

This is convention in the kernel and Ceph but is not clearly documented.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomgr/dashboard: Write E2E test to verify that Manager modules have editing functionality 29407/head
Rafael Quintero [Tue, 30 Jul 2019 20:49:24 +0000 (16:49 -0400)]
mgr/dashboard: Write E2E test to verify that Manager modules have editing functionality

Fixes: https://tracker.ceph.com/issues/40823
Signed-off-by: Adam King <adking@redhat.com>
Signed-off-by: Rafael Quintero <rquinter@redhat.com>
6 years agocommon/config: respect POD_MEMORY_REQUEST *and* POD_MEMORY_LIMIT env vars 29511/head
Sage Weil [Tue, 6 Aug 2019 16:12:43 +0000 (11:12 -0500)]
common/config: respect POD_MEMORY_REQUEST *and* POD_MEMORY_LIMIT env vars

If a kubernetes pod spec specifies a limit of X, then the pod gets both
the limits.memory and requests.memory resource fields set, and rook passes
those as POD_MEMORY_LIMIT and POD_MEMORY_REQUEST environment variables.

This is a problem if only the limit is set, because we will end up
setting our osd_memory_target (and, in the future, other *_memory_targets)
to the hard limit, and the daemon will inevitably reach that threshold
and get killed.

Fix this by also looking at the POD_MEMORY_LIMIT value, and applying the
ratio (default: .8) to it, and setting our actual target to the min of
that and the POD_MEMORY_REQUEST.

Also, set the "default" target to ratio*limit, so that it will apply in
general when no request is specified.

When both request and limit are 10M, we then see

        "osd_memory_target": {
            "default": "800000000000",
            "env": "800000000000",
            "final": "800000000000"
        },

In a more "normal" situation where limit is 10M and request is 5M, we get

        "osd_memory_target": {
            "default": "800000000000",
            "env": "500000000000",
            "final": "500000000000"
        },

If only limit is specified (to 10M), we get

        "osd_memory_target": {
            "default": "800000000000",
            "final": "800000000000"
        },

Fixes: https://tracker.ceph.com/issues/41037
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/config: let diff show non-build defaults
Sage Weil [Tue, 6 Aug 2019 15:53:06 +0000 (10:53 -0500)]
common/config: let diff show non-build defaults

Notably, this includes things from set_val_default(), which may be set
at runtime.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agopybind/mgr/rbd_support: use image ids to detect duplicate tasks 29468/head
Jason Dillaman [Fri, 2 Aug 2019 15:57:29 +0000 (11:57 -0400)]
pybind/mgr/rbd_support: use image ids to detect duplicate tasks

This helps to to avoid the case where new tasks were not being scheduled
when an image name was re-used after having a task created under the
same name.

Fixes: https://tracker.ceph.com/issues/41032
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #29501 from tchaikov/wip-journal/test_JournalRecorder.cc
Kefu Chai [Tue, 6 Aug 2019 15:57:45 +0000 (23:57 +0800)]
Merge pull request #29501 from tchaikov/wip-journal/test_JournalRecorder.cc

journal: always shutdown JournalRecoreder before destructing it

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agocommon/config: do no include multiple 'default' values
Sage Weil [Tue, 6 Aug 2019 15:47:04 +0000 (10:47 -0500)]
common/config: do no include multiple 'default' values

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: Add standalone test for mon_memory_target 28227/head
Sridhar Seshasayee [Tue, 9 Jul 2019 11:17:49 +0000 (16:47 +0530)]
mon/OSDMonitor: Add standalone test for mon_memory_target

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
6 years agomon/OSDMonitor: Implement config observer to handle changes to cache sizes
Sridhar Seshasayee [Thu, 23 May 2019 14:19:20 +0000 (19:49 +0530)]
mon/OSDMonitor: Implement config observer to handle changes to cache sizes

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
6 years agomon/OSDMonitor: Use generic priority cache tuner for mon caches
Sridhar Seshasayee [Wed, 15 May 2019 09:56:52 +0000 (15:26 +0530)]
mon/OSDMonitor: Use generic priority cache tuner for mon caches

Use priority cache manager to tune inc, full and rocksdb caches.

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
6 years agoos/bluestore: teach fsck to tolerate per-pool omap
Sage Weil [Mon, 29 Jul 2019 19:44:15 +0000 (14:44 -0500)]
os/bluestore: teach fsck to tolerate per-pool omap

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: ondisk format change to 3 for per-pool omap
Sage Weil [Thu, 25 Jul 2019 14:02:04 +0000 (09:02 -0500)]
os/bluestore: ondisk format change to 3 for per-pool omap

Move to ondisk format v3.  This means that per-pool omap keys may exist,
but does not imply that *all* objects use the new form until the
per_pool_omap=1 super key is also set.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/PGMap: add data/omap breakouts for 'df detail' view
Sage Weil [Wed, 24 Jul 2019 19:28:18 +0000 (14:28 -0500)]
mon/PGMap: add data/omap breakouts for 'df detail' view

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/osd_types: separate get_{user,allocated}_bytes() into data and omap variants
Sage Weil [Wed, 24 Jul 2019 15:03:24 +0000 (10:03 -0500)]
osd/osd_types: separate get_{user,allocated}_bytes() into data and omap variants

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/PGMap: fix stored_raw calculation
Sage Weil [Wed, 24 Jul 2019 14:43:59 +0000 (09:43 -0500)]
mon/PGMap: fix stored_raw calculation

The get_user_bytes() helper is a bit weird because it uses the
raw_used_rate (replication/EC factor) so that it can work *backwards*
from raw usage to normalized user usage.  However, the legacy case that
works from PG stats does not use this factor... and the stored_raw value
(in the JSON output only) was incorrectly passing in a factor of 1.0,
which meant that for legacy mode it was a bogus value.

Fix by calculating stored_raw as stored_normalized * raw_used_rate.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/PGMap: add in actual omap usage into per-pool stats
Sage Weil [Tue, 23 Jul 2019 22:46:11 +0000 (17:46 -0500)]
mon/PGMap: add in actual omap usage into per-pool stats

This is a minimal change: we aren't separately reporting data vs omap
usage (like we do in 'osd df' output for individual osds).

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd: report per-pool omap support via store_statfs_t
Sage Weil [Tue, 23 Jul 2019 22:45:08 +0000 (17:45 -0500)]
osd: report per-pool omap support via store_statfs_t

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: set per_pool_omap key on mkfs
Sage Weil [Tue, 23 Jul 2019 22:44:40 +0000 (17:44 -0500)]
os/bluestore: set per_pool_omap key on mkfs

This key indicates that *all* objects put omap in the per-pool prefix and
key format.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/osd_types: count per-pool omap capable OSDs
Sage Weil [Tue, 23 Jul 2019 22:38:14 +0000 (17:38 -0500)]
osd/osd_types: count per-pool omap capable OSDs

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: report omap_allocated per-pool
Sage Weil [Tue, 23 Jul 2019 22:15:49 +0000 (17:15 -0500)]
os/bluestore: report omap_allocated per-pool

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: add pool prefix to omap keys
Sage Weil [Tue, 23 Jul 2019 22:12:22 +0000 (17:12 -0500)]
os/bluestore: add pool prefix to omap keys

Set per-onode flag to indicate whether the object has per-pool keys or
not.  This will allow us to incrementally transition objects later.

Put the new keys under a different prefix.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agokv/KeyValueDB: take key_prefix for estimate_prefix_size()
Sage Weil [Tue, 23 Jul 2019 22:11:04 +0000 (17:11 -0500)]
kv/KeyValueDB: take key_prefix for estimate_prefix_size()

Signed-off-by: Sage Weil <sage@redhat.com>