]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agotool: use coarse_mono_clock in ceph-kvstore-tool 18815/head
Chang Liu [Wed, 8 Nov 2017 08:13:34 +0000 (16:13 +0800)]
tool: use coarse_mono_clock in ceph-kvstore-tool

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
7 years agotool: ceph-kvstore-tool's store-crc command did not save result to the file as expected
Chang Liu [Wed, 8 Nov 2017 07:14:54 +0000 (15:14 +0800)]
tool: ceph-kvstore-tool's store-crc command did not save result to the file as expected

"store-crc <path>" command did not save result to <path>, it didn't use <path>
argument and alwayls passed a NULL to "st.traverse" function. now we will create file
<path>, pass a *ofstream to "st.traverse" function.

Fiexes: http://tracker.ceph.com/issues/22092

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
7 years agoMerge PR #18618 into master
Patrick Donnelly [Tue, 31 Oct 2017 23:27:44 +0000 (16:27 -0700)]
Merge PR #18618 into master

* refs/pull/18618/head:
mds: pass a reference of function to sanitize() not a copy

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #18572 from linuxbox2/wip-rgwfile-env
Casey Bodley [Tue, 31 Oct 2017 20:57:42 +0000 (16:57 -0400)]
Merge pull request #18572 from linuxbox2/wip-rgwfile-env

rgw_log, rgw_file: account for new required envvars

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18327 from PCzhangPC/clonelostmeta
Yuri Weinstein [Tue, 31 Oct 2017 20:56:56 +0000 (13:56 -0700)]
Merge pull request #18327 from PCzhangPC/clonelostmeta

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

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18546 from liewegas/wip-deprecate-features
Yuri Weinstein [Tue, 31 Oct 2017 20:56:20 +0000 (13:56 -0700)]
Merge pull request #18546 from liewegas/wip-deprecate-features

include/ceph_features: deprecate a bunch of features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #18616 from xiexingguo/wip-hunt-scrub-mismatch
Yuri Weinstein [Tue, 31 Oct 2017 20:51:31 +0000 (13:51 -0700)]
Merge pull request #18616 from xiexingguo/wip-hunt-scrub-mismatch

osd/PrimaryLogPG: more oi.extents fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18634 from tchaikov/wip-qa-add-restful
vasukulkarni [Tue, 31 Oct 2017 19:36:06 +0000 (12:36 -0700)]
Merge pull request #18634 from tchaikov/wip-qa-add-restful

qa: add "restful" to ceph_mgr_modules in ceph-ansible suite

7 years agoMerge pull request #18520 from alram/kube-helm-doc
Sage Weil [Tue, 31 Oct 2017 17:09:18 +0000 (12:09 -0500)]
Merge pull request #18520 from alram/kube-helm-doc

doc: Kube + Helm installation

7 years agoMerge pull request #18639 from yaozongyou/make-readme-properly-align
Sage Weil [Tue, 31 Oct 2017 16:44:33 +0000 (11:44 -0500)]
Merge pull request #18639 from yaozongyou/make-readme-properly-align

doc: make the commands in README.md properly aligned

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #18499 from batrick/ptl-tool-testing-time
Jos Collin [Tue, 31 Oct 2017 15:42:20 +0000 (15:42 +0000)]
Merge pull request #18499 from batrick/ptl-tool-testing-time

ptl-tool: make branch name configurable

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoptl-tool: make branch name configurable 18499/head
Patrick Donnelly [Tue, 24 Oct 2017 00:44:19 +0000 (17:44 -0700)]
ptl-tool: make branch name configurable

Also, include hours/minutes in branch so multiple branches in a day have
different names.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18642 from zhangsw/cleanup-rgwputobj-getdata
Casey Bodley [Tue, 31 Oct 2017 14:14:52 +0000 (10:14 -0400)]
Merge pull request #18642 from zhangsw/cleanup-rgwputobj-getdata

rgw: add logs if get_data returns error in RGWPutObj::execute.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge pull request #18645 from tchaikov/wip-cmake-Findgperftools
Jason Dillaman [Tue, 31 Oct 2017 11:56:21 +0000 (07:56 -0400)]
Merge pull request #18645 from tchaikov/wip-cmake-Findgperftools

