]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agorgw: remove placement_rule from cls_user_bucket_entry 18657/head
Casey Bodley [Tue, 31 Oct 2017 20:56:01 +0000 (16:56 -0400)]
rgw: remove placement_rule from cls_user_bucket_entry

placement_rule is no longer needed in cls_user_bucket_entry, because the
only time that it's needed, we can read it from the bucket instance in
RGWRados::update_containers_stats()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agorgw: remove placement_rule from rgw_link_bucket()
Casey Bodley [Tue, 31 Oct 2017 20:29:31 +0000 (16:29 -0400)]
rgw: remove placement_rule from rgw_link_bucket()

with the fallback in RGWRados::update_containers_stats(), we no longer
need to pass placement_rule into the cls_user_bucket_entry

this removes the dependency between bucket entrypoint metadata and its
bucket instance metadata during multisite sync

Fixes: http://tracker.ceph.com/issues/21990
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agorgw: take placement_rule from bucket info in update_containers_stats
Casey Bodley [Tue, 31 Oct 2017 20:26:54 +0000 (16:26 -0400)]
rgw: take placement_rule from bucket info in update_containers_stats

in case the cls_user_bucket_entry doesn't contain a placement_rule, take
it from the bucket instance info

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18615 from rgdoliveira/alpine
Jason Dillaman [Mon, 30 Oct 2017 12:51:34 +0000 (08:51 -0400)]
Merge pull request #18615 from rgdoliveira/alpine

rbd-fuse: make sure PATH_MAX is defined

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17363 from tchaikov/wip-ceph-disk
Kefu Chai [Mon, 30 Oct 2017 12:29:14 +0000 (20:29 +0800)]
Merge pull request #17363 from tchaikov/wip-ceph-disk

ceph-disk: unlock all partitions when activate

Reviewed-by: Sébastien Han <seb@redhat.com>
7 years agoMerge pull request #18585 from yaozongyou/fix-bluestore-tool-arg-bug
Sage Weil [Mon, 30 Oct 2017 12:00:46 +0000 (07:00 -0500)]
Merge pull request #18585 from yaozongyou/fix-bluestore-tool-arg-bug

ceph-bluestore-tool: link target shouldn't ending with "\n"

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17995 from scienceluo/wip-luo-fix-bluestore-metadata-branch
Sage Weil [Mon, 30 Oct 2017 12:00:29 +0000 (07:00 -0500)]
Merge pull request #17995 from scienceluo/wip-luo-fix-bluestore-metadata-branch

os/bluestore/BlueFS: Reduce unnecessary operations in collect_metadata

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agorbd-fuse: make sure PATH_MAX is defined 18615/head
Roberto Oliveira [Sun, 29 Oct 2017 14:05:48 +0000 (14:05 +0000)]
rbd-fuse: make sure PATH_MAX is defined

On systems without glibc, as Alpine Linux, you might lack definition of
PATH_MAX. This patch adds the limits.h header to solve this issue.

Signed-off-by: Roberto Oliveira <robertoguimaraes8@gmail.com>
7 years agoMerge pull request #18611 from liewegas/wip-interval-set
Sage Weil [Mon, 30 Oct 2017 11:59:41 +0000 (06:59 -0500)]
Merge pull request #18611 from liewegas/wip-interval-set

include/interval_set: parameterize by map type and kill btree_interval_set.h

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #18507 from hjwsm1989/skip-generation-object
Kefu Chai [Mon, 30 Oct 2017 08:33:47 +0000 (16:33 +0800)]
Merge pull request #18507 from hjwsm1989/skip-generation-object

ceph-objectstore-tool: skip object with generated version

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #18493 from liewegas/wip-unclean-degraded
Kefu Chai [Mon, 30 Oct 2017 07:02:32 +0000 (15:02 +0800)]
Merge pull request #18493 from liewegas/wip-unclean-degraded

mon/PGMap: 'unclean' does not imply damaged

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #18553 from liewegas/wip-preempt-feature
Sage Weil [Mon, 30 Oct 2017 02:36:38 +0000 (21:36 -0500)]
Merge pull request #18553 from liewegas/wip-preempt-feature

osd/PG: remote recovery preemption, and new feature bit to condition it on

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #18594 from zmc/wip-cephmetrics
Yuri Weinstein [Mon, 30 Oct 2017 01:25:43 +0000 (18:25 -0700)]
Merge pull request #18594 from zmc/wip-cephmetrics

