RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,865 Commits 216 Branches 394 Tags 1.8 GiB
3593233f35
Commit Graph

73865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Casey Bodley
9d7b477c70 Merge pull request #15613 from cbodley/wip-20244 
rgw: only log metadata on metadata master zone

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2017-06-13 10:37:27 -04:00
Casey Bodley
40d8bc7324 Merge pull request #15280 from ZVampirEM77/wip-bucket-policy-cleanup 
rgw: fix get bucket policy s3 compatible issue

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
 2017-06-13 10:27:47 -04:00
Kefu Chai
85293e7633 Merge pull request #15663 from zealoussnow/wip-fix-build 
cmake: exclude *.css while generating ctags

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-13 21:07:24 +08:00
Matt Benjamin
1031f90219 Merge pull request #15655 from guihecheng/rgw_file-fix-mkdir 
rgw_file: prevent conflict of mkdir between restarts
 2017-06-13 08:40:48 -04:00
Igor Fedotov
697dea6086 Merge pull request #15659 from lixiaoy1/fio_ceph 
test/fio: Fix assert in set_cache_shards in bluestore fio
 2017-06-13 16:24:50 +04:00
lisali
21fc54b11b Fix assert in set_cache_shards in bluestore fio 
The config osd_op_num_shards is changed so it needs to change in
fio_ceph_objectstore.cc.

Signed-off-by: Xiaoyan Li <xiaoyan.li@intel.com>
 2017-06-13 12:41:04 -04:00
Mykola Golub
b7d657d45e Merge pull request #15593 from chenfangxian/rbd-nbd-fix-unmap 
rbd-nbd: ensure unmap returns error code

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Pan Liu <wanjun.lp@alibaba-inc.com>
 2017-06-13 15:10:25 +03:00
Leo Zhang
3c1eb63cb9 doc: remove some non-existent and fix the default value according to source code 
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
 2017-06-13 19:57:07 +08:00
Leo Zhang
7681fd8e4a build: add css file to excludes while generate tags 
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
 2017-06-13 19:43:54 +08:00
Jing Wenjun
ce88212582 rgw: fix the signature mismatch of FormPost in swift API 
Fixes: http://tracker.ceph.com/issues/20220
Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
 2017-06-13 18:05:52 +08:00
Kefu Chai
b7f59b6437 qa/suites/upgrade: remove duplicated upgrade task 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-06-13 17:00:06 +08:00
Kefu Chai
3734280522 qa/suites/upgrade: set "sortbitwise" for jewel clusters 
so ceph.healthy or wait-for-healthy won't be blocked by this warning.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-06-13 17:00:00 +08:00
Gui Hecheng
87cec5ff9a rgw_file: prevent conflict of mkdir between restarts 
Fixes: http://tracker.ceph.com/issues/20275

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
 2017-06-13 15:28:37 +08:00
Gregory Farnum
52f0deb9a3 Merge pull request #15648 from joscollin/wip-CID1412575-incorrect-expression 
mon: Incorrect expression in PGMap::get_health()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2017-06-13 00:20:18 -04:00
Kefu Chai
3048d94ee3 Merge pull request #15638 from liewegas/wip-19948 
ceph_test_rados_api_*: wait for snap trim on ENOENT during cleanup

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-13 11:40:53 +08:00
chenfangxian
890adc605b rbd-nbd: fix nbd do_unmap error handling 
when nbd disconnect failed, ensure do_unmap return error logic.

Signed-off-by: chenfangxian <chenfangxian@cmss.chinamobile.com>
Signed-off-by: guojiannan <guojiannan@cmss.chinamobile.com>
 2017-06-13 11:05:51 +08:00
Sage Weil
aeb402988a Merge pull request #15519 from liewegas/wip-19595 
osd/PrimaryLogPG: clear oi from trim_object()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-12 22:01:05 -05:00
Jos Collin
7c2ab49cdf mon: Incorrect expression in PGMap::get_health() 
Fixes:

CID 1412575:  Incorrect expression  (COPY_PASTE_ERROR)
ceph/src/mon/PGMap.cc: 2764 in PGMap::get_health()
"num_err" in "ss2 << num_err" looks like a copy-paste error.

Signed-off-by: Jos Collin <jcollin@redhat.com>
 2017-06-13 08:24:23 +05:30
Haomai Wang
6d23ae59c1 Merge pull request #15629 from Linbing/wip-msg-async-op-threads 
msg/async: add assert of ms_async_op_threads > 0

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2017-06-13 10:26:35 +08:00
Yehuda Sadeh
7ad2ae27a4 Merge pull request #15426 from zhangsw/fix-rgw-gc-loglevel 
rgw: lower some log's level in gc process.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-12 13:07:43 -07:00
Casey Bodley
78c6e6e8d0 Merge pull request #15571 from ceph/wip-fix-fio-shard-hint 
test/fio: fix lack of setting for Sequencer::shard_hint

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-12 16:03:21 -04:00
Sage Weil
ad5a4363cc Merge pull request #15603 from idryomov/wip-rados-df-typo 
rados: fix typo in 'df' column name
 2017-06-12 14:13:21 -05:00
Sage Weil
c7f7500b88 Merge pull request #15615 from joscollin/wip-CID717210-Uninitialized-members 
common: initialize _hash in LogEntryKey()

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-06-12 14:12:40 -05:00
Sage Weil
04ab255175 Merge pull request #15627 from theanalyst/12.1.0/release-notes-2 
doc: 12.1.0/release notes 2
 2017-06-12 14:06:40 -05:00
Sage Weil
4302237637 ceph_test_rados_api_*: wait for snap trim on ENOENT during cleanup 
Assume that an ENOENT removing an object during cleanup means the
head is a whiteout because there are clones.  When that happens
just sleep for a bit and then retry in the hopes that snap
trimming has happened.

Time out (and fail) after retrying for 10 minutes' worth of tries.

Fixes: http://tracker.ceph.com/issues/19948
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-12 14:57:22 -04:00
Sage Weil
cd1271b432 osd/PrimaryLogPG: clear oi from trim_object() 
trim_object() is unique in that its resulting OpContxtUPtr is fed to
simple_opc_submit() but does not first pass through finish_ctx().  Almost
none of what finish_ctx is helpful for us because we are the only place
where we delete a clone, and for that reason it is not terribly useful to
put what we do into finish_ctx.  However, *one* thing that finish_ctx()
does do that we don't (didn't) is clear out the object_info_t io on
delete.  This would leave things like version with a value that would
bleed into future instantiations of the object and break things like
the prior_version in pg_log_entry_t's and, much later, break asserts
when loading the missing set off of disk.

Fix by clearing oi.

Fixes: http://tracker.ceph.com/issues/19947
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-12 14:05:41 -04:00
Sage Weil
b98fad9b1c Merge pull request #15604 from liewegas/wip-rest-test-qa 
qa/suites/rados/rest: test restful mgr module

Reviewed-by: Boris Ranto <branto@redhat.com>
 2017-06-12 12:47:32 -05:00
Sage Weil
be88220965 qa/suites/rados/rest/mgr-restful: test on centos 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-12 13:46:58 -04:00