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
50,990 Commits 212 Branches 394 Tags 1.5 GiB
740b95051b
Commit Graph

50990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Dillaman
740b95051b librbd: handle unregistering the image watcher when disconnected 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-14 12:15:46 -04:00
Sage Weil
af0e063576 Merge pull request #7870 from stiopaa1/blueStoreRemoveIncludes 
osd: bluestore: remove unneeded includes

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-14 09:59:52 -04:00
Sage Weil
376936a426 Merge pull request #7871 from xiexingguo/xxg-wip-cleanasync 
msg: async: small cleanups

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-03-14 08:27:47 -04:00
Kefu Chai
0d6d340087 Merge pull request #7170 from trociny/wip-freebsd-misc 
FreeBSD related fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-14 17:38:05 +08:00
Kefu Chai
10990bd6a1 Merge pull request #7947 from saru95/patch---2 
ceph.in: Minor python3 specific changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-14 17:36:25 +08:00
Kefu Chai
f9a1f05bed Merge pull request #7974 from tchaikov/wip-buffer-eq-neq 
buffer: add symmetry operator==() and operator!=()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-14 17:35:05 +08:00
Loic Dachary
e530ade4d4 Merge pull request #8074 from tchaikov/wip-ceph-detect-init-test 
ceph-detect-init: add debian/jessie test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-03-13 16:40:49 +07:00
Kefu Chai
7c62ddf523 ceph-detect-init: return None at seeing unknown debian distro 
* return None at seeing unknown debian distros
* add test for this accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-03-13 15:09:11 +08:00
Haomai Wang
1d685bbbc7 Merge pull request #8046 from xiexingguo/xxg-wip-fixpc 
msg: async: fix perf counter description and simplify _send_keepalive_or_ack

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-03-13 12:19:57 +08:00
Haomai Wang
497cde4067 Merge pull request #7949 from wjin/fix 
Event: fix clock skew problem

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-03-13 12:15:53 +08:00
Yehuda Sadeh
206699670e Merge pull request #8076 from ceph/wip-rgw-ldap 
Wip rgw ldap

This follows a revert of the previous PR. This branch has some build related fixes.
 2016-03-12 20:10:02 -08:00
Yehuda Sadeh
a014ad92fd Merge pull request #8075 from ceph/revert-7985-rgw-token-7 
Revert "rgw ldap"

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-12 20:07:52 -08:00
Yehuda Sadeh
52ccf75cff Revert "rgw ldap" 2016-03-12 20:07:04 -08:00
Yehuda Sadeh
e4e9c2c021 Merge pull request #8066 from yehudasa/wip-rgw-swift-versioning-disabled 
Wip rgw swift versioning disabled

Reviewed-by: Josh Durgin <joshd@redhat.com>
 2016-03-12 18:02:50 -08:00
Yehuda Sadeh
e5c11f1854 Merge pull request #7985 from linuxbox2/rgw-token-7 
rgw ldap (Matt Benjamin)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-12 18:02:06 -08:00
Yehuda Sadeh
5077d729cb Merge remote-tracking branch 'origin/master' into wip-rgw-ldap 2016-03-12 15:17:03 -08:00
Yehuda Sadeh
40e92c02c5 test: disable test_rgw_ldap 
for now

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-12 15:16:54 -08:00
Yehuda Sadeh
e93778c367 rgw/Makefile.am: add a missing .h file 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-12 13:02:58 -08:00
Matt Benjamin
46a34790cb rgw_ldap: merge cleanups 
* match LDAPHelper op return codes to RGW (-POSIX)
* make temporary LDAP handle local (MT-safe)
* add required --encode and --ttype to usage
* use versioned encoding macros

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-03-12 13:02:58 -08:00
Matt Benjamin
de8367bc27 rgw: require openldap library client headers 
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-03-12 13:02:58 -08:00
Matt Benjamin
a0a8dcc26c rgw: free components on shutdown 
Also, use ldout in rgw_file.h in 3 places.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-03-12 13:02:58 -08:00
Matt Benjamin
38fd3f190a rgw: LDAP pass-through authentication 
Implement a new external authenticator based on LDAP and the
new external token format.

External LDAP auth now works, at least with openldap/X.500 style
naming and ldaps:// (SSL).

The latter is AD-friendly, but since AD uses dnattr=cn (IIRC)
everywhere, AD will need testing.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-03-12 09:57:12 -08:00
Sage Weil
41cf56062b Merge remote-tracking branch 'gh/jewel' 2016-03-12 09:03:06 -05:00
Sage Weil
37605d0eba Merge branch 'wip-15086' of git://github.com/SUSE/ceph 
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-12 09:02:49 -05:00
Josh Durgin
750701b644 Merge pull request #8068 from SUSE/wip-15104 
qa/workunits/rbd: use POSIX function definition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-11 17:48:43 -08:00
Josh Durgin
93863e7e22 Merge pull request #7663 from javacruft/wip-pybind-flags 
pybind: Ensure correct python flags are passed

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-11 17:40:40 -08:00
Josh Durgin
a7f7339df7 Merge pull request #7856 from jdurgin/wip-cython-cleanup 
configure.ac: update help strings for cython

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
 2016-03-11 17:35:11 -08:00
Josh Durgin
4a7212257f Merge remote-tracking branch 'origin/wip-josh-testing' 2016-03-11 17:20:47 -08:00
Gregory Farnum
3c1d464fd5 Merge pull request #8067 from athanatos/wip-fix-filestore-warning 
FileStore: fix initialization order for m_disable_wbthrottle

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-11 17:06:07 -08:00
Nathan Cutler
996be8ef49 qa/workunits/rbd: use POSIX function definition 
In scripts with /bin/sh shebang, we must use POSIX function definitions to
avoid syntax errors on platforms that link /bin/sh to something other than
/bin/bash.

