]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agomon: modify the level of a log about OSD's condition in OSDMonitor.cc 6928/head
Yongqiang He [Thu, 17 Dec 2015 18:57:07 +0000 (13:57 -0500)]
mon: modify the level of a log about OSD's condition in OSDMonitor.cc

    In actual use, we replace old hard disk by new or do performance testing regularly and need to down OSDs manually, but there are some OSDs can not be marked down, and there is no obvious information.
The log { dout(5) << "can_mark_down current up_ratio " << up_ratio << " < min "<< g_conf->mon_osd_min_up_ratio<< ", will not mark osd." << i << "down" << dendl ; }" can explain  why it happened.
   In addition, we can change the value of mon_osd_min_up_ratio more reasonable in our operating environment.so it is necessary to adjust the log's level lower.

For example:
   There are 6 OSDs , wen have marked down 5 of them and the mon_osd_min_up_ratio = 0.3.
   In this situation, when we mark the last OSD to down, it will show "ceph-osd stop/waiting", but in actually, the OSD is still up.

Signed-off-by: Yongqiang He <he.yongqiang@h3c.com>
9 years agoMerge pull request #6643 from rzarzynski/wip-rgw-slo-rzarzynski
Yehuda Sadeh [Tue, 15 Dec 2015 01:00:36 +0000 (17:00 -0800)]
Merge pull request #6643 from rzarzynski/wip-rgw-slo-rzarzynski

- rgw: swift bulk delete (Radoslaw Zarzynski)
- rgw: static large objects (Radoslaw Zarzynski, Yehuda Sadeh)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6925 from dillaman/wip-13633
Josh Durgin [Mon, 14 Dec 2015 23:47:57 +0000 (15:47 -0800)]
Merge pull request #6925 from dillaman/wip-13633

librbd: optionally validate new RBD pools for snapshot support

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotests: new integration test for validating new RBD pools 6925/head
Jason Dillaman [Mon, 14 Dec 2015 22:49:55 +0000 (17:49 -0500)]
tests: new integration test for validating new RBD pools

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: optionally validate RBD pool configuration (snapshot support)
Jason Dillaman [Mon, 14 Dec 2015 22:41:49 +0000 (17:41 -0500)]
librbd: optionally validate RBD pool configuration (snapshot support)

Fixes: #13633
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6917 from majianpeng/journal-iohint
Josh Durgin [Mon, 14 Dec 2015 22:16:19 +0000 (14:16 -0800)]
Merge pull request #6917 from majianpeng/journal-iohint

Journal iohint for librbd

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6923 from dillaman/wip-14060
Josh Durgin [Mon, 14 Dec 2015 21:41:40 +0000 (13:41 -0800)]
Merge pull request #6923 from dillaman/wip-14060

librbd: correct race conditions discovered during unit testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agojournal: avoid race between flush request and in-flight flushes 6923/head
Jason Dillaman [Mon, 14 Dec 2015 20:28:38 +0000 (15:28 -0500)]
journal: avoid race between flush request and in-flight flushes

Previously, if the journal object was empty, a flush request could
complete instantly even if there is an in-flight 'record safe'
callback.

Fixes: #14060
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: fix test case race condition for maintenance requests
Jason Dillaman [Mon, 14 Dec 2015 20:27:54 +0000 (15:27 -0500)]
librbd: fix test case race condition for maintenance requests

Fixes: #14060
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6922 from liewegas/wip-cephfs-posix
Sage Weil [Mon, 14 Dec 2015 18:12:58 +0000 (13:12 -0500)]
Merge pull request #6922 from liewegas/wip-cephfs-posix

doc/cephfs/posix: update

9 years agoMerge pull request #6899 from branch-predictor/bp-fix-no-rbd-build
Josh Durgin [Mon, 14 Dec 2015 17:49:49 +0000 (09:49 -0800)]
Merge pull request #6899 from branch-predictor/bp-fix-no-rbd-build

rbd: fix build with "--without-rbd"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorbd: fix build with "--without-rbd" 6899/head
Piotr Dałek [Fri, 11 Dec 2015 15:42:51 +0000 (16:42 +0100)]
rbd: fix build with "--without-rbd"

It's not possible to build Ceph configured with "--without-rbd", as
tests and FileStore depends on components provided by RBD. This changeset
fixes this.

Fixes: #14058
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agodoc/cephfs/posix: update 6922/head
Sage Weil [Mon, 14 Dec 2015 15:45:30 +0000 (10:45 -0500)]
doc/cephfs/posix: update

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6873 from javacruft/wip/debian-infernalis-patches
Loic Dachary [Mon, 14 Dec 2015 11:52:28 +0000 (12:52 +0100)]
Merge pull request #6873 from javacruft/wip/debian-infernalis-patches

ceph-detect-init: Ubuntu >= 15.04 uses systemd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6787 from oritwas/wip-run-cmake-check
Loic Dachary [Mon, 14 Dec 2015 11:49:37 +0000 (12:49 +0100)]
Merge pull request #6787 from oritwas/wip-run-cmake-check