suites/cephmetrics: Add Centos 7

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoMerge pull request #18601 from dillaman/wip-21961
Mykola Golub [Sun, 29 Oct 2017 07:03:15 +0000 (09:03 +0200)]
Merge pull request #18601 from dillaman/wip-21961

rbd-mirror: clean up spurious error log messages

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoosd/PG: handle spurious remote revoke or toofull 18553/head
Sage Weil [Sun, 29 Oct 2017 03:49:44 +0000 (22:49 -0500)]
osd/PG: handle spurious remote revoke or toofull

If we restart the recovery reservation process for some reason (e.g.,
local preemption), we may still get a racing REVOKE from the replicas in
the previous round.  Ignore.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorbd-mirror: journal debug message should not be logged as error 18601/head
Jason Dillaman [Fri, 27 Oct 2017 20:02:47 +0000 (16:02 -0400)]
rbd-mirror: journal debug message should not be logged as error

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: avoid attempting to decode an empty client data buffer
Jason Dillaman [Fri, 27 Oct 2017 20:02:20 +0000 (16:02 -0400)]
rbd-mirror: avoid attempting to decode an empty client data buffer

Fixes: http://tracker.ceph.com/issues/21961
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18604 from dillaman/wip-21960
Mykola Golub [Sat, 28 Oct 2017 21:27:39 +0000 (00:27 +0300)]
Merge pull request #18604 from dillaman/wip-21960

cls/journal: ensure tags are properly expired

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agounittest_interval_set: test with flat_map<> too 18611/head
Sage Weil [Sat, 28 Oct 2017 21:24:30 +0000 (16:24 -0500)]
unittest_interval_set: test with flat_map<> too

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/btree_interval_set: remove it!
Sage Weil [Sat, 28 Oct 2017 21:20:53 +0000 (16:20 -0500)]
include/btree_interval_set: remove it!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: use interval_set<...,btree_map<...>>
Sage Weil [Sat, 28 Oct 2017 21:20:43 +0000 (16:20 -0500)]
os/bluestore: use interval_set<...,btree_map<...>>

This avoid the code duplication, yay!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/btree_map: clean up wrapper header around btree_map
Sage Weil [Sat, 28 Oct 2017 20:56:35 +0000 (15:56 -0500)]
include/btree_map: clean up wrapper header around btree_map

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore/BitMapAllocator: drop useless include
Sage Weil [Sat, 28 Oct 2017 20:50:30 +0000 (15:50 -0500)]
os/bluestore/BitMapAllocator: drop useless include

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/interval_set: cbegin/cend -> begin/end
Sage Weil [Sat, 28 Oct 2017 21:21:15 +0000 (16:21 -0500)]
include/interval_set: cbegin/cend -> begin/end

c{begin,end} don't exist for btree_map<>.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/interval_set: tolerate maps that invalidate iterator on change
Sage Weil [Sat, 28 Oct 2017 20:37:03 +0000 (15:37 -0500)]
include/interval_set: tolerate maps that invalidate iterator on change

These changes picked out of the diff between the original
btree_interval_set.h and interval_set.h (sadly I had it rolled into the
initial commit so it was tedious to identify these).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/interval_set: templating map used
Sage Weil [Sat, 28 Oct 2017 20:27:47 +0000 (15:27 -0500)]
include/interval_set: templating map used

Default to std::map for backward compat.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: handle RELEASE race with Remote*Reserved on replica
Sage Weil [Sat, 28 Oct 2017 21:02:52 +0000 (16:02 -0500)]
osd/PG: handle RELEASE race with Remote*Reserved on replica

If we get a REQUEST and RELEASE in quick succession, we may process a
local Remote*Reserved back in the RepNotRecovering state.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18602 from adamemerson/wip-optional-failure
Adam C. Emerson [Sat, 28 Oct 2017 18:14:58 +0000 (14:14 -0400)]
Merge pull request #18602 from adamemerson/wip-optional-failure

rgw: Fix dereference of empty optional

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoosd/PG: fix Remote*Preempted handling in ReplicaActive
Sage Weil [Sat, 28 Oct 2017 13:12:02 +0000 (08:12 -0500)]
osd/PG: fix Remote*Preempted handling in ReplicaActive

