]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agocmake: add rgw_basic_types.cc to librgw.a 6786/head
Orit Wasserman [Thu, 3 Dec 2015 10:58:28 +0000 (11:58 +0100)]
cmake: add rgw_basic_types.cc to librgw.a

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #6784 from ceph/wip-5073
Yehuda Sadeh [Thu, 3 Dec 2015 05:52:00 +0000 (21:52 -0800)]
Merge pull request #6784 from ceph/wip-5073

rgw multitenancy

Buckets and users can now have a tenant associated with them. Buckets can be specified as [<tenant>:]<bucket> and users can be specified as [<tenant>$]<uid>. The existing users and buckets are part of the default global tenant.
This is first phase. Future work will add tighter integration (e.g., swift tenant mapping, s3 subdomain tenant mapping, etc.)

Reviewed-by: Pete Zaitcev <zaitcev@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6727 from smithfarm/wip-index
Loic Dachary [Wed, 2 Dec 2015 23:18:31 +0000 (00:18 +0100)]
Merge pull request #6727 from smithfarm/wip-index

doc/dev/index.rst: begin writing Contributing to Ceph

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc/dev/index.rst: begin writing Contributing to Ceph 6727/head
Nathan Cutler [Sun, 29 Nov 2015 23:51:11 +0000 (00:51 +0100)]
doc/dev/index.rst: begin writing Contributing to Ceph

Replace existing index.rst with the beginnings of a comprehensive
developer guide.

Move the old index.rst to index-old.rst.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #6775 from mkoderer/doc/fixowner
Danny Al-Gaaf [Wed, 2 Dec 2015 19:18:37 +0000 (20:18 +0100)]
Merge pull request #6775 from mkoderer/doc/fixowner

doc: remove unnecessary period in headline

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
9 years agodoc: remove unnecessary period in headline 6775/head
Marc Koderer [Wed, 2 Dec 2015 19:05:26 +0000 (20:05 +0100)]
doc: remove unnecessary period in headline

Signed-off-by: Marc Koderer <marc@koderer.com>
9 years agorgw: remove comments 6784/head
Yehuda Sadeh [Mon, 30 Nov 2015 21:57:56 +0000 (13:57 -0800)]
rgw: remove comments

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: a minor cleanup
Yehuda Sadeh [Mon, 30 Nov 2015 21:51:35 +0000 (13:51 -0800)]
rgw: a minor cleanup

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: don't re-set bucket tenant and name when selecting location
Yehuda Sadeh [Mon, 30 Nov 2015 21:50:07 +0000 (13:50 -0800)]
rgw: don't re-set bucket tenant and name when selecting location

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fix a typo
Yehuda Sadeh [Mon, 30 Nov 2015 21:48:10 +0000 (13:48 -0800)]
rgw: fix a typo

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: don't allow cross-tenant bucket creation
Yehuda Sadeh [Mon, 30 Nov 2015 21:46:05 +0000 (13:46 -0800)]
rgw: don't allow cross-tenant bucket creation

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: avoid calling rgw_make_bucket_entry_name() when not needed
Yehuda Sadeh [Mon, 30 Nov 2015 20:15:24 +0000 (12:15 -0800)]
rgw: avoid calling rgw_make_bucket_entry_name() when not needed

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: objexp hint name backward compatibility
Yehuda Sadeh [Mon, 30 Nov 2015 19:56:03 +0000 (11:56 -0800)]
rgw: objexp hint name backward compatibility

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: inherit bucket tenant from user if not specified
Yehuda Sadeh [Mon, 30 Nov 2015 19:33:48 +0000 (11:33 -0800)]
rgw: inherit bucket tenant from user if not specified

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6739 from dreamhost/wip-13920
Samuel Just [Wed, 2 Dec 2015 17:58:52 +0000 (09:58 -0800)]
Merge pull request #6739 from dreamhost/wip-13920

Gentoo: _FORTIFY_SOURCE fix.

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6771 from dillaman/wip-backtrace-fixes
Loic Dachary [Wed, 2 Dec 2015 16:14:07 +0000 (17:14 +0100)]
Merge pull request #6771 from dillaman/wip-backtrace-fixes