Wip run cmake check

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agojournal: add iohint flags for journal replayer. 6917/head
Jianpeng Ma [Mon, 14 Dec 2015 05:23:04 +0000 (13:23 +0800)]
journal: add iohint flags for journal replayer.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agojournal: Add iohint flags for journal write ops.
Jianpeng Ma [Mon, 14 Dec 2015 05:32:02 +0000 (13:32 +0800)]
journal: Add iohint flags for journal write ops.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.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 agocmake: add run_cmake-check.sh 6787/head
Orit Wasserman [Thu, 3 Dec 2015 11:32:03 +0000 (12:32 +0100)]
cmake: add run_cmake-check.sh

currently only check to cmake build process

Signed-off-by: Orit Wasserman <owasserm@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 agoceph-detect-init: Ubuntu >= 15.04 uses systemd 6873/head
James Page [Wed, 9 Dec 2015 10:34:38 +0000 (10:34 +0000)]
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>
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 agorgw: enforce SLO part's ETag match during GET on SLO of Swift. 6643/head
Radoslaw Zarzynski [Thu, 19 Nov 2015 14:06:31 +0000 (15:06 +0100)]
rgw: enforce SLO part's ETag match during GET on SLO of Swift.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: append X-Static-Large-Object attribute during PUT on SLO.
Radoslaw Zarzynski [Thu, 19 Nov 2015 13:12:36 +0000 (14:12 +0100)]
rgw: append X-Static-Large-Object attribute during PUT on SLO.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: add support for normalisation of ranged SLO requests.
Radoslaw Zarzynski [Wed, 18 Nov 2015 19:15:09 +0000 (20:15 +0100)]
rgw: add support for normalisation of ranged SLO requests.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: fix wrong ofs handling during GET on Swift's SLO.
Radoslaw Zarzynski [Wed, 18 Nov 2015 19:12:37 +0000 (20:12 +0100)]
rgw: fix wrong ofs handling during GET on Swift's SLO.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: handle errors during GET on Swift's SLO appropriately.
Radoslaw Zarzynski [Wed, 18 Nov 2015 14:52:16 +0000 (15:52 +0100)]
rgw: handle errors during GET on Swift's SLO appropriately.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: make response for multipart delete on a SLO compliant with Swift.
Radoslaw Zarzynski [Mon, 9 Nov 2015 18:12:49 +0000 (19:12 +0100)]
rgw: make response for multipart delete on a SLO compliant with Swift.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: add support for multipart delete on a SLO of Swift.
Radoslaw Zarzynski [Mon, 9 Nov 2015 16:16:34 +0000 (17:16 +0100)]
rgw: add support for multipart delete on a SLO of Swift.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: fix iterate_slo_parts() and improve its declaration's formatting.
Radoslaw Zarzynski [Mon, 9 Nov 2015 16:15:25 +0000 (17:15 +0100)]
rgw: fix iterate_slo_parts() and improve its declaration's formatting.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: move RGWBulkDelete in rgw/rgw_op.h.
Radoslaw Zarzynski [Mon, 9 Nov 2015 16:14:49 +0000 (17:14 +0100)]
rgw: move RGWBulkDelete in rgw/rgw_op.h.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: iterate over slo parts
Yehuda Sadeh [Tue, 22 Sep 2015 07:35:03 +0000 (00:35 -0700)]
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

9 years agorgw: store slo info when putting object
Yehuda Sadeh [Tue, 22 Sep 2015 05:14:22 +0000 (22:14 -0700)]
rgw: store slo info when putting object

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Conflicts:
src/rgw/rgw_op.cc
src/rgw/rgw_op.h

9 years agorgw: read and parse put slo obj request
Yehuda Sadeh [Tue, 22 Sep 2015 03:56:29 +0000 (20:56 -0700)]
rgw: read and parse put slo obj request

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Conflicts:
src/rgw/rgw_op.h
src/rgw/rgw_rest_swift.cc

9 years agorgw: s/obj_manifest/dlo_manifest
Yehuda Sadeh [Tue, 22 Sep 2015 03:22:40 +0000 (20:22 -0700)]
rgw: s/obj_manifest/dlo_manifest

Be more clear, as slo_manifest will come later.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Conflicts:
src/rgw/rgw_op.cc

9 years agorgw: support bucket removal in Bulk Delete API implementation.
Radoslaw Zarzynski [Sun, 25 Oct 2015 13:15:32 +0000 (14:15 +0100)]
rgw: support bucket removal in Bulk Delete API implementation.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: improve response code handling for Bulk Delete API.
Radoslaw Zarzynski [Sun, 25 Oct 2015 14:38:21 +0000 (15:38 +0100)]
rgw: improve response code handling for Bulk Delete API.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: enable chunking in Bulk Delete API implementation.
Radoslaw Zarzynski [Sun, 25 Oct 2015 13:16:05 +0000 (14:16 +0100)]
rgw: enable chunking in Bulk Delete API implementation.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: add support for Bulk Delete API of Swift.
Radoslaw Zarzynski [Thu, 22 Oct 2015 17:00:21 +0000 (19:00 +0200)]
rgw: add support for Bulk Delete API of Swift.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>