RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,920 Commits 216 Branches 395 Tags 1.4 GiB
967ceae2c8
Commit Graph

73920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
yuliyang
04a5f2445b rgw-multisite: fix the problem of rgw website configure request not redirect to metadata master 
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
 2017-06-15 07:19:35 +08:00
Casey Bodley
72e7d1a1e7 qa/rgw: add encryption config for s3tests under thrash 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2017-06-14 16:23:35 -04:00
Yuri Weinstein
3ace41f8d2 Merge pull request #15381 from xiexingguo/wip-noout-osdlist 
mon/OSDMonitor: batch OSDs nodown/noout support

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
 2017-06-14 13:11:58 -07:00
Yuri Weinstein
5ad4ee86f5 Merge pull request #15535 from gregsfortytwo/wip-jumbo-ping 
osd: heartbeat with packets large enough to require working jumbo frames

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-14 13:10:05 -07:00
Yuri Weinstein
6006aff269 Merge pull request #15645 from yuyuyu101/wip-20230 
msg/async: fix deleted_conn is out of sync with conns


Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Alexey Sheplyakov <asheplyakov@mirantis.com>
 2017-06-14 13:07:43 -07:00
Kefu Chai
1e1b108bb6 Merge pull request #15376 from tchaikov/wip-remove-boost-submodule 
cmake: build boost as an external project

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-15 00:40:28 +08:00
Radoslaw Zarzynski
04f9789e9d Merge pull request #15269 from theanalyst/rgw/env-fix 
rgw: make RGWEnv return a const ref. to its map

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2017-06-14 18:11:18 +02:00
Kefu Chai
6a9212035e Merge pull request #15690 from jcsp/wip-mgr-doc 
doc: freshen mgr docs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-14 23:57:32 +08:00
Kefu Chai
db253676fe cmake: do not link libmon with mon_common_objs 
ceph-common includes them already.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-06-14 23:53:50 +08:00
Kefu Chai
ddeb43840f cmake: move common/util.cc into ceph-common 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-06-14 23:53:50 +08:00
Kefu Chai
d104236187 cmake: do not include Monitor.cc in osd 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-06-14 23:53:50 +08:00
Kefu Chai
edd41a7015 common: #include <atomic> in headers where atomic<> is used 
so these headers are self-contained.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-06-14 23:53:50 +08:00
Kefu Chai
1b96dada33 cmake: include boost before default system directory 
so ceph will prefer the local boost installation to the one in system if
any.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-06-14 23:53:50 +08:00
Kefu Chai
83432b4461 cmake: build boost as an external project 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-06-14 23:53:50 +08:00
Adam C. Emerson
4b4ec58e88 Merge pull request #15607 from joke-lee/fix_bucket_policy_IfExists 
rgw: fix rgw bucket policy IfExists position

Reviewed By: Adam C. Emerson <aemerson@redhat.com>
 2017-06-14 11:25:52 -04:00
Casey Bodley
1905d40146 Merge pull request #15686 from mikulely/drop-header-ended 
rgw: drop unused var header_ended

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-14 11:14:28 -04:00
John Spray
1cfeff3661 doc/mgr: update for mgr_beacon_period change 
This setting got renamed.

Signed-off-by: John Spray <john.spray@redhat.com>
 2017-06-14 10:04:22 -04:00
John Spray
fc990666d5 doc/mgr: flesh out introductory text 
Signed-off-by: John Spray <john.spray@redhat.com>
 2017-06-14 09:54:27 -04:00
John Spray
b61f0c0b31 doc/mgr: fix auth keys instruction 
This was out of date.

Signed-off-by: John Spray <john.spray@redhat.com>
 2017-06-14 09:54:26 -04:00
John Spray
fc8b8000b0 doc/install: reference mgr manual setup 
Signed-off-by: John Spray <john.spray@redhat.com>
 2017-06-14 09:54:26 -04:00
Orit Wasserman
b4e75a3990 Merge pull request #15688 from rzarzynski/wip-rgw-fix-auth-for-clang 
rgw: don't use strlen in constexprs to not brake Clang builds.
Reviewed-by : Orit Wasserman <owasserm@redhat.com>
 2017-06-14 16:04:32 +03:00
Abhishek Lekshmanan
1afcc3866c rgw: make RGWEnv return a const ref. to its map 
We already have a public method `set` for setting values in the RGW env
map, making the map as a read only. In addition:

- Added const to other  methods in `RGWEnv` which are getters
- `req_info::init_meta` also reused the same `iter` name for an internal
  find, changed the var name
- `add_grants_headers` now accepts an RGWEnv instead of the map
- use range based for loops wherever the code was changed
- req_info holds a ptr to a const RGWEnv, since we seem to only read the
  values from it

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2017-06-14 14:27:05 +02:00
Nathan Cutler
85b0b8a15d Merge pull request #15399 from smithfarm/wip-20127 
build/ops: miscellaneous cleanups and fixes (run-make-check.sh, ceph.spec.in)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
 2017-06-14 13:33:26 +02:00
Radoslaw Zarzynski
44ac4a895b rgw: don't use strlen in constexprs to not brake Clang builds. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2017-06-14 12:20:54 +02:00
Nathan Cutler
5cd2aa214d build/ops: rpm: one License line to rule them all 
The SUSE and Fedora packaging guidelines specify that subpackages _may_ have
their own License line if it is necessary. (Hopefully it's not, because
maintaining one License line is much easier.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2017-06-14 12:15:47 +02:00
Nathan Cutler
0f2f7d60a2 build/ops: rpm, COPYING: drop GPL 2.0 with Autoconf Exception 
This license is no longer used.

Fixes: http://tracker.ceph.com/issues/20091
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2017-06-14 12:15:47 +02:00
Nathan Cutler
084678de77 build/ops: rpm: Enable ppc64le and s390x builds in SLE 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2017-06-14 12:15:47 +02:00
Nathan Cutler
e889eb07e1 build/ops: rpm: ceph.spec.in: drop redundant defattrs 
The defattr(-,root,root,-) has been the default for a long time.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2017-06-14 12:15:47 +02:00
Nathan Cutler
38ee2a34d0 build/ops: rpm: add which as a build dependency, unconditionally 
Although "which" is only used in the tests, we need the dependency
to be picked up by install-deps.sh.

This is a stopgap measure until we can get rid of the dependency entirely by
replacing "which" with "type -P" in the tests.

Fixes: http://tracker.ceph.com/issues/20127
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2017-06-14 12:15:47 +02:00
Nathan Cutler
ec01d242cb build/ops: make sure which is installed in run-make-check.sh 
Fixes: http://tracker.ceph.com/issues/20127
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2017-06-14 12:15:47 +02:00
Xie Xingguo
be31dfac3b Merge pull request #15664 from zealoussnow/wip-fix-doc 
doc: remove some non-existent and fix the default value according to …

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-06-14 18:07:50 +08:00
Xie Xingguo
bd821ec257 Merge pull request #15681 from zealoussnow/wip-option-comment-error 
common: fix typo in option of rados_mon_op_timeout's comment

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-14 18:06:05 +08:00
Jiaying Ren
d73d57427e rgw: drop unused var header_ended 
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
 2017-06-14 17:54:06 +08:00
Brad Hubbard
5511309fe9 osd: Change *pg_to_* to return void 
Returning the number of items in the vector is not required and can be
calculated since the caller has access to the vector.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
 2017-06-14 18:40:35 +10:00
Leo Zhang
7e1dd4faab common: fix option "rados_mon_op_timeout" comment spell error 
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
 2017-06-14 15:55:03 +08:00