]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agobuild/ops: rpm: selinux-policy fixes 19026/head
Brad Hubbard [Fri, 17 Nov 2017 01:54:38 +0000 (11:54 +1000)]
build/ops: rpm: selinux-policy fixes

Requiring the file /usr/share/selinux/devel/policyhelp breaks fc27 and
Rawhide builds as they do not have that file. This exposed the fact this
code had not worked in some time due to changes in selinux policy
modules packaging. See
https://bugzilla.redhat.com/show_bug.cgi?id=999584

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #17977 from cbodley/wip-rgw-beast-qa
Matt Benjamin [Thu, 16 Nov 2017 20:14:28 +0000 (15:14 -0500)]
Merge pull request #17977 from cbodley/wip-rgw-beast-qa

qa/rgw: add beast frontend to some rgw suites

7 years agoMerge PR #18600 into master
Patrick Donnelly [Thu, 16 Nov 2017 19:47:05 +0000 (11:47 -0800)]
Merge PR #18600 into master

* refs/pull/18600/head:
MDSMonitor: only clog changes to active

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
7 years agogithubmap: update contributors
Patrick Donnelly [Thu, 16 Nov 2017 19:47:05 +0000 (11:47 -0800)]
githubmap: update contributors

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18774 into master
Patrick Donnelly [Thu, 16 Nov 2017 19:45:59 +0000 (11:45 -0800)]
Merge PR #18774 into master

* refs/pull/18774/head:
mds: fix CDir::log_mark_dirty()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18887 from dillaman/wip-20789
Mykola Golub [Thu, 16 Nov 2017 17:32:42 +0000 (19:32 +0200)]
Merge pull request #18887 from dillaman/wip-20789

librbd: compare and write against a clone can result in failure

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18924 from ceph/wip-cv-filestore-devices
Andrew Schoen [Thu, 16 Nov 2017 16:47:14 +0000 (10:47 -0600)]
Merge pull request #18924 from ceph/wip-cv-filestore-devices

ceph-volume: allow using a device or partition for `lvm --data`

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #18700 from tianshan/fix_cls_bucket_head
Yuri Weinstein [Thu, 16 Nov 2017 16:31:16 +0000 (08:31 -0800)]
Merge pull request #18700 from tianshan/fix_cls_bucket_head

rgw: fix cls_bucket_head result order consistency

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18926 from theanalyst/wip-mp-jewel-fix
Yuri Weinstein [Thu, 16 Nov 2017 16:30:52 +0000 (08:30 -0800)]
Merge pull request #18926 from theanalyst/wip-mp-jewel-fix

rgw: set sync_from_all as true when no value is seen

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoceph-volume tests.functional create a common playbook directory for setups 18924/head
Alfredo Deza [Thu, 16 Nov 2017 13:50:34 +0000 (08:50 -0500)]
ceph-volume tests.functional create a common playbook directory for setups

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc/ceph-volume lvm prepare can accept devices for --data
Alfredo Deza [Tue, 14 Nov 2017 16:01:48 +0000 (11:01 -0500)]
doc/ceph-volume lvm prepare can accept devices for --data

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add setup playbook for xenial filestore
Alfredo Deza [Tue, 14 Nov 2017 13:42:27 +0000 (08:42 -0500)]
ceph-volume tests.functional add setup playbook for xenial filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add data device and journal to xenial filestore
Alfredo Deza [Tue, 14 Nov 2017 13:42:02 +0000 (08:42 -0500)]
ceph-volume tests.functional add data device and journal to xenial filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add setup playbook for xenial bluestore
Alfredo Deza [Tue, 14 Nov 2017 13:40:37 +0000 (08:40 -0500)]
ceph-volume tests.functional add setup playbook for xenial bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add raw data device to xenial bluestore
Alfredo Deza [Tue, 14 Nov 2017 13:40:18 +0000 (08:40 -0500)]
ceph-volume tests.functional add raw data device to xenial bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional tox.ini addition of setup playbook for partitions
Alfredo Deza [Tue, 14 Nov 2017 13:38:23 +0000 (08:38 -0500)]
ceph-volume tests.functional tox.ini addition of setup playbook for partitions

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add raw data device to centos7 bluestore
Alfredo Deza [Tue, 14 Nov 2017 13:37:17 +0000 (08:37 -0500)]
ceph-volume tests.functional add raw data device to centos7 bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add setup playbook for centos7 bluestore
Alfredo Deza [Tue, 14 Nov 2017 13:36:36 +0000 (08:36 -0500)]
ceph-volume tests.functional add setup playbook for centos7 bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add setup playbook for centos7 filestore
Alfredo Deza [Tue, 14 Nov 2017 13:35:59 +0000 (08:35 -0500)]
ceph-volume tests.functional add setup playbook for centos7 filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add raw device to centos7 filestore
Alfredo Deza [Tue, 14 Nov 2017 13:35:42 +0000 (08:35 -0500)]
ceph-volume tests.functional add raw device to centos7 filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume lvm.common update --data flag to reflect device acceptance
Alfredo Deza [Mon, 13 Nov 2017 19:29:32 +0000 (14:29 -0500)]
ceph-volume lvm.common update --data flag to reflect device acceptance

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #18969 from vshankar/rbd-mirror-image-map-state-transition
Jason Dillaman [Thu, 16 Nov 2017 13:36:23 +0000 (08:36 -0500)]
Merge pull request #18969 from vshankar/rbd-mirror-image-map-state-transition

