]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoos/bluestore: avoid nullptr in bluestore_extent_ref_map_t::bound_encode 14073/head
Sage Weil [Thu, 23 Mar 2017 13:21:39 +0000 (08:21 -0500)]
os/bluestore: avoid nullptr in bluestore_extent_ref_map_t::bound_encode

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14030 from tchaikov/wip-denc-without-nullptr
Sage Weil [Tue, 21 Mar 2017 17:58:14 +0000 (12:58 -0500)]
Merge pull request #14030 from tchaikov/wip-denc-without-nullptr

os/bluestore: do not use nullptr to calc the size of bluestore_pextent_t

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #12041 from yangdongsheng/rbd_mirror_clone
Jason Dillaman [Tue, 21 Mar 2017 15:42:15 +0000 (11:42 -0400)]
Merge pull request #12041 from yangdongsheng/rbd_mirror_clone

librbd: asynchronous clone state machine

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14058 from tchaikov/wip-doc-linkcheck
Kefu Chai [Tue, 21 Mar 2017 14:41:59 +0000 (22:41 +0800)]
Merge pull request #14058 from tchaikov/wip-doc-linkcheck

doc: add optional argument for build-doc

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: liuchang0812 <liuchang0812@gmail.com>
8 years agoMerge pull request #14023 from dillaman/wip-rbd-coverity
Mykola Golub [Tue, 21 Mar 2017 14:40:36 +0000 (16:40 +0200)]
Merge pull request #14023 from dillaman/wip-rbd-coverity

librbd: fix valid coverity warnings

Reviewed-by: Pan Liu <liupan1111@gmail.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #14034 from liupan1111/wip-fix-comment-nbd
Mykola Golub [Tue, 21 Mar 2017 14:37:04 +0000 (16:37 +0200)]
Merge pull request #14034 from liupan1111/wip-fix-comment-nbd

rbd-nbd: fix typo in comment

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agorbd-nbd: fix typo in comment. 14034/head
Pan Liu [Tue, 21 Mar 2017 11:22:26 +0000 (19:22 +0800)]
rbd-nbd: fix typo in comment.

Signed-off-by: Pan Liu <liupan1111@gmail.com>
8 years agodoc: cephfs: fix the unexpected indent warning 14058/head
Kefu Chai [Tue, 21 Mar 2017 04:49:45 +0000 (12:49 +0800)]
doc: cephfs: fix the unexpected indent warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoadmin/build-doc: support optional argument for specifying sphinx builders
Kefu Chai [Tue, 21 Mar 2017 04:22:57 +0000 (12:22 +0800)]
admin/build-doc: support optional argument for specifying sphinx builders

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13997 from tchaikov/wip-doc-fixings
Kefu Chai [Tue, 21 Mar 2017 03:46:12 +0000 (11:46 +0800)]
Merge pull request #13997 from tchaikov/wip-doc-fixings

doc:  fixes to silence sphinx-build

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #14057 from badone/wip-RadosImport-connect
Brad Hubbard [Tue, 21 Mar 2017 03:35:09 +0000 (13:35 +1000)]
Merge pull request #14057 from badone/wip-RadosImport-connect

tools/rados: Check return value of connect

Reviewed-by: David Zafman <dzafman@redhat.com>
8 years agotools/rados: Check return value of connect 14057/head
Brad Hubbard [Tue, 21 Mar 2017 02:22:20 +0000 (12:22 +1000)]
tools/rados: Check return value of connect

Fail gracefully if Rados::connect returns an error.

Fixes: http://tracker.ceph.com/issues/19319
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #13971 from optimistyzy/0315_1
Haomai Wang [Mon, 20 Mar 2017 21:18:20 +0000 (05:18 +0800)]
Merge pull request #13971 from optimistyzy/0315_1

os/blestore/NVMEDevice: fix the I/O logic for read

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #13923 from xiexingguo/wip-clean-pglog-t
Yuri Weinstein [Mon, 20 Mar 2017 20:05:54 +0000 (13:05 -0700)]
Merge pull request #13923 from xiexingguo/wip-clean-pglog-t

OSD: drop parameter t from merge_log()

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #13938 from jimmyway/wip-chg-return-value-to-refs
Yuri Weinstein [Mon, 20 Mar 2017 20:04:44 +0000 (13:04 -0700)]
Merge pull request #13938 from jimmyway/wip-chg-return-value-to-refs

