Sage Weil
6bedb4c35a
Merge pull request #15395 from liewegas/wip-log-entity
...
common/LogEntry: include EntityName in log entries
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-02 10:19:58 -05:00
Sage Weil
ecef6fd839
Merge pull request #15398 from liewegas/wip-bluestore-leak
...
os/bluestore: fix buffers pinned by indefinitely deferred writes
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-06-02 10:19:26 -05:00
Sage Weil
773a0ac2d3
Merge pull request #15402 from liewegas/wip-bluestore-mempools
...
os/bluestore: improve mempool usage
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-06-02 10:19:03 -05:00
Sage Weil
a35cd1cb35
Merge pull request #15403 from liewegas/wip-mempool-dump
...
mempool: improve dump; fix buffer accounting bugs
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-02 10:18:38 -05:00
Casey Bodley
a8a9969571
Merge pull request #15431 from rzarzynski/wip-rgw-vim-modeline-for-orhpantool
...
rgw: add the Vim's modeline into rgw_orphan.cc.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-02 10:05:17 -04:00
Kefu Chai
d5f178f0e5
Merge pull request #15425 from yaozongyou/fix-build-error
...
cmake: link against fcgi only if enabled
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-02 21:56:03 +08:00
Radoslaw Zarzynski
e342c39a57
rgw: add the Vim's modeline into rgw_orphan.cc.
...
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-06-02 14:05:39 +02:00
Kefu Chai
fda6e16cf1
vstart: print "start osd.$id" instead of "start osd$id"
...
"osd.9" is more consistent with other places where an osd is referenced.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-02 15:10:45 +08:00
Jos Collin
371f227f10
Merge pull request #15408 from yonghengdexin735/wip-zzz-add_const
...
include/lru.h: add const to member functions
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-06-02 11:11:58 +05:30
Yao Zongyou
3b7ecf37e9
Fix cmake build error.
...
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2017-06-02 12:11:59 +08:00
Sage Weil
17751bac69
Merge pull request #15420 from yuriw/wip_remove_default_idle_timeout
...
qa: Removed all 'default_idle_timeout' due to chnage in rwg task
2017-06-01 22:08:31 -05:00
Sage Weil
1244c0a501
Merge pull request #15397 from dzafman/wip-20089
...
osd: Object level shard errors are tracked and used if no auth available
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-01 21:40:29 -05:00
Sage Weil
ea5b054e65
qa/workunits/cephtool/test.sh: adjust watch test
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-01 22:22:24 -04:00
Sage Weil
6912c4f9ea
Merge pull request #15417 from smithfarm/wip-cond-epoch-2
...
build/ops: rpm: move _epoch_prefix below Epoch definition
2017-06-01 21:14:13 -05:00
yonghengdexin735
75c5c2b782
include/lru: add const to member function
...
Signed-off-by: yonghengdexin735 <zhang.zezhu@zte.com.cn>
2017-06-02 07:55:19 +08:00
Yuri Weinstein
02242ea48e
Removed all 'default_idle_timeout' due to chnage in rwg task
...
8c74c8a639 (diff-995b04809fcabacc3e3ecfaea903a41aL539)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2017-06-01 14:01:30 -07:00
Yehuda Sadeh
6594d972f2
qa/tasks/rgw_multisite.py: adjust zone init
...
zone is now a ZoneConn object. Also, change import to make it relative
so that qa task can locate it.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-06-01 13:32:00 -07:00
Nathan Cutler
3e30232607
build/ops: rpm: move _epoch_prefix below Epoch definition
...
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-01 21:37:09 +02:00
Sage Weil
b5da257b2a
Merge pull request #15400 from yehudasa/wip-20128
...
qa/rgw_snaps: move default_idle_timeout config under the client
2017-06-01 14:22:39 -05:00
David Zafman
1cacbea763
osd: Object level shard errors are tracked and used if no auth available
...
Shards with object mismatch are tracked to mark them inconsistent
Fix test because storing omap_digest in object_info not behaving as before
Fixes: http://tracker.ceph.com/issues/20089
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-06-01 10:46:48 -07:00
David Zafman
955deac56f
osd-scrub-repair: Fix broken test and correctly handle ec overwrite testing
...
Caused by: 3ca750d41d
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-06-01 10:09:29 -07:00
Sage Weil
8bcf3e5781
Merge pull request #15212 from neha-ojha/wip-fix-recovery-sleep-configurable
...
osd: Implement asynchronous recovery sleep
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-01 11:54:58 -05:00
Sage Weil
703055b0c0
Merge pull request #15262 from Adirl/revert_cm
...
msg/async: Revert RDMA-CM
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-06-01 11:54:33 -05:00
Sage Weil
703125eb34
Merge pull request #15307 from ovh/bp-64bit-mem-is-zero
...
inline_memory: optimized mem_is_zero for non-x64
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-01 11:54:19 -05:00
Sage Weil
268d5cdeba
Merge pull request #15340 from wjwithagen/wip-wjw-libcommon
...
cmake: do not link libcommon against some libs
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-01 11:53:54 -05:00
Sage Weil
f6220d1504
Merge pull request #15342 from chardan/jfw-wip-add_VLA_warning
...
build: Adds C++ warning flag for C Variable-Length Arrays.
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-01 11:53:32 -05:00
Sage Weil
aee60f2d92
Merge pull request #15364 from joscollin/wip-cleanup-putto-operator-const
...
src: put-to operator function - const input cleanup
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-01 11:52:57 -05:00
Sage Weil
d3887bfeda
Merge pull request #15372 from ganeshmaharaj/reuse-isal
...
erasure-code: Remove duplicate of isa-l files
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-06-01 11:52:40 -05:00
Sage Weil
4e160f20e4
os/bluestore: release aios and pinned buffers on io complete
...
Once we're done with our IO, clear the aio list so that the pinned buffers
are unpinned. This ensures we release memory quickly, even if the
TransContext sticks around for a while (e.g., in the osr q).
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-01 12:28:44 -04:00
Sage Weil
d82af301c8
os/bluestore: submit deferred if txc cleanup is blocked
...
If we have a single deferred write, and then a uniform workload with *no*
deferred writes, we will never actually submit it. Meanwhile, the txc is
stuck on the osr q and nothing ever gets retired.
Simple fix is to submit any deferred ops if the osr queue is blocked by
a queued deferred write and the osr queue length is above some
threshold. This prevents memory from being pinned indefinitely.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-01 12:28:43 -04:00
Sage Weil
aff9e37e83
Merge pull request #15209 from liewegas/wip-sortbitwise-notes
...
doc/release-notes: update which jewel version does sortbitwise warning
2017-06-01 11:26:06 -05:00
Sage Weil
ff2d625763
Merge pull request #15274 from liewegas/wip-auto-ccache
...
do_cmake.sh: enable ccache if installed
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-01 11:25:36 -05:00
Sage Weil
f251b07e5d
do_cmake.sh: enable ccache if installed
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-01 12:25:11 -04:00
Sage Weil
cc5aed2390
Merge pull request #15391 from liewegas/wip-authors
...
AUTHORS: update with release manager, backport team
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-06-01 10:15:30 -05:00
Loic Dachary
9c4aa772b9
Merge pull request #15410 from dachary/wip-19941-ceph-disk
...
ceph-disk: do not setup_statedir on trigger
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-01 16:31:38 +02:00
Kefu Chai
dd514aee2c
Merge pull request #15412 from dachary/wip-choose-args
...
crush: add missing tunable in tests
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-01 20:57:25 +08:00
Loic Dachary
82a703c950
crush: add missing tunable in tests
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2017-06-01 13:56:34 +02:00
Kefu Chai
92ebb7038e
Merge pull request #15286 from smithfarm/wip-cond-epoch
...
build/ops: rpm: apply epoch only if %epoch macro is defined
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-01 19:41:41 +08:00
John Spray
b267806249
Merge pull request #15240 from ukernel/wip-20055
...
osdc/Journaler: avoid executing on_safe contexts prematurely
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-01 11:33:51 +01:00
John Spray
284c96f0d6
Merge pull request #15282 from david-z/wip-fix-mantle
...
mds: Pass empty string to clear mantle balancer
Reviewed-by: John Spray <john.spray@redhat.com>
2017-06-01 11:28:46 +01:00
John Spray
607226bdec
Merge pull request #15314 from renhwztetecs/renhw-wip-client-cleanup
...
client: fix display ino in the ldout
Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-06-01 11:25:44 +01:00
John Spray
1d83d775fd
Merge pull request #15300 from ukernel/wip-20083
...
mds: properly create aux subtrees for pinned directory
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-06-01 11:24:09 +01:00
John Spray
78a17fb1a3
Merge pull request #15278 from viCEnTECheNg/wip-data-pools-type
...
mds: change the type of data_pools
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2017-06-01 11:23:33 +01:00
John Spray
01c46bf832
Merge pull request #15205 from batrick/i20039
...
mds: check export pin during replay
Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-06-01 11:23:02 +01:00
Loic Dachary
16bfbdd3d9
ceph-disk: do not setup_statedir on trigger
...
trigger may run when statedir is unavailable and does not use it.
Fixes: http://tracker.ceph.com/issues/19941
Signed-off-by: Loic Dachary <loic@dachary.org>
2017-06-01 11:37:20 +02:00
Kefu Chai
f7edefb80c
Merge pull request #15406 from tchaikov/wip-setuptools-vendors-six-or-not
...
install-deps.sh: workaround setuptools' dependency on six
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-06-01 15:17:15 +08:00
Kefu Chai
30ce5e5546
install-deps.sh: workaround setuptools' dependency on six
...
see also https://github.com/pypa/setuptools/issues/1042
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-01 14:52:44 +08:00
Sage Weil
e84a948514
os/bluestore: mempools for writing and writing_deferred
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 22:50:04 -04:00
Sage Weil
e40f19736b
os/bluestore: bluestore_txc mempool
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 22:45:11 -04:00
Sage Weil
bf790b6a93
os/bluestore: rename cache mempools to bluestore_cache_*
...
These map directly onto the bluestore_cache_size setting.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-31 22:43:17 -04:00