Commit Graph

73993 Commits

Author SHA1 Message Date
Jason Dillaman
ba220e4179 Merge pull request #15561 from zy751713126/add-create-rbd-default-info
rbd: add default note info to size (create and resize)

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-06-16 09:02:02 -04:00
Jason Dillaman
7edc62d3f1 Merge pull request #15611 from tchaikov/wip-20175
test/librbd: decouple ceph_test_librbd_api from libceph-common

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-06-16 09:01:10 -04:00
Kefu Chai
84d57eb007 Merge pull request #15622 from joscollin/wip-CID1412576-divide-by-zero
mon: DIVIDE_BY_ZERO in PGMapDigest::dump_pool_stats_full()

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-16 10:04:30 +08:00
Kefu Chai
0202d5f978 Merge pull request #15596 from smithfarm/wip-copying
build/ops: rpm: package COPYING, move sample ceph.conf to ceph-common

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-16 10:03:16 +08:00
Kefu Chai
3a714e848b Merge pull request #15668 from Liuchang0812/wip-fix-mgr-dashboard
mgr/dashboard: fix type error in get_rate function

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-16 10:01:34 +08:00
Kefu Chai
765b10b5e2 Merge pull request #15650 from gmayyyha/filestore-zfs
os/filestore: zfs add get_name()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-16 10:00:02 +08:00
Kefu Chai
791856d1b7 Merge pull request #15680 from xiexingguo/wip-bluestore-20170614
os/bluestore: cleanup bluestore_types

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-16 09:59:25 +08:00
Kefu Chai
25576bb524 Merge pull request #15704 from tchaikov/wip-mgr-raise-in-send-command
mgr: raise python exception on failure in send_command()

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-16 09:57:51 +08:00
Sage Weil
9f574bc826 Merge pull request #15654 from lixiaoy1/lisa_bid
bluestore: wrap blob id when it reaches maximum value of int16_t

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-15 16:35:26 -05:00
Sage Weil
b64305bd8c Merge pull request #15666 from xiexingguo/wip-fix-shard-finishers
os/bluestore: initialize finishers properly

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-15 16:34:35 -05:00
Sage Weil
078e910eff Merge pull request #15675 from gregsfortytwo/wip-bad-command
mon,mgr: fix "ceph osd df", add some tools to find untested commands

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-15 16:34:10 -05:00
Sage Weil
f05c965ee6 Merge pull request #15687 from xiexingguo/wip-fix-decode-oi
osd/OSD: bump up current version; conditionally encoding manifest into oi

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-15 16:33:52 -05:00
Sage Weil
38b34a7835 Merge pull request #15696 from liewegas/wip-19947
osd/PrimaryLogPG: fix oi reset during trim_object
2017-06-15 16:33:09 -05:00
John Spray
0f2130ece5 Merge pull request #15407 from david-z/wip-fix-mds-balancer
mds/MDBalancer: remove useless check_targets and hit_targets logic from MDS balancer

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-06-15 14:23:25 -04:00
Josh Durgin
c15effaccb Merge pull request #15095 from gregsfortytwo/wip-doc-mark-event
doc: describe mark_events logging available via the OSD's OpTracker

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-15 14:01:09 -04:00
Matt Benjamin
ff0903d04b Merge pull request #15698 from Wilhelmshaven/remove_unused_func
rgw: remove unused func in rgw_file.h
2017-06-15 13:24:07 -04:00
Sage Weil
8c3d7be548 Merge pull request #15707 from tchaikov/wip-20239
doc: document the setup of restful and dashboard plugins
2017-06-15 11:43:19 -05:00
John Spray
20c31b3e81 Merge pull request #15125 from ukernel/wip-multimds-misc2
mds: miscellaneous multimds fixes part2

Reviewed-by: John Spray <john.spray@redhat.com>
2017-06-15 12:07:59 -04:00
John Spray
3d9a0a577b Merge pull request #15440 from ukernel/wip-20170
mds: multimds flock fixes

