Commit Graph

71633 Commits

Author SHA1 Message Date
lu.shasha
4348ac1579 rgw: drop unused param "bucket" from select_bucket_placement
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
2017-04-28 08:41:37 +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
954f123350 mon/OSDMonitor: use emplace() to avoid creating temporary elements
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-28 06:25:49 +08:00
Kefu Chai
963b8d8617 mon/OSDMonitor: do not alter the "created" epoch of a pg
Fixes: http://tracker.ceph.com/issues/19787
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-28 06:25:49 +08:00
J. Eric Ivancich
d6b04e3db3 Add a README to explain some of the nature of git subtrees and some of
the pitfalls surrounding them.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-04-27 18:18:39 -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
Jason Dillaman
cbe469f3c9 rbd-mirror: provide image status updates without remotes
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 15:54:13 -04:00
Jason Dillaman
68a10a3b8b rbd-mirror: new state machine for preparing local image
This state machine will be invoked before the bootstrap state machine
and will be responsible for detecting if the local image is already
primary or if it needs to be deleted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 15:54:13 -04:00
Jason Dillaman
c7aa9a818b librbd: remove duplicative journal helper functions
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 15:54:13 -04:00
Jason Dillaman
717af7caa9 rbd-mirror: forward initial pool image deletions to instance
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 15:54:13 -04:00
Jason Dillaman
2cfe02452b rbd-mirror: deletions should be scheduled using global ids
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 15:54:12 -04:00
Jason Dillaman
0a8788d364 rbd-mirror: pass pool watcher image ids by rvalue
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 15:54:12 -04:00
Jason Dillaman
b51db2655b qa/workunits/rbd: increased trash deferment period
Teuthology would periodically fail due to a delay >10 seconds
between moving the item to the trash and checking its status.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 15:27:50 -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
Casey Bodley
a31aa6f65c qa/rgw: add cluster name to path when s3tests scans rgw log
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-27 14:48:40 -04: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
Jing Wenjun
9aee3c1c22 rgw: add support container and object levels of swift bulkupload
Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
2017-04-27 22:56:51 +08: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
Sage Weil
dd174148ef qa/suites/upgrade/kraken-x/stress-split: updates
Bring this in line with jewel-x (which now passes).

Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-27 10:07:44 -04: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
Sage Weil
92d8e19660 Merge pull request #14831 from smithfarm/wip-stress-split
tests: fix broken links in upgrade/hammer-jewel-x/stress-split
2017-04-27 08:43:30 -05:00
Kefu Chai
c891d63bbd rocksdb: sync with upstream
to avoid warning with glibc 2.25, see
https://github.com/facebook/rocksdb/pull/2208 and
https://github.com/ceph/rocksdb/pull/17

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-27 20:53:59 +08:00
Nathan Cutler
5b51dee035 build/ops: cmake: explicitly disable MSSE 4.2 if not supported
This became necessary when upstream unconditionally enabled MSSE 4.2
via https://github.com/facebook/rocksdb/commit/bc397325

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-27 20:53:58 +08:00
Jason Dillaman
edc88b132b Merge pull request #14751 from trociny/wip-19716
test/librbd/test_notify.py: don't disable feature in slave

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-27 08:25:01 -04:00
Nathan Cutler
7c973b0968 tests: fix broken links in upgrade/hammer-jewel-x/stress-split
Fixes: http://tracker.ceph.com/issues/19793
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-04-27 14:03:04 +02:00