This was only half-implemented by c1e652a4547d89b889954ca4bdb82506ca0f1d83

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocls/journal: ensure tags are properly expired 18604/head
Jason Dillaman [Fri, 27 Oct 2017 20:45:54 +0000 (16:45 -0400)]
cls/journal: ensure tags are properly expired

Previously, if only the local image was using the journal or if
a disconnected peer was attached, the tag entries could not be
expired even if unreferenced.

Fixes: http://tracker.ceph.com/issues/21960
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoceph-bluestore-tool: the link target should not ending with new line 18585/head
Yao Zongyou [Sat, 28 Oct 2017 10:23:30 +0000 (18:23 +0800)]
ceph-bluestore-tool: the link target should not ending with new line

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agoceph-bluestore-tool: the right action is prime-osd-dir not prime-osd-dev
Yao Zongyou [Sat, 28 Oct 2017 10:22:27 +0000 (18:22 +0800)]
ceph-bluestore-tool: the right action is prime-osd-dir not prime-osd-dev

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agoMerge pull request #18592 from dillaman/wip-21956
Mykola Golub [Sat, 28 Oct 2017 06:36:30 +0000 (09:36 +0300)]
Merge pull request #18592 from dillaman/wip-21956

cls/journal: fixed possible infinite loop in expire_tags

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18607 from yaozongyou/fix-typo
Xie Xingguo [Sat, 28 Oct 2017 01:44:53 +0000 (09:44 +0800)]
Merge pull request #18607 from yaozongyou/fix-typo

doc: fix typo e.g,. => e.g.,

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agodoc: fix typo e.g,. => e.g., 18607/head
Yao Zongyou [Sat, 28 Oct 2017 01:06:24 +0000 (09:06 +0800)]
doc: fix typo e.g,. => e.g.,

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agoMerge pull request #18519 from liewegas/wip-21712-c
Sage Weil [Fri, 27 Oct 2017 22:41:35 +0000 (17:41 -0500)]
Merge pull request #18519 from liewegas/wip-21712-c

ceph_test_objectstore: do not change model for 0-length zero

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/PG: send release to remote reservations in progress
Sage Weil [Fri, 27 Oct 2017 22:37:47 +0000 (17:37 -0500)]
osd/PG: send release to remote reservations in progress

If we have a REQUEST outstanding and then cancel, send a RELEASE to the
REQUEST target too, so that they too can clean up.  This avoids leaving
the replica in the RepRecovering state when the primary is restarting
the whole reservation process.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw: Fix dereference of empty optional 18602/head
Adam C. Emerson [Fri, 27 Oct 2017 19:57:18 +0000 (15:57 -0400)]
rgw: Fix dereference of empty optional

Due to the lack of a return, there was a case where an invalid ARN
could cause a dereference of an uninitialized boost::optional.

As a bit of defensive programming, restructure a couple functions to
make that kind of error impossible by ensuring the optional is only in
scope when it is initialized and relying less in early return on
error.

Fixes: http://tracker.ceph.com/issues/21962
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoqa/suites/rbd: run cls tests for all dependencies 18592/head
Jason Dillaman [Fri, 27 Oct 2017 13:58:20 +0000 (09:58 -0400)]
qa/suites/rbd: run cls tests for all dependencies

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/journal: fixed possible infinite loop in expire_tags
Jason Dillaman [Fri, 27 Oct 2017 13:57:43 +0000 (09:57 -0400)]
cls/journal: fixed possible infinite loop in expire_tags

Fixes: http://tracker.ceph.com/issues/21956
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18571 from linuxbox2/wip-rgwfile-21940
Matt Benjamin [Fri, 27 Oct 2017 18:52:12 +0000 (14:52 -0400)]
Merge pull request #18571 from linuxbox2/wip-rgwfile-21940

rgw_file:  set s->obj_size from bytes_written

7 years agoMerge pull request #18449 from dzafman/wip-zafman-misc
David Zafman [Fri, 27 Oct 2017 17:21:25 +0000 (10:21 -0700)]
Merge pull request #18449 from dzafman/wip-zafman-misc

mark_unfound_lost fix and some other minor changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoUse a symlink for Ubuntu fragment 18594/head
Zack Cerza [Fri, 27 Oct 2017 16:33:28 +0000 (10:33 -0600)]
Use a symlink for Ubuntu fragment

