RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,632 Commits 212 Branches 394 Tags 1.5 GiB
aef59d5538
Commit Graph

56632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Casey Bodley
aef59d5538 Merge pull request #10232 from weiqiaomiao/wqm-wip-rgw-cleanbl 
rgw:clean unuse bufferlist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-09 09:43:28 -04:00
Mykola Golub
67b86b8c77 Merge pull request #10613 from dillaman/wip-16956 
rbd-mirror: potential assertion failure during error-induced shutdown

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-08-09 16:18:49 +03:00
John Spray
b6d6fdfd01 Merge pull request #10622 from xiexingguo/xxg-wip-kill-cephfs-warn 
libcephfs: kill compiling warning

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-08-09 12:13:16 +01:00
Nathan Cutler
1ab77924df Merge pull request #9744 from SUSE/wip-16345 
rpm: fix shared library devel package names and dependencies

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
 2016-08-09 11:18:24 +02:00
Kefu Chai
2c7ec0730e Merge pull request #10612 from tchaikov/wip-16955 
test/ceph_test_msgr: fix circular locking dependency

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-08-09 17:08:44 +08:00
Kefu Chai
ad2c64fc28 Merge pull request #10620 from dachary/wip-16961-subman 
subman: use replace instead of format

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-08-09 16:50:26 +08:00
xie xingguo
954a999e22 libcephfs: kill compiling warning 
As below:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/cephfs/libcephfs.h:1499:20: warning: ‘struct flock’ declared inside parameter list [enabled by default]
     Fh *fh, struct flock *fl, uint64_t owner);
                    ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/cephfs/libcephfs.h:1499:20: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/cephfs/libcephfs.h:1501:20: warning: ‘struct flock’ declared inside parameter list [enabled by default]
     Fh *fh, struct flock *fl, uint64_t owner, int sleep);

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-08-09 16:34:21 +08:00
Loic Dachary
b006c13676 subman: use replace instead of format 
Otherwise all {} are assumed to be substituted. Add a test.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2016-08-09 10:20:05 +02:00
Kefu Chai
a9a5bbe0b1 Merge pull request #10454 from SUSE/wip-quick-start 
doc: add openSUSE instructions to quick-start-preflight

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-08-09 11:22:21 +08:00
weiqiaomiao
0a6e8486a9 rgw:clean unuse bufferlist 
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
 2016-08-09 08:44:26 +08:00
Yuri Weinstein
aa5ef1dc1a Merge pull request #10526 from xiexingguo/xxg-wip-misc-2016-07-30 
osd: minor performance improvements and fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-08-08 16:25:07 -07:00
Yuri Weinstein
94b5837b59 Merge pull request #10548 from xiexingguo/xxg-wip-osd-2016-08-02 
osd: more cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-08-08 16:24:16 -07:00
Yuri Weinstein
9efb0187ed Merge pull request #10559 from xiexingguo/xxg-wip-osd-2016-08-03 
osd: drop unused variables/methods

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-08-08 16:23:46 -07:00
Nathan Cutler
d566b96ed1 doc: add openSUSE instructions to quick-start-preflight 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-08-08 22:59:40 +02:00
Casey Bodley
28d5af49ca Merge pull request #10212 from rzarzynski/wip-rgw-cleanup-auth 
rgw: clean-up in the authentication infrastructure

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 15:32:31 -04:00
Casey Bodley
0fd8ad868c Merge pull request #10233 from weiqiaomiao/wqm-wip-ver_check 
rgw: fix wrong  variable definition in cls_version_check func

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 15:30:22 -04:00
Nathan Cutler
aadc9ae139 Merge pull request #10594 from michelmno/forpull2 
rpm: ExclusiveArch for suse_version

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
 2016-08-08 20:56:10 +02:00
