]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorbd: process crushed, rbd creating with striping parameters 6942/head
na xie [Tue, 15 Dec 2015 13:28:34 +0000 (21:28 +0800)]
rbd: process crushed, rbd creating with striping parameters

Signed-off-by: Na Xie <xie.na@h3c.com>
9 years agoMerge pull request #6790 from kylinstorage/wip-subprocess
Kefu Chai [Mon, 14 Dec 2015 04:15:28 +0000 (12:15 +0800)]
Merge pull request #6790 from kylinstorage/wip-subprocess

SubProcess: fix multiple definition bug

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5921 from caibo2014/add-tool-feature
Kefu Chai [Mon, 14 Dec 2015 04:13:40 +0000 (12:13 +0800)]
Merge pull request #5921 from caibo2014/add-tool-feature

tools:support printing part cluster map in readable fashion

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6906 from HeyoQiang/heyongqiang1212
Loic Dachary [Sun, 13 Dec 2015 20:57:36 +0000 (21:57 +0100)]
Merge pull request #6906 from HeyoQiang/heyongqiang1212

client: modify a word in log

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6866 from xiaoxichen/umount_before_mount
Loic Dachary [Sun, 13 Dec 2015 12:47:30 +0000 (13:47 +0100)]
Merge pull request #6866 from xiaoxichen/umount_before_mount

init-ceph: do umount when the path exists.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoinit-ceph: do umount when the path exists. 6866/head
Xiaoxi Chen [Wed, 9 Dec 2015 07:16:59 +0000 (15:16 +0800)]
init-ceph: do umount when the path exists.

If the specified mount point is in use, umount it instead
of skipping mounting the fs.

In previous code , if we forgot that we already mount something unrelated to
*this ceph osd * to the particular mount point, we will skip the mount and
finally get an error complaining superblock not matching OSD ID.

umount & remount is better because
1. If the wrong FS not in use, we can get the right FS we want and make ceph boot smoothly.
2. If the wrong FS is in use, we will get EBUSY on umount, which seems explain the situation
more clearly than superblock mismatch.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
9 years agoMerge pull request #6905 from H3C/wip-bugfix-mount1
Kefu Chai [Sun, 13 Dec 2015 04:52:31 +0000 (12:52 +0800)]
Merge pull request #6905 from H3C/wip-bugfix-mount1

mount.ceph: memory leaks

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6908 from nilamdyuti/wip-doc-rbdsnapshot
Loic Dachary [Sun, 13 Dec 2015 01:10:12 +0000 (02:10 +0100)]
Merge pull request #6908 from nilamdyuti/wip-doc-rbdsnapshot

doc: Modified a note section in rbd-snapshot doc.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agomount/mtab.cc: memory leaks 6905/head
qiankunzheng [Sun, 13 Dec 2015 01:03:22 +0000 (20:03 -0500)]
mount/mtab.cc: memory leaks
the free() should be called to free resources, in order to avoid memory leaks

Fixes:#14066
Signed-off-by: Qiankun Zheng <zheng.qiankun@h3c.com>
9 years agoclient: modify a word in log 6906/head
Yongqiang He [Sat, 12 Dec 2015 20:21:07 +0000 (15:21 -0500)]
client: modify a word in log

This modification changed the word "comit" in line 7704
/* ldout(cct, 10) << "sync_write_comit -- no more unsafe writes, unmount can proceed" << dendl; */
by the word "commit";

Signed-off-by: YongQiang He<he.yongqiang@h3c.com>
9 years agodoc: Modified a note section in rbd-snapshot doc. 6908/head
Nilamdyuti Goswami [Sat, 12 Dec 2015 19:53:30 +0000 (01:23 +0530)]
doc: Modified a note section in rbd-snapshot doc.

Elaborates the note section a bit more as to why stopping I/O before
taking a snapshot is recommended and how to do it.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
9 years agoMerge pull request #6901 from yehudasa/wip-mstart
Sage Weil [Fri, 11 Dec 2015 21:46:50 +0000 (16:46 -0500)]
Merge pull request #6901 from yehudasa/wip-mstart

