]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoMerge pull request #8006 from liewegas/wip-big-pages
Sage Weil [Fri, 11 Mar 2016 15:29:00 +0000 (10:29 -0500)]
Merge pull request #8006 from liewegas/wip-big-pages

os/bluestore/KernelDevice: force block size

9 years agoMerge pull request #8019 from kmroz/wip-upstream-civetweb-low-ports-6
Sage Weil [Fri, 11 Mar 2016 15:28:17 +0000 (10:28 -0500)]
Merge pull request #8019 from kmroz/wip-upstream-civetweb-low-ports-6

rgw: drop permissions of rgw/civetweb after startup

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8007 from wido/se-mirror-mail
Kefu Chai [Fri, 11 Mar 2016 14:39:59 +0000 (22:39 +0800)]
Merge pull request #8007 from wido/se-mirror-mail

mirrors: Change contact e-mail address for se.ceph.com

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7991 from xiexingguo/xxg-wip-remove-upthrupending
Kefu Chai [Fri, 11 Mar 2016 14:39:29 +0000 (22:39 +0800)]
Merge pull request #7991 from xiexingguo/xxg-wip-remove-upthrupending

osd: remove up_thru_pending field, which is never used

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8023 from roidayan/xio-remove_unused_variable
Kefu Chai [Fri, 11 Mar 2016 14:15:54 +0000 (22:15 +0800)]
Merge pull request #8023 from roidayan/xio-remove_unused_variable

xio: remove unused variable

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7923 from RustShen/master
Josh Durgin [Fri, 11 Mar 2016 08:04:44 +0000 (00:04 -0800)]
Merge pull request #7923 from RustShen/master

doc: add cinder backend section to rbd-openstack.rst

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7999 from liewegas/wip-armhf
Dan Mick [Fri, 11 Mar 2016 03:15:59 +0000 (19:15 -0800)]
Merge pull request #7999 from liewegas/wip-armhf

a few armhf (32-bit build) fixes

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoMerge pull request #7891 from rzarzynski/wip-rgw-content-disp
Yehuda Sadeh [Thu, 10 Mar 2016 23:41:27 +0000 (15:41 -0800)]
Merge pull request #7891 from rzarzynski/wip-rgw-content-disp

rgw: multiple Swift API compliance improvements for TempURL (Radoslaw Zarzynsk)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7990 from x11562/rgw_unused_vector
Yehuda Sadeh [Thu, 10 Mar 2016 22:57:06 +0000 (14:57 -0800)]
Merge pull request #7990 from x11562/rgw_unused_vector

rgw: remove unused vector

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8031 from ceph/wip-rgw-usage
Yehuda Sadeh [Thu, 10 Mar 2016 22:53:15 +0000 (14:53 -0800)]
Merge pull request #8031 from ceph/wip-rgw-usage

rgw: admin api for retrieving usage info (Ji Chen)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #8036 from yehudasa/wip-rgw-support-json-format-v2
Yehuda Sadeh [Thu, 10 Mar 2016 22:50:21 +0000 (14:50 -0800)]
Merge pull request #8036 from yehudasa/wip-rgw-support-json-format-v2

rgw: support json format for admin policy API (Dunrong Huang)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #7874 from badone/wip-coverity-rgw_lib-uninit
Yehuda Sadeh [Thu, 10 Mar 2016 22:26:30 +0000 (14:26 -0800)]
Merge pull request #7874 from badone/wip-coverity-rgw_lib-uninit

[rgw] RGWLib::env is not used so remove it

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw_admin: policy dump --xml backward compatibility 8036/head
Yehuda Sadeh [Thu, 10 Mar 2016 22:15:09 +0000 (14:15 -0800)]
rgw_admin: policy dump --xml backward compatibility

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: remove unused header file
Dunrong Huang [Wed, 3 Feb 2016 08:07:03 +0000 (16:07 +0800)]
rgw: remove unused header file

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
9 years agorgw: support json format output for rados-admin policy command
Dunrong Huang [Wed, 3 Feb 2016 07:59:24 +0000 (15:59 +0800)]
rgw: support json format output for rados-admin policy command