rbd-mirror: use next transition state to check transition completeness

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18960 from Liuchang0812/mailmap-update
Sage Weil [Thu, 16 Nov 2017 13:15:08 +0000 (07:15 -0600)]
Merge pull request #18960 from Liuchang0812/mailmap-update

.mailmap, .organizationmap: update JingChen, ZongyouYao, ShanchunLv's…

7 years agotest/librbd: disable compare and write if skipping partial discard 18887/head
Jason Dillaman [Wed, 15 Nov 2017 13:24:50 +0000 (08:24 -0500)]
test/librbd: disable compare and write if skipping partial discard

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: refactor object write request state machines
Jason Dillaman [Thu, 9 Nov 2017 17:10:30 +0000 (12:10 -0500)]
librbd: refactor object write request state machines

Fixes: http://tracker.ceph.com/issues/20789
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: consolidate all object discard-related logic into single state machine
Jason Dillaman [Thu, 9 Nov 2017 15:24:08 +0000 (10:24 -0500)]
librbd: consolidate all object discard-related logic into single state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: simplify interface between object IO and copyup state machines
Jason Dillaman [Wed, 8 Nov 2017 17:31:28 +0000 (12:31 -0500)]
librbd: simplify interface between object IO and copyup state machines

The initial copyup was not receiving a write hint and the
code for hints was duplicated multiple times. Additionally,
the object map state should match the last executed write op.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: copyup state machine needs to handle empty write ops
Jason Dillaman [Thu, 9 Nov 2017 20:15:58 +0000 (15:15 -0500)]
librbd: copyup state machine needs to handle empty write ops

The compare-and-write object operation cannot be executed
concurrently within a copyup operation since the object might not
exist yet (if not performing a deep-copy).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: object cacher should re-use read state machine
Jason Dillaman [Tue, 7 Nov 2017 19:36:10 +0000 (14:36 -0500)]
librbd: object cacher should re-use read state machine

This adds support for sparse-reads and ensures all object reads
utilize a single, tested code path.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: refactor io::ObjectReadRequest
Jason Dillaman [Tue, 7 Nov 2017 17:24:44 +0000 (12:24 -0500)]
librbd: refactor io::ObjectReadRequest

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: default template parameter for C_SparseReadRequest
Jason Dillaman [Tue, 7 Nov 2017 19:17:25 +0000 (14:17 -0500)]
librbd: default template parameter for C_SparseReadRequest

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: reduce lock scope when assembling read results
Jason Dillaman [Tue, 7 Nov 2017 18:42:19 +0000 (13:42 -0500)]
librbd: reduce lock scope when assembling read results

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: ObjectReadRequest does not require buffer extents
Jason Dillaman [Tue, 7 Nov 2017 18:33:12 +0000 (13:33 -0500)]
librbd: ObjectReadRequest does not require buffer extents