osd: replace object_info_t::operator=() with decode()

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13980 from majianpeng/filejournal-bufferlist-rebuild
Yuri Weinstein [Mon, 20 Mar 2017 20:03:58 +0000 (13:03 -0700)]
Merge pull request #13980 from majianpeng/filejournal-bufferlist-rebuild

os/filestore/FileJournal: bufferlist rebuild

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13535 from dongbula/add-rgw-finisher-to-perfcounter
Sage Weil [Mon, 20 Mar 2017 15:20:48 +0000 (10:20 -0500)]
Merge pull request #13535 from dongbula/add-rgw-finisher-to-perfcounter

rgw: add radosclient finisher to perf counter

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13955 from wangzhengyong/notify_finish
Casey Bodley [Mon, 20 Mar 2017 14:25:39 +0000 (10:25 -0400)]
Merge pull request #13955 from wangzhengyong/notify_finish

rgw: handle error return value in build_linked_oids_index

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13820 from mikulely/cleanup-rgw-lc
Casey Bodley [Mon, 20 Mar 2017 14:25:14 +0000 (10:25 -0400)]
Merge pull request #13820 from mikulely/cleanup-rgw-lc

rgw: cleanup lifecycle managament

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13481 from theanalyst/rgw/env-dout
Casey Bodley [Mon, 20 Mar 2017 14:20:43 +0000 (10:20 -0400)]
Merge pull request #13481 from theanalyst/rgw/env-dout

rgw: don't log the env_map twice

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13895 from guihecheng/rgw_file-fix
Matt Benjamin [Mon, 20 Mar 2017 13:54:02 +0000 (09:54 -0400)]
Merge pull request #13895 from guihecheng/rgw_file-fix

rgw_file: fix reversed return value of getattr

8 years agoMerge pull request #14045 from guihecheng/rgw_file-fix-retcode
Matt Benjamin [Mon, 20 Mar 2017 13:44:18 +0000 (09:44 -0400)]
Merge pull request #14045 from guihecheng/rgw_file-fix-retcode

rgw_file: fix non-negative return code for open operation

8 years agoMerge pull request #14049 from yangdongsheng/rbd_cleanup
Jason Dillaman [Mon, 20 Mar 2017 13:37:41 +0000 (09:37 -0400)]
Merge pull request #14049 from yangdongsheng/rbd_cleanup

cleanup: rbd: fix a typo in comment

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoBluestore,NVMEDEVICE: fix the I/O logic for READ 13971/head
Ziye Yang [Wed, 15 Mar 2017 06:32:53 +0000 (14:32 +0800)]
Bluestore,NVMEDEVICE: fix the I/O logic for READ

Aio_submit will submit both aio_read/write, and also there
are synchronized read and random read, so we need to
handle the read I/O completion in a correct way.

Since random read has its own ioc, so the
num_reading for ioc will be at most 1, which will be easy
to handle in io_complete. And we need only to differentiate
whethere it is an aio_read.

Also fix the exception logic in command send, make the style
consistent.

Signed-off-by: optimistyzy <optimistyzy@gmail.com>
8 years agoMerge pull request #13936 from ZVampirEM77/cleanup-rgw-doc
Kefu Chai [Mon, 20 Mar 2017 07:49:08 +0000 (15:49 +0800)]
Merge pull request #13936 from ZVampirEM77/cleanup-rgw-doc

doc: fix typos in radosgw-admin usage

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13559 from voidbag/wip-fix-_open_super_meta
Kefu Chai [Mon, 20 Mar 2017 07:32:28 +0000 (15:32 +0800)]
Merge pull request #13559 from voidbag/wip-fix-_open_super_meta

os/bluestore: fix bug in _open_super_meta()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13718 from aclamk/wip-bs-indexed-bitshift
Kefu Chai [Mon, 20 Mar 2017 07:31:10 +0000 (15:31 +0800)]
Merge pull request #13718 from aclamk/wip-bs-indexed-bitshift

os/bluestore: cleanup, got rid of table reference of 1<<x

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13769 from wangzhengyong/wip-noid
Kefu Chai [Mon, 20 Mar 2017 07:30:29 +0000 (15:30 +0800)]
Merge pull request #13769 from wangzhengyong/wip-noid

