Commit Graph

73899 Commits

Author SHA1 Message Date
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
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
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
Kefu Chai
c27ccf6939 cmake: use boost target instead of libary path while linking against them
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-14 11:17:41 +08:00
Matt Benjamin
2b4b718210 Merge pull request #14885 from rzarzynski/wip-rgw-auth-rework-cont-3-awsv4
rgw: continuation of the auth rework -- AWSv4
2017-06-13 17:16:20 -04:00
Greg Farnum
2096113d9e osd: heartbeat with packets large enough to require working jumbo frames.
We get periodic reports that users somehow misconfigure one of their switches
so that it drops jumbo frames, yet the servers are still passing them along. In
that case, MOSDOp messages generally don't get through because they are much
larger than the 1500-byte non-jumbo limit, but the MOSDPing messages have kept
going (as they are very small and dispatched independently, even when the
server is willing to make jumbo frames). This means peer OSDs won't mark down
the ones behind the broken switch, despite all IO hanging.
Push the MOSDPing message size over the 1500-byte limit so that anybody in
this scenario will see the OSDs stuck behind a bad switch get marked down.

Fixes: http://tracker.ceph.com/issues/20087

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-06-13 13:43:29 -07:00
Orit Wasserman
51b512a585 Merge pull request #14344 from rzarzynski/wip-rgw-repect-negative-refacls
rgw: respect Swift's negative, HTTP referer-based ACL grants.
2017-06-13 20:46:25 +03:00
Adam C. Emerson
6cad64afc3 Merge pull request #15586 from adamemerson/wip-ex-ML
rgw: Remove spurious XML header for GetBucketPolicy

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-06-13 12:54:02 -04:00
Adam C. Emerson
6eb78223e1 rgw: Remove spurious XML header for GetBucketPolicy
Fixes: http://tracker.ceph.com/issues/20247
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-06-13 11:37:42 -04:00
Radoslaw Zarzynski
7369880918 Merge pull request #15564 from Jing-Scott/fix-formpost-auth
rgw: fix the signature mismatch of FormPost in swift API

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-06-13 17:28:49 +02:00
Sage Weil
73c9df743e Merge pull request #15581 from neha-ojha/wip-fix-objclass
objclass-sdk: use namespace ceph for bufferlist

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-06-13 10:26:55 -05:00
Sage Weil
b431d3d7f0 Merge pull request #15595 from ztczll/zl
os/bluestore/BlueFS: .slow should be compared with dirname

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-13 10:26:34 -05:00
Yuri Weinstein
b37c4a2cf3 Merge pull request #15590 from Linbing/wip-osd-check-osdmap-twice
osd: the condition of last epoch <= superblock.newest_map epoch has been check twice

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-13 08:18:42 -07:00
Kefu Chai
e62f1feb76 Merge pull request #15661 from tchaikov/wip-qa-upgrade-set-sortbitwise
qa/suites/upgrade: set "sortbitwise" for jewel clusters

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-13 22:56:12 +08:00
Haomai Wang
99f580a395 msg/async: go to open new session when existing already closed
Fixes: http://tracker.ceph.com/issues/20230
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-06-13 22:44:06 +08:00