cmake: should use the value of GPERFTOOLS_LIBRARIES as REQUIRED_VARS

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18283 from tchaikov/wip-laggy-mgr
Kefu Chai [Tue, 31 Oct 2017 11:03:13 +0000 (19:03 +0800)]
Merge pull request #18283 from tchaikov/wip-laggy-mgr

 qa: reduce mon-client-hunt-interval-max-multiple to 2

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agocmake: should check the availability of aligned_alloc() by running the test 18645/head
Kefu Chai [Tue, 31 Oct 2017 09:39:02 +0000 (17:39 +0800)]
cmake: should check the availability of aligned_alloc() by running the test

this mimics the failure of rocksdb without a working
aligned_alloc()/free().

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: should use the value of GPERFTOOLS_LIBRARIES as REQUIRED_VARS
Kefu Chai [Tue, 31 Oct 2017 08:58:02 +0000 (16:58 +0800)]
cmake: should use the value of GPERFTOOLS_LIBRARIES as REQUIRED_VARS

otherwise it's always true, even if the libaries are not found. also
the cmake output will be wrong without this change:

without this change, it is:

-- Found gperftools: GPERFTOOLS_TCMALLOC_LIBRARY;GPERFTOOLS_TCMALLOC_MINIMAL_LIBRARY;GPERFTOOLS_PROFILER_LIBRARY (found version "2.5.93")

with this change, it would be:

-- Found gperftools: /tmp/gperf/lib/libtcmalloc.so (found version "2.5.93")

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agorgw: add logs if get_data returns error in RGWPutObj::execute. 18642/head
Zhang Shaowen [Tue, 31 Oct 2017 06:42:52 +0000 (14:42 +0800)]
rgw: add logs if get_data returns error in RGWPutObj::execute.

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
7 years agodoc: make the commands in README.md properly aligned 18639/head
Yao Zongyou [Tue, 31 Oct 2017 05:44:23 +0000 (13:44 +0800)]
doc: make the commands in README.md properly aligned

The commands in README.md are aligned using one tab or eight spaces,
the github markdown engine not handle this properly, so using one tab
universely.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agoMerge pull request #18547 from batrick/ptl-tool-trackers
Jos Collin [Tue, 31 Oct 2017 04:18:35 +0000 (04:18 +0000)]
Merge pull request #18547 from batrick/ptl-tool-trackers

ptl-tool: print bzs/tickets cited in commit msgs/comments

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18495 from ceph/wip-da-SCA-20171013
Kefu Chai [Tue, 31 Oct 2017 04:13:28 +0000 (12:13 +0800)]
Merge pull request #18495 from ceph/wip-da-SCA-20171013

osd,rgw,librbd: SCA fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18535 from yanghonggang/master
Kefu Chai [Tue, 31 Oct 2017 04:04:09 +0000 (12:04 +0800)]
Merge pull request #18535 from yanghonggang/master

os/bluestore/bluestore_tool: add log-dump command to dump bluefs's log

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
7 years agoMerge pull request #18574 from shashalu/fix-strict-strtol
Kefu Chai [Tue, 31 Oct 2017 04:02:37 +0000 (12:02 +0800)]
Merge pull request #18574 from shashalu/fix-strict-strtol

common: strict_strtol INT_MAX and INT_MIN is valid

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18577 from tchaikov/wip-kill-clang-warning
Kefu Chai [Tue, 31 Oct 2017 04:02:10 +0000 (12:02 +0800)]
Merge pull request #18577 from tchaikov/wip-kill-clang-warning

ceph-syn: silence clang analyzer warning

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoqa: add "restful" to ceph_mgr_modules in ceph-ansible suite 18634/head
Kefu Chai [Tue, 31 Oct 2017 03:21:58 +0000 (11:21 +0800)]
qa: add "restful" to ceph_mgr_modules in ceph-ansible suite

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoptl-tool: print bzs/tickets cited in commit msgs 18547/head
Patrick Donnelly [Wed, 25 Oct 2017 22:54:14 +0000 (15:54 -0700)]
ptl-tool: print bzs/tickets cited in commit msgs

This makes it easier to update issues after a merge.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18631 from gohighsec/cleanup
Sage Weil [Tue, 31 Oct 2017 02:18:38 +0000 (21:18 -0500)]
Merge pull request #18631 from gohighsec/cleanup