os/bluestore: "noid" is not always necessary in clone op

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13804 from xiaoxichen/fix_adminsocket
Kefu Chai [Mon, 20 Mar 2017 07:28:58 +0000 (15:28 +0800)]
Merge pull request #13804 from xiaoxichen/fix_adminsocket

pybind/ceph_daemon: use small chunk for recv

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13814 from liupan1111/wip-fix-remove-when-full
Kefu Chai [Mon, 20 Mar 2017 07:28:01 +0000 (15:28 +0800)]
Merge pull request #13814 from liupan1111/wip-fix-remove-when-full

rados: allow "rados purge" to delete objects when osd is full

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13822 from Liuchang0812/wip-event-center-bug
Kefu Chai [Mon, 20 Mar 2017 07:26:54 +0000 (15:26 +0800)]
Merge pull request #13822 from Liuchang0812/wip-event-center-bug

msg/async: fix crash that writing char to nonblock-fd gets EAGAIN in EventCenter::wakeup

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #13853 from tchaikov/wip-19134
Kefu Chai [Mon, 20 Mar 2017 07:25:34 +0000 (15:25 +0800)]
Merge pull request #13853 from tchaikov/wip-19134

mon/MonClient: don't return zero global_id

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #13899 from jcsp/wip-19245
Yan, Zheng [Mon, 20 Mar 2017 06:49:48 +0000 (14:49 +0800)]
Merge pull request #13899 from jcsp/wip-19245

mds: fix handling very fast delete ops

8 years agoMerge pull request #14007 from badone/wip-api-doc-code-fixes
Kefu Chai [Mon, 20 Mar 2017 04:12:28 +0000 (12:12 +0800)]
Merge pull request #14007 from badone/wip-api-doc-code-fixes

docs: Fix problems with example code

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14028 from tchaikov/wip-kill-gcc-warning
Kefu Chai [Mon, 20 Mar 2017 04:05:36 +0000 (12:05 +0800)]
Merge pull request #14028 from tchaikov/wip-kill-gcc-warning

os/bluestore: silence gcc warning

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #13969 from tchaikov/wip-ceph-disk-manpage-formatting
Kefu Chai [Mon, 20 Mar 2017 04:04:05 +0000 (12:04 +0800)]
Merge pull request #13969 from tchaikov/wip-ceph-disk-manpage-formatting

man/8/ceph-disk: fix formatting

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agorgw_file: fix non-negative return code for open operation 14045/head
Gui Hecheng [Mon, 20 Mar 2017 02:53:46 +0000 (10:53 +0800)]
rgw_file: fix non-negative return code for open operation

The nfs-ganesha expects a negative retcode for errors.

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
8 years agoMerge pull request #13988 from guihecheng/rgw_file-fix-rename
Matt Benjamin [Mon, 20 Mar 2017 00:01:45 +0000 (20:01 -0400)]
Merge pull request #13988 from guihecheng/rgw_file-fix-rename

rgw_file: fix double unref on rgw_fh for rename

8 years agoMerge pull request #14033 from wjin/clean
Brad Hubbard [Sun, 19 Mar 2017 00:03:42 +0000 (10:03 +1000)]
Merge pull request #14033 from wjin/clean

mon/PGMonitor: rm nonused function

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agomon/PGMonitor: rm nonused function 14033/head
Wei Jin [Sat, 18 Mar 2017 13:50:54 +0000 (21:50 +0800)]
mon/PGMonitor: rm nonused function

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
8 years agoos/bluestore: do not use nullptr to calc the size of bluestore_pextent_t 14030/head
Kefu Chai [Sat, 18 Mar 2017 09:07:48 +0000 (17:07 +0800)]
os/bluestore: do not use nullptr to calc the size of bluestore_pextent_t

see also #13889, otherwise this segfaults when compiled with -O0.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: silence gcc warning 14028/head
Kefu Chai [Sat, 18 Mar 2017 08:39:27 +0000 (16:39 +0800)]
os/bluestore: silence gcc warning

