RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 08:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,505 Commits 211 Branches 394 Tags 2 GiB
a6f2f816ae
Commit Graph

39505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Durgin
161d3982a9 Merge remote-tracking branch 'origin/wip-10785' into hammer 
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/librbd/ImageWatcher.cc
 2015-02-12 15:57:12 -08:00
Sage Weil
b28c555105 Merge pull request #3723 from concubidated/master 
Docs: OSD name, not id, needs to be given to remove an item from crush map

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-12 14:44:19 -08:00
Tyler Brekke
8e806bce89 Docs: OSD name, not id, needs to be given to remove an item from the CRUSH map. 
Include command for deleteing bucket from the CRUSH map.

Signed-off-by: Tyler Brekke <tbrekke@redhat.com>
 2015-02-12 14:37:17 -08:00
Yan, Zheng
fd830205bd mds: fix decoding of InodeStore::oldest_snap 
There is no ENCODE_START/FINISH block when encoding inode that
embedded in dentry. So we can't use encoding version to check
if the buffer contains InodeStore::oldest_snap. Instead, we check
if the buffer iterator reaches end of buffer.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-02-12 20:43:26 +08:00
Loic Dachary
c7f3691384 Merge pull request #3698 from dachary/wip-10836-erasure-code-corpus 
tests: clone ceph-erasure-code-corpus from ceph

Reviewed-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
 2015-02-12 13:40:56 +01:00
Loic Dachary
3a598f3546 Merge pull request #3696 from dachary/wip-10755-centos-docker 
tests: add support for centos 6

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-02-12 13:32:09 +01:00
Loic Dachary
12b04458ab Merge pull request #3714 from tchaikov/fix-osdcap-parser-10757 
osd: fix OSDCap parser on old boost/spirit

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-02-12 13:30:59 +01:00
Loic Dachary
6918a98af1 tests: Dockerfile COPY with two arguments 
Avoid using COPY with multiple files because it will not behave as
intended with older (1.2) versions of docker.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-02-12 11:22:12 +01:00
Loic Dachary
98297e0809 tests: update docker helper documentation 
The tags for the centos repository changed from centos6, centos7 to 6
and 7 which is consistent with the other distribution
repositories. Update the documentation accordingly.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-02-12 11:22:12 +01:00
Loic Dachary
1023aa973b tests: add Dockerfile for centos-6 
http://tracker.ceph.com/issues/10755 Fixes: #10755

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-02-12 11:22:04 +01:00
Loic Dachary
b3771ebfaf tests: one Dockerfile per repository:tag 
There cannot be a common Dockerfile for all repository:tag combination
of a given operating system. The only way to customize a Dockerfile is
via variable substitution and it cannot conveniently address all
differences between versions.

Create one Dockerfile per operating system version instead. I.e. one
dockerfile for centos:7, one for centos:6 etc.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-02-12 11:18:17 +01:00
Kefu Chai
b9b586831c osd: fix OSDCap parser on old boost/spirit 
* on boost 1.41, the ascii::space skipper fails to skip the spaces at the
  beginning of the parsed string, so as a workaround we replace the `lit(' ')`
  in grammar spec with `ascii::blank`. this also simplifies the grammar
  a little bit.

Fixes: #10757
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2015-02-12 18:08:02 +08:00
Loic Dachary
f53daa1c06 Merge pull request #3707 from dachary/wip-erasure-code-uninitialized 
erasure-code: initialize all data members

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
 2015-02-12 11:06:41 +01:00
Loic Dachary
b7bdb2fa15 Merge pull request #3713 from tchaikov/pass-string-by-ref 
Pass string by ref

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-02-12 11:05:19 +01:00
Kefu Chai
4ced591a34 osd/OpRequest: pass string by const& 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2015-02-12 13:10:28 +08:00
Gregory Farnum
bac1846828 Merge pull request #3711 from ceph/hadoop 
qa: hadoop plays nice with new teuthology task
 2015-02-11 21:04:03 -08:00
Sage Weil
26dfad798d Merge remote-tracking branch 'gh/master' into hammer 2015-02-11 18:31:39 -08:00
Sage Weil
ee3e466fc4 Merge pull request #3522 from ceph/wip-8600 
mon: OSDMonitor: tolerate catastrophically bad crush maps

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-11 18:31:42 -08:00
Sage Weil
25d197f052 Merge pull request #3703 from vuhuong/wip-xio-hammer 
Wip xio hammer

Reviewed-by: Matt Benjamin <matt@cohortfs.com>
 2015-02-11 18:21:24 -08:00
Samuel Just
74d5ccf1b5 osd/: include version_t in extra_reqids with promote 
Otherwise, we can't return the correct user version on a dup request.

Note: This patch does not handle compatilibity with the variant which
does not include the version_t field.  Since it's been less than 2 weeks
and we haven't had a release, I think that's ok since handling
compatilibity would require some overhead in the encode/decode
methods.

Fixes: 10830
Introduced (merge): b79c349067
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-02-11 17:44:49 -08:00
Samuel Just
584f535132 Merge pull request #3664 from liewegas/wip-10695 
mon: fix 'nan' from osd df output

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
 2015-02-11 17:35:22 -08:00