vstart.sh: add mstart, mstop, mrun wrappers for running multiple vstart-style test clusters out of src tree

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6698 from mathslinux/auth-crash-fix
Sage Weil [Fri, 11 Dec 2015 20:42:53 +0000 (15:42 -0500)]
Merge pull request #6698 from mathslinux/auth-crash-fix

auth: fix crash when bad keyring is passed

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6890 from dachary/wip-13986-test-pg-scrub
Loic Dachary [Fri, 11 Dec 2015 17:24:56 +0000 (18:24 +0100)]
Merge pull request #6890 from dachary/wip-13986-test-pg-scrub

tests: fix failure for osd-scrub-snap.sh

Reviewed-by: Xinze Chi <xinze@xsky.com>
Reviewed-by: Ning Yao <zay11022@gmail.com>
9 years agovstart.sh: mon osd reporter subtree level = osd
Sage Weil [Fri, 11 Dec 2015 16:30:08 +0000 (11:30 -0500)]
vstart.sh: mon osd reporter subtree level = osd

Since everything is on one host!

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6709 from xiaoxichen/failure_by_host
Sage Weil [Fri, 11 Dec 2015 16:32:17 +0000 (11:32 -0500)]
Merge pull request #6709 from xiaoxichen/failure_by_host

mon: support min_down_reporter by subtree level (default by host)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomstop.sh, mrgw.sh: more scripts to control daemons in dev env 6901/head
Yehuda Sadeh [Tue, 8 Dec 2015 21:41:07 +0000 (13:41 -0800)]
mstop.sh, mrgw.sh: more scripts to control daemons in dev env

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agomrun: a tool to run commands against specific mstart cluster
Yehuda Sadeh [Tue, 8 Dec 2015 17:36:47 +0000 (09:36 -0800)]
mrun: a tool to run commands against specific mstart cluster

E.g.,

$ ./mstart.sh foo -n
$ ./mrun foo ceph -s

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agomstart.sh: run multiple clusters in a single source tree
Yehuda Sadeh [Tue, 8 Dec 2015 01:06:03 +0000 (17:06 -0800)]
mstart.sh: run multiple clusters in a single source tree

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6823 from oritwas/wip-cmake-fix-authtool
Kefu Chai [Fri, 11 Dec 2015 15:32:40 +0000 (23:32 +0800)]
Merge pull request #6823 from oritwas/wip-cmake-fix-authtool

cmake: add TracepointProvider.cc to libcommon

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6827 from trociny/wip-scrub-debug
Kefu Chai [Fri, 11 Dec 2015 15:28:11 +0000 (23:28 +0800)]
Merge pull request #6827 from trociny/wip-scrub-debug

Little improvements for troubleshooting scrub issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6732 from aalba6675/patch-custom-cluster-name
Sage Weil [Fri, 11 Dec 2015 15:24:45 +0000 (10:24 -0500)]
Merge pull request #6732 from aalba6675/patch-custom-cluster-name

sysvinit: allow custom cluster names

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6730 from kylinstorage/fix-refcounter-in-replica_scrub
Sage Weil [Fri, 11 Dec 2015 15:22:32 +0000 (10:22 -0500)]
Merge pull request #6730 from kylinstorage/fix-refcounter-in-replica_scrub

osd: fix MOSDRepScrub reference counter in replica_scrub

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6713 from zhanghuan/fix-wbthrottle
Sage Weil [Fri, 11 Dec 2015 15:21:53 +0000 (10:21 -0500)]
Merge pull request #6713 from zhanghuan/fix-wbthrottle

osd: fix incorrect throttle in WBThrottle

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6731 from kylinstorage/clean_up_objecter
Sage Weil [Fri, 11 Dec 2015 15:20:58 +0000 (10:20 -0500)]
Merge pull request #6731 from kylinstorage/clean_up_objecter

