]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agorgw_file: disable FLAG_EXACT_MATCH enforcement 18335/head
Matt Benjamin [Thu, 12 Oct 2017 15:44:45 +0000 (11:44 -0400)]
rgw_file: disable FLAG_EXACT_MATCH enforcement

a. upstream motivating behavior no longer reproduces
b. incorrect stat behavior observed, traced to exact match enforcement

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agorgw_file: implement variant offset readdir processing
Matt Benjamin [Mon, 16 Oct 2017 01:48:19 +0000 (21:48 -0400)]
rgw_file: implement variant offset readdir processing

Introduce new rgw_readdir2(...), which in which continues
from an arbitrary dirent name, which presumably has been
seen in a prior partial enumeration.

Add single-file unit test for READDIR cases, librgw_file_marker.cc.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
7 years agoMerge pull request #18292 from xiexingguo/wip-recovery-order
Kefu Chai [Sat, 14 Oct 2017 22:55:11 +0000 (06:55 +0800)]
Merge pull request #18292 from xiexingguo/wip-recovery-order

osd/PrimaryLogPG: arrange recovery order by number of missing objects

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18295 from adamwg/awg/update-orgmap
Jos Collin [Sat, 14 Oct 2017 12:09:51 +0000 (12:09 +0000)]
Merge pull request #18295 from adamwg/awg/update-orgmap

organizationmap: Add Adam Wolfe Gordon's affiliation

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge PR #18139 into master
Patrick Donnelly [Fri, 13 Oct 2017 23:51:36 +0000 (16:51 -0700)]
Merge PR #18139 into master

* refs/pull/18139/head:
test: make the LibCephFS.ShutdownRacer test even more thrashy
lockdep: free_ids and lock_ref hashes must be truly global
common: add a clear_g_str_vec() function to clear g_str_vec
common: make it safe to call env_to_vec multiple times

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #18183 into master
Patrick Donnelly [Fri, 13 Oct 2017 23:51:31 +0000 (16:51 -0700)]
Merge PR #18183 into master

* refs/pull/18183/head:
osdc/ObjectCacher: limit memory usage of BufferHead

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18215 into master
Patrick Donnelly [Fri, 13 Oct 2017 23:51:27 +0000 (16:51 -0700)]
Merge PR #18215 into master

* refs/pull/18215/head:
mds: update client metadata for already open session

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18261 into master
Patrick Donnelly [Fri, 13 Oct 2017 23:51:22 +0000 (16:51 -0700)]
Merge PR #18261 into master

* refs/pull/18261/head:
mds: keep CInode::STATE_QUEUEDEXPORTPIN state when exporting inode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18244 into master
Patrick Donnelly [Fri, 13 Oct 2017 23:51:18 +0000 (16:51 -0700)]
Merge PR #18244 into master

* refs/pull/18244/head:
mds: additional damage handling case in EImportStart

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18229 from liewegas/wip-21753
Sage Weil [Fri, 13 Oct 2017 20:40:48 +0000 (15:40 -0500)]
Merge pull request #18229 from liewegas/wip-21753

ceph-objectstore-tool: fix import of post-split pg from pre-split ancestor

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #18224 from liewegas/wip-pglog-cf
Sage Weil [Fri, 13 Oct 2017 20:32:40 +0000 (15:32 -0500)]
Merge pull request #18224 from liewegas/wip-pglog-cf

os/bluestore: dynamic CF configuration; put pglog omap in separate CF

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
7 years agoMerge pull request #18186 from xiexingguo/wip-miss-loc
Sage Weil [Fri, 13 Oct 2017 20:31:38 +0000 (15:31 -0500)]
Merge pull request #18186 from xiexingguo/wip-miss-loc

osd/PG: reduce some overhead on operating MissingLoc

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #16030 from myoungwon/wip-revamp-opwq
Sage Weil [Fri, 13 Oct 2017 20:31:21 +0000 (15:31 -0500)]
Merge pull request #16030 from myoungwon/wip-revamp-opwq

