RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,535 Commits 219 Branches 396 Tags 1.3 GiB
0c4063d6b7
Commit Graph

55535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
59ddf4d619 include/assert: define ceph_assert[f]_always 
These variants we promise never to compile out based on NDEBUG.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-28 16:13:46 -04:00
Sage Weil
ae9991054f include/assert: define ceph_assert[f] that mirror assert[f] 
We will transition to these.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-28 16:13:46 -04:00
Sage Weil
bc1ca22a3f include/assert: drop some dead code 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-28 16:13:46 -04:00
Sage Weil
23d6438f12 include/assert: define ceph_abort_msg(cct, msg) 
Abort with an error string.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-28 16:13:46 -04:00
Sage Weil
8b4aef679c include/assert: ceph_abort should call abort(), not assert(0) 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-28 16:13:46 -04:00
Michal Jarzabek
027035de74 msg/AsyncMessenger: move C_processor_accept class 
Move C_processor_accept class to cc file.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-06-28 20:46:57 +01:00
Jason Dillaman
995a16ebcb test: ensure unique template specializations per test case 
With optimizations disabled, there can be cross translation unit
symbol leaking that is not present when inlining is enabled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 15:18:51 -04:00
Jason Dillaman
187e2c87b5 test: missing template specialization for unittest_rbd_mirror 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 14:59:17 -04:00
Jason Dillaman
8db54c6733 cmake: add missing cls object dependencies 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 14:58:43 -04:00
Ali Maredia
864d1b3e97 Merge pull request #9975 from ceph/wip-cmake 
cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
 2016-06-28 14:46:26 -04:00
Dan Mick
d136f7b452 Merge pull request #9986 from liewegas/wip-make-dist 
make-dist: generate ceph.spec

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-06-28 11:43:10 -07:00
Mykola Golub
af03b8d020 Merge pull request #9964 from dillaman/wip-16491 
rbd-mirror: 'wait_for_scheduled_deletion' callback might deadlock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-06-28 21:11:18 +03:00
Sage Weil
8528aea8cf v11.0.0 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-28 11:43:46 -04:00
Sage Weil
b1ca522c6e make-dist: generate ceph.spec 
Fixes: http://tracker.ceph.com/issues/16501
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-06-28 11:40:37 -04:00
Casey Bodley
b31c899ecb Merge pull request #9889 from Yan-waller/yj-wip-rgwbucketcc 
rgw: add string describing for error number

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-28 11:17:55 -04:00
Casey Bodley
785203e142 Merge pull request #9888 from weiqiaomiao/wqm-wip-clean-swiftapi 
rgw: duplicate check for acl op in RGWHandler_REST_Bucket_SWIFT::op_get()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-28 11:17:33 -04:00
Casey Bodley
20a3a4a5ff Merge pull request #9854 from Yan-waller/yj-wip-rgwunlinkbucket 
rgw: remove unused bufferlist variable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-28 11:17:13 -04:00
Casey Bodley
acfefbe3af Merge pull request #9822 from Yan-waller/yj-wiph-rgwfixinitwatch 
rgw: fix the missing return value of init_watch

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-28 11:16:50 -04:00
Casey Bodley
196ed89c25 Merge pull request #9808 from Yan-waller/yj-wip-rgwtoolsinitreturn 
rgw: add error return code checking for rgw_tools_init and rgw_perf_start

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-28 11:16:23 -04:00
Casey Bodley
42567901c9 Merge pull request #9796 from Yan-waller/yj-wip-rgwremoveuser 
rgw: miscellaneous cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-28 11:16:00 -04:00
Casey Bodley
e10c1ed215 Merge pull request #9780 from theanalyst/rgw/create-bucket-cleanup 
rgw_bucket: remove unused bufferlist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-06-28 11:15:14 -04:00
Kefu Chai
e220295d4f Merge pull request #9987 from jcsp/wip-cmake-fortify-source 
cmake: fix FORTIFY_SOURCE check

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-06-28 22:58:56 +08:00
John Spray
004c8d1f2f cmake: fix FORTIFY_SOURCE check 
This got broken in 6f3e3cf6.  The -Werror part wasn't
having the desired effect, so we were enabling FORTIFY_SOURCE
even when in -O0

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-06-28 15:54:13 +01:00
Haomai Wang
f6c73e9f4c msg/async/AsyncMessenger: make sure all connections closed then shutdown dq 
1. ensure stop accepter before shutdown dispatcherqueue
2. ensure we don't generate new item after dispatcher queue shutdown

Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-06-28 22:29:59 +08:00
Haomai Wang
70cc0704c2 msg/async: keep out_seq inc/dec with sent messages 
Partial revert 84b9088e16
Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-06-28 22:29:59 +08:00
Haomai Wang
fba59af260 msg/async/AsyncConnection: handle send buffer overflow case 
It's rare happen in real env, because each socket has enough write buffer
to store a little handshake info.