when use rados-admin to get policy with parameter --format=json:
$ radosgw-admin policy --bucket=m8x --format=json

policy information with json format should be output.

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
9 years agorgw: support json format for admin policy API
Dunrong Huang [Wed, 3 Feb 2016 07:43:40 +0000 (15:43 +0800)]
rgw: support json format for admin policy API

Fixes: #14090, #14091
- before this patch:
$ curl -s -X GET http://radosrgw:9090/admin/bucket?format=json&policy&bucket=m8x | xmllint --format -

got XML response with error format

- after this patch:
got correct response with json format

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
9 years agoMerge pull request #8027 from liewegas/wip-reweight-fix
Gregory Farnum [Thu, 10 Mar 2016 21:03:32 +0000 (13:03 -0800)]
Merge pull request #8027 from liewegas/wip-reweight-fix

test/pybind/test_ceph_argparse: fix reweight-by-utilization tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6656 from jmunhoz/wip-bucket-request-payment-usage-log
Yehuda Sadeh [Thu, 10 Mar 2016 19:13:24 +0000 (11:13 -0800)]
Merge pull request #6656 from jmunhoz/wip-bucket-request-payment-usage-log

rgw: add bucket request payment feature usage statistics integration

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8021 from branch-predictor/bp-bench-full-bw
Sage Weil [Thu, 10 Mar 2016 18:08:54 +0000 (13:08 -0500)]
Merge pull request #8021 from branch-predictor/bp-bench-full-bw

common/obj_bencher.cc: bump the precision of bandwidth field

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7675 from vmcloud/wip-12917
Matt Benjamin [Thu, 10 Mar 2016 17:03:49 +0000 (12:03 -0500)]
Merge pull request #7675 from vmcloud/wip-12917

rgw: adjust the request_uri to support absoluteURI of http request

9 years agotest/pybind/test_ceph_argparse: fix reweight-by-utilization tests 8027/head
Sage Weil [Thu, 10 Mar 2016 13:50:57 +0000 (08:50 -0500)]
test/pybind/test_ceph_argparse: fix reweight-by-utilization tests

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoman/8/ceph.rst: remove invalid option for reweight-by-*
Kefu Chai [Thu, 10 Mar 2016 13:41:15 +0000 (21:41 +0800)]
man/8/ceph.rst: remove invalid option for reweight-by-*

--yes-i-really-mean-it is not valid option for reweight-by-*

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8025 from roidayan/xio-remove_duplicate_peer_addr_assignment
Kefu Chai [Thu, 10 Mar 2016 13:52:36 +0000 (21:52 +0800)]
Merge pull request #8025 from roidayan/xio-remove_duplicate_peer_addr_assignment

xio: remove duplicate assignment of peer addr

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoxio: remove duplicate assignment of peer addr 8025/head
Roi Dayan [Wed, 2 Mar 2016 07:58:45 +0000 (09:58 +0200)]
xio: remove duplicate assignment of peer addr

Signed-off-by: Roi Dayan <roid@mellanox.com>
9 years agotest: correct journal test failure caused by two merged commits
Jason Dillaman [Thu, 10 Mar 2016 12:58:31 +0000 (07:58 -0500)]
test: correct journal test failure caused by two merged commits

Commit 21d9595 changed the journal width to 3 objects while commit
a00eae0 changed the signature of the journal create helper.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoxio: remove unused variable 8023/head
Roi Dayan [Wed, 9 Mar 2016 10:55:45 +0000 (12:55 +0200)]
xio: remove unused variable

Signed-off-by: Roi Dayan <roid@mellanox.com>
9 years agocommon/obj_bencher.cc: bump the precision of bandwidth field 8021/head
Piotr Dałek [Thu, 10 Mar 2016 11:48:49 +0000 (12:48 +0100)]
common/obj_bencher.cc: bump the precision of bandwidth field

When calculated final average bandwidth exceeds 999MB, it starts
to get printed in scientific notation. Bump up the bandwidth
field precision so it'll remain in floating-point format for
a bit longer.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge remote-tracking branch 'origin/jewel'
Greg Farnum [Thu, 10 Mar 2016 08:56:37 +0000 (00:56 -0800)]
Merge remote-tracking branch 'origin/jewel'