osd: generalize queueing and lock interface for OpWq

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17541 from mikulely/log-time-msecs
Yuri Weinstein [Fri, 13 Oct 2017 19:52:15 +0000 (12:52 -0700)]
Merge pull request #17541 from mikulely/log-time-msecs

rgw: fix total_time to msec as per AWS S3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18214 from shashalu/fix-null-data-mtime
Yuri Weinstein [Fri, 13 Oct 2017 19:51:50 +0000 (12:51 -0700)]
Merge pull request #18214 from shashalu/fix-null-data-mtime

rgw: don't change rados object's mtime when update olh

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18245 from yaozongyou/wip-radosgw-admin-bi-fix
Yuri Weinstein [Fri, 13 Oct 2017 19:51:26 +0000 (12:51 -0700)]
Merge pull request #18245 from yaozongyou/wip-radosgw-admin-bi-fix

rgw: udpate radosgw-admin usage with bi purge

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18248 from ivancich/wip-rgw-unify-bi-hash-calc
Yuri Weinstein [Fri, 13 Oct 2017 19:50:59 +0000 (12:50 -0700)]
Merge pull request #18248 from ivancich/wip-rgw-unify-bi-hash-calc

rgw: consolidate code that implements hashing algorithms

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18272 from cbodley/wip-compressor-random
Kefu Chai [Fri, 13 Oct 2017 17:16:01 +0000 (01:16 +0800)]
Merge pull request #18272 from cbodley/wip-compressor-random

compressor: use generate_random_number() for type="random"

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18240 from tchaikov/wip-21716
Kefu Chai [Fri, 13 Oct 2017 17:14:51 +0000 (01:14 +0800)]
Merge pull request #18240 from tchaikov/wip-21716

test: fix misc fiemap testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #18221 from tchaikov/wip-kvstore-tool-cleanup
Kefu Chai [Fri, 13 Oct 2017 17:13:58 +0000 (01:13 +0800)]
Merge pull request #18221 from tchaikov/wip-kvstore-tool-cleanup

ceph-kvstore-tool: use unique_ptr<> to manage the lifecycle of bluestore

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Chang Liu <liuchang0812@gmail.com>
7 years agoorganizationmap: Add Adam Wolfe Gordon's affiliation (DigitalOcean) 18295/head
Adam Wolfe Gordon [Fri, 13 Oct 2017 16:11:20 +0000 (16:11 +0000)]
organizationmap: Add Adam Wolfe Gordon's affiliation (DigitalOcean)

Signed-off-by: Adam Wolfe Gordon <awg@digitalocean.com>
7 years agoMerge pull request #18285 from tchaikov/wip-cmake
Ali Maredia [Fri, 13 Oct 2017 14:47:34 +0000 (10:47 -0400)]
Merge pull request #18285 from tchaikov/wip-cmake

cmake: bump up required cmake version to 2.8.12

7 years agoMerge pull request #18273 from cbodley/wip-21775
Matt Benjamin [Fri, 13 Oct 2017 13:56:04 +0000 (09:56 -0400)]
Merge pull request #18273 from cbodley/wip-21775

rgw: 'zone placement' commands validate compression type

7 years agoosd/PrimaryLogPG: arrange recovery order by number of missing objects 18292/head
xie xingguo [Fri, 13 Oct 2017 06:08:28 +0000 (14:08 +0800)]
osd/PrimaryLogPG: arrange recovery order by number of missing objects

Replica which has the shortest missing list (smallest amount of
objects to recover) should go recovering first, since it can be
technically brought back to normal sooner than others.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agocmake: fix gperftools version detection 18285/head
Kefu Chai [Fri, 13 Oct 2017 07:10:29 +0000 (15:10 +0800)]
cmake: fix gperftools version detection

there is chance that its "patch" version is empty. in that case, do not
include it in its version string. otherwise, we will have something
like:

Found gperftools:
GPERFTOOLS_TCMALLOC_LIBRARY;GPERFTOOLS_TCMALLOC_MINIMAL_LIBRARY;GPERFTOOLS_PROFILER_LIBRARY
(found version "2.4.#define TC_VERSION_PATCH  """)