The ReadResult wrapper requires the buffer extents to know
how to properly reconstruct the out buffer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: templatize IO object request state machines
Jason Dillaman [Mon, 6 Nov 2017 23:35:42 +0000 (18:35 -0500)]
librbd: templatize IO object request state machines

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librados_test_stub: mocked remainder of IO ops used by librbd
Jason Dillaman [Sat, 11 Nov 2017 02:45:13 +0000 (21:45 -0500)]
test/librados_test_stub: mocked remainder of IO ops used by librbd

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librados_test_stub: simulate set_alloc_hint creating a non-existent file
Jason Dillaman [Fri, 10 Nov 2017 21:26:19 +0000 (16:26 -0500)]
test/librados_test_stub: simulate set_alloc_hint creating a non-existent file

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: use next transition state to check transition completeness 18969/head
Venky Shankar [Thu, 16 Nov 2017 11:57:36 +0000 (06:57 -0500)]
rbd-mirror: use next transition state to check transition completeness

Signed-off-by: Venky Shankar <vshankar@redhat.com>
7 years agoMerge pull request #18952 from dillaman/wip-test-librbd
Mykola Golub [Thu, 16 Nov 2017 11:34:28 +0000 (13:34 +0200)]
Merge pull request #18952 from dillaman/wip-test-librbd

test/librbd: clean up for several mock function tests

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18947 from dillaman/wip-22131
Mykola Golub [Thu, 16 Nov 2017 11:32:46 +0000 (13:32 +0200)]
Merge pull request #18947 from dillaman/wip-22131

rbd-nbd: certain kernels may not discover resized block devices

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18909 from dillaman/wip-22120
Mykola Golub [Thu, 16 Nov 2017 11:30:18 +0000 (13:30 +0200)]
Merge pull request #18909 from dillaman/wip-22120

librbd: possible deadlock with synchronous maintenance operations

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18923 from dillaman/wip-21966
Mykola Golub [Thu, 16 Nov 2017 11:28:51 +0000 (13:28 +0200)]
Merge pull request #18923 from dillaman/wip-21966

librbd: prevent overflow of discard API result code

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18918 from ZVampirEM77/wip-em-rewrite-cmd
Jos Collin [Thu, 16 Nov 2017 04:55:32 +0000 (10:25 +0530)]
Merge pull request #18918 from ZVampirEM77/wip-em-rewrite-cmd

rgw: add rewrite cmd and options into radosgw-admin usage and doc

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years ago.mailmap, .organizationmap: update JingChen, ZongyouYao, ShanchunLv's mailmap and... 18960/head
Chang Liu [Thu, 16 Nov 2017 04:09:48 +0000 (12:09 +0800)]
.mailmap, .organizationmap: update JingChen, ZongyouYao, ShanchunLv's mailmap and affiliation

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
7 years agorgw: add rewrite related cmd and parameter into radosgw-admin help info 18918/head
Enming Zhang [Tue, 14 Nov 2017 11:37:53 +0000 (19:37 +0800)]
rgw: add rewrite related cmd and parameter into radosgw-admin help info

+ radosgw-admin object rewrite
+ radosgw-admin bucket rewrite
+ --min-rewrite-size
+ --max-rewrite-size
+ --min-rewrite-stripe-size

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
7 years agoMerge pull request #18808 from tchaikov/wip-qa-max-pg-per-osd
Josh Durgin [Thu, 16 Nov 2017 02:05:58 +0000 (18:05 -0800)]
Merge pull request #18808 from tchaikov/wip-qa-max-pg-per-osd

qa: do not wait for down/out osd for pg convergence

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #15788 from vshankar/mirror-ha-poolwatcher-policy
Jason Dillaman [Thu, 16 Nov 2017 01:24:32 +0000 (20:24 -0500)]
Merge pull request #15788 from vshankar/mirror-ha-poolwatcher-policy

rbd-mirror: track images in policy map in support of A/A

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18953 from cbodley/wip-22139
Casey Bodley [Wed, 15 Nov 2017 23:24:59 +0000 (18:24 -0500)]
Merge pull request #18953 from cbodley/wip-22139