Conflicts:
src/client/Client.h
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7495 from ukernel/jewel-10436
Gregory Farnum [Thu, 10 Mar 2016 08:52:17 +0000 (00:52 -0800)]
Merge pull request #7495 from ukernel/jewel-10436

client: flush kernel pagecache before creating snapshot

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agorgw: instruct civetweb to drop permissions 8018/head 8019/head
Karol Mroz [Tue, 8 Mar 2016 08:54:03 +0000 (09:54 +0100)]
rgw: instruct civetweb to drop permissions

Get uid set in g_ceph_context and pass to civetweb where setuid()/setgid()
will be invoked. This Allows for starting civetweb under privileged port
numbers.

Fixes: #13600
Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agorgw_main: break up frontend config parsing
Karol Mroz [Tue, 9 Feb 2016 23:10:15 +0000 (15:10 -0800)]
rgw_main: break up frontend config parsing

Before invoking global_init(), determine which frontends are configured.
If Civetweb is to be used, ensure it will be responsible for dropping
permissions after radosgw startup.

Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agoglobal_init: add run_pre_init argument to function signature
Karol Mroz [Tue, 9 Feb 2016 22:09:29 +0000 (14:09 -0800)]
global_init: add run_pre_init argument to function signature

Allows running the global_pre_init() separately in order to parse config
options prior to invoking global_init().

Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agoglobal: record target user and group strings
Karol Mroz [Wed, 9 Mar 2016 15:25:39 +0000 (16:25 +0100)]
global: record target user and group strings

Useful so we don't have to do a reverse lookup when dropping permissions
in civetweb.

Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agoMerge pull request #7798 from ukernel/wip-mds-snap
Gregory Farnum [Thu, 10 Mar 2016 06:49:46 +0000 (22:49 -0800)]
Merge pull request #7798 from ukernel/wip-mds-snap

A few more snapshot fixes, mostly around snapshotted inode/dentry tracking

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7994 from ukernel/jewel-14996
Gregory Farnum [Thu, 10 Mar 2016 06:43:04 +0000 (22:43 -0800)]
Merge pull request #7994 from ukernel/jewel-14996

Merge: Fix client handling of "lost" open directories on shutdown

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoModifications to rbd-openstack.rst 7923/head
RustShen [Fri, 4 Mar 2016 06:50:41 +0000 (14:50 +0800)]
Modifications to rbd-openstack.rst

Original configuration is not working

'enabled_backends' should be changed accordingly

Signed-off-by: RustShen <rustinpeace@163.com>
Update rbd-openstack.rst

9 years agoMerge remote-tracking branch 'origin/greg-fs-testing-3-7-damage'
Greg Farnum [Thu, 10 Mar 2016 06:25:25 +0000 (22:25 -0800)]
Merge remote-tracking branch 'origin/greg-fs-testing-3-7-damage'

9 years agoMerge pull request #7686 from david-z/wip-fix-fh-ref-leak
Gregory Farnum [Thu, 10 Mar 2016 06:25:42 +0000 (22:25 -0800)]
Merge pull request #7686 from david-z/wip-fix-fh-ref-leak

ceph-fuse: Fix potential filehandle ref leak at umount

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7685 from david-z/wip-fix-put-free-fd-back
Gregory Farnum [Thu, 10 Mar 2016 06:24:22 +0000 (22:24 -0800)]
Merge pull request #7685 from david-z/wip-fix-put-free-fd-back

[cephfs] fix free fds being exhausted eventually because freed fds are never put back

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7003 from jcsp/wip-cephfs-tmap-migrate
Gregory Farnum [Thu, 10 Mar 2016 06:22:42 +0000 (22:22 -0800)]
Merge pull request #7003 from jcsp/wip-cephfs-tmap-migrate

tools/cephfs: add tmap_upgrade

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8014 from ukernel/wip-15038
Gregory Farnum [Thu, 10 Mar 2016 06:12:07 +0000 (22:12 -0800)]
Merge pull request #8014 from ukernel/wip-15038