when running cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18286 from tchaikov/wip-kill-bluestore-warning
Xie Xingguo [Fri, 13 Oct 2017 07:10:43 +0000 (15:10 +0800)]
Merge pull request #18286 from tchaikov/wip-kill-bluestore-warning

os/bluestore: silence -Wreturn-type warning

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #18277 from dillaman/wip-librbd-unused-variables
Mykola Golub [Fri, 13 Oct 2017 06:46:46 +0000 (09:46 +0300)]
Merge pull request #18277 from dillaman/wip-librbd-unused-variables

librbd: remove unused variables from ReadResult refactor

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agocmake: use CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN
Kefu Chai [Fri, 13 Oct 2017 05:53:29 +0000 (13:53 +0800)]
cmake: use CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN

instead of using "-fvisibility=hidden -fvisibility-inlines-hidden", more
cmake-ish this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: s/LINK_PRIVATE/PRIVATE/
Kefu Chai [Fri, 13 Oct 2017 05:46:34 +0000 (13:46 +0800)]
cmake: s/LINK_PRIVATE/PRIVATE/

as 2.8.12 is required not, no need to be compatible with 2.8.11 anymore.

this reverts 457f023.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: refactor -fsanitize=... options
Kefu Chai [Fri, 13 Oct 2017 05:34:09 +0000 (13:34 +0800)]
cmake: refactor -fsanitize=... options

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoos/bluestore: silence -Wreturn-type warning 18286/head
Kefu Chai [Fri, 13 Oct 2017 06:12:44 +0000 (14:12 +0800)]
os/bluestore: silence -Wreturn-type warning

this silences following warning:

ceph/src/os/bluestore/bluestore_types.h: In member function ‘bool bluestore_blob_t::_validate_range(uint64_t, uint64_t, bool) const’:
ceph/src/os/bluestore/bluestore_types.h:664:3: warning: control reaches end of non-void function [-Wreturn-type]
   }
   ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: use CMAKE_POSITION_INDEPENDENT_CODE not -fPIC
Kefu Chai [Fri, 13 Oct 2017 05:01:59 +0000 (13:01 +0800)]
cmake: use CMAKE_POSITION_INDEPENDENT_CODE not -fPIC

we use the global setting of CMAKE_POSITION_INDEPENDENT_CODE for
defining this flag.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: bump up the required version to 2.8.12
Kefu Chai [Fri, 13 Oct 2017 05:00:49 +0000 (13:00 +0800)]
cmake: bump up the required version to 2.8.12

as both trusty and centos 7.3 offer 2.8.12

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17793 from amitkumar50/cov-misc-6
Kefu Chai [Fri, 13 Oct 2017 04:17:37 +0000 (12:17 +0800)]
Merge pull request #17793 from amitkumar50/cov-misc-6

librbd,os: address coverity false positives

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17825 from amitkumar50/cov-misc-9
Kefu Chai [Fri, 13 Oct 2017 04:17:10 +0000 (12:17 +0800)]
Merge pull request #17825 from amitkumar50/cov-misc-9

librbd,test: address coverity false positives

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17972 from cbodley/wip-21401
Kefu Chai [Fri, 13 Oct 2017 04:16:26 +0000 (12:16 +0800)]
Merge pull request #17972 from cbodley/wip-21401

auth: keep /dev/urandom open for get_random_bytes

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #18204 from ownedu/wip-fix-async-rdma-coredump
Kefu Chai [Fri, 13 Oct 2017 04:15:27 +0000 (12:15 +0800)]
Merge pull request #18204 from ownedu/wip-fix-async-rdma-coredump

msg/async/rdma: fix a coredump introduced by PR #18053

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18217 from liewegas/wip-pg-clang
Kefu Chai [Fri, 13 Oct 2017 04:14:31 +0000 (12:14 +0800)]
Merge pull request #18217 from liewegas/wip-pg-clang

osd/PG: fix clang build vs private state events

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18259 from xiexingguo/wip-blue-reclaim
Kefu Chai [Fri, 13 Oct 2017 04:12:45 +0000 (12:12 +0800)]
Merge pull request #18259 from xiexingguo/wip-blue-reclaim