src/os/bluestore/BitAllocator.h:410:8: warning: ‘virtual bool
BitMapAreaIN::child_check_n_lock(BitMapArea*, int64_t, bool)’ was
hidden    [-Woverloaded-virtual]
 bool child_check_n_lock(BitMapArea *child, int64_t required, bool
lock) {
      ^~~~~~~~~~~~~~~~~~
 /var/ceph/ceph/src/os/bluestore/BitAllocator.h:489:8: warning:   by
 ‘BitMapAreaLeaf::child_check_n_lock’ [-Woverloaded-virtual]
  bool child_check_n_lock(BitMapZone* child, int64_t required, bool
  lock);
       ^~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13917 from nikitych/add-oracle-distros
Loic Dachary [Sat, 18 Mar 2017 07:48:58 +0000 (08:48 +0100)]
Merge pull request #13917 from nikitych/add-oracle-distros

ceph-detect-init: Adds Oracle Linux Server and Oracle VM Server detect

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #14006 from ShiqiCooperation/master
Xie Xingguo [Sat, 18 Mar 2017 07:27:36 +0000 (15:27 +0800)]
Merge pull request #14006 from ShiqiCooperation/master

test/unittest_bluefs: remove unused variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14005 from liupan1111/wip-fix-resize-issue
Mykola Golub [Sat, 18 Mar 2017 07:09:53 +0000 (09:09 +0200)]
Merge pull request #14005 from liupan1111/wip-fix-resize-issue

rbd-nbd: update size only when NBD_SET_SIZE successful

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #13922 from gregsfortytwo/wip-pg-unsigned-warning
Yuri Weinstein [Fri, 17 Mar 2017 21:39:04 +0000 (14:39 -0700)]
Merge pull request #13922 from gregsfortytwo/wip-pg-unsigned-warning

osd: fix a signed/unsigned warning in PG

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13946 from LiumxNL/wip-170313
Yuri Weinstein [Fri, 17 Mar 2017 21:35:45 +0000 (14:35 -0700)]
Merge pull request #13946 from LiumxNL/wip-170313

osd: don't share osdmap with objecter when preboot

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agolibrbd: fix valid coverity warnings 14023/head
Jason Dillaman [Fri, 17 Mar 2017 18:53:35 +0000 (14:53 -0400)]
librbd: fix valid coverity warnings

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13911 from liewegas/wip-bluestore-fix-flush
Sage Weil [Fri, 17 Mar 2017 18:36:42 +0000 (13:36 -0500)]
Merge pull request #13911 from liewegas/wip-bluestore-fix-flush

os/bluestore: fix bugs in bluefs and bdev flush

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #12364 from dillaman/wip-rbd-mirror-notifications
Mykola Golub [Fri, 17 Mar 2017 17:01:00 +0000 (19:01 +0200)]
Merge pull request #12364 from dillaman/wip-rbd-mirror-notifications

rbd-mirror: replace remote pool polling with add/remove notifications

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #12970 from VictorDenisov/snapshot_namespace_index
Jason Dillaman [Fri, 17 Mar 2017 16:55:48 +0000 (12:55 -0400)]
Merge pull request #12970 from VictorDenisov/snapshot_namespace_index

librbd: add SnapshotNamespace to ImageCtx

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #14019 from singler/wip-cleanup-create_new_fs
John Spray [Fri, 17 Mar 2017 16:04:07 +0000 (16:04 +0000)]
Merge pull request #14019 from singler/wip-cleanup-create_new_fs

mon/MDSMonitor: remove create_new_fs from header

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #13684 from shashalu/rgw-admin-init-bucket-for-sync
Casey Bodley [Fri, 17 Mar 2017 13:40:17 +0000 (09:40 -0400)]
Merge pull request #13684 from shashalu/rgw-admin-init-bucket-for-sync

rgw: fix init_bucket_for_sync retcode

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agomon/MDSMonitor: remove create_new_fs from header 14019/head
Henrik Korkuc [Fri, 17 Mar 2017 13:29:11 +0000 (15:29 +0200)]
mon/MDSMonitor: remove create_new_fs from header

create_new_fs was refactored and moved earlier. This removes a left
over header entry.

Signed-off-by: Henrik Korkuc <henrik@kirneh.eu>
8 years agoMerge pull request #14012 from optimistyzy/0317_2
Haomai Wang [Fri, 17 Mar 2017 10:18:05 +0000 (18:18 +0800)]
Merge pull request #14012 from optimistyzy/0317_2

bluestore,NVMEDevice: minor error for get slave core

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agobluestore,NVMEDevice: minor error for get slave core 14012/head
Ziye Yang [Fri, 17 Mar 2017 09:23:07 +0000 (17:23 +0800)]
bluestore,NVMEDevice: minor error for get slave core

The second parameter should set to 1 to skip master core.

Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
8 years agoMerge pull request #13646 from mslovy/wip-fix-test-pidfile
Loic Dachary [Fri, 17 Mar 2017 08:26:10 +0000 (09:26 +0100)]
Merge pull request #13646 from mslovy/wip-fix-test-pidfile

test: fix test_pidfile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agodoc: fix typos in common/config_opts.h comments 13820/head
Jiaying Ren [Thu, 16 Mar 2017 03:20:12 +0000 (11:20 +0800)]
doc: fix typos in common/config_opts.h comments

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
8 years agorgw: kill dead lc config options
Jiaying Ren [Wed, 15 Mar 2017 14:03:15 +0000 (22:03 +0800)]
rgw: kill dead lc config options

+ rgw_lifecycle_enabled is redundant with rgw_enable_lc_threads,which is
  wildly used.
+ rgw_lifecycle_thread is never used.

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
8 years agorgw: cleanup redundant file include for lc
Jiaying Ren [Wed, 15 Mar 2017 08:30:24 +0000 (16:30 +0800)]
rgw: cleanup redundant file include for lc

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
8 years agodocs: Fix problems with example code 14007/head
Brad Hubbard [Fri, 17 Mar 2017 06:12:41 +0000 (16:12 +1000)]
docs: Fix problems with example code

Current code generates warnings and, in some cases, doesn't compile.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agotest: Invalid local variables and it is in an infinite loop 14006/head
shiqi [Fri, 17 Mar 2017 02:08:39 +0000 (10:08 +0800)]
test: Invalid local variables and it is in an infinite loop

Signed-off-by: shiqi <1454927420@qq.com>
8 years agorbd-nbd: only set size to new_size when NBD_SET_SIZE successfully. 14005/head
Pan Liu [Fri, 17 Mar 2017 01:56:37 +0000 (09:56 +0800)]
rbd-nbd: only set size to new_size when NBD_SET_SIZE successfully.

Signed-off-by: Pan Liu <liupan1111@gmail.com>
8 years agorgw_file: fix double unref on rgw_fh for rename 13988/head
Gui Hecheng [Wed, 15 Mar 2017 07:01:05 +0000 (15:01 +0800)]
rgw_file: fix double unref on rgw_fh for rename

Skip unref after unlink to fix the problem.

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
8 years agorgw: fix init_bucket_for_sync retcode 13684/head
lu.shasha [Tue, 28 Feb 2017 06:28:38 +0000 (14:28 +0800)]
rgw: fix init_bucket_for_sync retcode

init_bucket_for_sync error retcode should be negative

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
8 years agorbd-mirror: move replayer admin socket hook to anonymous namespace 12364/head
Jason Dillaman [Wed, 15 Mar 2017 15:18:01 +0000 (11:18 -0400)]
rbd-mirror: move replayer admin socket hook to anonymous namespace

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: refresh local images after acquiring leader role
Jason Dillaman [Wed, 15 Mar 2017 15:16:24 +0000 (11:16 -0400)]
rbd-mirror: refresh local images after acquiring leader role

The local image id set should be up-to-date when attempting to
determine which images need to be deleted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: utilize the mirroring watcher to receive update notifications
Jason Dillaman [Tue, 22 Nov 2016 18:47:37 +0000 (13:47 -0500)]
rbd-mirror: utilize the mirroring watcher to receive update notifications

Fixes: http://tracker.ceph.com/issues/15029
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: templatize Threads helper class for mock tests
Jason Dillaman [Mon, 28 Nov 2016 21:02:07 +0000 (16:02 -0500)]
rbd-mirror: templatize Threads helper class for mock tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #13953 from linuxbox2/wip-rmdir-check
Matt Benjamin [Thu, 16 Mar 2017 20:15:23 +0000 (16:15 -0400)]
Merge pull request #13953 from linuxbox2/wip-rmdir-check

rgw_file: implement reliable has-children check (unlink dir)

8 years agoMerge pull request #13951 from smithfarm/wip-drop-obsolete-bt
Tamilarasi Muthamizhan [Thu, 16 Mar 2017 17:40:24 +0000 (10:40 -0700)]
Merge pull request #13951 from smithfarm/wip-drop-obsolete-bt

tests: drop obsolete Perl scripts

8 years agoMerge pull request #13944 from liupan1111/wip-fix-nbd-issues
Mykola Golub [Thu, 16 Mar 2017 17:18:34 +0000 (19:18 +0200)]
Merge pull request #13944 from liupan1111/wip-fix-nbd-issues

rbd-nbd: don't ignore --read-only option in BLKROSET ioctl

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #13893 from hrchu/rgw-admin-api-doc
Casey Bodley [Thu, 16 Mar 2017 16:37:43 +0000 (12:37 -0400)]
Merge pull request #13893 from hrchu/rgw-admin-api-doc

doc: Update adminops.rst

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13688 from theanalyst/fix/rgw/http-client-dout-msg
Casey Bodley [Thu, 16 Mar 2017 16:20:20 +0000 (12:20 -0400)]
Merge pull request #13688 from theanalyst/fix/rgw/http-client-dout-msg

rgw: http_client clarify the debug msg function call

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #13985 from ebozag/master
John Wilkins [Thu, 16 Mar 2017 16:19:59 +0000 (09:19 -0700)]
Merge pull request #13985 from ebozag/master

doc: Fixes a typo.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
8 years agoMerge pull request #13761 from zhangsw/cleanup-rgw-unlinkobj
Casey Bodley [Thu, 16 Mar 2017 16:19:36 +0000 (12:19 -0400)]
Merge pull request #13761 from zhangsw/cleanup-rgw-unlinkobj

rgw: correct the debug info when unlink instance failed.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw_file: remove unused rgw_key variable 13953/head
Matt Benjamin [Wed, 15 Mar 2017 20:35:16 +0000 (16:35 -0400)]
rgw_file:  remove unused rgw_key variable

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: rgw_readdir: return dot-dirs only when *offset is 0
Matt Benjamin [Wed, 15 Mar 2017 20:40:35 +0000 (16:40 -0400)]
rgw_file:  rgw_readdir:  return dot-dirs only when *offset is 0

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agorgw_file: implement reliable has-children check (unlink dir)
Matt Benjamin [Tue, 14 Mar 2017 01:52:08 +0000 (21:52 -0400)]
rgw_file: implement reliable has-children check (unlink dir)

Bug report and discussion provided by
Gui Hecheng <guihecheng@cmss.chinamobile.com> in nfs-ganesha upstream
github.  Briefly, while a reliable check is potentially costly,
it is necessary.

Fixes: http://tracker.ceph.com/issues/19270
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge pull request #13408 from zhangsw/fix-rgw-loglevel
Casey Bodley [Thu, 16 Mar 2017 15:37:14 +0000 (11:37 -0400)]
Merge pull request #13408 from zhangsw/fix-rgw-loglevel

rgw: change loglevel to 5 in user's quota sync.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14001 from Adirl/rdma-cm-1
Haomai Wang [Thu, 16 Mar 2017 15:14:05 +0000 (23:14 +0800)]
Merge pull request #14001 from Adirl/rdma-cm-1

msg/async/rdma: Introduce Device.{cc,h}

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #13930 from drunkard/master
Kefu Chai [Thu, 16 Mar 2017 15:05:42 +0000 (23:05 +0800)]
Merge pull request #13930 from drunkard/master

doc: fix a typo

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #13958 from wangzhengyong/have_output
Kefu Chai [Thu, 16 Mar 2017 15:02:39 +0000 (23:02 +0800)]
Merge pull request #13958 from wangzhengyong/have_output

mon: drop useless assignment statements

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomsg/async/rdma: Introduce Device.{cc,h} 14001/head
Amir Vadai [Wed, 15 Mar 2017 09:08:38 +0000 (11:08 +0200)]
msg/async/rdma: Introduce Device.{cc,h}

Later on, multidevice support will be added and Device class will be the
main RDMA class (instead of Infiniband as it is today).

Issue: 995322
Change-Id: I060d849de21c8f847dd11ecd3edf1ddfb79b0820
Signed-off-by: Amir Vadai <amir@vadai.me>
8 years agomsg/async/rdma: Change port num into int to be printed properly
Amir Vadai [Mon, 6 Feb 2017 17:32:27 +0000 (19:32 +0200)]
msg/async/rdma: Change port num into int to be printed properly

Issue: 995322
Change-Id: If3095f2cc257cfe110652adca4a6175644c0230e
Signed-off-by: Amir Vadai <amir@vadai.me>
8 years agocleanup: rbd: fix a typo in comment 14049/head
Dongsheng Yang [Thu, 16 Mar 2017 12:48:11 +0000 (20:48 +0800)]
cleanup: rbd: fix a typo in comment

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
8 years agoos/filestore/FileJournal: Only write w/ directio fail, it check bufferlist whether... 13980/head
Jianpeng Ma [Thu, 16 Mar 2017 12:25:30 +0000 (20:25 +0800)]
os/filestore/FileJournal: Only write w/ directio fail, it check bufferlist whether align.

Move check bufferlist align into after direct-write which met error. Because check_align basilly
don't met error.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agorbd-mirror: fix the unittest for new CloneRequest 12041/head
Dongsheng Yang [Tue, 6 Dec 2016 09:09:13 +0000 (04:09 -0500)]
rbd-mirror: fix the unittest for new CloneRequest

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
8 years agorbd-mirror: use asynchrorous CloneRequest
Dongsheng Yang [Tue, 6 Dec 2016 09:08:24 +0000 (04:08 -0500)]
rbd-mirror: use asynchrorous CloneRequest

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
8 years agolibrbd: use CloneRequest in librbd::clone
Dongsheng Yang [Thu, 17 Nov 2016 09:23:03 +0000 (04:23 -0500)]
librbd: use CloneRequest in librbd::clone

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
8 years agolibrbd: Asynchronous image clone
Dongsheng Yang [Thu, 17 Nov 2016 09:19:25 +0000 (04:19 -0500)]
librbd: Asynchronous image clone

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
8 years agoos/filestore/FileJournal: change func align_bl to check_align.
Jianpeng Ma [Thu, 16 Mar 2017 12:04:08 +0000 (20:04 +0800)]
os/filestore/FileJournal: change func align_bl to check_align.

In fact, this function only check bufferlist whether size&address aling.
It don't do any retune work. So change name to check_align.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoos/filestore: Only directio mode, it do bufferlist::rebuild_align.
Jianpeng Ma [Thu, 16 Mar 2017 11:51:55 +0000 (19:51 +0800)]
os/filestore: Only directio mode, it do bufferlist::rebuild_align.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoMerge pull request #13986 from dillaman/wip-19081
Mykola Golub [Thu, 16 Mar 2017 11:38:28 +0000 (13:38 +0200)]
Merge pull request #13986 from dillaman/wip-19081

librbd: image create validates that pool supports overwrites

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoosd: delete the copy assignment operator, replace it to decode() 13938/head
tang.jin [Thu, 16 Mar 2017 11:31:43 +0000 (19:31 +0800)]
osd: delete the copy assignment operator, replace it to decode()

Signed-off-by: tang.jin <tang.jin@istuary.com>
8 years agodoc/glossary: add "Ceph Manager" and "OSD Daemons" to glossary 13997/head
Kefu Chai [Thu, 16 Mar 2017 07:38:15 +0000 (15:38 +0800)]
doc/glossary: add "Ceph Manager" and "OSD Daemons" to glossary

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: indent :maxdepth: using spaces in toc
Kefu Chai [Thu, 16 Mar 2017 07:03:43 +0000 (15:03 +0800)]
doc: indent :maxdepth: using spaces in toc

* indent :maxdepth: directive properly, otherwise sphinx complains
   index.rst:45: WARNING: toctree contains reference to nonexisting
   document u'rados/configuration/    :maxdepth: 1'
* also reindent the entries in toc, so we can add paths without
  documenting their titles. because otherwise the paths inclues an extra
  space, without the proper indent.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: add :orphan: to orphaned docs
Kefu Chai [Thu, 16 Mar 2017 06:44:31 +0000 (14:44 +0800)]
doc: add :orphan: to orphaned docs

we should remove the deprecated ones once it's safe to remove them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc/dev/index: fix sphinx warnings
Kefu Chai [Thu, 16 Mar 2017 06:40:27 +0000 (14:40 +0800)]
doc/dev/index: fix sphinx warnings

- index.rst:822: ERROR: Unknown target name: "teuthology-suite".
  add a ref to teuthology doc
- index.rst:3: WARNING: Duplicate explicit target name: "here".
  use "Named hyperlink references" instead of "anonymous hyperlink
  references"

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc/cephfs: add capabilities.rst to toc
Kefu Chai [Thu, 16 Mar 2017 06:34:08 +0000 (14:34 +0800)]
doc/cephfs: add capabilities.rst to toc

Signed-off-by: Kefu Chai <kchai@redhat.com>