RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 22:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,717 Commits 211 Branches 394 Tags 1.4 GiB
913339f75f
Commit Graph

46717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loic Dachary
85f77419bb Merge pull request #6750 from theanalyst/doc/mailmap/jewel 
mailmap: Jewel updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-11 10:47:01 +01:00
Loic Dachary
f516f5ae57 Merge pull request #6872 from dachary/wip-osd-typo 
doc: osd: s/schedued/scheduled/

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 09:46:41 +01:00
Abhishek Lekshmanan
9f34737920 mailmap: YankunLi affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:12:01 +05:30
Abhishek Lekshmanan
b3c28b94f6 mailmap: Nishtha Rai affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:12:01 +05:30
Abhishek Lekshmanan
0828cb438a mailmap: John Coyle affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Conflicts:
	.organizationmap
Trivial merge conflict as upstream had an additional entry
 2015-12-11 13:11:28 +05:30
Abhishek Lekshmanan
0d3605f4ed mailmap: Jashan Kamboj affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:42 +05:30
Abhishek Lekshmanan
e108b22d83 mailmap: Adam Kupczyk affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
c65bab189d mailmap: Jacek J. Lakis affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
41a18ffd6d mailmap: runsisi affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
458c59a632 mailmap: Zeqiang Zhuang affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
e2cd81d771 mailmap: You Ji affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
5991644312 mailmap: Wenjun Huang affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
5ed7d09f21 mailmap: Wei Luo affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
ea8ad14e2b mailmap: Sangdi Xu name normalization 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
e9aa13289e mailmap: Robin H. Johnson name normalization 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:40 +05:30
Abhishek Lekshmanan
fee41ad2e3 mailmap: Guang Yang name normalization 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:40 +05:30
Sage Weil
1c24b207bf Merge pull request #6783 from yuyuyu101/wip-13961 
osd: KeyValueStore: don't queue NULL context

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-10 21:29:18 -05:00
Josh Durgin
b2ec53c873 Merge pull request #6892 from kylinstorage/wip-fix-rbd-tracepoint 
librbd: fix tracepoint parameter in diff_iterate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-10 17:24:02 -08:00
Josh Durgin
6955d2940d Merge pull request #6878 from manens/pybind_rados_ioctx_snap_rollback 
pybind: Implementation of rados_ioctx_snapshot_rollback

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-10 11:58:16 -08:00
Josh Durgin
134c988e0c Merge pull request #6889 from kylinstorage/wip-fix-merge-diff 
librbd: fix merge-diff for >2GB diff-files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-10 11:18:31 -08:00
Yehuda Sadeh
019a93f6bc Merge pull request #6888 from prallabh/master 
rgw: fix a glaring syntax error

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-12-10 09:50:22 -08:00
Ning Yao
e2f163a5e1 tests: fix failure for osd-scrub-snap.sh 
Reason to get a false negative only one osd, when calling kill_daemons
$dir KILL osd, which means kill -9 shutdown() would not be called to
notify monitor so that it remain active+clean and osd up until monitor
got a mon_report timeout.  Thus wait_for_clean lose it function and when
we call ceph pg scrub, we got an EAGAIN error and monitor will ignore
the scrub message because of osd not up

Signed-off-by: Ning Yao <zay11022@gmail.com>
 2015-12-10 17:34:32 +01:00
Loic Dachary
5876829dc7 tests: kill_daemons uses TERM instead of KILL 
When called to teardown a test, kill_daemon should use KILL to ensure
all leftovers are removed as quickly as possible to leave a clean state
for the next test. However, when kill_daemons is called to shutdown a
given daemon from within a test, it should use TERM by default so the
daemon has time to notify the MON that it goes down. For instance, if
KILLing an OSD, the mon will still report it as being up although the
calling function probably expects that it will be marked out.

Signed-off-by: Loic Dachary <loic@dachary.org>
 2015-12-10 17:34:32 +01:00
Yunchuan Wen
68125dd013 librbd: fix merge-diff for >2GB diff-files 
from http://tracker.ceph.com/issues/14030

Fixes: #14030

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
 2015-12-10 23:10:36 +08:00
Pavan Rallabhandi
213cd780f4 rgw: fix a glaring syntax error 
syntactical error is causing rgw not to start

Signed-off-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
 2015-12-10 17:48:22 +05:30
Florent Manens
2b50a75375 Implementation of rados_ioctx_snapshot_rollback 
Signed-off-by: Florent Manens <florent@beezim.fr>
 2015-12-10 12:09:07 +01:00