os/bluestore/BlueFS: sanity check that alloc->allocate() won't return 0

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18262 from tchaikov/wip-rocksdb
Kefu Chai [Fri, 13 Oct 2017 04:10:57 +0000 (12:10 +0800)]
Merge pull request #18262 from tchaikov/wip-rocksdb

rocksdb: sync with upstream

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
7 years agoos/bluestore: dynamically configure CFs and options via bluestore_rocksdb_cfs 18224/head
Sage Weil [Tue, 10 Oct 2017 20:05:39 +0000 (15:05 -0500)]
os/bluestore: dynamically configure CFs and options via bluestore_rocksdb_cfs

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/bluestore: put pglog omap in a separate CF
Sage Weil [Tue, 10 Oct 2017 19:49:29 +0000 (14:49 -0500)]
os/bluestore: put pglog omap in a separate CF

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agolibrbd: remove unused variables from ReadResult refactor 18277/head
Jason Dillaman [Thu, 12 Oct 2017 22:35:28 +0000 (18:35 -0400)]
librbd: remove unused variables from ReadResult refactor

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18210 from shangfufei/wip-async-fix
Yuri Weinstein [Thu, 12 Oct 2017 19:54:24 +0000 (12:54 -0700)]
Merge pull request #18210 from shangfufei/wip-async-fix

msg/async: fix bug of data type conversion when uint64_t -> int -> uint64_t

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Amit Kumar amitkuma@redhat.com
7 years agoMerge pull request #18246 from liewegas/wip-seesaw-warning
Yuri Weinstein [Thu, 12 Oct 2017 19:52:42 +0000 (12:52 -0700)]
Merge pull request #18246 from liewegas/wip-seesaw-warning

qa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18270 from dillaman/wip-21391
Mykola Golub [Thu, 12 Oct 2017 19:39:55 +0000 (22:39 +0300)]
Merge pull request #18270 from dillaman/wip-21391

cls/journal: possible infinite loop within tag_list class method

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agocompressor: use generate_random_number for type="random" 18272/head
Casey Bodley [Thu, 12 Oct 2017 16:46:09 +0000 (12:46 -0400)]
compressor: use generate_random_number for type="random"

use an existing thread-local random engine instead of constructing,
seeding, and locking a separate engine

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agorgw: 'zone placement' commands validate compression type 18273/head
Casey Bodley [Thu, 12 Oct 2017 17:26:29 +0000 (13:26 -0400)]
rgw: 'zone placement' commands validate compression type

Fixes: http://tracker.ceph.com/issues/21775
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agocls/journal: fixed possible infinite loop which could kill the OSD 18270/head
Jason Dillaman [Thu, 12 Oct 2017 12:58:03 +0000 (08:58 -0400)]
cls/journal: fixed possible infinite loop which could kill the OSD

Fixes: http://tracker.ceph.com/issues/21771
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest: ceph_test_cls_journal was dropped when converting to cmake
Jason Dillaman [Thu, 12 Oct 2017 12:56:57 +0000 (08:56 -0400)]
test: ceph_test_cls_journal was dropped when converting to cmake

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18258 from shinobu-x/sk-osdmonitor_move_bufferlist_before_use
Joao Eduardo Luis [Thu, 12 Oct 2017 08:24:22 +0000 (09:24 +0100)]
Merge pull request #18258 from shinobu-x/sk-osdmonitor_move_bufferlist_before_use

mon/OSDMonitor: cleanup: move bufferlist before use

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
7 years agoMerge pull request #18235 from tchaikov/wip-qa-backfilling
Kefu Chai [Thu, 12 Oct 2017 06:54:41 +0000 (14:54 +0800)]
Merge pull request #18235 from tchaikov/wip-qa-backfilling

qa: s/backfill/backfilling/

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18222 from adamemerson/wip-don't-fix-what-ain't-broke
Kefu Chai [Thu, 12 Oct 2017 06:50:53 +0000 (14:50 +0800)]
Merge pull request #18222 from adamemerson/wip-don't-fix-what-ain't-broke

