1
0
mirror of https://github.com/ceph/ceph synced 2025-03-18 16:36:12 +00:00
Commit Graph

42345 Commits

Author SHA1 Message Date
Loic Dachary
160201f2c9 Merge pull request from Arshanes/master
doc: Fixed the picture on page http://ceph.com/docs/master/cephfs/

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-19 15:54:27 +02:00
Valentin
a1e3108628 doc: Fixed the picture on page http://ceph.com/docs/master/cephfs/
Fixes: 

Signed-off-by Valentin Thomas <valentin.arshanes.thomas@gmail.com>
2015-06-19 13:37:56 +02:00
branto1
02ef5cf9b3 Merge pull request from SUSE/wip_ceph_spec_directories_not_owned_by_a_package
ceph.spec.in: fix:Add missing directories breaking suse rpm build

Reviewed-by: Boris Ranto <branto@redhat.com>
2015-06-19 11:54:29 +02:00
Owen Synge
f1ff3e4dcb ceph.spec.in: fix:Add missing directories breaking build
SUSE builds on OBS are failing with the missing dir entries:

    /usr/share/ceph
    /usr/lib/ceph

On suse these correspond to:

    %dir %{_datarootdir}/ceph/
    %dir %{_libexecdir}/ceph/

Signed-off-by: Owen Synge <osynge@suse.com>
2015-06-19 11:22:19 +02:00
Yan, Zheng
902385ce38 Merge pull request from ceph/wip-frag-asok
mds: add dirfrag split/merge asok commands
2015-06-19 15:23:13 +08:00
Josh Durgin
a2ef5e431a Merge pull request from majianpeng/librbd-remove-iohint
librbd: If objectmap tell object exist, don't send alloc_hint w/ write command

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-06-19 00:03:26 -07:00
Jianpeng Ma
449948edb7 librbd: If objectmap tell object exist, don't send alloc_hint w/ write command.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-06-19 14:50:26 +08:00
Kefu Chai
edd3542df1 Merge pull request from wonzhq/tracked-op
common: tracked op fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-19 09:35:31 +08:00
Kefu Chai
ee4df07874 Merge pull request from wonzhq/rmattr
osd: return with ENOENT if object doesn't exist during rmattr

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-19 09:31:52 +08:00
Sage Weil
e5f3a23de1 Merge pull request from SUSE/wip_fixes_to_rcceph
Fixes to rcceph script

Reviewed-by: Sage Weil <sage@redhat.com>
2015-06-18 16:45:35 -07:00
Josh Durgin
6a15c03092 Merge pull request from yuyuyu101/wip-setallochint-option
librbd: Add option to allow disabling issuing alloc hint

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-06-18 15:00:28 -07:00
David Zafman
fd610f2bc0 Merge pull request from ceph/wip-12064
mon: only send MMonMetadata to peer mons that support it

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-06-18 14:33:42 -07:00
Loic Dachary
a5d670a35c Merge pull request from maxime1992/master
doc: Document include/str_list.h

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 20:09:34 +02:00
Maxime ROBERT
b4e83f440d doc: Document include/str_list.h
Fixes: .
Signed-off-by: Claire MASSOT <claire.massot93@gmail.com>
Signed-off-by: Jordan DORNE <jordan.dorne@gmail.com>
Signed-off-by: Kévin CARADANT <kevin.caradant@gmail.com>
Signed-off-by: Gabriel SENTUCQ <perso@kazhord.fr>
Signed-off-by: Maxime ROBERT <maxime.robert1992@gmail.com>
2015-06-18 19:32:19 +02:00
Loic Dachary
8e08d6cc64 Merge pull request from JordanDorne/master
doc: Replace requries with requires in python API doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 18:09:29 +02:00
JordanDorne
350139b3a7 doc: Replace requries with requires in python API doc
Fixes: 
Signed-off-by: Jordan DORNE <jordan.dorne@gmail.com>
2015-06-18 17:39:40 +02:00
Loic Dachary
5277861153 Merge pull request from ltoto2/master
doc: Adding a link to documentation on admin socket

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 17:36:33 +02:00
Thomas Laumondais
0c4555d1f4 doc: Adding a link to documentation on admin socket
Fixes: 

Signed-off-by: Thomas Laumondais <thomas.laumondais@gmail.com>
2015-06-18 17:23:40 +02:00
Owen Synge
dfda3ff874 Bug fix to ceph systemV compatability script.
Was failing with more than one OSD / MON deamon on a single node.
Fixes suse bugzilla 

Signed-off-by: Owen Synge <osynge@suse.com>
2015-06-18 17:15:22 +02:00
Loic Dachary
67343f614f Merge pull request from robin974/master
doc: Fixes a missing dot

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 17:14:41 +02:00
Loic Dachary
cb49329c42 Merge pull request from Claire1293/master
doc: dev/differences-from-posix

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 17:12:08 +02:00
Loic Dachary
6c93465ec1 Merge pull request from Aeryax/master
doc: Replaced "disk or drive" by "disk" in ceph-disk.rs

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 17:10:18 +02:00
robin974
f105fdc255 doc: Fixes a missing dot
Fixes: 