mds: fix inode_t::compare()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8012 from zmc/jewel
Dan Mick [Thu, 10 Mar 2016 03:40:04 +0000 (19:40 -0800)]
Merge pull request #8012 from zmc/jewel

man/8/ceph-disk: fix formatting issue

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agomds: fix inode_t::compare() 8014/head
Yan, Zheng [Thu, 10 Mar 2016 02:50:07 +0000 (10:50 +0800)]
mds: fix inode_t::compare()

Fixes: #15038
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7978 from dillaman/wip-14908
Josh Durgin [Thu, 10 Mar 2016 01:51:02 +0000 (17:51 -0800)]
Merge pull request #7978 from dillaman/wip-14908

librbd: refresh image if required before replaying journal ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8009 from dillaman/wip-14988
Josh Durgin [Thu, 10 Mar 2016 01:30:08 +0000 (17:30 -0800)]
Merge pull request #8009 from dillaman/wip-14988

test: reproducer for writeback CoW deadlock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8005 from dillaman/wip-rbd-lock-fence
Josh Durgin [Thu, 10 Mar 2016 01:25:55 +0000 (17:25 -0800)]
Merge pull request #8005 from dillaman/wip-rbd-lock-fence

pybind: flag an RBD image as closed regardless of result code

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8001 from dillaman/wip-rbd-cram
Josh Durgin [Thu, 10 Mar 2016 01:23:54 +0000 (17:23 -0800)]
Merge pull request #8001 from dillaman/wip-rbd-cram

test: update rbd integration cram tests for new default features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotest: reproducer for writeback CoW deadlock 8009/head
Jason Dillaman [Wed, 9 Mar 2016 22:31:06 +0000 (17:31 -0500)]
test: reproducer for writeback CoW deadlock

Refs: #14988

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoman/8/ceph-disk: fix formatting issue 8012/head
Sage Weil [Wed, 9 Mar 2016 17:30:23 +0000 (12:30 -0500)]
man/8/ceph-disk: fix formatting issue

ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:39: Unexpected indentation.
WARNING: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:40: Block quote ends without a blank line; unexpected unindent.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8dcaacbb0549a188ebe4b598d5eccf5584a27e6f)

9 years agoMerge pull request #7906 from dillaman/wip-14869
Josh Durgin [Wed, 9 Mar 2016 22:18:13 +0000 (14:18 -0800)]
Merge pull request #7906 from dillaman/wip-14869

journal: re-use common threads between journalers

Conflicts:
src/journal/JournalPlayer.cc
src/librbd/Journal.cc
src/test/rbd_mirror/image_replay.cc
src/tools/rbd_mirror/ImageReplayer.h
src/tools/rbd_mirror/Mirror.cc