Signed-off-by: Zack Cerza <zack@redhat.com>
7 years agosuites/cephmetrics: Add Centos 7
Zack Cerza [Thu, 26 Oct 2017 22:29:22 +0000 (16:29 -0600)]
suites/cephmetrics: Add Centos 7

Signed-off-by: Zack Cerza <zack@redhat.com>
7 years agoMerge pull request #18402 from cbodley/wip-21831
Casey Bodley [Fri, 27 Oct 2017 15:22:28 +0000 (11:22 -0400)]
Merge pull request #18402 from cbodley/wip-21831

rgw: fix for pause in beast frontend

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #18328 from PCzhangPC/cplostmeta
Yuri Weinstein [Fri, 27 Oct 2017 15:17:27 +0000 (08:17 -0700)]
Merge pull request #18328 from PCzhangPC/cplostmeta

librbd: cannot copy all image-metas if we have more than 64 key/value pairs

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18419 from majianpeng/librbd-bug-fix
Yuri Weinstein [Fri, 27 Oct 2017 15:17:03 +0000 (08:17 -0700)]
Merge pull request #18419 from majianpeng/librbd-bug-fix

librbd misc cleanup.

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18542 from trociny/wip-metadata-open
Yuri Weinstein [Fri, 27 Oct 2017 15:16:47 +0000 (08:16 -0700)]
Merge pull request #18542 from trociny/wip-metadata-open

librbd: don't read metadata twice on image open

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18561 from dillaman/wip-librbd-test-notify
Yuri Weinstein [Fri, 27 Oct 2017 15:16:19 +0000 (08:16 -0700)]
Merge pull request #18561 from dillaman/wip-librbd-test-notify

test/librbd: added update_features RPC message to test_notify

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
7 years agoMerge pull request #18583 from idryomov/wip-qa-xfstests-except
Jason Dillaman [Fri, 27 Oct 2017 15:12:18 +0000 (11:12 -0400)]
Merge pull request #18583 from idryomov/wip-qa-xfstests-except

qa/tasks/rbd: run all xfstests runs to completion

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18557 from tchaikov/wip-cmake-cleanup
Jason Dillaman [Fri, 27 Oct 2017 14:06:08 +0000 (10:06 -0400)]
Merge pull request #18557 from tchaikov/wip-cmake-cleanup

cmake: check for aligned_alloc() instead of checking tcmalloc version

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18551 from liewegas/wip-object-stat-decode
Sage Weil [Fri, 27 Oct 2017 13:23:02 +0000 (08:23 -0500)]
Merge pull request #18551 from liewegas/wip-object-stat-decode

osd/osd_types: fix object_stat_sum_t decode

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #18565 from liewegas/wip-prime-fixes
Sage Weil [Fri, 27 Oct 2017 13:19:11 +0000 (08:19 -0500)]
Merge pull request #18565 from liewegas/wip-prime-fixes

ceph-bluestore-tool: prime-osd-dir: update symlinks instead of bailing

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoosd/PG: handle slow Remote*Preempted events
Sage Weil [Fri, 27 Oct 2017 13:13:07 +0000 (08:13 -0500)]
osd/PG: handle slow Remote*Preempted events

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: allow preemption of remote recovery reservation too
Sage Weil [Thu, 26 Oct 2017 03:09:16 +0000 (22:09 -0500)]
osd/PG: allow preemption of remote recovery reservation too

We did backfill but not recovery.  This one is easier because we already
have a DeferRecovery event we can queue that does everything.

Condition on the RECOVERY_RESERVATION_2 feature.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: condition remote backfill preemption on RECOVERY_RESERVATION_2
Sage Weil [Thu, 26 Oct 2017 02:58:46 +0000 (21:58 -0500)]
osd/PG: condition remote backfill preemption on RECOVERY_RESERVATION_2

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/ceph_features: define RECOVERY_RESERVATION_2
Sage Weil [Thu, 26 Oct 2017 02:55:55 +0000 (21:55 -0500)]
include/ceph_features: define RECOVERY_RESERVATION_2

This will allow us to backport support for reservation preemption and
cancellations on the wire.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18518 from ceph/wip-cv-fix-default-flags
Andrew Schoen [Fri, 27 Oct 2017 13:01:54 +0000 (08:01 -0500)]
Merge pull request #18518 from ceph/wip-cv-fix-default-flags