Just harden the current codes

Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-06-28 22:29:59 +08:00
Haomai Wang
f97d0d2ccb msg/async: Consolidate accept error handle 
The original logic is from
ba140b5a6d
I think it doesn't make sense in detail errno case.

Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-06-28 22:29:59 +08:00
Haomai Wang
5a20a6a2d5 msg/async/Epoll: make sure error event can be handle 
Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-06-28 22:29:59 +08:00
Loic Dachary
3e1a85d5df Merge pull request #9984 from tchaikov/wip-fix-test_crush_bucket.sh 
test/test_crush_bucket.sh: source detect-build-env-vars.sh for settin…

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-06-28 16:25:29 +02:00
Sage Weil
c84f7b1f84 Merge pull request #9771 from yuyuyu101/wip-async-priority 
msg/async: set socket priority for heartbeat socket

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-06-28 10:21:37 -04:00
Yan Jun
9ae514caaa rgw: use string::npos while 'string::find()' find nothing 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-06-28 22:03:59 +08:00
Tim Serong
3cf6c534ff cmake: Add FCGI_INCLUDE_DIR to include_directories for rgw 
rgw_fcgi.{cc,h} includes either "fastcgi/fcgiapp.h" or "fcgiapp.h",
depending on whether FASTCGI_INCLUDE_DIR is set.  That define is set by
autotools, but cmake builds work a little differently -- in the cmake
case, FCGI_INCLUDE_DIR is set by Findfcgi.cmake, provided it can find
the fastcgi headers *somewhere*.  This means the cmake build breaks on
SUSE distros (and presumably others) which use "fastcgi/fcgiapp.h",
because FASTCGI_INCLUDE_DIR isn't set, so it tries to include
"fcgiapp.h", and fails.

This change adds FCGI_INCLUDE_DIR to the include directories, and tries
to #include <fcgiapp.h> if FASTCGI_INCLUDE_DIR is not set, which should
work for both cmake and autotools builds.

(It would probably be cleanest to fix autotools to behave like cmake,
then the #ifdef/#else stuff can be dropped, and we could just always
include <fcgiapp.h>)

Signed-off-by: Tim Serong <tserong@suse.com>
 2016-06-28 23:21:17 +10:00
Jason Dillaman
45498d0499 qa/workunits/rbd: remove temporary image exports 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 09:08:47 -04:00
Jason Dillaman
3e224c6c03 rbd-mirror: fix potential image replayer state transition race 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 09:08:47 -04:00
Jason Dillaman
c3f1cb3a34 rbd-mirror: cancel image deletion callback on shut down 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 09:08:47 -04:00
Jason Dillaman
9d1cd90c22 rbd-mirror: fixed potential leaking image deletion context callback 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 09:08:47 -04:00
Jason Dillaman
7e5afc71df rbd-mirror: ImageReplayer doesn't need image deleted callback 
The Replayer will detect that the ImageReplayer is stopped and will
schedule the "wait for deleted" callback before attempting to
restart the ImageReplayer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 09:08:47 -04:00
Jason Dillaman
c136f44336 rbd-mirror: use async callback when deletion not in-progress 
Fixes: http://tracker.ceph.com/issues/16491
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 09:08:47 -04:00
Mykola Golub
396b58cb55 Merge pull request #9958 from dillaman/wip-16489 
rbd-mirror: clean up ImageReplayer before stopping state machine

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-06-28 16:02:41 +03:00
Mykola Golub
4f6d153c13 Merge pull request #9923 from dillaman/wip-16471 
librbd: removal of partially deleted image needs id lookup

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-06-28 16:01:39 +03:00
Kefu Chai
707d2da7bf test/test_crush_bucket.sh: source detect-build-env-vars.sh for settings paths 
this fixes errors like

../qa/workunits/ceph-helpers.sh:354: run_mon:  ceph-mon --id a
--mon-osd-full-ratio=.99 --mon-data-avail-crit=1
--paxos-propose-interval=0.1 --osd-crush-chooseleaf-type=0
--erasure-code-dir= --plugin-dir= --debug-mon 20 --debug-ms 20
--debug-paxos 20 --chdir= --mon-data=testdir/testcrushbucket/a
'--log-file=testdir/testcrushbucket/$name.log'
'--admin-socket=testdir/testcrushbucket/$cluster-$name.asok'
--mon-cluster-log-file=testdir/testcrushbucket/log
--run-dir=testdir/testcrushbucket
'--pid-file=testdir/testcrushbucket/$name.pid'
2016-06-28 11:24:24.105884 2b1bbd3d0380 -1 load
dlopen(/libec_jerasure.so): /libec_jerasure.so: cannot open shared
object file: No such file or directory
../qa/workunits/ceph-helpers.sh:371: run_mon:  return 1

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-06-28 20:55:15 +08:00
Jason Dillaman
2066ad818f Merge pull request #9539 from cxwshawn/wip-tc9-fix 
librbd: optimize header file dependency and modify related files

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 08:20:10 -04:00
Jason Dillaman
921e03cf41 Merge pull request #9500 from zhuangzeqiang/wip-16056 
librbd: restrict mirror enable/disable actions on parents/clones

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 08:19:28 -04:00
Jason Dillaman
af3c8e14f7 Merge pull request #9623 from rjfd/wip-15239 
rbd-mirror: Throttle in-flight image syncs to only a N concurrent

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 08:18:48 -04:00
Jason Dillaman
89eb5635b5 Merge pull request #9856 from hzhang-wx/master 
librbd: discard should return error if length too large

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 08:18:14 -04:00
Ricardo Dias
8ca9a84f36
rbd-mirror: tests: ImageSyncThrottler unit tests 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2016-06-28 13:17:29 +01:00
Ricardo Dias
6a91146255
rbd-mirror: Usage of image-sync throttler in BootstrapRequest 
Fixes: http://tracker.ceph.com/issues/15239

Signed-off-by: Ricardo Dias <rdias@suse.com>
 2016-06-28 13:17:29 +01:00
Ricardo Dias
c4f926d698
rbd-mirror: Implementation of image-sync throttler 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2016-06-28 13:17:29 +01:00
Jason Dillaman
bf42fe79e1 Merge pull request #9699 from rjfd/wip-15108 
rbd-mirror:  Update the sync point object number during sync

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-06-28 08:14:41 -04:00
Yan Jun
7cd3cd38e5 rgw: return from init_complete directly 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-06-28 16:39:56 +08:00