(merged interface changes to ImageReplayer, and reduced scope for
change to JournalPlayer due to pr #7884 (wip-14663)).

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7958 from trociny/wip-rbd-mirror-fixup
Josh Durgin [Wed, 9 Mar 2016 22:03:48 +0000 (14:03 -0800)]
Merge pull request #7958 from trociny/wip-rbd-mirror-fixup

rbd-mirror: minor fix-ups for initial skeleton implementation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7884 from dillaman/wip-14663
Josh Durgin [Wed, 9 Mar 2016 22:02:38 +0000 (14:02 -0800)]
Merge pull request #7884 from dillaman/wip-14663

librbd: allocate new journal tag after acquiring exclusive lock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7772 from xinxinsh/wip-14789
Josh Durgin [Wed, 9 Mar 2016 22:01:54 +0000 (14:01 -0800)]
Merge pull request #7772 from xinxinsh/wip-14789

librbd: truncate does not need to mark the object as existing in the object map

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agodoc: Add French mirror 8007/head
Wido den Hollander [Wed, 9 Mar 2016 21:52:49 +0000 (22:52 +0100)]
doc: Add French mirror

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agomirrors: Change contact e-mail address for se.ceph.com
Wido den Hollander [Wed, 9 Mar 2016 21:42:15 +0000 (22:42 +0100)]
mirrors: Change contact e-mail address for se.ceph.com

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agoMerge pull request #8003 from liewegas/wip-ceph-disk-doc
Zack Cerza [Wed, 9 Mar 2016 21:32:50 +0000 (14:32 -0700)]
Merge pull request #8003 from liewegas/wip-ceph-disk-doc

man/8/ceph-disk: fix formatting issue

9 years agoMerge pull request #7927 from oritwas/wip-rgw-fix-default
Sage Weil [Wed, 9 Mar 2016 21:13:16 +0000 (16:13 -0500)]
Merge pull request #7927 from oritwas/wip-rgw-fix-default

rgw: RGWZoneParams::create should not handle -EEXIST error

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 9 Mar 2016 20:45:38 +0000 (15:45 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #7768 from xinxinsh/wip-fix-zero
Sage Weil [Wed, 9 Mar 2016 20:05:28 +0000 (15:05 -0500)]
Merge pull request #7768 from xinxinsh/wip-fix-zero

osd: filestore: FALLOC_FL_PUNCH_HOLE must be used with FALLOC_FL_KEEP_SIZE

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7844 from xiexingguo/xxg-wip-14922
Sage Weil [Wed, 9 Mar 2016 20:03:42 +0000 (15:03 -0500)]
Merge pull request #7844 from xiexingguo/xxg-wip-14922

osd: replicatedpg: break out loop if we encounter fatal error during do_pg_op()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7864 from dillaman/wip-librados-aio-notify
Sage Weil [Wed, 9 Mar 2016 20:03:14 +0000 (15:03 -0500)]
Merge pull request #7864 from dillaman/wip-librados-aio-notify

librados: race condition on aio_notify completion handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7928 from branch-predictor/bp-radostool-reduce-mem
Sage Weil [Wed, 9 Mar 2016 20:02:00 +0000 (15:02 -0500)]
Merge pull request #7928 from branch-predictor/bp-radostool-reduce-mem

tools/rados: reduce "rados put" memory usage by op_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7967 from tchaikov/wip-si-cast-coverity
Sage Weil [Wed, 9 Mar 2016 20:01:31 +0000 (15:01 -0500)]
Merge pull request #7967 from tchaikov/wip-si-cast-coverity

common/strtol.cc: fix the coverity warnings

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #7948 from avnerbh/fix_avoid_enqueue_dup_code
Sage Weil [Wed, 9 Mar 2016 19:07:21 +0000 (14:07 -0500)]
Merge pull request #7948 from avnerbh/fix_avoid_enqueue_dup_code

msg: remove duplicated code - local_delivery will now call 'enqueue'

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7890 from liewegas/wip-reweight
Sage Weil [Wed, 9 Mar 2016 19:06:30 +0000 (14:06 -0500)]
Merge pull request #7890 from liewegas/wip-reweight

mon: osd [test-]reweight-by-{pg,utilization} command updates

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agopybind: flag an RBD Image as closed regardless of result code 8005/head
Jason Dillaman [Wed, 9 Mar 2016 18:56:16 +0000 (13:56 -0500)]
pybind: flag an RBD Image as closed regardless of result code

The image will always be closed -- the error code just alerts the
user to any possible error encountered when closing the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: permit watch flush to return error code
Jason Dillaman [Wed, 9 Mar 2016 18:55:29 +0000 (13:55 -0500)]
librbd: permit watch flush to return error code

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomon: remove range=100 from reweight-by-* commands 7890/head
Sage Weil [Wed, 9 Mar 2016 18:25:55 +0000 (13:25 -0500)]
mon: remove range=100 from reweight-by-* commands

Specifying the range makes it skip instead of error when you give
it a bad value.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoman/8/ceph-disk: fix formatting issue 8003/head
Sage Weil [Wed, 9 Mar 2016 17:30:23 +0000 (12:30 -0500)]
man/8/ceph-disk: fix formatting issue

ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:39: Unexpected indentation.
WARNING: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:40: Block quote ends without a blank line; unexpected unindent.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: pg: remove get_log_write_pos() method 7991/head
xie xingguo [Wed, 9 Mar 2016 16:55:13 +0000 (00:55 +0800)]
osd: pg: remove get_log_write_pos() method

which is never used.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agotest: update rbd integration cram tests for new default features 8001/head
Jason Dillaman [Wed, 9 Mar 2016 16:42:16 +0000 (11:42 -0500)]
test: update rbd integration cram tests for new default features

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7847 from wido/mirroring-fixes
Kefu Chai [Wed, 9 Mar 2016 15:50:16 +0000 (23:50 +0800)]
Merge pull request #7847 from wido/mirroring-fixes

Updated scripts and documentation for mirrors

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoAdd script to test connectivity and availability of Ceph mirrors 7847/head
Wido den Hollander [Tue, 16 Feb 2016 10:37:43 +0000 (11:37 +0100)]
Add script to test connectivity and availability of Ceph mirrors

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agomirror: Add examle rsync daemon configuration
Wido den Hollander [Wed, 10 Feb 2016 08:01:24 +0000 (09:01 +0100)]
mirror: Add examle rsync daemon configuration

This can be used by mirrors to offer a rsync service to end-users

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agodoc: Updated docs with additional mirror information
Wido den Hollander [Mon, 8 Feb 2016 11:11:21 +0000 (12:11 +0100)]
doc: Updated docs with additional mirror information

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agoMerge pull request #7552 from dachary/wip-14669-key-management
Sage Weil [Wed, 9 Mar 2016 15:31:53 +0000 (10:31 -0500)]
Merge pull request #7552 from dachary/wip-14669-key-management

ceph-disk: key management support

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7995 from majianpeng/bluestore-dump-onode
Sage Weil [Wed, 9 Mar 2016 15:18:28 +0000 (10:18 -0500)]
Merge pull request #7995 from majianpeng/bluestore-dump-onode

osd: bluestore: allow _dump_onode dynamic accept log level

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueStore: Allow _dump_onode dynamic accept log level. 7995/head
Jianpeng Ma [Wed, 9 Mar 2016 15:03:27 +0000 (23:03 +0800)]
os/bluestore/BlueStore: Allow _dump_onode dynamic accept log level.

Make _dump_onode dynamic accept different log level in different case.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge pull request #7996 from majianpeng/bluestore-fullextent-overwrite
Sage Weil [Wed, 9 Mar 2016 15:13:43 +0000 (10:13 -0500)]
Merge pull request #7996 from majianpeng/bluestore-fullextent-overwrite

osd: bluestore: for overwrite a extent, allocate new extent on min_alloc_size write

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueStore: For overwrite a extent, allocate new extent rather than WAL. 7996/head
Jianpeng Ma [Wed, 9 Mar 2016 15:52:23 +0000 (23:52 +0800)]
os/bluestore/BlueStore: For overwrite a extent, allocate new extent rather than WAL.

This bug introduce by commit:b0b4b6de362f0edf. This commit forget this
case which overwrite(0, bluestore_min_alloc_size).
For this case it  need a new extent rather than WAL.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agocls_rgw: use sized uint64_t for encoded time_t 7999/head
Sage Weil [Wed, 9 Mar 2016 14:48:15 +0000 (09:48 -0500)]
cls_rgw: use sized uint64_t for encoded time_t

The size of time_t varies between architectures--do not encode it
directly.

Reported-by: Eric Lee <eric.lee@hgst.com>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agotest/librgw_file_*: use size_t* for rgw_read arg
Signed-off-by: Eric Lee [Wed, 9 Mar 2016 13:28:32 +0000 (08:28 -0500)]
test/librgw_file_*: use size_t* for rgw_read arg

Fixes 32-bit build.

Signed-off-by: Eric Lee <eric.lee@hgst.com>
9 years agoclient: pass proper old snap context to queue_cap_snap() 7495/head
Yan, Zheng [Wed, 9 Mar 2016 13:50:45 +0000 (21:50 +0800)]
client: pass proper old snap context to queue_cap_snap()

the snap realm for split point can be newly created, its snap context
is empty in this case.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoclient: flush kernel pagecache before creating snapshot
Yan, Zheng [Mon, 15 Feb 2016 07:29:28 +0000 (15:29 +0800)]
client: flush kernel pagecache before creating snapshot

Fixes: #10436
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoosd: remove up_thru_pending field, which is never used
xie xingguo [Wed, 9 Mar 2016 11:17:46 +0000 (19:17 +0800)]
osd: remove up_thru_pending field, which is never used

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7960 from SUSE/wip-docdev-mon
Loic Dachary [Wed, 9 Mar 2016 09:41:14 +0000 (16:41 +0700)]
Merge pull request #7960 from SUSE/wip-docdev-mon

doc/dev: continue writing Testing in the cloud chapter

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc/dev: Continue writing Testing in the cloud chapter 7960/head
Nathan Cutler [Mon, 7 Mar 2016 17:03:08 +0000 (18:03 +0100)]
doc/dev: Continue writing Testing in the cloud chapter

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoceph_test_libcephfs: shutdown without closing file/dir 7994/head
Yan, Zheng [Wed, 9 Mar 2016 04:06:52 +0000 (12:06 +0800)]
ceph_test_libcephfs: shutdown without closing file/dir

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoclient: close opened dirs when umounting
Yan, Zheng [Wed, 9 Mar 2016 04:04:59 +0000 (12:04 +0800)]
client: close opened dirs when umounting

Fixes: #14996
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agorgw: remove unused vector 7990/head
x11562 [Wed, 9 Mar 2016 02:50:31 +0000 (10:50 +0800)]
rgw: remove unused vector

Signed-off-by: Na Xie <xie.na@h3c.com>
9 years agoMerge pull request #7986 from liewegas/wip-xxhash
Josh Durgin [Tue, 8 Mar 2016 23:22:26 +0000 (15:22 -0800)]
Merge pull request #7986 from liewegas/wip-xxhash

xxhash: use clone of xxhash.git; add .gitignore

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoxxHash: add .gitignore for build artifacts 7986/head
Sage Weil [Tue, 8 Mar 2016 21:18:00 +0000 (16:18 -0500)]
xxHash: add .gitignore for build artifacts

Signed-off-by: Sage Weil <sage@redhat.com>
9 years ago.gitmodules: use github.com/ceph/xxHash clone
Sage Weil [Tue, 8 Mar 2016 21:04:31 +0000 (16:04 -0500)]
.gitmodules: use github.com/ceph/xxHash clone

This lets us add our own commits, if necessary.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agolibrbd: refresh image if required before replaying journal ops 7978/head
Jason Dillaman [Tue, 8 Mar 2016 18:20:24 +0000 (13:20 -0500)]
librbd: refresh image if required before replaying journal ops

Fixes: #14908
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agodoc/release-notes: v10.0.4
Sage Weil [Tue, 8 Mar 2016 16:37:12 +0000 (11:37 -0500)]
doc/release-notes: v10.0.4

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7966 from dachary/wip-release-notes
Sage Weil [Tue, 8 Mar 2016 16:33:52 +0000 (11:33 -0500)]
Merge pull request #7966 from dachary/wip-release-notes

release-notes: draft v10.0.4 release notes

9 years agoMerge pull request #7880 from SUSE/wip_keyring_permisions_for_mon_deamon_14950
Sage Weil [Tue, 8 Mar 2016 16:22:08 +0000 (11:22 -0500)]
Merge pull request #7880 from SUSE/wip_keyring_permisions_for_mon_deamon_14950

mon: fix keyring permissions

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7121 from efirs/ef_eversion_t_no_sprintf
Sage Weil [Tue, 8 Mar 2016 16:21:42 +0000 (11:21 -0500)]
Merge pull request #7121 from efirs/ef_eversion_t_no_sprintf

osd: Replace snprintf with faster implementation in eversion_t::get_key_name

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7141 from jecluis/wip-mon-clockskew
Sage Weil [Tue, 8 Mar 2016 16:21:20 +0000 (11:21 -0500)]
Merge pull request #7141 from jecluis/wip-mon-clockskew

mon: make clock skew checks sane

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7899 from liewegas/wip-osd-markdown
Sage Weil [Tue, 8 Mar 2016 16:20:54 +0000 (11:20 -0500)]
Merge pull request #7899 from liewegas/wip-osd-markdown

test/osd: Relax the timing intervals in osd-markdown.sh