ceph-volume: ensure correct --filestore/--bluestore behavior

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #18502 from optimistyzy/1024_yzy
Pan Liu [Fri, 27 Oct 2017 09:41:33 +0000 (17:41 +0800)]
Merge pull request #18502 from optimistyzy/1024_yzy

bluestore/NVMEDevice: convert the legacy config opt related with SPDK

7 years agoMerge pull request #18576 from tchaikov/wip-cmake-no-rados_a
Kefu Chai [Fri, 27 Oct 2017 08:19:04 +0000 (16:19 +0800)]
Merge pull request #18576 from tchaikov/wip-cmake-no-rados_a

cmake: do not link against librados.a

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agocmake: remove rados_a target 18576/head
Kefu Chai [Fri, 27 Oct 2017 03:10:08 +0000 (11:10 +0800)]
cmake: remove rados_a target

rados_a is librados.a, which is not neeeded anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: link librbd against librados not rados_a
Kefu Chai [Fri, 27 Oct 2017 02:57:43 +0000 (10:57 +0800)]
cmake: link librbd against librados not rados_a

link librados.so in hope to reduce the size of librdb, also the size of
debug-info.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: link librados tests against librados.so
Kefu Chai [Thu, 26 Oct 2017 11:42:00 +0000 (19:42 +0800)]
cmake: link librados tests against librados.so

* in hope to shrink the test, and the debug-info rpm package
* also add librados to radostest's target_link_libraries(),  otherwise we might
   run into linker order issue, like