librados: clean up Objecter.h

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6863 from jdurgin/wip-buffer-header
Sage Weil [Fri, 11 Dec 2015 13:35:57 +0000 (08:35 -0500)]
Merge pull request #6863 from jdurgin/wip-buffer-header

buffer: make usable outside of ceph source again

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6750 from theanalyst/doc/mailmap/jewel
Loic Dachary [Fri, 11 Dec 2015 09:47:01 +0000 (10:47 +0100)]
Merge pull request #6750 from theanalyst/doc/mailmap/jewel

mailmap: Jewel updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6872 from dachary/wip-osd-typo
Loic Dachary [Fri, 11 Dec 2015 08:46:41 +0000 (09:46 +0100)]
Merge pull request #6872 from dachary/wip-osd-typo

doc: osd: s/schedued/scheduled/

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: YankunLi affiliation 6750/head
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:15:41 +0000 (18:45 +0530)]
mailmap: YankunLi affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Nishtha Rai affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:15:13 +0000 (18:45 +0530)]
mailmap: Nishtha Rai affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: John Coyle affiliation
Abhishek Lekshmanan [Fri, 11 Dec 2015 07:41:28 +0000 (13:11 +0530)]
mailmap: John Coyle affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Conflicts:
.organizationmap
Trivial merge conflict as upstream had an additional entry

9 years agomailmap: Jashan Kamboj affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:14:32 +0000 (18:44 +0530)]
mailmap: Jashan Kamboj affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Adam Kupczyk affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:14:04 +0000 (18:44 +0530)]
mailmap: Adam Kupczyk affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Jacek J. Lakis affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:13:37 +0000 (18:43 +0530)]
mailmap: Jacek J. Lakis affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: runsisi affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:13:09 +0000 (18:43 +0530)]
mailmap: runsisi affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Zeqiang Zhuang affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:11:19 +0000 (18:41 +0530)]
mailmap: Zeqiang Zhuang affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: You Ji affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:10:30 +0000 (18:40 +0530)]
mailmap: You Ji affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Wenjun Huang affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:09:23 +0000 (18:39 +0530)]
mailmap: Wenjun Huang affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Wei Luo affiliation
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:08:43 +0000 (18:38 +0530)]
mailmap: Wei Luo affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Sangdi Xu name normalization
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:06:56 +0000 (18:36 +0530)]
mailmap: Sangdi Xu name normalization

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Robin H. Johnson name normalization
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:06:11 +0000 (18:36 +0530)]
mailmap: Robin H. Johnson name normalization

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Guang Yang name normalization
Abhishek Lekshmanan [Tue, 1 Dec 2015 13:05:36 +0000 (18:35 +0530)]
mailmap: Guang Yang name normalization

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agoMerge pull request #6783 from yuyuyu101/wip-13961
Sage Weil [Fri, 11 Dec 2015 02:29:18 +0000 (21:29 -0500)]
Merge pull request #6783 from yuyuyu101/wip-13961

osd: KeyValueStore: don't queue NULL context

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6892 from kylinstorage/wip-fix-rbd-tracepoint
Josh Durgin [Fri, 11 Dec 2015 01:24:02 +0000 (17:24 -0800)]
Merge pull request #6892 from kylinstorage/wip-fix-rbd-tracepoint

librbd: fix tracepoint parameter in diff_iterate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6878 from manens/pybind_rados_ioctx_snap_rollback
Josh Durgin [Thu, 10 Dec 2015 19:58:16 +0000 (11:58 -0800)]
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>
9 years agoMerge pull request #6889 from kylinstorage/wip-fix-merge-diff
Josh Durgin [Thu, 10 Dec 2015 19:18:31 +0000 (11:18 -0800)]
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>
9 years agoMerge pull request #6888 from prallabh/master
Yehuda Sadeh [Thu, 10 Dec 2015 17:50:22 +0000 (09:50 -0800)]
Merge pull request #6888 from prallabh/master