config: Remove _get_val

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomds: keep CInode::STATE_QUEUEDEXPORTPIN state when exporting inode 18261/head
Yan, Zheng [Thu, 12 Oct 2017 04:01:35 +0000 (12:01 +0800)]
mds: keep CInode::STATE_QUEUEDEXPORTPIN state when exporting inode

Fixes: http://tracker.ceph.com/issues/21768
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agorocksdb: sync with upstream 18262/head
Kefu Chai [Thu, 12 Oct 2017 03:45:55 +0000 (11:45 +0800)]
rocksdb: sync with upstream

to pickup two changes

- prefetched skiplist
- enable SSE42 CRC32 on EL7

Fixes: http://tracker.ceph.com/issues/21603
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoos/bluestore/BlueFS: sanity check that alloc->allocate() won't return 0 18259/head
xie xingguo [Thu, 12 Oct 2017 02:34:27 +0000 (10:34 +0800)]
os/bluestore/BlueFS: sanity check that alloc->allocate() won't return 0

If alloc[id]->allocate() returns 0, no space is actually reclaimed.
But BlueStore treats returning 0 as success and will keep reclaiming
space from BlueFS until hit the given threshold, which turns out to
be deadloop-prone.

For now, Bitmap and Stupid never return 0-length allocated space
(which is instead converted to -ENOSPC to suggest an error to caller),
so sanity checking against result code 0 will suffice.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agomon/OSDMonitor: Move bufferlist before use 18258/head
Shinobu Kinjo [Thu, 12 Oct 2017 02:03:12 +0000 (11:03 +0900)]
mon/OSDMonitor: Move bufferlist before use

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
7 years agoosd: fix reference a deleted item 16030/head
myoungwon oh [Wed, 11 Oct 2017 16:43:37 +0000 (01:43 +0900)]
osd: fix reference a deleted item

move() delete to_process' entries. This commit will prevent
referencing a deleted item

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
7 years agoMerge pull request #17824 from shashalu/fix-lc-expiration
Yuri Weinstein [Wed, 11 Oct 2017 16:37:58 +0000 (09:37 -0700)]
Merge pull request #17824 from shashalu/fix-lc-expiration

rgw:lc fix expiration time

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
7 years agoMerge pull request #18102 from MI-OSiRIS/mgr_influx_dbcheck
John Spray [Wed, 11 Oct 2017 16:33:47 +0000 (17:33 +0100)]
Merge pull request #18102 from MI-OSiRIS/mgr_influx_dbcheck

Modify mgr-influx module database check to not require admin privileges

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18104 from linuxbox2/rgw-rel-lock-earlyx
Yuri Weinstein [Wed, 11 Oct 2017 16:30:36 +0000 (09:30 -0700)]
Merge pull request #18104 from linuxbox2/rgw-rel-lock-earlyx

rgw: release cls lock if taken in RGWCompleteMultipart

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18175 from yaozongyou/fix-radosgw-admin-command-arg-bug
Yuri Weinstein [Wed, 11 Oct 2017 16:30:02 +0000 (09:30 -0700)]
Merge pull request #18175 from yaozongyou/fix-radosgw-admin-command-arg-bug

rgw: fix command argument error for radosgw-admin

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18193 from cbodley/wip-rgw-pool-application-jewel
Yuri Weinstein [Wed, 11 Oct 2017 15:48:09 +0000 (08:48 -0700)]
Merge pull request #18193 from cbodley/wip-rgw-pool-application-jewel

qa/rgw: ignore errors from 'pool application enable'

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoMerge pull request #18225 from adamemerson/wip-retract-assertions
Yuri Weinstein [Wed, 11 Oct 2017 15:44:30 +0000 (08:44 -0700)]
Merge pull request #18225 from adamemerson/wip-retract-assertions

rgw: Remove assertions in IAM Policy

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
7 years agotest: make the LibCephFS.ShutdownRacer test even more thrashy 18139/head
Jeff Layton [Wed, 11 Oct 2017 15:16:39 +0000 (11:16 -0400)]
test: make the LibCephFS.ShutdownRacer test even more thrashy

