Yehuda Sadeh
a5afab1086
Merge pull request #14842 from cbodley/wip-rgw-admin-suite
...
qa/rgw: fix assertions in radosgw_admin task
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-28 09:39:59 -07:00
Sage Weil
d0b2e606f7
Merge pull request #14826 from tchaikov/wip-prime-pg-temp
...
mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-04-28 11:27:22 -05:00
Sage Weil
e1065fed07
Merge pull request #14818 from tchaikov/wip-rocksdb
...
rocksdb: sync with upstream
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-28 11:26:54 -05:00
Yuri Weinstein
ebdce966de
Merge pull request #14817 from TsaiJin/wip-set-boolean-variable-with-boolean-value
...
osd: ReplicatedBackend::prep_push() remove redundant variable assignments
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-28 08:38:06 -07:00
Yuri Weinstein
75c1818f1e
Merge pull request #14835 from tchaikov/wip-19743
...
mgr: do shutdown using finisher so we can do it in the right order
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 08:34:19 -07:00
Yuri Weinstein
5f6db0e81a
Merge pull request #14838 from liewegas/wip-mgr-dirs
...
debian/ceph-base.dirs: create bootstrap-mgr dirs
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-04-28 08:32:52 -07:00
Kefu Chai
7b676f4f0f
Merge pull request #14384 from hrchu/radosgw-admin-key
...
doc: rgw: Rewrite the key management
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-28 23:32:16 +08:00
Mykola Golub
59a48daec3
Merge pull request #14848 from dillaman/wip-19798
...
test: remove hard-coded image name from RBD metadata test
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-04-28 17:26:39 +03:00
Sage Weil
a07cacb9e3
Merge pull request #13315 from dang/wip-build-no-nss
...
cmake: Allow tests to build without NSS
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-28 08:47:46 -05:00
Sage Weil
bce9c53144
Merge pull request #14367 from mslovy/wip-fix-infinitloops
...
os/filestore: fix infinit loops in fiemap()
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 08:47:05 -05:00
Sage Weil
e9fb6a06e0
Merge pull request #14391 from LiumxNL/wip-170407
...
mon/PGMonitor: fix wrongly report "pg stuck in inactive"
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 08:46:47 -05:00
Sage Weil
2944c48d3f
Merge pull request #14675 from ifed01/wip-bluestore-nolock
...
os/bluestore: eliminate some excessive stuff
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-28 08:46:23 -05:00
Sage Weil
0530a24bb6
Merge pull request #14475 from liewegas/wip-message-compat-cruft
...
messages: remove compat cruft
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-28 08:30:19 -05:00
Igor Fedotov
6b457d168b
os/bluestore: move TransContext finalization out of osr_lock to avoid potential contention.
...
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2017-04-28 04:30:25 -07:00
Igor Fedotov
ad9d87c87a
os/bluestore: get rid off Onode::flush_txn set.
...
It looks like flushing_count counter is enough.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2017-04-28 04:29:52 -07:00
Kefu Chai
1d642f248b
Merge pull request #14840 from drunkard/master
...
doc: style fix for doc/cephfs/client-config-ref.rst
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-28 10:57:53 +08:00
Drunkard Zhang
ab0310883e
doc: typo fixes in doc/cephfs/client-config-ref.rst
...
fixed:
Reference symbol, i.e. s/`/``/
Hyperlink typo at ``client_trace``
Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
2017-04-28 09:53:17 +08:00
Sage Weil
ebabb5fe77
Merge pull request #14302 from liewegas/wip-19452
...
osdc/Objecter: handle command target that goes down
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-04-27 20:02:38 -05:00
Kefu Chai
e15fda3e84
Merge pull request #14850 from tchaikov/wip-cmake
...
cmake: add "container" to required boost components
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-28 08:57:58 +08:00
Brad Hubbard
01625a91b5
Merge pull request #14794 from joscollin/wip-warning-simplespin
...
test: fixing assert that creates warning: comparison between signed and unsigned integer expressions
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-28 10:22:39 +10:00
Casey Bodley
88b6a142bc
qa/rgw: fix assertions in radosgw_admin task
...
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-27 19:38:10 -04:00
Kefu Chai
b32f1813bb
cmake: add "container" to required boost components
...
it is used by our denc
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-28 05:09:08 +08:00
Sage Weil
a001e0bfa4
Merge pull request #14843 from wjwithagen/wip-wjw-fix-pipe
...
src/msg/simple/Pipe.cc: Fix the inclusion of '}'
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-27 15:51:25 -05:00
Jason Dillaman
8f72e745e1
test: remove hard-coded image name from RBD metadata test
...
Fixes: http://tracker.ceph.com/issues/19798
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 16:24:02 -04:00
Willem Jan Withagen
cdc067e06c
src/msg/simple/Pipe.cc: Fix the inclusion of '}'
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-04-27 20:53:49 +02:00
Jason Dillaman
b67c5c7aa4
Merge pull request #14754 from trociny/wip-19128
...
rbd: import needs to sanity check auto-generated image name
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 14:40:51 -04:00
Yehuda Sadeh
f929d4f798
Merge pull request #14592 from prallabh/wip-manifest
...
rgw: custom user data header
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-27 11:25:00 -07:00
Casey Bodley
bac49f33ce
Merge pull request #14816 from cbodley/wip-rgw-test-multi-list-fix
...
test/rgw: fix for empty lists as default arguments
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-27 13:38:15 -04:00
Sage Weil
9fa79ba205
Merge pull request #14473 from ShiqiCooperation/master
...
os/bluestore: assert blob map returns success
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 12:33:06 -05:00
Sage Weil
930d2151c6
Merge pull request #14491 from liewegas/wip-bluestore-deferred-rewrite
...
os/bluestore: rewrite deferred write handling
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-04-27 12:32:52 -05:00
Sage Weil
05bb3b5360
Merge pull request #14695 from dachary/wip-choosleaf-stable
...
crush: builder: legacy has chooseleaf_stable = 0
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 12:32:31 -05:00
Sage Weil
528c6e067a
Merge pull request #14696 from dachary/wip-crush-workspace
...
crush: crush_init_workspace starts with struct crush_work
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 12:32:21 -05:00
Sage Weil
559a7a83ee
Merge pull request #14814 from neha-ojha/wip-osd-filestore-default
...
osd: switch filestore to default to rocksdb
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 12:32:09 -05:00
Kefu Chai
8fb1af0aba
Merge pull request #14795 from tchaikov/wip-so-priority-cleanup
...
msg/async: return right away in NetHandler::set_priority() if not supported
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-04-28 00:48:23 +08:00
Sage Weil
40699a61b2
Merge pull request #14802 from tchaikov/wip-mgr-cleanup
...
mgr: various cleanups
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 11:43:32 -05:00
Sage Weil
add2015fe3
Merge pull request #14807 from liewegas/wip-jewel-x
...
ceph_test_rados_api_tier: tolerate ENOENT from 'pg scrub'
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-27 11:43:12 -05:00
Yuri Weinstein
b9d9eb9933
Merge pull request #14717 from liewegas/wip-bluestore-remove-max-ops
...
os/bluestore: rename/fix throttle options
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-04-27 09:35:09 -07:00
Sage Weil
16e22eb998
Merge pull request #14819 from tchaikov/wip-objecter-more-constness
...
osdc/Objecter: more constness
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 11:26:45 -05:00
Yuri Weinstein
a00005cee1
Merge pull request #14773 from viva64/sizeof_pointer
...
src/msg/async/AsyncConnect.cc: Use of sizeof() on a Pointer Type
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-04-27 09:22:01 -07:00
Yuri Weinstein
e3ba7b99c7
Merge pull request #14782 from yuyuyu101/wip-rdma-perf
...
msg/async/rdma: add inqueue rx chunks perf counter
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 09:19:35 -07:00
Yuri Weinstein
1a02455e4d
Merge pull request #14797 from wjwithagen/wip-wjw-freebsd-config-path
...
common/config: Add /usr/local/etc/ceph to default paths
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 09:15:56 -07:00
Yuri Weinstein
8f0b77d4fa
Merge pull request #14801 from tchaikov/wip-crypto-cleanup
...
crypto: cleanup NSPR in main thread
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 09:15:25 -07:00
Yuri Weinstein
482eb4a38b
Merge pull request #14805 from tchaikov/wip-mon-check-get
...
mon/OSDMonitor: check get()'s return value instead of bl's length
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 09:13:30 -07:00
Jason Dillaman
46119d15b3
Merge pull request #14836 from idryomov/wip-krbd-wac-tests
...
qa: krbd write-after-checksum tests
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 11:42:55 -04:00
Yehuda Sadeh
4db11779a8
Merge pull request #14803 from hrchu/rgwadmin-api-doc-usage-conf
...
doc: rgw: note rgw_enable_usage_log option in adminops guide
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-27 08:42:09 -07:00
Sage Weil
25f500725a
debian/ceph-base.dirs: create bootstrap-mgr dirs
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-27 10:49:55 -04:00
Sage Weil
7d28d0c86e
Merge pull request #14824 from renhwztetecs/renhw-wip-mgr-bootstrap
...
mgr: mkdir bootstrap-mgr
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-27 09:46:57 -05:00
Ilya Dryomov
7c8a7f52da
qa: krbd write-after-checksum tests
...
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-04-27 16:28:08 +02:00
Kefu Chai
145acbe976
mgr: do shutdown using finisher so we can do it in the right order
...
otherwise we can shutdown a PyModules while it still being init'ed
Fixes: http://tracker.ceph.com/issues/19743
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-27 22:16:41 +08:00
Willem Jan Withagen
bcc644593c
common/config_opts.h: Allow for /usr/local/etc/ceph to hold keyrings
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-04-27 15:58:36 +02:00