rgw: fix a glaring syntax error

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotests: fix failure for osd-scrub-snap.sh 6890/head
Ning Yao [Thu, 10 Dec 2015 07:36:33 +0000 (15:36 +0800)]
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>
9 years agotests: kill_daemons uses TERM instead of KILL
Loic Dachary [Thu, 10 Dec 2015 14:16:44 +0000 (15:16 +0100)]
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>
9 years agolibrbd: fix merge-diff for >2GB diff-files 6889/head
Yunchuan Wen [Thu, 10 Dec 2015 14:13:38 +0000 (22:13 +0800)]
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>
9 years agorgw: fix a glaring syntax error 6888/head
Pavan Rallabhandi [Thu, 10 Dec 2015 12:18:22 +0000 (17:48 +0530)]
rgw: fix a glaring syntax error

syntactical error is causing rgw not to start

Signed-off-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
9 years agoImplementation of rados_ioctx_snapshot_rollback 6878/head
Florent Manens [Wed, 9 Dec 2015 21:37:56 +0000 (22:37 +0100)]
Implementation of rados_ioctx_snapshot_rollback

Signed-off-by: Florent Manens <florent@beezim.fr>
9 years agoMerge pull request #6858 from jcsp/wip-cephfs-auth-doc
Yan, Zheng [Thu, 10 Dec 2015 08:30:13 +0000 (16:30 +0800)]
Merge pull request #6858 from jcsp/wip-cephfs-auth-doc

doc: note that cephfs auth stuff is new in jewel

9 years agoMerge pull request #6768 from marcan/cython
Josh Durgin [Wed, 9 Dec 2015 23:45:17 +0000 (15:45 -0800)]
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>
9 years agoMerge pull request #6877 from dillaman/wip-14001
Josh Durgin [Wed, 9 Dec 2015 21:49:33 +0000 (13:49 -0800)]
Merge pull request #6877 from dillaman/wip-14001

librbd: fix test case race condition for journaling ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: fix test case race condition for journaling ops 6877/head
Jason Dillaman [Wed, 9 Dec 2015 21:21:04 +0000 (16:21 -0500)]
librbd: fix test case race condition for journaling ops

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoRevert "LifeCycle feature"
Yehuda Sadeh [Wed, 9 Dec 2015 19:34:08 +0000 (11:34 -0800)]
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 7d48f62f5c86913d8f00b44d46a04a52d338907c.

9 years agoMerge pull request #6331 from chenji-kael/wip-lifecycle
Daniel Gryniewicz [Wed, 9 Dec 2015 14:09:10 +0000 (09:09 -0500)]
Merge pull request #6331 from chenji-kael/wip-lifecycle

LifeCycle feature

9 years agoMerge pull request #6871 from dachary/wip-14027-scrub-load
Loic Dachary [Wed, 9 Dec 2015 12:55:51 +0000 (13:55 +0100)]
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>
9 years agotests: --osd-scrub-load-threshold=2000 for more consistency 6871/head
Loic Dachary [Wed, 9 Dec 2015 00:41:42 +0000 (01:41 +0100)]
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>
9 years agopybind/rbd.pyx: misc typo bugfixes 6768/head
Hector Martin [Wed, 9 Dec 2015 09:47:40 +0000 (18:47 +0900)]
pybind/rbd.pyx: misc typo bugfixes

9 years agopybind/rbd.pyx: PyString -> PyBytes
Hector Martin [Wed, 9 Dec 2015 09:07:50 +0000 (18:07 +0900)]
pybind/rbd.pyx: PyString -> PyBytes

9 years agodoc: osd: s/schedued/scheduled/ 6872/head
Loic Dachary [Wed, 9 Dec 2015 00:36:31 +0000 (01:36 +0100)]
doc: osd: s/schedued/scheduled/

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6830 from vumrao/wip-12112-vumrao
Josh Durgin [Tue, 8 Dec 2015 23:30:09 +0000 (15:30 -0800)]
Merge pull request #6830 from vumrao/wip-12112-vumrao