Have each thread do the startup and shutdown in a loop for a specified
number of times.

Tracker: http://tracker.ceph.com/issues/21512
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agolockdep: free_ids and lock_ref hashes must be truly global
Jeff Layton [Wed, 11 Oct 2017 15:16:38 +0000 (11:16 -0400)]
lockdep: free_ids and lock_ref hashes must be truly global

It's possible for the teardown of g_lockdep_ceph_ctx to occur, followed
by a new context being registered as the lockdep context. When that
occurs, we can end up reusing lock id's that were previously handed out
to consumers. We need for those IDs to be persistent across lockdep
enablement and disablement.

Make both the free_ids table, and the lock_refs map persistent across
lockdep_unregister_ceph_context and lockdep_register_ceph_context cycles.
Entries in those tables will only be deleted by the destruction of the
associated mutex.

When lockdep_unregister is called, do the refcounting like we normally
would, but only clear out the state when the lockid is registered
in the lock_names hash.

Finally, we do still need to handle the case where g_lockdep has gone
false even when there are outstanding references after the decrement.
Only log the message if that's not the case.

With this, we can deal with the case of multiple clients enabling and
disabling lockdep in an unsynchronized way.

Tracker: http://tracker.ceph.com/issues/21512
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agocommon: add a clear_g_str_vec() function to clear g_str_vec
Jeff Layton [Wed, 11 Oct 2017 15:16:38 +0000 (11:16 -0400)]
common: add a clear_g_str_vec() function to clear g_str_vec

Prefix str_vec and str_vec_lock with "g_" to make it clear that they are
truly global values. Add a new clear_g_str_vec function to allow it to
be explicitly cleaned out by callers that need that functionality
(mostly testcase for now).

Tracker: http://tracker.ceph.com/issues/21512
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agocommon: make it safe to call env_to_vec multiple times
Jeff Layton [Wed, 11 Oct 2017 15:16:38 +0000 (11:16 -0400)]
common: make it safe to call env_to_vec multiple times

After it has been called once and we have outstanding CephContexts with
pointers into str_vec, we can't call get_str_vec on it again.

Add a static local mutex to protect access to str_vec.

Tracker: http://tracker.ceph.com/issues/21512
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agorgw: udpate radosgw-admin usage with bi purge. 18245/head
Yao Zongyou [Wed, 11 Oct 2017 15:04:55 +0000 (23:04 +0800)]
rgw: udpate radosgw-admin usage with bi purge.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agoMerge pull request #17420 from tchaikov/wip-19705
Kefu Chai [Wed, 11 Oct 2017 14:48:00 +0000 (22:48 +0800)]
Merge pull request #17420 from tchaikov/wip-19705

arch/arm: set ceph_arch_aarch64_crc32 only if the build host supports crc32cx

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #18242 from tchaikov/wip-21758
Sage Weil [Wed, 11 Oct 2017 13:44:45 +0000 (08:44 -0500)]
Merge pull request #18242 from tchaikov/wip-21758

crushtool: print error message to stderr not dout(1)

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN 18246/head
Sage Weil [Wed, 11 Oct 2017 13:24:50 +0000 (08:24 -0500)]
qa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN

Mgr can get marked down when mon weirdness is happening.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18137 from cbodley/wip-21685
Matt Benjamin [Wed, 11 Oct 2017 12:32:49 +0000 (08:32 -0400)]
Merge pull request #18137 from cbodley/wip-21685

rgw: RGWUser::init no longer overwrites user_id

7 years agomds: additional damage handling case in EImportStart 18244/head
John Spray [Wed, 11 Oct 2017 10:36:36 +0000 (11:36 +0100)]
mds: additional damage handling case in EImportStart

Fixes: http://tracker.ceph.com/issues/21759
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18233 from gmayyyha/ceph-fs-status-21752
John Spray [Wed, 11 Oct 2017 10:21:11 +0000 (11:21 +0100)]
Merge pull request #18233 from gmayyyha/ceph-fs-status-21752