os/bluestore: delete redundant header file in KernelDevice.cc

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agobluestore: delete redundant header file in KernelDevice.cc 18631/head
lijing [Tue, 31 Oct 2017 01:44:10 +0000 (09:44 +0800)]
bluestore: delete redundant header file in KernelDevice.cc

Signed-off-by: Jing Li <lijing@gohighsec.com>
7 years agoMerge pull request #18603 from batrick/i21945
Sage Weil [Mon, 30 Oct 2017 20:43:11 +0000 (15:43 -0500)]
Merge pull request #18603 from batrick/i21945

mon/MDSMonitor: wait for readable OSDMap before sanitizing

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #18039 into master
Patrick Donnelly [Mon, 30 Oct 2017 19:24:23 +0000 (12:24 -0700)]
Merge PR #18039 into master

* refs/pull/18039/head:
mgr/dashboard: redirect away if viewed filesystem is removed
mgr/dashboard: 404 instead of 500 on missing filesystem
mds: fix FSMap copy constructor

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18477 from ZVampirEM77/wip-em-cleanup
Yehuda Sadeh [Mon, 30 Oct 2017 18:20:05 +0000 (11:20 -0700)]
Merge pull request #18477 from ZVampirEM77/wip-em-cleanup

rgw: drop unused variable in copy_obj_data()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #18579 from idryomov/wip-doc-kclient-snapshots
Ilya Dryomov [Mon, 30 Oct 2017 16:42:23 +0000 (17:42 +0100)]
Merge pull request #18579 from idryomov/wip-doc-kclient-snapshots

doc/cephfs/experimental-features: kernel client snapshots limit

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge pull request #18513 from ceph/ceph-volume-zap
Alfredo Deza [Mon, 30 Oct 2017 14:57:33 +0000 (10:57 -0400)]
Merge pull request #18513 from ceph/ceph-volume-zap

ceph-volume: adds the ceph-volume lvm zap subcommand

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoosd/PrimaryLogPG: add_object_context_to_pg_stat - fix stat 18616/head
xie xingguo [Thu, 26 Oct 2017 07:54:27 +0000 (15:54 +0800)]
osd/PrimaryLogPG: add_object_context_to_pg_stat - fix stat

There might be holes in the extents map, thus it is not always
consistent to calc the clone bytes this way.
Instead we could switch to its own (simpler and consistent) way to
count used bytes for head-object and clone respectively.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/osd_type.cc: use "<<" directly for oi.extents
xie xingguo [Thu, 26 Oct 2017 03:27:41 +0000 (11:27 +0800)]
osd/osd_type.cc: use "<<" directly for oi.extents

there's already a builtin operator<< for interval_set,
which is simpler.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/PrimaryLogPG: make oi.extents handle 0-length write/write_full properly
xie xingguo [Thu, 26 Oct 2017 03:04:33 +0000 (11:04 +0800)]
osd/PrimaryLogPG: make oi.extents handle 0-length write/write_full properly

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
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 agomds: pass a reference of function to sanitize() not a copy 18618/head
Kefu Chai [Mon, 30 Oct 2017 06:48:43 +0000 (14:48 +0800)]
mds: pass a reference of function to sanitize() not a copy

to save the overhead of creating and destoying a copy of the function
closure.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoos/bluestore/bluestore_tool: add bluefs-log-dump command to dump bluefs's log 18535/head
Yang Honggang [Mon, 30 Oct 2017 03:10:00 +0000 (23:10 -0400)]
os/bluestore/bluestore_tool: add bluefs-log-dump command to dump bluefs's log

./bin/ceph-bluestore-tool --command bluefs-log-dump --path dev/osd0/
...
0x1000: txn(seq 2 len 0xd7 crc 0x306e389b)
0x1000:  op_dir_create db
0x1000:  op_dir_create db.wal
0x1000:  op_dir_create db.slow
0x1000:  op_file_update  file

Signed-off-by: Yang Honggang <joseph.yang@xtaotech.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 agotest_librbd:add a test case of 70 key/val pairs in TestClone2 18327/head
PCzhangPC [Sat, 28 Oct 2017 06:29:45 +0000 (14:29 +0800)]
test_librbd:add a test case of 70 key/val pairs in TestClone2

Signed-off-by: PCzhangPC <pengcheng.zhang@easystack.cn>
7 years agotest_librbd:add a test case of 70 key/val pairs in TestClone
PCzhangPC [Sat, 21 Oct 2017 03:31:02 +0000 (11:31 +0800)]
test_librbd:add a test case of 70 key/val pairs in TestClone