common: fix BoundedKeyCounter const_pointer_iterator

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agocommon: fix BoundedKeyCounter const_pointer_iterator 18953/head
Casey Bodley [Wed, 15 Nov 2017 21:03:00 +0000 (16:03 -0500)]
common: fix BoundedKeyCounter const_pointer_iterator

with libc++, clang fails to compile a call to:

  vector::assign(const_pointer_iterator, const_pointer_iterator)

because const_pointer_iterator does not satisfy the InputIterator
concept. added the necessary typedefs for value_type and reference
to reflect the pointer type

Fixes: http://tracker.ceph.com/issues/22139
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agotest/librbd: fixed gmock uninteresting function call warnings 18952/head
Jason Dillaman [Wed, 15 Nov 2017 20:46:24 +0000 (15:46 -0500)]
test/librbd: fixed gmock uninteresting function call warnings

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd: eliminate sleeps within deep-copy mock tests
Jason Dillaman [Wed, 15 Nov 2017 20:35:22 +0000 (15:35 -0500)]
test/librbd: eliminate sleeps within deep-copy mock tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18883 from cbodley/wip-22083+
Casey Bodley [Wed, 15 Nov 2017 19:51:14 +0000 (14:51 -0500)]
Merge pull request #18883 from cbodley/wip-22083+

rgw: set num_shards on 'radosgw-admin data sync init'

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agorgw: set num_shards on 'radosgw-admin data sync init' 18883/head
Casey Bodley [Fri, 10 Nov 2017 19:27:59 +0000 (14:27 -0500)]
rgw: set num_shards on 'radosgw-admin data sync init'

Fixes: http://tracker.ceph.com/issues/22083
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agodencoder/rgw: expose rgw sync status types
Casey Bodley [Wed, 8 Nov 2017 15:21:55 +0000 (10:21 -0500)]
dencoder/rgw: expose rgw sync status types

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agolibrbd: added missing locks for snap rollback and rename 18909/head
Jason Dillaman [Tue, 14 Nov 2017 17:07:36 +0000 (12:07 -0500)]
librbd: added missing locks for snap rollback and rename

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18940 from trociny/wip-valgrind-DeadLockOwner
Jason Dillaman [Wed, 15 Nov 2017 17:57:30 +0000 (12:57 -0500)]
Merge pull request #18940 from trociny/wip-valgrind-DeadLockOwner

test/librbd: valgrind warning in TestMockManagedLockBreakRequest.DeadLockOwner

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17761 from cbodley/wip-rgw-bilog-trim
Yuri Weinstein [Wed, 15 Nov 2017 17:04:50 +0000 (09:04 -0800)]
Merge pull request #17761 from cbodley/wip-rgw-bilog-trim

rgw multisite: automated trimming for bucket index logs

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #18811 from oritwas/wip-rgw-22046
Yuri Weinstein [Wed, 15 Nov 2017 17:04:05 +0000 (09:04 -0800)]
Merge pull request #18811 from oritwas/wip-rgw-22046

tenant fixes for dynamic resharding

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18920 from yaozongyou/wip-ceph-dencoder-add-types
Yuri Weinstein [Wed, 15 Nov 2017 17:03:26 +0000 (09:03 -0800)]
Merge pull request #18920 from yaozongyou/wip-ceph-dencoder-add-types

ceph-dencoder: add support for cls_rgw_lc_obj_head

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18946 from joscollin/wip-add-cbodley
Casey Bodley [Wed, 15 Nov 2017 16:24:19 +0000 (11:24 -0500)]
Merge pull request #18946 from joscollin/wip-add-cbodley

.githubmap: Add cbodley

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18900 from qrGitHub/master
Casey Bodley [Wed, 15 Nov 2017 16:04:59 +0000 (11:04 -0500)]
Merge pull request #18900 from qrGitHub/master

rgw.iam: change '1' to '1ULL' in function print_actions

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agolibrbd: invalidating the cache shouldn't hold write lock 18947/head
Jason Dillaman [Wed, 15 Nov 2017 15:35:16 +0000 (10:35 -0500)]
librbd: invalidating the cache shouldn't hold write lock

This can cause deadlock when readahead is in-progress since neither
can make forward progress.