rbd: add --object-size option, deprecate --order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agobuffer: make usable outside of ceph source again 6863/head
Josh Durgin [Tue, 8 Dec 2015 21:58:40 +0000 (13:58 -0800)]
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>
9 years agoMerge pull request #6857 from dachary/wip-13986-test-pg-scrub
Loic Dachary [Tue, 8 Dec 2015 16:03:10 +0000 (17:03 +0100)]
Merge pull request #6857 from dachary/wip-13986-test-pg-scrub

tests: osd-scrub-snaps.sh to display full osd logs on error

Reviewed-by: Xinze Chi <xinze@xsky.com>
9 years agodoc: note that cephfs auth stuff is new in jewel 6858/head
John Spray [Tue, 8 Dec 2015 14:10:18 +0000 (14:10 +0000)]
doc: note that cephfs auth stuff is new in jewel

+ bonus whitespace fixes to the code blocks to
get them to render properly

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agotests: osd-scrub-snaps.sh to display full osd logs on error 6857/head
Loic Dachary [Tue, 8 Dec 2015 12:54:58 +0000 (13:54 +0100)]
tests: osd-scrub-snaps.sh to display full osd logs on error

This generates a large output but is the only way to get more
information about race conditions that turn out to show up frequently.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6850 from H3C/wip-zcl-ceph-mds
John Spray [Tue, 8 Dec 2015 12:31:40 +0000 (12:31 +0000)]
Merge pull request #6850 from H3C/wip-zcl-ceph-mds

ceph-mds:add --help/-h

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #6848 from H3C/wip-zcl-layout-rst
John Spray [Tue, 8 Dec 2015 11:47:22 +0000 (11:47 +0000)]
Merge pull request #6848 from H3C/wip-zcl-layout-rst

doc:file must be empty when writing layout fields of file use "setfattr"

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agorbd: add --object-size option 6830/head
Vikhyat Umrao [Mon, 7 Dec 2015 16:48:13 +0000 (22:18 +0530)]
rbd: add --object-size option

Object size can be specified when creating an image with the --order option,
as a number of bits in the size.

This patch is adding new option --object-size. This new option will specify
object size directly for example --object-size 2M.

It would be easier to use. --order is still present for backwards compatibility.
For simplicity, we are rounding up the object size to the nearest power of 2.

Fixes #12112

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agoceph-mds:add --help/-h 6850/head
Cilang Zhao [Tue, 8 Dec 2015 09:00:58 +0000 (04:00 -0500)]
ceph-mds:add --help/-h

When use ceph-mds --hlep/-h, the usage will be showed

Signed-off-by: Cilang Zhao <zhao.cilang@h3c.com>
9 years agodoc:file must be empty when writing layout fields of file use "setfattr" 6848/head
Cilang Zhao [Tue, 8 Dec 2015 08:45:34 +0000 (03:45 -0500)]
doc:file must be empty when writing layout fields of file use "setfattr"

When the layout fields of a file are modified, this file must be empty, otherwise an error would occur.

Signed-off-by:Cilang Zhao zhao.cilang@h3c.com

9 years agoMerge remote-tracking branch 'ceph/jewel'
Loic Dachary [Tue, 8 Dec 2015 08:03:55 +0000 (09:03 +0100)]
Merge remote-tracking branch 'ceph/jewel'

9 years agoMerge pull request #6844 from dachary/wip-13997-centos-libunwind-jewel
Loic Dachary [Tue, 8 Dec 2015 07:52:58 +0000 (08:52 +0100)]
Merge pull request #6844 from dachary/wip-13997-centos-libunwind-jewel

build/ops: enable CR in CentOS 7

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agobuild/ops: enable CR in CentOS 7 6844/head
Loic Dachary [Tue, 8 Dec 2015 07:02:56 +0000 (08:02 +0100)]
build/ops: enable CR in CentOS 7