common: re-enable backtrace support

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6657 from kylinstorage/wip-rbd-nbd
Jason Dillaman [Wed, 2 Dec 2015 15:38:54 +0000 (10:38 -0500)]
Merge pull request #6657 from kylinstorage/wip-rbd-nbd

rbd-nbd: network block device (NBD) support for RBD

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6769 from aiicore/configure_fix
branto1 [Wed, 2 Dec 2015 13:31:48 +0000 (14:31 +0100)]
Merge pull request #6769 from aiicore/configure_fix

configure.ac: macro fix

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoconfigure.ac: macro fix 6769/head
Igor Podoski [Wed, 2 Dec 2015 06:25:00 +0000 (07:25 +0100)]
configure.ac: macro fix

Configure fails with autoconf 2.63 on Centos 6.6 with:

./configure: line 34026: syntax error near unexpected token `newline'
./configure: line 34026: `  yes:no:'

Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>
9 years agoMerge pull request #5685 from ceph/wip-12133
Yan, Zheng [Wed, 2 Dec 2015 08:15:50 +0000 (16:15 +0800)]
Merge pull request #5685 from ceph/wip-12133

cephfs-data-scan: scrub tag filtering (#12133 and #12145)

9 years agotools/cephfs: enable tag filter in DataScan 5685/head
John Spray [Mon, 27 Jul 2015 10:07:49 +0000 (11:07 +0100)]
tools/cephfs: enable tag filter in DataScan

Fixes: #12133
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agotools/cephfs: fix datascan kwarg parsing
John Spray [Fri, 24 Jul 2015 13:57:01 +0000 (14:57 +0100)]
tools/cephfs: fix datascan kwarg parsing

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agocls_cephfs: add PGLSCephFSFilter
John Spray [Fri, 17 Jul 2015 13:19:57 +0000 (14:19 +0100)]
cls_cephfs: add PGLSCephFSFilter

Special purpose filter for use with CephFS disaster
recovery.

Fixes: #12145
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agocommon: re-enable backtrace support 6771/head
Jason Dillaman [Wed, 2 Dec 2015 05:43:48 +0000 (00:43 -0500)]
common: re-enable backtrace support

A recent porting effort disabled support for backtrace creation.  It
also didn't initialize all variables, which would lead to a crash when
deleting a backtrace instance.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6719 from jcsp/wip-13898
Yan, Zheng [Wed, 2 Dec 2015 03:44:22 +0000 (11:44 +0800)]
Merge pull request #6719 from jcsp/wip-13898

tools: Fix layout handing in cephfs-data-scan (#13898)

9 years agoUpdate man page for new rbd nbd command 6657/head
Yunchuan Wen [Wed, 2 Dec 2015 03:27:32 +0000 (11:27 +0800)]
Update man page for new rbd nbd command

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
9 years agoupdate test_librbd_fsx to support rbd-nbd
Yunchuan Wen [Thu, 19 Nov 2015 08:08:50 +0000 (16:08 +0800)]
update test_librbd_fsx to support rbd-nbd

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
9 years agoadd rbd-nbd man page reference
Yunchuan Wen [Sun, 15 Nov 2015 10:26:51 +0000 (18:26 +0800)]
add rbd-nbd man page reference

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
9 years agoadd rbd-nbd wrap to rbd CLI
Yunchuan Wen [Wed, 2 Dec 2015 03:29:01 +0000 (11:29 +0800)]
add rbd-nbd wrap to rbd CLI

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
9 years agoMerge pull request #6661 from xiaoxichen/rbd_misc_fix1
Josh Durgin [Wed, 2 Dec 2015 03:06:44 +0000 (19:06 -0800)]
Merge pull request #6661 from xiaoxichen/rbd_misc_fix1

cls/cls_rbd.cc: fix misused metadata_name_from_key

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agocls/cls_rbd.cc: no need to skip key == after. 6661/head
Xiaoxi Chen [Fri, 20 Nov 2015 08:00:19 +0000 (16:00 +0800)]
cls/cls_rbd.cc: no need to skip key == after.

We already skip the pair where key == after in both LevelDBWholeSpaceIteratorImpl::upper_bound
and RocksDBWholeSpaceIteratorImpl::upper_bound.

Fixes: #13922
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
9 years agoMerge pull request #6742 from dillaman/wip-13913
Josh Durgin [Tue, 1 Dec 2015 16:31:14 +0000 (08:31 -0800)]
Merge pull request #6742 from dillaman/wip-13913

librbd: automatically flush IO after blocking write operations

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoinit-ceph: fix systemd-run cant't start ceph daemon sometimes
wangchaunhong [Tue, 20 Oct 2015 10:40:23 +0000 (18:40 +0800)]
init-ceph: fix systemd-run cant't start ceph daemon sometimes

Fixes: #13474
Signed-off-by: Chuanhong Wang <wang.chuanhong@zte.com.cn>
9 years agoMerge pull request #6749 from dachary/wip-doc-install
Loic Dachary [Tue, 1 Dec 2015 15:03:54 +0000 (16:03 +0100)]
Merge pull request #6749 from dachary/wip-doc-install

doc: INSTALL redirect to online documentation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotools/cephfs: fix layout handling in injection 6719/head
John Spray [Fri, 27 Nov 2015 01:21:12 +0000 (01:21 +0000)]
tools/cephfs: fix layout handling in injection

When the stashed-layout handling stuff was added,
the guessing part got lost from the path where
we only had a single object.  Broke test_data_scan.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #6729 from majianpeng/librbd-journal
Jason Dillaman [Tue, 1 Dec 2015 14:24:05 +0000 (09:24 -0500)]
Merge pull request #6729 from majianpeng/librbd-journal

librbd: only send signal when AIO completions queue empty

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6751 from ceph/wip-cmake-strerror_r
John Spray [Tue, 1 Dec 2015 14:17:46 +0000 (14:17 +0000)]
Merge pull request #6751 from ceph/wip-cmake-strerror_r

cmake: define STRERROR_R_CHAR_P for GNU-specific strerror_r

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5465 from yuyuyu101/wip-librbd-ap
Jason Dillaman [Tue, 1 Dec 2015 14:16:19 +0000 (09:16 -0500)]
Merge pull request #5465 from yuyuyu101/wip-librbd-ap

librbd: support eventfd for AIO completion notifications

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: define STRERROR_R_CHAR_P for GNU-specific strerror_r 6751/head
Ilya Dryomov [Tue, 1 Dec 2015 14:07:48 +0000 (15:07 +0100)]
cmake: define STRERROR_R_CHAR_P for GNU-specific strerror_r

This is what autotools does with AC_FUNC_STRERROR_R bit.  It takes us
from

    $ monmaptool --print nonexistant
    monmaptool: monmap file nonexistant
    monmaptool: couldn't open nonexistant: (2)

to

    $ monmaptool --print nonexistant
    monmaptool: monmap file nonexistant
    monmaptool: couldn't open nonexistant: (2) No such file or directory

on cmake - otherwise we end up using GNU-specific version as if it was
the POSIX version.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agoMerge pull request #6745 from drunkard/master
Sage Weil [Tue, 1 Dec 2015 13:59:57 +0000 (08:59 -0500)]
Merge pull request #6745 from drunkard/master

doc: fix typo in cephfs/quota

9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Tue, 1 Dec 2015 13:51:48 +0000 (08:51 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agodoc: INSTALL redirect to online documentation 6749/head
Loic Dachary [Tue, 1 Dec 2015 13:28:05 +0000 (14:28 +0100)]
doc: INSTALL redirect to online documentation

The INSTALL file has obsolete and misleading instructions to compile
from sources (-pg actually fails at link time). Replace with links to
the online installation and build from source documentations.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agodoc: typo fix in cephfs/quota 6745/head
Drunkard Zhang [Tue, 1 Dec 2015 09:15:29 +0000 (17:15 +0800)]
doc: typo fix in cephfs/quota

9 years agolibrbd/JournalReplay: Only Send signal when aio completions queue empty. 6729/head
Jianpeng Ma [Fri, 27 Nov 2015 02:27:47 +0000 (10:27 +0800)]
librbd/JournalReplay: Only Send signal when aio completions queue empty.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge pull request #6697 from XinzeChi/wip-scrub-test
Loic Dachary [Tue, 1 Dec 2015 08:50:06 +0000 (09:50 +0100)]
Merge pull request #6697 from XinzeChi/wip-scrub-test

test: fix osd-scrub-snaps.sh

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotest: fix osd-scrub-snaps.sh 6697/head
Xinze Chi [Wed, 25 Nov 2015 12:19:54 +0000 (20:19 +0800)]
test: fix osd-scrub-snaps.sh

when we run run-make-check.sh in hdd disk, it would spend much more
time to finish scrub.

Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agotest: add pg_scrub for ceph-helpers.sh
Xinze Chi [Wed, 25 Nov 2015 12:19:03 +0000 (20:19 +0800)]
test: add pg_scrub for ceph-helpers.sh

Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agolibrbd: Fix rebase with new io flow 5465/head
Haomai Wang [Fri, 20 Nov 2015 04:27:27 +0000 (12:27 +0800)]
librbd: Fix rebase with new io flow

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agolibrbd: fix lttng tracing argument mismatch
Haomai Wang [Fri, 20 Nov 2015 04:27:18 +0000 (12:27 +0800)]
librbd: fix lttng tracing argument mismatch

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agolibrbd: Add set_event_notify to AioImageRequestWQ
Haomai Wang [Wed, 18 Nov 2015 07:43:51 +0000 (15:43 +0800)]
librbd: Add set_event_notify to AioImageRequestWQ

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agolibrbd: Remove unneeded set_event_notify
Haomai Wang [Mon, 9 Nov 2015 15:05:01 +0000 (23:05 +0800)]
librbd: Remove unneeded set_event_notify

Since xlist clear method invoked below is enough to disassociate the xlist
item from the xlist, so the remove_myself() call in the destructor is safe
to invoke since it's already been removed from the list.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMakefile: Add noinst headr files
Haomai Wang [Mon, 9 Nov 2015 15:01:45 +0000 (23:01 +0800)]
Makefile: Add noinst headr files

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agolibrbd: Make rbd header file uses independent enum definition
Haomai Wang [Mon, 9 Nov 2015 14:58:32 +0000 (22:58 +0800)]
librbd: Make rbd header file uses independent enum definition

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoLibrbd: Make AioCompletion complete doesn't unlock if callback
Haomai Wang [Sat, 7 Nov 2015 07:55:47 +0000 (15:55 +0800)]
Librbd: Make AioCompletion complete doesn't unlock if callback

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoLibrbd: fix return code of EventSocket init and notify
Haomai Wang [Sat, 7 Nov 2015 07:54:53 +0000 (15:54 +0800)]
Librbd: fix return code of EventSocket init and notify

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agolibrbd: Add ictx check to avoid AIO_TYPE_NONE completion
Haomai Wang [Fri, 21 Aug 2015 06:54:56 +0000 (14:54 +0800)]
librbd: Add ictx check to avoid AIO_TYPE_NONE completion

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agolibrbd: normalize notify return code
Haomai Wang [Wed, 19 Aug 2015 08:15:40 +0000 (16:15 +0800)]
librbd: normalize notify return code

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agolibrbd: Fix incorrect api declaration
Haomai Wang [Thu, 6 Aug 2015 03:14:46 +0000 (11:14 +0800)]
librbd: Fix incorrect api declaration

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agolibrbd: check event_notify to avoid extra logic
Haomai Wang [Wed, 5 Aug 2015 14:59:32 +0000 (22:59 +0800)]
librbd: check event_notify to avoid extra logic

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agoEventSocket: Add new event type pipe support
Haomai Wang [Tue, 4 Aug 2015 09:50:36 +0000 (17:50 +0800)]
EventSocket: Add new event type pipe support

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agotest: Add tests for getting arg of completion
Haomai Wang [Tue, 4 Aug 2015 09:33:39 +0000 (17:33 +0800)]
test: Add tests for getting arg of completion

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agolibrbd: Add interface to let user can get private data from comp
Haomai Wang [Tue, 4 Aug 2015 09:31:43 +0000 (17:31 +0800)]
librbd: Add interface to let user can get private data from comp

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agotests: Add tests for user io event notify
Haomai Wang [Tue, 4 Aug 2015 09:22:56 +0000 (17:22 +0800)]
tests: Add tests for user io event notify

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agolibrbd: Add event notify interfaces
Haomai Wang [Tue, 4 Aug 2015 09:22:40 +0000 (17:22 +0800)]
librbd: Add event notify interfaces

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agolibrbd: automatically flush IO after blocking write operations 6742/head
Jason Dillaman [Tue, 24 Nov 2015 18:24:01 +0000 (13:24 -0500)]
librbd: automatically flush IO after blocking write operations

This simplifies other state machines that previously had to flush IO
after blocking write operations.

Fixes: #13913
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6741 from SUSE/wip-tyepdef-typo-fix
Loic Dachary [Mon, 30 Nov 2015 23:58:30 +0000 (00:58 +0100)]
Merge pull request #6741 from SUSE/wip-tyepdef-typo-fix

include/rados/librados.h: fix typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoinclude/rados/librados.h: fix typo 6741/head
Nathan Cutler [Mon, 30 Nov 2015 23:26:08 +0000 (00:26 +0100)]
include/rados/librados.h: fix typo

This typo causes a warning when building the docs.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #6740 from dillaman/wip-13911
Josh Durgin [Mon, 30 Nov 2015 22:50:27 +0000 (14:50 -0800)]
Merge pull request #6740 from dillaman/wip-13911

librbd: ensure copy-on-read requests are complete prior to closing parent image

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: utilize common flush helper when closing parent images 6740/head
Jason Dillaman [Mon, 30 Nov 2015 21:32:10 +0000 (16:32 -0500)]
librbd: utilize common flush helper when closing parent images

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: only enqueue flush completion if a flush is pending
Jason Dillaman [Mon, 30 Nov 2015 21:30:51 +0000 (16:30 -0500)]
librbd: only enqueue flush completion if a flush is pending

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoGentoo: _FORTIFY_SOURCE fix. 6739/head
Robin H. Johnson [Mon, 30 Nov 2015 21:20:45 +0000 (13:20 -0800)]
Gentoo: _FORTIFY_SOURCE fix.

GCC under Gentoo has a patch that has a built-in define for
_FORTIFY_SOURCE if -O2 or higher are used. This causes warnings about
_FORTIFY_SOURCE redefined for every single object compiled.

Work around the issue by explicitly undefining _FORTIFY_SOURCE before we
define it again.

http://tracker.ceph.com/issues/13920 Fixes: #13920
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agoMerge pull request #6737 from dillaman/wip-13912
Josh Durgin [Mon, 30 Nov 2015 20:30:36 +0000 (12:30 -0800)]
Merge pull request #6737 from dillaman/wip-13912

librbd: check for presence of journal before attempting to remove

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6668 from zaitcev/cleanup-dead-code-2
Yehuda Sadeh [Mon, 30 Nov 2015 20:30:21 +0000 (12:30 -0800)]
Merge pull request #6668 from zaitcev/cleanup-dead-code-2

rgw: Remove unused code in PutMetadataAccount:execute

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #6738 from ceph/wip-rbd-cli-misc
Jason Dillaman [Mon, 30 Nov 2015 19:43:42 +0000 (14:43 -0500)]
Merge pull request #6738 from ceph/wip-rbd-cli-misc

rbd: fixes for refactored CLI and related tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6715 from jcsp/wip-librbd-cmake
Jason Dillaman [Mon, 30 Nov 2015 19:02:57 +0000 (14:02 -0500)]
Merge pull request #6715 from jcsp/wip-librbd-cmake

cmake: update for recent librbd changes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6432 from ukernel/wip-11482
John Spray [Mon, 30 Nov 2015 17:53:51 +0000 (17:53 +0000)]
Merge pull request #6432 from ukernel/wip-11482

mds: fix client capabilities during reconnect (client.XXXX isn't responding to mclientcaps(revoke))

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #6736 from dillaman/wip-13914
Josh Durgin [Mon, 30 Nov 2015 17:43:17 +0000 (09:43 -0800)]
Merge pull request #6736 from dillaman/wip-13914

librbd: not necessary to hold owner_lock while releasing snap id

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: check for presence of journal before attempting to remove 6737/head
Jason Dillaman [Mon, 30 Nov 2015 17:36:13 +0000 (12:36 -0500)]
librbd: check for presence of journal before attempting to remove

Fixes: #13912
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: helper method to determine if journal exists
Jason Dillaman [Mon, 30 Nov 2015 17:31:02 +0000 (12:31 -0500)]
journal: helper method to determine if journal exists

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: not necessary to hold owner_lock while releasing snap id 6736/head
Jason Dillaman [Mon, 30 Nov 2015 16:55:10 +0000 (11:55 -0500)]
librbd: not necessary to hold owner_lock while releasing snap id

Fixes: #13914
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: bail if too many arguments provided 6738/head
Ilya Dryomov [Sun, 29 Nov 2015 20:46:41 +0000 (21:46 +0100)]
rbd: bail if too many arguments provided

The code has a catch clause for that, but it was being rendered useless
by the preceding

    if (command_spec.size() > matching_spec->size())
      positional_options.add(at::POSITIONAL_ARGUMENTS.c_str(), -1);

which names all (both expected and extraneous) positional arguments.

Change it to name only expected arguments, deriving the number of
expected arguments from the length of positional_opts vector, supplied
by each action.  This works for all actions except "feature enable" and
"feature disable" which are specified as multitoken, so keep on passing
in -1 for those.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agorbd: don't append an extra newline after some errors
Ilya Dryomov [Mon, 30 Nov 2015 16:19:12 +0000 (17:19 +0100)]
rbd: don't append an extra newline after some errors

Don't append an extra newline after program_options-generated errors,
like "unrecognised option" or "the argument for option is invalid".

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agotests: update unmap.t CLI test
Ilya Dryomov [Mon, 30 Nov 2015 15:36:43 +0000 (16:36 +0100)]
tests: update unmap.t CLI test

Fixup the exit code - the old CLI tried to differentiate between CLI
errors and action errors by returning EXIT_FAILURE in the former case.
Also remove a test that relied on a special case check in the old CLI.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agocmake: librbd needs libjournal and libcls_journal_client
Ilya Dryomov [Mon, 30 Nov 2015 15:29:56 +0000 (16:29 +0100)]
cmake: librbd needs libjournal and libcls_journal_client

Commit 4719696cadd1 ("cmake: updates for refactored librbd IO path")
fixed file lists but missed the link dependency - librbd now needs
libjournal and libcls_journal_client.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agoMerge pull request #6706 from xiexingguo/xxg-wip-13711
Jason Dillaman [Mon, 30 Nov 2015 15:12:57 +0000 (10:12 -0500)]
Merge pull request #6706 from xiexingguo/xxg-wip-13711

rbd: output formatter may not be closed upon error

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6734 from accelazh/master
Loic Dachary [Mon, 30 Nov 2015 15:11:25 +0000 (16:11 +0100)]
Merge pull request #6734 from accelazh/master

Correct typo 'restared' to 'restarted'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoCorrect typo 'restared' to 'restarted' 6734/head
Accela Zhao [Mon, 30 Nov 2015 14:24:26 +0000 (22:24 +0800)]
Correct typo 'restared' to 'restarted'

There is a typo in document "Monitoring OSDs and PGs" as below

    An OSD was ``down``, was restared, and is now ``recovering``.

This patch corrects 'restared' to 'restarted'. The whole code base
is also searched to ensure there is no more 'restared'.

Signed-off-by: Yilong Zhao <accelazh@gmail.com>
9 years agoMerge pull request #6733 from tchaikov/wip-fixcodingstyle
Loic Dachary [Mon, 30 Nov 2015 14:00:04 +0000 (15:00 +0100)]
Merge pull request #6733 from tchaikov/wip-fixcodingstyle

CodingStyle: fix broken URLs

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoCodingStyle: fix broken URLs 6733/head
Kefu Chai [Mon, 30 Nov 2015 13:12:37 +0000 (21:12 +0800)]
CodingStyle: fix broken URLs

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6724 from dachary/wip-13592-test-auto-repair 6728/head
Loic Dachary [Sun, 29 Nov 2015 16:01:14 +0000 (17:01 +0100)]
Merge pull request #6724 from dachary/wip-13592-test-auto-repair

tests: fix race condition testing auto scrub

Reviewed-by: Xinze Chi <xinze@xsky.com>
9 years agomon/PGMonitor: MAX AVAIL is 0 if some OSDs' weight is 0
Chengyuan Li [Fri, 20 Nov 2015 05:29:39 +0000 (22:29 -0700)]
mon/PGMonitor: MAX AVAIL is 0 if some OSDs' weight is 0

In get_rule_avail(), even p->second is 0, it's possible to be used
as divisor and quotient is infinity, then is converted to an integer
which is negative value.
So we should check p->second value before calculation.

It fixes BUG #13840.

Signed-off-by: Chengyuan Li <chengyli@ebay.com>
(cherry picked from commit 18713e60edd1fe16ab571f7c83e6de026db483ca)

9 years agoos: FileStore::_destroy_collection may hide the real mistake.
Ruifeng Yang [Tue, 17 Nov 2015 03:18:27 +0000 (11:18 +0800)]
os: FileStore::_destroy_collection may hide the real mistake.

Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
(cherry picked from commit 9e9770ca87720781264d2e283739fc9e197706c9)

9 years agoFix mon routed_request_tids leak
Ning Yao [Thu, 8 Oct 2015 08:24:50 +0000 (16:24 +0800)]
Fix mon routed_request_tids leak

Signed-off-by: Ning Yao <zay11022@gmail.com>
(cherry picked from commit ba3c64ca705590f833806300461f3b98de0e62f8)

9 years agopybind: decode empty string in conf_parse_argv() correctly
Josh Durgin [Thu, 26 Nov 2015 05:37:23 +0000 (21:37 -0800)]
pybind: decode empty string in conf_parse_argv() correctly

cretargs is a array of c_char_p, which means ctypes has already
converted it to python byte strings. decode_cstr() would misinterpret
the empty string as a NULL c_char_p(), and convert it to None by
accident, resulting in errors when running commands like
'ceph config-key put foo ""'.

Since this is the only place we use arrays of c_char_p, just decode
it directly in conf_parse_argv(). Tested with python 2 and 3.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit f76d5d6fe6a9f92b1ec17191f5504e2f61e0ff28)

9 years agoceph_test_keyvaluedb_iterators: Fix broken test
Haomai Wang [Mon, 16 Nov 2015 04:41:50 +0000 (12:41 +0800)]
ceph_test_keyvaluedb_iterators: Fix broken test

Introduced by #6312
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit ce0369444558b6308e1e0ffa49ae68faaac2bd1d)

9 years agotests: fix race condition testing auto scrub 6724/head
Loic Dachary [Sat, 28 Nov 2015 16:55:46 +0000 (17:55 +0100)]
tests: fix race condition testing auto scrub

When testing auto scrub, waiting 20 seconds for the scrub to complete is
sometimes not enough and creates false negatives.

Split wait_for_scrub out of the repair helper so that it can be used to
wait for the scrub to happen instead of using a timer.

The scrub timestamp is obtained after removing the object, therefore
there is a chance for the scrub to be finished already. But since auto
scrub is scheduled every 5 seconds, it will only make the test wait an
extra 5 seconds and not hang forever.

http://tracker.ceph.com/issues/13592

Signed-off-by: Xinze Chi <xinze@xsky.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agocmake: update for recent librbd changes 6715/head
John Spray [Thu, 26 Nov 2015 14:29:23 +0000 (14:29 +0000)]
cmake: update for recent librbd changes

Recent merge moved lots of things.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #6503 from XinzeChi/wip-repop-worker
Sage Weil [Sat, 28 Nov 2015 13:31:12 +0000 (08:31 -0500)]
Merge pull request #6503 from XinzeChi/wip-repop-worker

osd: defer decoding of MOSDRepOp/MOSDRepOpReply

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6597 from ceph/wip-fix-kvdb-test
Sage Weil [Sat, 28 Nov 2015 13:29:15 +0000 (08:29 -0500)]
Merge pull request #6597 from ceph/wip-fix-kvdb-test

tests: ceph_test_keyvaluedb_iterators: fix broken test

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #6543 from efirs/optimize-stringify-call
Sage Weil [Sat, 28 Nov 2015 13:28:36 +0000 (08:28 -0500)]
Merge pull request #6543 from efirs/optimize-stringify-call

common: reduce CPU usage by making stringstream in stringify function thread local

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>