Fixes: http://tracker.ceph.com/issues/22131
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-nbd: rescan partition table after image resize event
Jason Dillaman [Wed, 15 Nov 2017 15:34:32 +0000 (10:34 -0500)]
rbd-nbd: rescan partition table after image resize event

Fixes: http://tracker.ceph.com/issues/22131
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years ago.githubmap: Add cbodley 18946/head
Jos Collin [Wed, 15 Nov 2017 15:31:45 +0000 (21:01 +0530)]
.githubmap: Add cbodley

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18921 from Leeshine/wip-data-sync-cmd
Jos Collin [Wed, 15 Nov 2017 15:28:58 +0000 (20:58 +0530)]
Merge pull request #18921 from Leeshine/wip-data-sync-cmd

rgw: add metadata and data sync related cmd into radosgw-admin usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agorgw: add data sync related cmd into radosgw-admin help info 18921/head
lvshanchun [Tue, 14 Nov 2017 22:05:00 +0000 (17:05 -0500)]
rgw: add data sync related cmd into radosgw-admin help info

+ radosgw-admin data sync status
+ radosgw-admin data sync init
+ radosgw-admin data sync run

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
7 years agorgw: add metadata sync related cmd into radosgw-admin help info
Leeshine [Tue, 14 Nov 2017 15:43:37 +0000 (23:43 +0800)]
rgw: add metadata sync related cmd into radosgw-admin help info

+ radosgw-admin metadata sync status
+ radosgw-admin metadata sync init
+ radosgw-admin metadata sync run

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
7 years agolibrbd: prevent overflow of discard API result code 18923/head
Jason Dillaman [Wed, 15 Nov 2017 14:09:15 +0000 (09:09 -0500)]
librbd: prevent overflow of discard API result code

Prevent discard/writesame lengths larger than 2GB.

Fixes: http://tracker.ceph.com/issues/21966
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd: valgrind warning in TestMockManagedLockBreakRequest.DeadLockOwner 18940/head
Mykola Golub [Wed, 15 Nov 2017 08:20:58 +0000 (10:20 +0200)]
test/librbd: valgrind warning in TestMockManagedLockBreakRequest.DeadLockOwner

When running with 'debug_rbd >= 20':

  Conditional jump or move depends on uninitialised value(s)
    by 0x94277B: operator<< (ostream:167)
    by 0x94277B: librbd::managed_lock::BreakRequest<librbd::(anonymous namespace)::MockTestImageCtx>::handle_get_watchers(int) (BreakRequest.cc:101)

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agorgw: fix cls_bucket_head result order consistency 18700/head
Tianshan Qu [Fri, 3 Nov 2017 07:53:41 +0000 (15:53 +0800)]
rgw: fix cls_bucket_head result order consistency

headers's key is string but bucket_instance_ids's key is int
looked around and found no one use header's key, so change
header from map to vector

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
7 years agoMerge pull request #18905 from ifed01/wip-bluestore-recalc-alloc
Kefu Chai [Wed, 15 Nov 2017 04:30:11 +0000 (12:30 +0800)]
Merge pull request #18905 from ifed01/wip-bluestore-recalc-alloc

os/bluestore: remove ineffective BlueFS fnode extent calculation.

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18903 from jan--f/jan-mgr-prometheus-unkown-pgstate
Kefu Chai [Wed, 15 Nov 2017 04:20:16 +0000 (12:20 +0800)]
Merge pull request #18903 from jan--f/jan-mgr-prometheus-unkown-pgstate

pybind/mgr/prometheus: don't crash when encountering an unknown PG state

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18885 from dzafman/wip-22112
Kefu Chai [Wed, 15 Nov 2017 04:18:58 +0000 (12:18 +0800)]
Merge pull request #18885 from dzafman/wip-22112

ceph-objectstore-tool: Fix set-size to clear data_digest if changing …

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18622 from majianpeng/bluestore-opseq
Kefu Chai [Wed, 15 Nov 2017 04:17:05 +0000 (12:17 +0800)]
Merge pull request #18622 from majianpeng/bluestore-opseq

