]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
David Zafman [Tue, 24 Oct 2017 03:20:44 +0000 (20:20 -0700)]
osd: Handle objects on non-actingbackfill nodes during recovery
With this fix we can see more misplaced and no degraded when
doing recovery to a new up/acting set with node(s) containing
objects that are not longer part of up/acting.
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Mon, 23 Oct 2017 21:49:02 +0000 (14:49 -0700)]
osd: Adjust misplaced calculation
When there are more backfill ndoes then misplaced nodes the
object calculation would cause misplace to drop too quickly.
Assuming that all backfill nodes are at approximate the same
place, we compute backfill per node and only adjust by
the number of misplaced nodes.
Fixes: http://tracker.ceph.com/issues/21898
Signed-off-by: David Zafman <dzafman@redhat.com>
Sage Weil [Sun, 22 Oct 2017 03:16:27 +0000 (22:16 -0500)]
osd/PG: _update_calc_stats: backfill targets do not always affect degraded
Our progress on a backfill target should only count toward degraded if
the target is needed in order for us to reach the target pool size. If
we have remapped other complete copies, we can backfill and not be degraded
at all. And we may be some combination of the two if there are multiple
backfill targets; use the target(s) with the most objects.
Signed-off-by: Sage Weil <sage@redhat.com>
David Zafman [Mon, 16 Oct 2017 15:19:41 +0000 (08:19 -0700)]
osd: Re-organize _update_calc_stats() to make the code clearer
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Fri, 13 Oct 2017 23:04:01 +0000 (16:04 -0700)]
osd: Fix object_copies calculation so degraded is accurate
Fixes: http://tracker.ceph.com/issues/21803
Signed-off-by: David Zafman <dzafman@redhat.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Sage Weil [Tue, 10 Oct 2017 22:25:21 +0000 (17:25 -0500)]
Update .githubmap
Signed-off-by: Sage Weil <sage@redhat.com>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
Mykola Golub [Tue, 10 Oct 2017 15:00:52 +0000 (18:00 +0300)]
Merge pull request #18158 from dillaman/wip-21711
librbd: refresh image after applying new metadata
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
Kefu Chai [Tue, 10 Oct 2017 14:28:14 +0000 (22:28 +0800)]
ceph-kvstore-tool: use unique_ptr<> manage the lifecycle of bluestore and db
Signed-off-by: Kefu Chai <kchai@redhat.com>
myoungwon oh [Fri, 15 Sep 2017 13:30:23 +0000 (22:30 +0900)]
osd: generalize PGSrub, PGRecovery, PGSnapTrim
This commit will allow PGScrub, PGRecovery, PGSnapTrim
to be created anywhere (e.g. TestMClockClientQueue.cc)
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
myoungwon oh [Tue, 10 Oct 2017 14:16:26 +0000 (23:16 +0900)]
osd: use get_pgid() instead of info.pgid
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
myoungwon oh [Fri, 22 Sep 2017 07:10:01 +0000 (16:10 +0900)]
osd: use global id instead of entity_inst_t
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
Kefu Chai [Wed, 12 Jul 2017 07:19:13 +0000 (15:19 +0800)]
osd: move pgid into OpQueueItem
this pave the road to generalize OpWQ
We're going to want to be able to queue things that are not ordered by
the PG lock. To that end, this patch genearlizes OSD::ShardedOpWQ to
use a type which can specify an ordering token and locking structure
other than a PG.
There is a lot of collateral damage which I didn't feel was worth
separating out into other commits. The code in ShardedOpWQ itself got
some superficial cleanup. Also, the item being queued has been switched
to not use a boost::variant. It was a cute way before to make the type
easily copyable, but adding more visitors for the locking support would
have been annoying. Instead, the variant is a unique_ptr to an
interface. This makes the queue item type no longer copyable, which is
just as well since we don't really want to be copying queue items anyway
(duplicates would be most likely a bug)
Signed-off-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
Sage Weil [Tue, 10 Oct 2017 12:23:19 +0000 (07:23 -0500)]
osd/PG: fix clang build vs private state events
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Fri, 6 Oct 2017 19:03:34 +0000 (15:03 -0400)]
librbd: refresh image after applying new/removing old metadata
Fixes: http://tracker.ceph.com/issues/21711
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Tue, 10 Oct 2017 12:32:08 +0000 (20:32 +0800)]
mon/PGMap: let pg_string_state() return boost::optional<>
better to be specific, so we don't run into the same problem even we
are using the MSB of uint64_t for a pg state bit in future. we could,
however use uint64_t(-1) to indicate the pg_string_state()'s failure to
parse the state string, because pg_string_state() only translate a
single state a time. but it's always better to be explicit than
implicit.
Fixes: http://tracker.ceph.com/issues/21609
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 10 Oct 2017 12:40:24 +0000 (20:40 +0800)]
mon/PGMap: use uint64_t for pg state
Signed-off-by: Kefu Chai <kchai@redhat.com>
myoungwon oh [Fri, 15 Sep 2017 16:04:43 +0000 (01:04 +0900)]
src/test: fix move semantics
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
Kefu Chai [Wed, 12 Jul 2017 04:11:45 +0000 (12:11 +0800)]
common,osd: enforce move semantics in WorkQueue
enable the WorkQueue to support move-only template types.
Signed-off-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Myoungwon Oh <omwmw@sk.com>