Commit Graph

56588 Commits

Author SHA1 Message Date
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
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
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
Yuri Weinstein
23e731807c Merge pull request #9259 from xiexingguo/xxg-wip-fix-monclientpinger
mon: MonClient may hang on pinging an unresponsive monitor

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:12:29 -07:00
Casey Bodley
e0e25dd99d Merge pull request #10593 from linuxbox2/ldap-bindv3-again
rgw ldap: enforce simple_bind w/LDAPv3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-05 11:11:36 -04:00
Yuri Weinstein
4075f98da1 Merge pull request #9718 from songbaisen/a8
mon: clear list in better way

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:09:58 -07:00
Yuri Weinstein
6a1f5a294a Merge pull request #10392 from stiopaa1/mon_monclient_moveCCancelMonCommand
mon/MonClient: move C_CancelMonCommand to cc file

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-05 08:09:07 -07:00
Yuri Weinstein
8fd699c5c5 Merge pull request #10470 from xiexingguo/xxg-wip-osd-2016-07-28
osd: minor performance improvements

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-05 08:08:19 -07:00
John Spray
e688f5f80e Merge pull request #10539 from jcsp/wip-mds-counters
mds: add perf counters for MDLog replay and SessionMap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-08-05 15:55:56 +01:00
Matt Benjamin
08d5429143 rgw ldap: enforce simple_bind w/LDAPv3
Found by Harald Klein <hklein@redhat.com>.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-05 10:38:39 -04:00
Michel Normand
a8db0f4d96 ExclusiveArch for suse_version
for SLES supports only x86_64 and aarch64 targets
for openSUSE (Tumbleweed and Leap) add ppc64/ppc64le targets.

fixes: http://tracker.ceph.com/issues/16936
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
2016-08-05 16:34:48 +02:00
Jason Dillaman
8865846f27 Merge pull request #10542 from ktdreyer/doc-rbd-libvirt-logging
doc: describe libvirt client logging

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-05 09:52:06 -04:00
Jason Dillaman
efa5f730cc Merge pull request #10488 from lande1234/wip-lan-testing
rbd-mirror: add additional test scenarios

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-05 09:20:37 -04:00
John Spray
4a648d2d4a Merge pull request #10573 from renhwztetecs/renhw-wip-doc-cephfs
doc/mds: fixup mds doc

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-05 12:26:21 +01:00
John Spray
9d84634d9a mds: add perf counter for rate of replay
Useful for watching the progress of a daemon
in standby-replay or replay.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-08-05 12:22:53 +01:00
John Spray
6e34969b8f mds: expose perf counters for SessionMap
So that we can see how many sessions exist via
the counters rather than only by looking at status.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-08-05 12:22:53 +01:00
John Spray
8aeec4cf0d Merge pull request #10512 from renhwztetecs/renhw-wip-mds-balancer
mds/MDBalancer: cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-05 12:01:12 +01:00
John Spray
019f1cf519 Merge pull request #10485 from gregsfortytwo/wip-client-dump-complete
client: include COMPLETE and ORDERED states in cache dump

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-05 12:00:05 +01:00
John Spray
4dcae90ed2 Merge pull request #10533 from gregsfortytwo/wip-mds-dispatch-refcount
mds: fix up _dispatch ref-counting semantics

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-05 11:59:21 +01:00
John Spray
f6d6bc7cc1 Merge pull request #10540 from jcsp/wip-mds-multimds-standby
mds: fix daemon selection when starting ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-08-05 11:58:32 +01:00
Yan Jun
d1caad6789 rgw: remove unused variables
remove the unused bufferlist variables

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2016-08-05 16:50:20 +08:00
Jason Dillaman
4de7c8d0a7 librbd: prevent creation of v2 image ids that are too large
The librbd API is capped at 24 characters for expressing the
object prefix for data blocks (including trailing null byte).

Fixes: http://tracker.ceph.com/issues/16887
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-04 20:56:36 -04:00
Robin H. Johnson
921c556b65
rgw: Fix civetweb IPv6
Commit c38e3cbb6f7c6221209f2b512cba18c564c895a4 introduced a second
compiled version of src/civetweb/src/civetweb.c, but did not pass the
configuration header (civetweb/include/civetweb_conf.h).

As a result, USE_IPV6 was not defined when it was compiled, and that
copy was included into the radosgw binary. This caused breakage for the
civetweb frontend when used with IPv6:
  rgw frontends = civetweb port=[::]:7480

Reintroduce the header so that civetweb is compiled correctly again.

Fixes: http://tracker.ceph.com/issues/16928
Backport: jewel
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-08-04 17:15:18 -07:00