Signed-off-by: PCzhangPC <pengcheng.zhang@easystack.cn>
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 agoMDSMonitor: wait for readable OSDMap before sanitizing 18603/head
Patrick Donnelly [Fri, 27 Oct 2017 20:20:07 +0000 (13:20 -0700)]
MDSMonitor: wait for readable OSDMap before sanitizing

Fixes: http://tracker.ceph.com/issues/21945
Signed-off-by: Patrick Donnelly <pdonnell@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 agoceph-volume: set journal_uuid and journal_device when using a partition 18513/head
Andrew Schoen [Fri, 27 Oct 2017 16:29:50 +0000 (11:29 -0500)]
ceph-volume: set journal_uuid and journal_device when using a partition

This correctly sets the tags when a partition is used for a filestore
journal.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agodocs for ceph-volume lvm zap
Andrew Schoen [Tue, 24 Oct 2017 15:13:40 +0000 (10:13 -0500)]
docs for ceph-volume lvm zap

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: add tests for ceph-volume lvm zap
Andrew Schoen [Mon, 23 Oct 2017 14:51:43 +0000 (09:51 -0500)]
ceph-volume: add tests for ceph-volume lvm zap

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: print success message if zap succeeds
Andrew Schoen [Mon, 23 Oct 2017 14:44:07 +0000 (09:44 -0500)]
ceph-volume: print success message if zap succeeds

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: terminal.write only takes one argument
Andrew Schoen [Fri, 20 Oct 2017 14:58:48 +0000 (09:58 -0500)]
ceph-volume: terminal.write only takes one argument

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: the metadata field for the lv path is lv_path not path
Andrew Schoen [Thu, 19 Oct 2017 21:29:39 +0000 (16:29 -0500)]
ceph-volume: the metadata field for the lv path is lv_path not path

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: update help text for ceph-volume lvm zap
Andrew Schoen [Thu, 19 Oct 2017 19:59:26 +0000 (14:59 -0500)]
ceph-volume: update help text for ceph-volume lvm zap

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: remove lvm metadata when zapping an lv
Andrew Schoen [Thu, 19 Oct 2017 19:55:44 +0000 (14:55 -0500)]
ceph-volume: remove lvm metadata when zapping an lv

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: adds Volume.clear_tags
Andrew Schoen [Thu, 19 Oct 2017 19:55:02 +0000 (14:55 -0500)]
ceph-volume: adds Volume.clear_tags

Will remove all tags for the current lv

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: zap should leave lvs and partitions intact
Andrew Schoen [Thu, 19 Oct 2017 17:01:57 +0000 (12:01 -0500)]
ceph-volume: zap should leave lvs and partitions intact

This will remove filesystems and wipe data from any lv or partition
given to 'ceph-volume lvm zap' but still leave it intact for further
use.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: adds utilites to wipe the fs and clear data when zapping
Andrew Schoen [Thu, 19 Oct 2017 16:44:11 +0000 (11:44 -0500)]
ceph-volume: adds utilites to wipe the fs and clear data when zapping

These should eventually move to a disk api.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: adds tests for api.lvm.remove_lv
Andrew Schoen [Thu, 19 Oct 2017 15:35:51 +0000 (10:35 -0500)]
ceph-volume: adds tests for api.lvm.remove_lv

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: api.lvm.remove_lv should return True when successful
Andrew Schoen [Thu, 19 Oct 2017 15:35:10 +0000 (10:35 -0500)]
ceph-volume: api.lvm.remove_lv should return True when successful

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: zap logical volumes
Andrew Schoen [Wed, 18 Oct 2017 15:19:25 +0000 (10:19 -0500)]
ceph-volume: zap logical volumes

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: adds a remove_lv command to the lvm api
Andrew Schoen [Wed, 18 Oct 2017 15:19:00 +0000 (10:19 -0500)]
ceph-volume: adds a remove_lv command to the lvm api

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: stubs out the ceph-volume lvm zap command
Andrew Schoen [Tue, 17 Oct 2017 19:15:18 +0000 (14:15 -0500)]
ceph-volume: stubs out the ceph-volume lvm zap command

Signed-off-by: Andrew Schoen <aschoen@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>