See https://wiki.ubuntu.com/DashAsBinSh#function for more information.

http://tracker.ceph.com/issues/15104 Fixes: #15104

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-12 02:03:27 +01:00
Yehuda Sadeh
861676357e rgw: disable swift versioning by default 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-11 16:20:44 -08:00
Radoslaw Zarzynski
06c7716077 rgw: improve naming of Swift versioned object's copies. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2016-03-11 16:20:44 -08:00
Radoslaw Zarzynski
da9120aa79 rgw: dump X-Versions-Location HTTP header of Swift API. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2016-03-11 16:20:44 -08:00
Yehuda Sadeh
54ea09c362 rgw: copy swift versioned object to destination if overwritten 
Only allow if target bucket owner is the source bucket owner.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-11 16:20:44 -08:00
Yehuda Sadeh
2ae6d54f10 rgw: swift object versioning data structure changes 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-11 16:20:44 -08:00
Ken Dreyer
c5b00be0e7 Merge pull request #8034 from SUSE/wip-15047 
packaging: make infernalis -> jewel upgrade work

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
 2016-03-11 16:58:35 -07:00
Nathan Cutler
a230a3839d debian: make infernalis -> jewel upgrade work 
Attempts to install jewel ceph-common, ceph-mon, ceph-osd, and ceph-base
package over infernalis ceph package fail due to files existing in both.

See comment #4 in the tracker issue for a deeper analysis.

http://tracker.ceph.com/issues/15047 Fixes: #15047

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-12 00:22:07 +01:00
Samuel Just
ba4badf491 FileStore: fix initialization order for m_disable_wbthrottle 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-03-11 15:16:37 -08:00
Nathan Cutler
81b9928f38 ceph-detect-init: return systemd on Debian Jessie 
http://tracker.ceph.com/issues/15086 Fixes: #15086

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-11 23:55:52 +01:00
Sage Weil
4c97aac89d Revert "test/time: no need to abs(uint64_t) for comparing" 
This reverts commit da0f6608dd.

unittest_time fails:

[==========] Running 4 tests from 2 test cases.
[----------] Global test environment set-up.
[----------] 2 tests from RealClock
[ RUN      ] RealClock.Sanity
[       OK ] RealClock.Sanity (0 ms)
[ RUN      ] RealClock.Conversions
test/common/test_time.cc:125: Failure
Expected: ((Clock::from_double(bd) - brt).count()) < (30U), actual: 18446744073709551595 vs 30
[  FAILED  ] RealClock.Conversions (0 ms)
[----------] 2 tests from RealClock (0 ms total)

[----------] 2 tests from CoarseRealClock
[ RUN      ] CoarseRealClock.Sanity
[       OK ] CoarseRealClock.Sanity (0 ms)
[ RUN      ] CoarseRealClock.Conversions
test/common/test_time.cc:125: Failure
Expected: ((Clock::from_double(bd) - brt).count()) < (30U), actual: 18446744073709551595 vs 30
[  FAILED  ] CoarseRealClock.Conversions (0 ms)
[----------] 2 tests from CoarseRealClock (0 ms total)

[----------] Global test environment tear-down
[==========] 4 tests from 2 test cases ran. (0 ms total)
[  PASSED  ] 2 tests.
[  FAILED  ] 2 tests, listed below:
[  FAILED  ] RealClock.Conversions
[  FAILED  ] CoarseRealClock.Conversions

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-11 17:42:27 -05:00
Gregory Farnum
ff3b456946 Merge pull request #8063 from gregsfortytwo/wip-fix-fsmap-decode 
Wip fix fsmap decode

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-11 14:29:30 -08:00
Samuel Just
1cf29067e0 Merge pull request #7752 from somnathr/wip-odsync-write 
FileStore: Added O_DSYNC write scheme

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-11 13:47:38 -08:00
Greg Farnum
2cc736c39e FSMap: actually include the legacy MDSMap in Filesystems when upgrading 
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-11 13:41:48 -08:00
Greg Farnum
a83989d0a4 FSMap: decode old MDSMaps properly 
We accidentally left a few members out that the MDSMap had!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-11 13:36:51 -08:00
Yehuda Sadeh
23487e05e0 Merge pull request #8058 from yehudasa/wip-rgw-clean-log 
cleanup

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-03-11 12:47:04 -08:00
Matt Benjamin
78dc1b3dc4 rgw_ldap: merge cleanups 
* match LDAPHelper op return codes to RGW (-POSIX)
* make temporary LDAP handle local (MT-safe)
* add required --encode and --ttype to usage
* use versioned encoding macros

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-03-11 14:37:29 -05:00
Yehuda Sadeh
1d18a63794 rgw: silence compilation warnings 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-11 11:28:06 -08:00
Orit Wasserman
a0c816be0a rgw: cleanup of debug messages 
use ldout instead of derr and lderr and increase logging level

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-11 11:27:48 -08:00
Josh Durgin
b1f0cb902a Merge pull request #7944 from trociny/wip-rbd-mirror-image-replayer-async 
rbd-mirror: ImageReplayer async start/stop

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-11 11:24:12 -08:00
Josh Durgin
99a6934a29 Merge pull request #8028 from dillaman/wip-librbd-journal-replay 
librbd: replaying a journal op post-refresh requires locking

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-11 11:22:10 -08:00