mgr/status: fix ceph fs status returns error

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agocrushtool: print error message to stderr not dout(1) 18242/head
Kefu Chai [Wed, 11 Oct 2017 09:45:19 +0000 (17:45 +0800)]
crushtool: print error message to stderr not dout(1)

in hope to fix the mysterious test failure where cli/crushtool/build.t
prints nothing when error message is expected.

Fixes: http://tracker.ceph.com/issues/21758
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotest: fix misc fiemap testing 18240/head
Ning Yao [Thu, 7 Sep 2017 10:52:55 +0000 (10:52 +0000)]
test: fix misc fiemap testing

1) Different filesystem will have different behavior to
allocate extents. Therefore, even if write 4000 extents,
the filesystem may not really allocate 4000 extents.

2) kstore always return [0, xxx] even if offset ~= 0. Therefore,
the whole non-zero offset FiemapHoles test should be skipped

3) enable fiemap test for filestore, bluestore, memstore again

Fixes: http://tracker.ceph.com/issues/21716
Signed-off-by: Ning Yao <yaoning@unitedstack.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomsg/async: fix bug of data type conversion in do_request() 18210/head
shangfufei [Tue, 10 Oct 2017 06:00:08 +0000 (14:00 +0800)]
msg/async: fix bug of data type conversion in do_request()

Signed-off-by: shangfufei <shangfufei@inspur.com>
7 years agomsg/async/rdma: fix a coredump bug which is introduced by PR #18053, 18204/head
ownedu [Tue, 10 Oct 2017 02:16:05 +0000 (10:16 +0800)]
msg/async/rdma: fix a coredump bug which is introduced by PR #18053,
where the iterator is not working properly after erase().

Signed-off-by: Yan Lei <yongyou.yl@alibaba-inc.com>
7 years agoMerge pull request #18230 from ceph/liewegas-patch-1
Kefu Chai [Wed, 11 Oct 2017 04:08:12 +0000 (12:08 +0800)]
Merge pull request #18230 from ceph/liewegas-patch-1

.githubmap: Update

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa: s/backfill/backfilling/ 18235/head
Kefu Chai [Wed, 11 Oct 2017 03:45:33 +0000 (11:45 +0800)]
qa: s/backfill/backfilling/

it's renamed "backfilling" in 4015343f .

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18203 from majianpeng/bluestore-wake-kvfinathread
Xie Xingguo [Wed, 11 Oct 2017 03:35:40 +0000 (11:35 +0800)]
Merge pull request #18203 from majianpeng/bluestore-wake-kvfinathread

os/bluestore/BlueStore: ASAP wake up _kv_finalize_thread.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
7 years agoMerge pull request #18201 from gregsfortytwo/wip-21737-shutdown-assert
Kefu Chai [Wed, 11 Oct 2017 03:20:00 +0000 (11:20 +0800)]
Merge pull request #18201 from gregsfortytwo/wip-21737-shutdown-assert

common: by default, do not assert on leaks in the shared_cache code

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18218 from tchaikov/wip-21609
Kefu Chai [Wed, 11 Oct 2017 03:05:08 +0000 (11:05 +0800)]
Merge pull request #18218 from tchaikov/wip-21609

mon/PGMap: let pg_string_state() return boost::optional<>

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18213 from tchaikov/wip-log-on-osx
Kefu Chai [Wed, 11 Oct 2017 03:03:29 +0000 (11:03 +0800)]
Merge pull request #18213 from tchaikov/wip-log-on-osx

log: fix build on osx

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #18216 from tchaikov/wip-cmake-cleanup
Kefu Chai [Wed, 11 Oct 2017 03:02:29 +0000 (11:02 +0800)]
Merge pull request #18216 from tchaikov/wip-cmake-cleanup

cmake: set supported language the right way

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agomgr/status: fix ceph fs status returns error 18233/head
Yanhu Cao [Wed, 11 Oct 2017 01:31:14 +0000 (09:31 +0800)]
mgr/status: fix ceph fs status returns error