Yan, Zheng
021743938d Merge pull request #6858 from jcsp/wip-cephfs-auth-doc 
doc: note that cephfs auth stuff is new in jewel
 2015-12-10 16:30:13 +08:00
Josh Durgin
701a6626a2 Merge pull request #6768 from marcan/cython 
pybind: port the rbd bindings to Cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
 2015-12-09 15:45:17 -08:00
Josh Durgin
bcd37cf39b Merge pull request #6877 from dillaman/wip-14001 
librbd: fix test case race condition for journaling ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-09 13:49:33 -08:00
Jason Dillaman
7f5ee3378c librbd: fix test case race condition for journaling ops 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-12-09 16:21:04 -05:00
Yehuda Sadeh
9162bd2959 Revert "LifeCycle feature" 
It's not there yet. Created a branch with a few fixes, will need to go
through some more revisions.

This reverts commit 7d48f62f5c.
 2015-12-09 11:34:08 -08:00
Daniel Gryniewicz
b63c3fa26f Merge pull request #6331 from chenji-kael/wip-lifecycle 
LifeCycle feature
 2015-12-09 09:09:10 -05:00
Loic Dachary
461a191191 Merge pull request #6871 from dachary/wip-14027-scrub-load 
tests: --osd-scrub-load-threshold=2000 for more consistency

Reviewed-by: Xinze Chi <xinze@xsky.com>
 2015-12-09 13:55:51 +01:00
Loic Dachary
99bcc7cf16 tests: --osd-scrub-load-threshold=2000 for more consistency 
In a test environment, consistency is more important than
performances. Effectively disable the test that would postpone a scrub
depending on the load average. It is assumed that a machine with a load
average higher than 2000 won't be useable anyway.

http://tracker.ceph.com/issues/14027 Refs: #14027

Signed-off-by: Loic Dachary <loic@dachary.org>
 2015-12-09 11:48:45 +01:00
James Page
26008e8a72 ceph-detect-init: Ubuntu >= 15.04 uses systemd 
Ubuntu releases since Ubuntu 15.04 use systemd instead of upstart;
teach ceph-detect-init that this is the case, thus avoiding OSD
devices on systemd based installs being marked as managed by
upstart by ceph-disk.

Signed-off-by: James Page <james.page@ubuntu.com>
 2015-12-09 10:36:06 +00:00
Hector Martin
93cdc98965 pybind/rbd.pyx: misc typo bugfixes 2015-12-09 18:47:40 +09:00
Hector Martin
469b55a60c pybind/rbd.pyx: PyString -> PyBytes 2015-12-09 18:07:50 +09:00
Loic Dachary
6f1fb16158 doc: osd: s/schedued/scheduled/ 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2015-12-09 01:38:26 +01:00
Josh Durgin
f9f4d5c662 Merge pull request #6830 from vumrao/wip-12112-vumrao 
rbd: add --object-size option, deprecate --order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-08 15:30:09 -08:00
Josh Durgin
7d93cf43f7 buffer: make usable outside of ceph source again 
Add a rados/buffer_fwd.h symlink and remove the "include/" prefix from
buffer.h.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-08 15:09:54 -08:00
Radoslaw Zarzynski
72785ee969 rgw: enforce SLO part's ETag match during GET on SLO of Swift. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:10 +01:00
Radoslaw Zarzynski
1cf149d6b5 rgw: append X-Static-Large-Object attribute during PUT on SLO. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:09 +01:00
Radoslaw Zarzynski
630eac10cf rgw: add support for normalisation of ranged SLO requests. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:09 +01:00
Radoslaw Zarzynski
31f1b89fb6 rgw: fix wrong ofs handling during GET on Swift's SLO. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:09 +01:00
Radoslaw Zarzynski
dabf535605 rgw: handle errors during GET on Swift's SLO appropriately. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:09 +01:00
Radoslaw Zarzynski
fa71082ee4 rgw: make response for multipart delete on a SLO compliant with Swift. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:08 +01:00
Radoslaw Zarzynski
7e06dba6ba rgw: add support for multipart delete on a SLO of Swift. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:08 +01:00
Radoslaw Zarzynski
0a36b9576f rgw: fix iterate_slo_parts() and improve its declaration's formatting. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:08 +01:00
Radoslaw Zarzynski
4bab3fcac1 rgw: move RGWBulkDelete in rgw/rgw_op.h. 
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2015-12-08 17:58:08 +01:00
Yehuda Sadeh
1df28c8edd rgw: iterate over slo parts 
Read slo parts when a read request was sent.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Conflicts:
	src/rgw/rgw_op.cc
 2015-12-08 17:58:07 +01:00