Josh Durgin
c5717e2065 Merge pull request #3704 from ceph/wip-10761 
librbd: blacklist clients before breaking locks

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-11 17:32:53 -08:00
Samuel Just
b452286e2f Merge pull request #3513 from rzarzynski/wip-10425 
librados: Wip 10425

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-11 17:29:41 -08:00
Samuel Just
fbc5c0144f Merge pull request #3515 from rzarzynski/wip-10458 
librados: Wip 10458 - rectify the pool name caching in IoCtxImpl.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-11 17:28:09 -08:00
Samuel Just
5c9747ab81 Merge pull request #3674 from jdurgin/wip-python-leak 
rados.py: keep reference to python callbacks

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-11 17:26:43 -08:00
Samuel Just
7885bd2498 Merge pull request #3676 from majianpeng/misc 
Misc

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-11 17:26:05 -08:00
Samuel Just
fc8bf4df49 Merge pull request #3678 from tchaikov/fix-pg-leak 
osd: fix PG leak in SnapTrimWQ._clear()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-02-11 17:24:35 -08:00
Loic Dachary
96f1fe04a0 Merge remote-tracking branch 'ceph/hammer' 2015-02-12 01:08:07 +01:00
Noah Watkins
de6b53aba7 qa: hadoop plays nice with new teuthology task 
This brings the hadoop wordcount up-to-date with the new teuthology
hadoop task.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 2015-02-11 16:03:32 -08:00
Ken Dreyer
1914b90a8a Merge pull request #3683 from dachary/wip-10845-python-flask 
tests: no need for python-flask at build time

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
 2015-02-11 16:57:30 -07:00
Loic Dachary
3c05c9c829 tests: no need for python-flask at build time 
http://tracker.ceph.com/issues/10845 Refs: #10845

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-02-12 00:55:49 +01:00
Gregory Farnum
81b8c3744a Merge pull request #3699 from ceph/wip-early-adopters 
doc: Early adopter notes for CephFS

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-02-11 15:01:06 -08:00
Gregory Farnum
0feee20b21 Merge pull request #3617 from ceph/wip-10737 
mds: disallow layout changes for files with data

Reviewed-by: John Spray <john.spray@redhat.com>
 2015-02-11 14:47:41 -08:00
Gregory Farnum
890f5b6bd4 Merge pull request #3683 from ceph/wip-10791-stopping 
MDSMonitor: do not allow MDS to transition from STATE_STOPPING

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
 2015-02-11 14:39:29 -08:00
Gregory Farnum
b0176297ad Merge pull request #3599 from ceph/wip-traceless-reply 
Wip traceless reply

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-02-11 14:26:17 -08:00
Josh Durgin
f16ff13d3b Merge pull request #3700 from ceph/wip-librbd-maint-tests 
tests: add simple tests for proxied maintenance operations

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-11 14:04:09 -08:00
Sage Weil
a79c9bdae8 Merge pull request #3706 from dachary/wip-10839-shec-uninitialized-hammer 
erasure-code: fix uninitialized data members on SHEC

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-11 13:56:02 -08:00
Loic Dachary
b24a01b50a erasure-code: initialize all data members 
As a safeguard against unitialized memory in isa and jerasure
plugins. Since the init method is supposed to be called before the
plugin is used, it is mostly not relevant. However it can lead to
problems that are non trivial to figure out.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-02-11 22:45:49 +01:00
Loic Dachary
1a9d717d16 erasure-code: fix uninitialized data members on SHEC 
Also fix the tests that verify the result when init is not called and
factorize the two tests that were almost identical for simplicity.

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

Backport: hammer
Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-02-11 22:44:49 +01:00
Samuel Just
e2a508573f ReplicatedPG::on_change: requeue in_progress_async_reads close to last 
Fixes: 10768
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-02-11 10:30:51 -08:00
Samuel Just
efccb758cb Merge pull request #3692 from athanatos/wip-8753 
ReplicatedPG::on_change: clean up callbacks_for_degraded_object

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-11 10:29:47 -08:00
Samuel Just
a5ecaa189d ReplicatedPG::on_change: clean up callbacks_for_degraded_object 
Backport: dumpling, firefly, giant
Fixes: 8753
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-02-11 10:28:42 -08:00
Sage Weil
714fe73414 Merge pull request #3643 from athanatos/wip-10734 
ObjectStore: fix Transaction encoding version number

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-11 10:26:25 -08:00
Sage Weil
aa03d6a84c Merge remote-tracking branch 'gh/master' into hammer 2015-02-11 09:21:36 -08:00
Sage Weil
f65cb09e17 Merge pull request #3092 from abartlet/ceph-dmcrypt-plain 
Ceph dmcrypt with LUKS (split into 4 patches)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-02-11 09:21:53 -08:00
Sage Weil
1d306ad015 Merge branch 'hammer' of github.com:ceph/ceph into hammer 
mon bits
Reviewed-by: Sage Weil <sage@redhat.com>

cli bits
Reviewed-by: Dan Mick <dmick@redhat.com>
 2015-02-11 09:20:19 -08:00
Sage Weil
2d2dc13858 mon/PGMonitor: drop pg ls debug line 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-02-11 07:58:38 -08:00
Danny Al-Gaaf
65ce7b731a fix configure to reflect the missing libs for xio 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2015-02-11 14:37:01 +01:00
John Spray
a5804c45f1 doc: add a page for CephFS early adopters 
This is where we should point people who are
trying out CephFS in evaluation environments.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-02-11 13:24:13 +00:00
Sage Weil
d2376497e7 doc/cephfs: Ceph FS -> CephFS 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-02-11 13:24:13 +00:00