os/bluestore: OpSequencer: reduce kv_submitted_waiters if _is_all_kv_submitted() return true.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #17032 from yangdongsheng/rbd_qos
Jason Dillaman [Tue, 14 Nov 2017 23:57:16 +0000 (18:57 -0500)]
Merge pull request #17032 from yangdongsheng/rbd_qos

rbd: implement image qos in tokenbucket algorithm

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18483 from Songweibin/wip-list-children2
Jason Dillaman [Tue, 14 Nov 2017 21:14:14 +0000 (16:14 -0500)]
Merge pull request #18483 from Songweibin/wip-list-children2

 rbd: fix rbd children listing when child is in trash

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18007 from yehudasa/wip-rgw-config-desc
Yehuda Sadeh [Tue, 14 Nov 2017 20:31:28 +0000 (15:31 -0500)]
Merge pull request #18007 from yehudasa/wip-rgw-config-desc

options.cc: document rgw config options

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Abhishek Lekshmanan <alekshmanan@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agorgw: set sync_from_all as true when no value is seen 18926/head
Abhishek Lekshmanan [Tue, 14 Nov 2017 16:39:16 +0000 (17:39 +0100)]
rgw: set sync_from_all as true when no value is seen

In order to support jewel-luminous multisite scenarios where when a
jewel cluster is the master, the sync-from-all json field wouldn't be
set leading to the secondary not syncing data as this value can't be
overriden to true, so defaulting the value of sync_from_all to true when
we don't encounter it in the json

Fixes: http://tracker.ceph.com/issues/22062
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agoMerge pull request #18894 from liewegas/wip-fix-balancer
Sage Weil [Tue, 14 Nov 2017 17:01:46 +0000 (11:01 -0600)]
Merge pull request #18894 from liewegas/wip-fix-balancer

mgr/balancer: skip CRUSH_ITEM_NONE

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18763 from cfanz/master
Yuri Weinstein [Tue, 14 Nov 2017 16:19:06 +0000 (08:19 -0800)]
Merge pull request #18763 from cfanz/master

rgw: don't write bucket_header when it is not changed in rgw_bucket_prepare_op

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18852 from theanalyst/wip-22083
Yuri Weinstein [Tue, 14 Nov 2017 16:17:42 +0000 (08:17 -0800)]
Merge pull request #18852 from theanalyst/wip-22083

rgw: data sync: set num_shards when building full maps

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #18866 from cbodley/wip-22101
Yuri Weinstein [Tue, 14 Nov 2017 16:16:38 +0000 (08:16 -0800)]
Merge pull request #18866 from cbodley/wip-22101

rgw: RGWEnv::set() takes std::string

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agoMerge pull request #18875 from yaozongyou/rgw-cleanup
Yuri Weinstein [Tue, 14 Nov 2017 16:15:36 +0000 (08:15 -0800)]
Merge pull request #18875 from yaozongyou/rgw-cleanup

rgw: remove unused disable_signal_fd

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18895 from cooboos/wip-opt-maperase
Yuri Weinstein [Tue, 14 Nov 2017 16:15:19 +0000 (08:15 -0800)]
Merge pull request #18895 from cooboos/wip-opt-maperase

rgw: optimize the rgw-attr del code logic

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18845 from yaozongyou/wip-lifecycle-log-level
Casey Bodley [Tue, 14 Nov 2017 15:34:03 +0000 (10:34 -0500)]
Merge pull request #18845 from yaozongyou/wip-lifecycle-log-level

rgw: update life cycle related log level

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agolibrbd: possible deadlock with synchronous maintenance operations
Jason Dillaman [Mon, 13 Nov 2017 18:28:06 +0000 (13:28 -0500)]
librbd: possible deadlock with synchronous maintenance operations

Fixes: http://tracker.ceph.com/issues/22120
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoceph-dencoder: adding support for cls_rgw_lc_obj_head 18920/head
Yao Zongyou [Tue, 14 Nov 2017 13:42:25 +0000 (21:42 +0800)]
ceph-dencoder: adding support for cls_rgw_lc_obj_head