Undefined reference in
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/librados/test.cc:61
to `rados_application_enable'

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotest/librados/cmd.cc: avoid using non-librados facilities
Kefu Chai [Thu, 26 Oct 2017 09:34:23 +0000 (17:34 +0800)]
test/librados/cmd.cc: avoid using non-librados facilities

a test for librados should be only depending on librados

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18543 from neha-ojha/wip-add-cbt-repo
Josh Durgin [Fri, 27 Oct 2017 03:24:29 +0000 (20:24 -0700)]
Merge pull request #18543 from neha-ojha/wip-add-cbt-repo

qa: add cbt repo parameter

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #18573 from neha-ojha/wip-add-cbt-workloads
Josh Durgin [Fri, 27 Oct 2017 03:13:40 +0000 (20:13 -0700)]
Merge pull request #18573 from neha-ojha/wip-add-cbt-workloads

qa/suites/rados/perf: add workloads

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agocmake: check for aligned_alloc() 18557/head
Kefu Chai [Thu, 26 Oct 2017 10:26:24 +0000 (18:26 +0800)]
cmake: check for aligned_alloc()

in case developer is using patched tcmalloc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #18174 into master
Patrick Donnelly [Fri, 27 Oct 2017 02:39:13 +0000 (19:39 -0700)]
Merge PR #18174 into master

* refs/pull/18174/head:
mds: no assertion on inode being purging in find_ino_peers()

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #18537 into master
Patrick Donnelly [Fri, 27 Oct 2017 02:39:04 +0000 (19:39 -0700)]
Merge PR #18537 into master

* refs/pull/18537/head:
mds: set PRIO_USEFUL on num_sessions counter

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa/suites/rados/perf: add workloads 18573/head
Neha Ojha [Thu, 26 Oct 2017 22:37:45 +0000 (15:37 -0700)]
qa/suites/rados/perf: add workloads

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agorgw_file: set s->obj_size from bytes_written 18571/head
Matt Benjamin [Thu, 26 Oct 2017 22:28:10 +0000 (18:28 -0400)]
rgw_file:  set s->obj_size from bytes_written

Required to store correct final accounted_size of objects in
RGWWriteWriteRequest::write_finish.

Fixes: http://tracker.ceph.com/issues/21940
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge pull request #18524 from liewegas/wip-backfill-rops
Sage Weil [Thu, 26 Oct 2017 22:48:25 +0000 (17:48 -0500)]
Merge pull request #18524 from liewegas/wip-backfill-rops

osd/PG: fix recovery op leak

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #18552 from liewegas/wip-mds-cluster-down
Sage Weil [Thu, 26 Oct 2017 22:47:51 +0000 (17:47 -0500)]
Merge pull request #18552 from liewegas/wip-mds-cluster-down

qa/workunits/rest/test.py: stop trying to test obsolte cluster_up/down

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18489 from cbodley/wip-21895
Yehuda Sadeh [Thu, 26 Oct 2017 21:16:46 +0000 (14:16 -0700)]
Merge pull request #18489 from cbodley/wip-21895

rgw: fix extra_data_len handling in PutObj filters

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoceph-volume lvm.activate remove links on activate before priming 18518/head
Alfredo Deza [Thu, 26 Oct 2017 19:09:18 +0000 (15:09 -0400)]
ceph-volume lvm.activate remove links on activate before priming

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-bluestore-tool: prime-osd-dir: update symlinks instead of bailing 18565/head
Sage Weil [Thu, 26 Oct 2017 18:51:40 +0000 (13:51 -0500)]
ceph-bluestore-tool: prime-osd-dir: update symlinks instead of bailing

If the symlink points to the right location, do nothing.  If it doesn't,
replace it.  If it's not a symlink, bail with EEXIST.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18451 from zmc/wip-cephmetrics
vasukulkarni [Thu, 26 Oct 2017 18:31:19 +0000 (11:31 -0700)]
Merge pull request #18451 from zmc/wip-cephmetrics

Add cephmetrics suite

7 years agoMerge pull request #18198 from cbodley/wip-21735
Matt Benjamin [Thu, 26 Oct 2017 17:41:19 +0000 (13:41 -0400)]
Merge pull request #18198 from cbodley/wip-21735

rgw: fix error handling in ListBucketIndexesCR

7 years agoqa/tasks/rbd: run all xfstests runs to completion 18583/head
Ilya Dryomov [Thu, 26 Oct 2017 16:41:16 +0000 (18:41 +0200)]
qa/tasks/rbd: run all xfstests runs to completion

rbd.xfstests task allows spawning xfstests runs on multiple nodes.
Don't unwind task contexts if one of the runs fails -- let the other
runs finish.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
7 years agoAdd cephmetrics suite 18451/head
Zack Cerza [Wed, 18 Oct 2017 20:38:08 +0000 (14:38 -0600)]
Add cephmetrics suite

Signed-off-by: Zack Cerza <zack@redhat.com>
7 years agotest/librbd: added update_features RPC message to test_notify 18561/head
Jason Dillaman [Thu, 26 Oct 2017 14:57:20 +0000 (10:57 -0400)]
test/librbd: added update_features RPC message to test_notify

Fixes: http://tracker.ceph.com/issues/21936
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/workunits/rest/test.py: stop trying to test obsolete 'mds *' commands 18552/head
Sage Weil [Thu, 26 Oct 2017 02:45:11 +0000 (21:45 -0500)]
qa/workunits/rest/test.py: stop trying to test obsolete 'mds *' commands

These were recently removed.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18511 from smithfarm/wip-rpm-recommend-influxdb
John Spray [Thu, 26 Oct 2017 15:23:34 +0000 (17:23 +0200)]
Merge pull request #18511 from smithfarm/wip-rpm-recommend-influxdb

build/ops: rpm: recommend python-influxdb with ceph-mgr

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
7 years agoMerge pull request #18182 from nrdmn/dashboard
John Spray [Thu, 26 Oct 2017 15:17:37 +0000 (17:17 +0200)]
Merge pull request #18182 from nrdmn/dashboard

mgr/dashboard: improve error handling

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agolibrbd: don't read metadata twice on image open 18542/head
Mykola Golub [Tue, 24 Oct 2017 17:38:59 +0000 (20:38 +0300)]
librbd: don't read metadata twice on image open

After adding get_metadata to RefreshRequest it has become redundant
in OpenRequest.

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18533 from tchaikov/wip-qa-cephtool
Sage Weil [Thu, 26 Oct 2017 14:19:11 +0000 (09:19 -0500)]
Merge pull request #18533 from tchaikov/wip-qa-cephtool

qa: do not "ceph fs get cephfs" w/o a cephfs fs

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
7 years agoosd/PG: handle remote backfill recovation while waiting for other targets 18524/head
Sage Weil [Thu, 26 Oct 2017 13:42:34 +0000 (08:42 -0500)]
osd/PG: handle remote backfill recovation while waiting for other targets

If we have multiple targets, we may still be waiting on them when we get
a revocation.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore/BlueFS: Reduce unnecessary operations in collect_metadata 17995/head
Luo Kexue [Wed, 27 Sep 2017 14:40:00 +0000 (22:40 +0800)]
os/bluestore/BlueFS: Reduce unnecessary operations in collect_metadata

Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
7 years agoceph-volume lvm.activate ceph-bluestore-tool needs --cluster too
Alfredo Deza [Thu, 26 Oct 2017 11:48:24 +0000 (07:48 -0400)]
ceph-volume lvm.activate ceph-bluestore-tool needs --cluster too

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #18545 from batrick/pr18393-revert
Mykola Golub [Thu, 26 Oct 2017 07:28:58 +0000 (10:28 +0300)]
Merge pull request #18545 from batrick/pr18393-revert

Revert "ceph_context: re-expand admin_socket metavariables in child process"

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #18496 from liewegas/wip-pgmap
Sage Weil [Thu, 26 Oct 2017 02:53:07 +0000 (21:53 -0500)]
Merge pull request #18496 from liewegas/wip-pgmap

build: remove PGMap.cc from libcommon

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PG: make scan recovery op cancellation match up reliably
Sage Weil [Wed, 25 Oct 2017 03:32:18 +0000 (22:32 -0500)]
osd/PG: make scan recovery op cancellation match up reliably

Previously, there was only one time we would end up in this region of code:
when the backfill was rejected by the peer.  Previously that was apparently
reliably when we had an outstanding SCAN request, because we would
unconditionally cancle the MAX recovery op and clear waiting_on_backfill.

See 624aaf2a4ea9950153a89ff921e2adce683a6f51 for when this code appeared.

Now we have several similar paths, and we don't always have an outstanding
scan call (I don't think!).  Regardless, move most these three cases into
a common helper and make the finish_recovery_op completion conditional
on whether there is an outstanding SCAN.  This fixes a leak of a recovery
op when we defer while a scan is outstanding (this bug was recently
introduced by e708410542b0a52fbb29e14b76f49c94adbc0a59 and then
duplicated by 2463c6463d1ed38a2e15a0960ed1530a47851489).

Note that there is still one other time we register MAX ops: when we are
finishing backfill.  There, we start one per target.  But we will always
get back our reply and process it in the normal way (that old commit
did not change the timing for these).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: make recovering_oids a multiset
Sage Weil [Wed, 25 Oct 2017 03:16:26 +0000 (22:16 -0500)]
osd/PG: make recovering_oids a multiset

For multiple backfill targets, we start MAX multiple times.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18527 from xiexingguo/wip-hunt-scrub-mismatch
Sage Weil [Thu, 26 Oct 2017 02:49:45 +0000 (21:49 -0500)]
Merge pull request #18527 from xiexingguo/wip-hunt-scrub-mismatch

osd/PrimaryLogPG: several oi.extents fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18531 from majianpeng/msg-async
Sage Weil [Thu, 26 Oct 2017 02:49:27 +0000 (21:49 -0500)]
Merge pull request #18531 from majianpeng/msg-async

msg/async misc cleanup

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agomsg/async: record correctly l_msgr_send_bytes if "rc == 0". 18531/head
Jianpeng Ma [Thu, 26 Oct 2017 10:08:54 +0000 (18:08 +0800)]
msg/async: record correctly l_msgr_send_bytes if "rc == 0".

If rc == 0, it mean all data of outcoming_bl whether old or new data.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoosd/osd_types: fix object_stat_sum_t decode 18551/head
Sage Weil [Thu, 26 Oct 2017 02:39:23 +0000 (21:39 -0500)]
osd/osd_types: fix object_stat_sum_t decode

Broken by 71bf04775bef90c9291bd825da626bc9de6f9ec1

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #18192 into master
Patrick Donnelly [Thu, 26 Oct 2017 00:05:38 +0000 (17:05 -0700)]
Merge PR #18192 into master

* refs/pull/18192/head:
qa/cephfs: test ec data pool
qa/suites/fs/basic_functional/clusters: more osds

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoceph-volume lvm.activate consume cluster_name from lvm metadata
Alfredo Deza [Wed, 25 Oct 2017 22:57:28 +0000 (18:57 -0400)]
ceph-volume lvm.activate consume cluster_name from lvm metadata

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume lvm.prepare persist cluster_name on lvm metadata
Alfredo Deza [Wed, 25 Oct 2017 22:57:03 +0000 (18:57 -0400)]
ceph-volume lvm.prepare persist cluster_name on lvm metadata

Signed-off-by: Alfredo Deza <adeza@redhat.com>