Casey Bodley
f51f33b6cf Merge pull request #10122 from Yan-waller/yj-wiph-rgwradoscc-0704 
rgw: fix the missing return value

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:51:28 -04:00
Casey Bodley
b6efcebb6e Merge pull request #10194 from Yan-waller/yj-wip-rgwrados-0708 
rgw: remove unused bufferlist variable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:46:27 -04:00
Casey Bodley
29ff40ecd3 Merge pull request #10203 from Yan-waller/yj-wip-rgwcache-0708 
rgw: merge setting flags operation together and cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:45:48 -04:00
Casey Bodley
3ab63045df Merge pull request #10214 from theanalyst/rgw/multisite-fwd-log-cleanup 
rgw: drop create_bucket in fwd_request log message

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:42:32 -04:00
Casey Bodley
a11a93191c Merge pull request #10226 from Yan-waller/yj-wip-rgwrests3-0709 
rgw: use the standard usage of string.find

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:41:39 -04:00
Jason Dillaman
6a465d9dad rbd-mirror: potential assertion failure during error-induced shutdown 
Fixes: http://tracker.ceph.com/issues/16956
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-08-08 14:41:00 -04:00
Casey Bodley
39629678ec Merge pull request #10299 from Yan-waller/yj-wiph-rgwmetadata-0715 
rgw: miscellaneous cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:35:48 -04:00
Casey Bodley
0e0c38da7e Merge pull request #10408 from weiqiaomiao/wqm-wip-rgw-lc-set 
rgw: fix wrong variable definition in rgw_cls_lc_set_entry function

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:34:25 -04:00
Casey Bodley
7a7dad82a2 Merge pull request #10562 from aclamk/wip-rgw-s3-keystone-cache-mutex 
rgw: Got rid of recursive mutex.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:26:29 -04:00
Casey Bodley
5d7486dc34 Merge pull request #10424 from theanalyst/rgw/mp-complete-error-msg 
rgw: log mp upload failures due to parts mismatch

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:25:20 -04:00
Casey Bodley
9852b0c502 Merge pull request #10475 from yonghengdexin735/wip-zzz-rgw 
rgw/rgw_main: fix unnecessary variables defined

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:14:35 -04:00
Casey Bodley
d565e8904e Merge pull request #10589 from Yan-waller/yj-wip-rgwcls-0805 
rgw: remove unused variables

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 14:08:37 -04:00
Casey Bodley
491d0ce5a2 Merge pull request #10611 from linuxbox2/rgw-nfs-28 
Rgw nfs 28

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-08-08 13:56:27 -04:00
Kefu Chai
a9a89e59bc test/ceph_test_msgr: better looking log 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-08-09 00:12:11 +08:00
Kefu Chai
7d7f9b300b test/ceph_test_msgr: fix a mem leak 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-08-09 00:12:11 +08:00
Kefu Chai
cf1801c260 test/ceph_test_msgr: fix circular locking dependency 
* do not acquire lock when sending message
* remove lock in session
* reduce the scope guarded by locks for better performance.

Fixes: http://tracker.ceph.com/issues/16955
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-08-09 00:12:11 +08:00
Matt Benjamin
b4d079f2b5 rgw nfs: fix write continuations 
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-08-08 11:11:51 -04:00
Matt Benjamin
d74d46170d rgw nfs: don't leak fh->mtx in lookup_handle() 
This change fixes a serious latent locking problem, noticed after
updating the ganesha/rgw driver invalidation after renames.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-08-08 11:11:35 -04:00
Matt Benjamin
297220fd2a rgw file: refuse to rename directories 
The representation of paths as an aggregate involving any
number of objects argues against ever permitting such
operations.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-08-08 10:18:35 -04:00
Matt Benjamin
34224ecd83 rgw_file: refuse ops on deleted targets 
Detect these illegal cases, as they are indicate various incorrect
behaviors/bugs.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-08-08 10:17:13 -04:00
Kefu Chai
3d00b3558c Merge pull request #10598 from dillaman/wip-16882 
cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-08-08 12:01:49 +08:00
John Spray
df32a8b4a9 Merge pull request #9566 from ffilz/master 
Add ceph_ll_setlk and ceph_ll_getlk

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-08-07 15:49:20 +01:00
John Spray
d9948bbdb7 Merge pull request #10452 from jcsp/wip-16556 
test: break out librados-using cephfs test
 2016-08-07 15:48:49 +01:00
Mykola Golub
89a37496e7 Merge pull request #10574 from dillaman/wip-16923 
librbd: delay acquiring lock if image watch has failed

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-08-07 13:33:45 +03:00
Mykola Golub
8f8b92f3a1 Merge pull request #10581 from dillaman/wip-16887 
librbd: prevent creation of v2 image ids that are too large

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-08-07 13:33:01 +03:00
Jason Dillaman
aa679df487 cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage 
This now matches the autotools configuration and fixes the failed
assertion during test execution.

Fixes: http://tracker.ceph.com/issues/16882
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-08-05 15:34:00 -04:00
Matt Benjamin
41af3bb45e Merge pull request #10579 from dreamhost/wip-16928 
rgw: Fix civetweb IPv6

verified:  autobuild
 2016-08-05 15:26:57 -04:00
Matt Benjamin
b84046b936 Merge pull request #10597 from pritha-srivastava/wip_ldap_fix 
rgw: Fix for incorrect access key id in reworked ldap auth code.

verified non-regression (MS AD)
 2016-08-05 15:02:55 -04:00
Pritha Srivastava
c7dae89016 rgw: Fix for incorrect access key id reworked ldap auth code. 
The reworked ldap code does not use the correct access key id in get_policy.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
 2016-08-05 22:47:07 +05:30
Jason Dillaman
b0b1a8b438 Merge pull request #10595 from tchaikov/wip-rocksdb 
rocksdb: revert the change introduced by dc41731

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-08-05 11:41:00 -04:00
Kefu Chai
1e1f65e032 rocksdb: revert the change introduced by dc41731 
dc41731 reverts the submodule reference of rocksdb, and point it to an
older version which fails to support ppc64le and AArch64.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-08-05 23:33:58 +08:00
Yuri Weinstein
8175ce07b8 Merge pull request #10262 from dachary/wip-16580-ceph-disk-timeout 
ceph-disk: timeout ceph-disk to avoid blocking forever

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Ken Dreyer (Red Hat) <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
 2016-08-05 08:22:39 -07:00
Yuri Weinstein
bb7424e860 Merge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28 
osd/OSDMonitor: misc. fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-08-05 08:14:02 -07:00