Fixes: http://tracker.ceph.com/issues/21752
Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
7 years agoMerge pull request #18228 from ktdreyer/doc-mds-blacklist-interval-manual
Xie Xingguo [Wed, 11 Oct 2017 00:37:08 +0000 (08:37 +0800)]
Merge pull request #18228 from ktdreyer/doc-mds-blacklist-interval-manual

doc: rm stray ")" character from mds config ref

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17900 from markhpc/wip-filestore-rocksdb-compaction-readahead...
Josh Durgin [Tue, 10 Oct 2017 23:52:18 +0000 (16:52 -0700)]
Merge pull request #17900 from markhpc/wip-filestore-rocksdb-compaction-readahead-master

common/options.cc: Set Filestore rocksdb compaction readahead option.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoUpdate .githubmap 18230/head
Sage Weil [Tue, 10 Oct 2017 22:25:21 +0000 (17:25 -0500)]
Update .githubmap

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph-objectstore-tool: fix import of post-split pg from pre-split ancestor 18229/head
Sage Weil [Tue, 10 Oct 2017 22:02:56 +0000 (17:02 -0500)]
ceph-objectstore-tool: fix import of post-split pg from pre-split ancestor

If we export a PG, it later splits, and then we try to import a
post-split portion of it, we need to generate the PastIntervals
properly (instead of crashing).

Fixes: http://tracker.ceph.com/issues/21753
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #18223 into master
Patrick Donnelly [Tue, 10 Oct 2017 21:33:59 +0000 (14:33 -0700)]
Merge PR #18223 into master

* refs/pull/18223/head:
githubmap: define merge conflict resolution

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc: rm stray ")" character from mds config ref 18228/head
Ken Dreyer [Tue, 10 Oct 2017 21:11:11 +0000 (15:11 -0600)]
doc: rm stray ")" character from mds config ref

I accidentally introduced this in
4fb89a63172d2dc6ce8f4702fe90904f9a8fd7bd

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
7 years agorgw: Remove assertions in IAM Policy 18225/head
Adam C. Emerson [Tue, 10 Oct 2017 20:21:48 +0000 (16:21 -0400)]
rgw: Remove assertions in IAM Policy

A couple of them could be triggered by user input.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agogithubmap: define merge conflict resolution 18223/head
Patrick Donnelly [Tue, 10 Oct 2017 19:05:41 +0000 (12:05 -0700)]
githubmap: define merge conflict resolution

Use "union" merge to automatically resolve trivial append merge conflicts from
using ptl-tool.py.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17882 from ZVampirEM77/wip-rgw-encryption
Matt Benjamin [Tue, 10 Oct 2017 18:56:08 +0000 (14:56 -0400)]
Merge pull request #17882 from ZVampirEM77/wip-rgw-encryption

rgw: clean up and fix some bugs for encryption

7 years agoconfig: Remove _get_val 18222/head
Adam C. Emerson [Tue, 10 Oct 2017 18:37:59 +0000 (14:37 -0400)]
config: Remove _get_val

I added this originally to prevent a deadlock when reading a new-style
configuration variable from a called observer. I didn't realize at the
time that the config mutex was recursive, so this change was
superfluous.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #17759 from liewegas/wip-21407
Sage Weil [Tue, 10 Oct 2017 18:17:01 +0000 (13:17 -0500)]
Merge pull request #17759 from liewegas/wip-21407

osd: fix waiting_for_peered vs flushing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #18208 from jan--f/mgr-prometheus-fix-undef-metrics
Dan Mick [Tue, 10 Oct 2017 17:38:49 +0000 (10:38 -0700)]
Merge pull request #18208 from jan--f/mgr-prometheus-fix-undef-metrics

pybind/mgr/prometheus: fix metric type undef -> untyped

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
7 years agoMerge pull request #18136 from dillaman/wip-21561
Mykola Golub [Tue, 10 Oct 2017 15:01:44 +0000 (18:01 +0300)]
Merge pull request #18136 from dillaman/wip-21561

rbd-mirror: primary image should register in remote, non-primary image's journal

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>