Signed-off-by: Robin Tang <robintang974@gmail.com>
2015-06-18 16:43:45 +02:00
Loic Dachary
2bc009bb52 Merge pull request from jr31/master
doc: Unify ID format

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 16:39:03 +02:00
Loic Dachary
36369e0c05 Merge pull request from Cleminou/master
doc: Fixes a missing word in a printed string

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 16:38:11 +02:00
unknown
7fd1ae8b42 doc: dev/differences-from-posix
Fixes: 
Signed-off-by: Claire MASSOT <claire.massot93@gmail.com>
2015-06-18 16:37:26 +02:00
Jean-Rémi Deveaux
b10adf6a4f doc: Unify ID format
Fixes: 

Signed-off-by: Jean-Rémi Deveaux <jeanremi.deveaux@gmail.com>
2015-06-18 16:26:08 +02:00
Cleminou
145fbb7d3c doc: Fixes a missing word in a printed string
Fixes: 

Signed-off-by: Clement Lebrun <clement.lebrun.31@gmail.com>
2015-06-18 16:05:43 +02:00
Loic Dachary
2308faf206 Merge pull request from arthurgorjux/master
doc: Remove `` before and after 'ceph -s' in titles

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 15:48:18 +02:00
Kazhord
3cb8c4e8ef doc: Replaced "disk or drive" by "disk" in ceph-disk.rs
Fixes: 
Signed-off-by: Gabriel SENTUCQ <perso@kazhord.fr>
2015-06-18 15:47:26 +02:00
Loic Dachary
2b26011079 Merge pull request from Oxygen31/master
doc : Change of "create" in "add"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 15:47:21 +02:00
John Spray
787596dc6d Merge pull request from JevonQ/add-iov-support-in-libcephfs
libcephfs: add ceph_p{read,write}v

Reviewed-by: John Spray <john.spray@redhat.com>
2015-06-18 14:26:58 +01:00
Arthur Gorjux
7065203ff1 doc: Remove `` before and after 'ceph -s' in titles
Fixes: 
Signed-off-by: Arthur Gorjux <arthurgorjux@gmail.com>
2015-06-18 15:25:48 +02:00
Germain
cac48bd076 doc : Change of "ceph-deploy mon create {ceph-node}" with "ceph-deploy mon add {ceph-node}" in "Quick-ceph-deploy.rst"
Fixes : 

Signed-off-by : Germain CHIPAUX <germain.chipaux@gmail.com>
2015-06-18 15:24:43 +02:00
Loic Dachary
5cb3cb0958 Merge pull request from nicolasyong/master
doc: Modification of a sentence

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 15:22:00 +02:00
nicolasyong
33f4b9a05b doc: Modification of a sentence.
Fixes : 

Signed-off-by: Nicolas Yong <nicolas.yong93@gmail.com>
2015-06-18 15:15:06 +02:00
Loic Dachary
49f093af9a Merge pull request from kevincaradant/master
doc: ceph-deploy man page: typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 15:01:25 +02:00
Owen Synge
bfa0c4a626 Fixes to rcceph script
- only start OSDs if mon daemons are also present
 - adds support for mask and unmask
 - removes support for cluster with non default cluster name,
   as this was very limited and inconsistent
 - Reapplied from a patch as could not cherry-pick
   66cb46c411 from Mon Jan 12
   as this produced issues with src/gmock

Signed-off-by: Owen Synge <osynge@suse.com>
2015-06-18 14:16:03 +02:00
Gregory Farnum
459369e700 Merge pull request from yuyuyu101/wip-perf-msgr
PerfMsgr: A tool to benchmark messenger module

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-06-18 11:09:56 +01:00
Kefu Chai
952836a2f3 Merge pull request from liewegas/wip-mon-fixes
mon: fix warning, and get_bucket_utilization

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-06-18 14:59:23 +08:00
Josh Durgin
d87e5e2ea4 Merge pull request from majianpeng/librbd-cache-iohint
Librbd cache iohint

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-06-17 20:52:49 -07:00
Josh Durgin
4a3f615068 Merge branch 'next' 2015-06-17 20:16:06 -07:00
Josh Durgin
664123890c Merge remote-tracking branch 'origin/wip-11579' into next
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-06-17 20:15:25 -07:00
Josh Durgin
9f4c6e479f Merge branch 'next' 2015-06-17 18:23:11 -07:00
Jason Dillaman
adfa2e0070 librbd: flush operations need to acquire owner lock
Cache writeback operations will expect the owner lock to be held.

Fixes: 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-06-17 18:22:04 -07:00
Sage Weil
e1619eb3b5 Merge pull request from ilc/f22-build
Fix the build on Fedora 22.

Reviewed-by: Sage Weil <sage@redhat.com>
2015-06-17 18:15:14 -07:00
Josh Durgin
2314abbfb0 Merge branch 'next' 2015-06-17 18:02:31 -07:00
Josh Durgin
574785c645 Merge remote-tracking branch 'origin/wip-11537' into next
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-06-17 18:01:20 -07:00
Loic Dachary
789d1ab809 Merge pull request from maxime1992/master
doc: Change the type of list in doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-06-18 00:04:09 +02:00
Sage Weil
9298f932b0 mon/OSDMonitor: fix get_bucket_utilization return value
Broken in cc5f144a51.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-06-17 11:57:19 -07:00