To get libunwind from the CR repositories until CentOS 7.2.1511 is released.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6842 from badone/wip-13997
Loic Dachary [Tue, 8 Dec 2015 06:47:06 +0000 (07:47 +0100)]
Merge pull request #6842 from badone/wip-13997

tests: centos7 needs the Continuous Release (CR) Repository enabled for

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: centos7 needs the Continuous Release (CR) Repository enabled for 6842/head
Brad Hubbard [Tue, 8 Dec 2015 06:05:37 +0000 (16:05 +1000)]
tests: centos7 needs the Continuous Release (CR) Repository enabled for
libunwind

Fixes: #13997
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoLifeCycle feature 6331/head
Ji Chen [Wed, 21 Oct 2015 02:10:39 +0000 (10:10 +0800)]
LifeCycle feature
As same as amazon S3 interface,"PUT Bucket lifecycle" and
"DELETE Bucket lifecycle" have been implemented,
"GET Bucket lifecycle" not realized yet as S3cmd has not
realize it also.
The feature`s main point is to remove expire file per day.
Files transfer from hot layer to cold layer is not supported.
ToDo:Maybe to transfer from replicate pool to EC pool or
from ssd to sata pool will be valuable.

Now put all buckets which should do lifecycle into shard
objects in .rgw.lc pool.

lifecycle config file format:
<LifecycleConfiguration>
    <Rule>
        <ID>sample-rule</ID>
        <Prefix></Prefix>
        <Status>enable</Status>
        <Expiration>
           <Days>1</Days>
        </Expiration>
    </Rule>
</LifecycleConfiguration>

Signed-off-by: Ji Chen <insomnia@139.com>
9 years agoMerge pull request #6818 from trociny/fix-cmake
Josh Durgin [Tue, 8 Dec 2015 00:06:18 +0000 (16:06 -0800)]
Merge pull request #6818 from trociny/fix-cmake

cmake: update for recent rbd changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6837 from dreamhost/wip-test-cephtool-filenames
Josh Durgin [Mon, 7 Dec 2015 23:52:47 +0000 (15:52 -0800)]
Merge pull request #6837 from dreamhost/wip-test-cephtool-filenames

qa/workunits/cephtool/test.sh: false positive fail on /tmp/obj1.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: false positive fail on /tmp/obj1. 6837/head
Robin H. Johnson [Mon, 7 Dec 2015 22:41:12 +0000 (14:41 -0800)]
qa/workunits/cephtool/test.sh: false positive fail on /tmp/obj1.

If /tmp/obj1 happened to exist already, and was not writable by the
testing user, then this test failed!

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agoMerge pull request #6838 from stiopaa1/Wreorder_ceph_context
Josh Durgin [Mon, 7 Dec 2015 23:21:16 +0000 (15:21 -0800)]
Merge pull request #6838 from stiopaa1/Wreorder_ceph_context

common/ceph_context.cc:fix order of initialisers

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6831 from fullerdj/wip-14010
Josh Durgin [Mon, 7 Dec 2015 23:01:01 +0000 (15:01 -0800)]
Merge pull request #6831 from fullerdj/wip-14010

qa/krbd: Expunge generic/247

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6793 from dzafman/wip-hist-les-fix
David Zafman [Mon, 7 Dec 2015 22:56:03 +0000 (14:56 -0800)]
Merge pull request #6793 from dzafman/wip-hist-les-fix

osd: Allow repair of history.last_epoch_started using config

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agocommon/ceph_context.cc:fix order of initialisers 6838/head
Michal Jarzabek [Mon, 7 Dec 2015 22:36:16 +0000 (22:36 +0000)]
common/ceph_context.cc:fix order of initialisers

Fix order of member initialisers causing [-Wreorder] warning.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge branch 'unlinkcallbyrmbucket'
Yehuda Sadeh [Mon, 7 Dec 2015 19:54:49 +0000 (11:54 -0800)]
Merge branch 'unlinkcallbyrmbucket'

Conflicts:
src/rgw/rgw_bucket.cc

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw:dont update entrypoint when removing bucket
Aran85 [Wed, 30 Sep 2015 01:29:26 +0000 (09:29 +0800)]
rgw:dont update entrypoint when removing bucket

when removing bucket,we unlink the bucket bucket but we don't want
to update the entrypoint here.Because the update_entrypoint's default
value is true,so we need to indicate it to false.

Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
9 years agoMerge pull request #6735 from rzarzynski/wip-rgw-clean-putmetabucket
Yehuda Sadeh [Mon, 7 Dec 2015 19:10:24 +0000 (11:10 -0800)]
Merge pull request #6735 from rzarzynski/wip-rgw-clean-putmetabucket

rgw: remove unused variable in RGWPutMetadataBucket::execute

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6829 from LenzGr/master
Yehuda Sadeh [Mon, 7 Dec 2015 19:09:41 +0000 (11:09 -0800)]
Merge pull request #6829 from LenzGr/master

doc: Fixed incorrect name of a "List Multipart Upload Parts" Response Entity

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6774 from ceph/wip-rgw-cap-fix
Yehuda Sadeh [Mon, 7 Dec 2015 18:42:18 +0000 (10:42 -0800)]
Merge pull request #6774 from ceph/wip-rgw-cap-fix

rgw: add a missing cap type

9 years agoosd: fix arithmetic exception when scrub_min_interval is small 6827/head
Mykola Golub [Mon, 7 Dec 2015 06:53:23 +0000 (08:53 +0200)]
osd: fix arithmetic exception when scrub_min_interval is small

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoosd: more scrubber fields in pg query output
Mykola Golub [Fri, 4 Dec 2015 19:02:44 +0000 (21:02 +0200)]
osd: more scrubber fields in pg query output

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoosd: use hexdump when logging CRC values
Mykola Golub [Fri, 4 Dec 2015 18:58:34 +0000 (20:58 +0200)]
osd: use hexdump when logging CRC values

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoqa/krbd: Expunge generic/247 6831/head
Douglas Fuller [Mon, 7 Dec 2015 17:18:26 +0000 (09:18 -0800)]
qa/krbd: Expunge generic/247

xfstests generic/247 exercises XFS DIO and AIO to detect races. Some
races apparently exist in the XFS code as this is a known issue within
XFS. Expunge this test because it is not specifically relevant to krbd
and not a specific krbd issue.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
9 years agotests: make sure no segfault occurs when using some bad keyring 6698/head
Dunrong Huang [Mon, 7 Dec 2015 16:22:02 +0000 (00:22 +0800)]
tests: make sure no segfault occurs when using some bad keyring

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
9 years agocmake: add TracepointProvider.cc to libcommon 6823/head
Orit Wasserman [Mon, 7 Dec 2015 10:57:53 +0000 (11:57 +0100)]
cmake: add TracepointProvider.cc to libcommon

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #6805 from zaitcev/cmake-pluginregistry
Orit Wasserman [Mon, 7 Dec 2015 15:16:26 +0000 (16:16 +0100)]
Merge pull request #6805 from zaitcev/cmake-pluginregistry

cmake: Add common/PluginRegistry.cc to CMakeLists.txt

9 years agodoc: Fixed incorrect name of a "List Multipart Upload Parts" Response Entity 6829/head
Lenz Grimmer [Mon, 7 Dec 2015 14:54:49 +0000 (15:54 +0100)]
doc: Fixed incorrect name of a "List Multipart Upload Parts" Response Entity

Fixed incorrect name of a "List Multipart Upload Parts" Response Entity:
"InitiatedMultipartUploadsResult" -> "ListPartsResult"

Fixes: #14003
Signed-off-by: Lenz Grimmer <lenz@grimmer.com>
9 years agocmake: update for recent rbd changes 6818/head
Mykola Golub [Sun, 6 Dec 2015 19:55:20 +0000 (21:55 +0200)]
cmake: update for recent rbd changes

Signed-off-by: Mykola Golub <mgolub@mirantis.com>