Reviewed-by: John Spray <john.spray@redhat.com>
2017-06-15 12:06:35 -04:00
John Spray
18fbf24c7a Merge pull request #15308 from jcsp/wip-19706
mon: don't kill MDSs unless some beacons are getting through

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-06-15 10:50:44 -04:00
John Spray
4a1fe14bc6 Merge pull request #15411 from jcsp/wip-fs-suite
qa: misc cephfs test improvements

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-06-15 10:50:07 -04:00
Sage Weil
f2b8aab18d Merge pull request #15708 from markhpc/wip-bluestore-shard_target
os/bluestore: target_bytes should scale with meta/data ratios.

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-15 09:46:08 -05:00
Casey Bodley
967ceae2c8 Merge pull request #15082 from joke-lee/fix-website-redirect-request-to-master
rgw-multisite: fix the problem of rgw website configure request not redirect to metadata master

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-15 10:15:06 -04:00
Casey Bodley
4b33603079 Merge pull request #15617 from joke-lee/fix_put_bucket_policy_when_set_again
rgw: fix RGWPutBucketPolicy error when set BucketPolicy again without delete pre set Policy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-06-15 10:13:48 -04:00
Sage Weil
1dfd31bdac osd/PrimaryLogPG: fix oi reset during trim_object
We partially fixed this in cd1271b432
but cleared the wrong oi (the clone's and not the
snap/head object's).

While we're here, drop the various bits where we clear
state bits; these are about to get clobbered when we reset
oi anyway.

Fixes: http://tracker.ceph.com/issues/19947
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-15 10:01:50 -04:00
Sage Weil
8658ae10f4 Merge pull request #15631 from xiexingguo/wip-bluestore-20170612
os/bluestore: stop calculating bound if we must reshard; narrow shard combination condition

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-15 09:00:03 -05:00
Sage Weil
b18302dd18 Merge pull request #15636 from tsg-/isal-ec-avx512
erasure-code: update ec_isa version + add missing AVX512 ISA-L sources
2017-06-15 08:59:43 -05:00
Sage Weil
d17dbaf6c5 Merge pull request #15639 from liewegas/wip-20167
osd/PG: make non-empty PastIntervals non-fatal

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-15 08:59:14 -05:00
Sage Weil
9943df8711 Merge pull request #15641 from jecluis/wip-mon-deprecate-osd-create
mon: mark `osd create` as deprecated

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-15 08:58:50 -05:00
Mark Nelson
50e07f0dab os/Bluestore: target_bytes should scale with meta/data ratios.
Signed-off-by: Mark Nelson <mnelson@redhat.com>
2017-06-15 08:23:23 -05:00
Nathan Cutler
9164804416 build/ops: rpm: package COPYING, move conf example to ceph-common
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-15 13:30:52 +02:00
Nathan Cutler
c43bbd8df0 build/ops: drop sample.fetch_config
smithfarm: @liewegas Is src/fetch_config still needed?
liewegas: i don't think so

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-15 13:30:49 +02:00
Kefu Chai
774a856ec2 doc: document the setup of restful and dashboard plugins
Fixes: http://tracker.ceph.com/issues/20239
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 19:13:30 +08:00
xie xingguo
fb34a4b3d0 os/bluestore: add sanity check when appending pextents of blob
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-15 17:11:23 +08:00
xie xingguo
697347672f os/bluestore: dedup is_allocated() and is_unallocated() of bluestore_blob_t
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-15 17:11:23 +08:00
Kefu Chai
3ddbfcd435 Merge pull request #15646 from tchaikov/wip-20258
pybind/mgr/restful: use list to pass hooks to create a `Pecan` instance

Reviewed-by: Boris Ranto <branto@redhat.com>
2017-06-15 16:12:04 +08:00
Kefu Chai
10a383c805 mon/OSDMonitor: more assert()
this helps with silencing the clang analyzer also.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 16:10:51 +08:00
Kefu Chai
a1c9f69c64 mgr: raise python exception on failure in send_command()
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 15:49:44 +08:00
Kefu Chai
9673f95f8d pybind/mgr/restful: return 400 on bad request
we should return 500 on that case. it's the client's fault not feeding us
with expected requests.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 15:09:27 +08:00
Orit Wasserman
5daf94ce72 Merge pull request #15694 from cbodley/wip-qa-rgw-thrash-encryption
qa/rgw: add encryption config for s3tests under thrash
2017-06-15 09:32:45 +03:00
Brad Hubbard
15a9b59cc6 Merge pull request #15684 from badone/wip-refactor-of-osdmap-methods
osd/OSDMap: Change *pg_to_* to return void

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-15 12:58:17 +10:00
Kefu Chai
954f1930c8 Merge pull request #15692 from joscollin/wip-test-mon-Wreorder-warning
test/mon: silence warnings from -Wreorder

Reviewed By: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-15 10:52:11 +08:00
lihongjie
fc9a8ebfe9 rgw: remove unused func in rgw_file.h
Signed-off-by: lihongjie <lihongjie@cmss.chinamobile.com>
2017-06-15 10:50:32 +08:00
Kefu Chai
3ebb9c12b8 Revert "qa/suites/rados/rest/mgr-restful: test on centos"
This reverts commit be88220965.
we can workaround the limit of old requests by using the backward
compatible way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 10:25:05 +08:00
Kefu Chai
8a44b680dd qa/workunits/rest/test_mgr_rest_api.py: set headers for requests
i think it's a bug in httplib shipped in old distro.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 10:13:14 +08:00
Kefu Chai
3f007d935c pybind/mgr/restful: use list to pass hooks to create a Pecan instance
pecan 0.3.2 introduced the new way to pass the hooks to construct a
Pecan instance, but the "callable" builder for hooks is not compatible
with pecan < 0.3.2. and ubuntu trusty ships pecan 0.3.0, so we need to
do this the old way: pass a list of hooks instead of a callable.

see https://github.com/pecan/pecan/blame/0.3.2/pecan/core.py and
fb2cf166aa

Fixes: http://tracker.ceph.com/issues/20258
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-15 10:11:01 +08:00
Jos Collin
3593233f35 test/mon: silence warnings from -Wreorder
The following warning appears during make:

ceph/src/test/mon/test-mon-msg.cc: In constructor ‘MonMsgTest::MonMsgTest()’:
ceph/src/test/mon/test-mon-msg.cc:222:12: warning: ‘MonMsgTest::reply_msg’ will be initialized after [-Wreorder]
   Message *reply_msg;
            ^~~~~~~~~
ceph/src/test/mon/test-mon-msg.cc:229:16: warning:   base ‘MonClientHelper’ [-Wreorder]
     lock("lock") { }
                ^
ceph/src/test/mon/test-mon-msg.cc:226:3: warning:   when initialized here [-Wreorder]
   MonMsgTest() :

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-06-15 06:28:50 +05:30
xie xingguo
a7b277ed07 os/bluestore: kill dead fall_back_to_per_au() method
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-15 08:53:36 +08:00
xie xingguo
61524b7a9e osd/OSD: bump up current version of encoding; conditionally encoding manifest into oi
These versions shall match the corresponding encoding versions.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-06-15 08:35:38 +08:00
Greg Farnum
010e45d7d0 qa: test 'osd df' in cephtool/test.sh
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-06-14 17:02:50 -07:00