RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,931 Commits 211 Branches 394 Tags 2.1 GiB
a7f7339df7
Commit Graph

50931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Samuel Just
193b300277 Merge pull request #7483 from liewegas/wip-osd-boot 
osd: resolve boot vs NOUP set + clear race

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-03-11 11:03:58 -08:00
Orit Wasserman
9aaf672c66 Merge pull request #8030 from yehudasa/wip-rgw-sync-status 
adds the radosgw-admin sync status command that gives a human readable status of the sync process at a specific zone

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-11 19:39:59 +01:00
Yehuda Sadeh
97b90e6235 Merge pull request #7615 from ceph/wip-14678 
rgw: store system object meta in cache when creating it

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-03-11 10:21:03 -08:00
Yehuda Sadeh
c20d9c5faf Merge pull request #8037 from yehudasa/wip-bucket-link 
rgw:bucket link now set the bucket.instance acl (bug fix)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-11 10:17:07 -08:00
Orit Wasserman
2f81879434 Merge pull request #8013 from yehudasa/wip-rgw-multisite-fixes 
rgw multisite fixes

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-11 19:11:38 +01:00
Gregory Farnum
a7a0dac6a4 Merge pull request #6953 from jcsp/wip-fsmap 
Multi-filesystem support

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-11 09:36:30 -08:00
Sage Weil
49c3521b05 Merge pull request #7465 from liewegas/wip-promote-throttle 
osd: probabilistic cache tier promotion throttling

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-03-11 12:15:46 -05:00
Sage Weil
96c1da9cd1 v10.0.5 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlbi+tkACgkQ2kQg7SiJlcjm4gCeJ5FdX6wYXP69g3yrY7wHRxtM
 TawAoMnRD5i0Ndz4cceCvcBMk64W7mQG
 =Ta2C
 -----END PGP SIGNATURE-----

Merge tag 'v10.0.5'

v10.0.5

Conflicts:
	debian/changelog
 2016-03-11 12:07:55 -05:00
Sage Weil
5acb2655ec v10.0.5 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-11 12:05:13 -05:00
Dan Mick
10ca7f3efb debian/changelog: Remove stray 'v' in version 
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 0f7730c8f4)
 2016-03-11 11:57:56 -05:00
Sage Weil
8733c40ef5 Merge branch 'master' of github.com:ceph/ceph 2016-03-11 11:14:55 -05:00
Sage Weil
57c6d3b67a Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph 
Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
#	debian/control
 2016-03-11 11:14:18 -05:00
Sage Weil
b96cfda4a3 Merge pull request #8045 from tchaikov/wip-scrubstore-cleanup 
osd/ScrubStore: remove unused function

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-11 10:50:43 -05:00
Sage Weil
56fe749e2c Merge pull request #7707 from xiexingguo/xxg-wip-14815 
osd: filestore: fix wrong scope of result code for error cases during mount

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-11 10:33:13 -05:00
Sage Weil
4adeb410bf Merge pull request #7726 from tchaikov/wip-fix-ftbfs-gcc6 
test/time: no need to abs(uint64_t) for comparing

Reviewed-by: Adam Emerson <aemerson@redhat.com>
 2016-03-11 10:32:38 -05:00
Sage Weil
07c41fcd49 Merge pull request #7955 from ErwanAliasr1/evelu-check-bufferlist 
test/bufferlist: Avoid false-positive tests

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-11 10:32:05 -05:00
Sage Weil
a1490dc1bc Merge pull request #7980 from liewegas/wip-14952 
mon: initialize last_* timestamps on new pgs to creation time

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-03-11 10:31:34 -05:00
Sage Weil
5d745b2bee Merge pull request #7982 from liewegas/wip-14606 
qa/workunits/rest/test.py: add confirmation to 'mds setmap'
 2016-03-11 10:30:53 -05:00
Sage Weil
4ab0fc51d1 Merge pull request #7983 from liewegas/wip-14616 
log: do not repeat errors to stderr

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-11 10:29:55 -05:00
Sage Weil
c9124548e4 Merge pull request #8004 from liewegas/wip-rados-test-stderr 
qa/workunits/rados/test.sh: capture stderr too
 2016-03-11 10:29:39 -05:00
Sage Weil
243a36b37e Merge pull request #8006 from liewegas/wip-big-pages 
os/bluestore/KernelDevice: force block size
 2016-03-11 10:29:00 -05:00
Sage Weil
134466532d Merge pull request #8019 from kmroz/wip-upstream-civetweb-low-ports-6 
rgw: drop permissions of rgw/civetweb after startup

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-11 10:28:17 -05:00
Kefu Chai
eb1c5feb9a Merge pull request #8007 from wido/se-mirror-mail 
mirrors: Change contact e-mail address for se.ceph.com

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-11 22:39:59 +08:00
Kefu Chai
f0c512b021 Merge pull request #7991 from xiexingguo/xxg-wip-remove-upthrupending 
osd: remove up_thru_pending field, which is never used

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-11 22:39:29 +08:00
Kefu Chai
9e86b53906 Merge pull request #8023 from roidayan/xio-remove_unused_variable 
xio: remove unused variable

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-11 22:15:54 +08:00
Mykola Golub
3295253d64 test: add rbd-mirror test script 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-11 16:12:00 +02:00
Mykola Golub
866a704882 test: rbd_mirror_image_replay improve commit position parsing 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-11 16:12:00 +02:00
Mykola Golub
b0e1eb5245 test: ImageReplayer on_stop/on_start error tests 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-11 16:12:00 +02:00
Mykola Golub
b61692ba74 rbd-mirror: ImageReplayer async start/stop 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-11 16:12:00 +02:00
Jason Dillaman
39b27ef99a librbd: protect against duplicate journal events 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-11 09:08:15 -05:00
Jason Dillaman
a795d34c30 librbd: protect against journal replay shutdown race condition 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-11 09:07:46 -05:00
Jason Dillaman
aa6a8d3a8b librbd: replaying a journal op post-refresh requires locking 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-11 07:39:53 -05:00
Jason Dillaman
fdeb125581 test: periodic failure in TestJournalReplay.SnapRename 
Force the refresh of the image to pick up the new snapshot
name before testing that it successfully was renamed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-11 07:39:53 -05:00
Josh Durgin
164de7aa39 Merge pull request #7923 from RustShen/master 
doc: add cinder backend section to rbd-openstack.rst

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-11 00:04:44 -08:00
Kefu Chai
439991a438 osd/ScrubStore: remove unused function 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-03-11 15:52:25 +08:00
Dan Mick
81d7b0d338 Merge pull request #7999 from liewegas/wip-armhf 
a few armhf (32-bit build) fixes

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-03-10 19:15:59 -08:00