After adding cls_rgw_lc_obj_head, we can using the following command
to look into lc processing related information:
rados -p default.rgw.log getomapheader lc.0 ./header.bin --namespace=lc
ceph-dencoder type cls_rgw_lc_obj_head import ./header.bin decode dump_json

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agoMerge pull request #18873 from tchaikov/wip-bluestore-aio-log
Kefu Chai [Tue, 14 Nov 2017 07:03:56 +0000 (15:03 +0800)]
Merge pull request #18873 from tchaikov/wip-bluestore-aio-log

os/bluestore: print aio in batch

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #18888 from tchaikov/wip-osx
Kefu Chai [Tue, 14 Nov 2017 07:02:33 +0000 (15:02 +0800)]
Merge pull request #18888 from tchaikov/wip-osx

common,test,cmake: various changes to re-enable build on osx

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #16369 from bspark8/wip_dmc2_client_tracker
Kefu Chai [Tue, 14 Nov 2017 06:59:52 +0000 (14:59 +0800)]
Merge pull request #16369 from bspark8/wip_dmc2_client_tracker

dmclock: Delivery of the dmclock delta, rho and phase parameter + Enabling the client service tracker

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18798 from cbodley/wip-str-list-view
Kefu Chai [Tue, 14 Nov 2017 06:58:46 +0000 (14:58 +0800)]
Merge pull request #18798 from cbodley/wip-str-list-view

 common: add for_each_substr() for cheap string split

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agolibrbd: add new API methods and expand the rbd CLI to list trashed images 18483/head
songweibin [Tue, 31 Oct 2017 10:25:59 +0000 (18:25 +0800)]
librbd: add new API methods and expand the rbd CLI to list trashed images

implement librbd::RBD::list_children2 and rbd_list_children2
methods and expand the rbd CLI to list trashed images

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agolibrbd: limit IO per second by TokenBucketThrottle 17032/head
Dongsheng Yang [Tue, 12 Sep 2017 16:39:50 +0000 (00:39 +0800)]
librbd: limit IO per second by TokenBucketThrottle

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
7 years agoMerge pull request #18663 from dragonylffly/wip-rbd-nbd-fix
Jason Dillaman [Mon, 13 Nov 2017 19:46:15 +0000 (14:46 -0500)]
Merge pull request #18663 from dragonylffly/wip-rbd-nbd-fix

rbd-nbd: bug fix when running in container

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoceph-volume lvm.prepare add example of raw device or partition in help menu
Alfredo Deza [Mon, 13 Nov 2017 19:28:32 +0000 (14:28 -0500)]
ceph-volume lvm.prepare add example of raw device or partition in help menu

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #18713 from liewegas/wip-snapset-snaps
Sage Weil [Mon, 13 Nov 2017 19:27:54 +0000 (13:27 -0600)]
Merge pull request #18713 from liewegas/wip-snapset-snaps

osd/PrimaryLogPG: do not pull-up snapc to snapset

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoceph-volume lvm.prepare allow partition or raw device as input for --data in filestore
Alfredo Deza [Mon, 13 Nov 2017 19:26:44 +0000 (14:26 -0500)]
ceph-volume lvm.prepare allow partition or raw device as input for --data in filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #18882 from ceph/wip-cv-simple-testing
Andrew Schoen [Mon, 13 Nov 2017 17:26:08 +0000 (11:26 -0600)]
Merge pull request #18882 from ceph/wip-cv-simple-testing

ceph-volume add functional tests for simple, rearrange lvm tests

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agopybind/mgr/prometheus: don't crash when encountering an unknown PG state 18903/head
Jan Fajerski [Mon, 13 Nov 2017 13:42:56 +0000 (14:42 +0100)]
pybind/mgr/prometheus: don't crash when encountering an unknown PG state

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
7 years agoMerge pull request #18617 from tchaikov/wip-mon-cleanup
Kefu Chai [Mon, 13 Nov 2017 14:27:28 +0000 (22:27 +0800)]
Merge pull request #18617 from tchaikov/wip-mon-cleanup

mon: remove unused waiting_for_commit

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: remove ineffective BlueFS fnode extent calculation. 18905/head
Igor Fedotov [Wed, 1 Nov 2017 20:55:26 +0000 (13:55 -0700)]
os/bluestore: remove ineffective BlueFS fnode extent calculation.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>