Commit Graph

46314 Commits

Author SHA1 Message Date
Hector Martin
8655cca10b debian/control: make python-rbd depend on minimum librbd version
As the Cython bindings build to a binary module, backwards compatibility with
older librbd ABIs at runtime is not possible, so depend on at least the same
version (or newer).

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:29:55 +09:00
Hector Martin
0f5ce5eaa5 Makefile: break out local targets into variables
To support more than one set of local-* rules, break them out into
sub-rules referenced by appending to variables. This will be used
when introducing the Cython-based librbd bindings that rely on
setup.py

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:29:55 +09:00
Hector Martin
5113c962ee configure/packaging: introduce Cython dependency
To prepare for the migration of rbd.py to Cython, add Cython as a package
dependency and have the configure script look for it.

Also adds Cython as a dependency for admin/build-doc, and changes the
virtualenv to allow usage of system packages (to avoid having to compile
Cython inside the virtualenv).

With contributions by Josh Durgin <jdurgin@redhat.com>

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:29:54 +09:00
Loic Dachary
9bd4f745d7 Merge pull request #6749 from dachary/wip-doc-install
doc: INSTALL redirect to online documentation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-01 16:03:54 +01:00
Jason Dillaman
b2370e4135 Merge pull request #6729 from majianpeng/librbd-journal
librbd: only send signal when AIO completions queue empty

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-01 09:24:05 -05:00
John Spray
c07c76b8bc 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>
2015-12-01 14:17:46 +00:00
Jason Dillaman
2884d8b4b5 Merge pull request #5465 from yuyuyu101/wip-librbd-ap
librbd: support eventfd for AIO completion notifications

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-01 09:16:19 -05:00
Ilya Dryomov
184914b8de 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>
2015-12-01 15:07:48 +01:00
Sage Weil
57c7d55856 Merge pull request #6745 from drunkard/master
doc: fix typo in cephfs/quota
2015-12-01 08:59:57 -05:00
Sage Weil
48abbe7081 Merge remote-tracking branch 'gh/jewel' 2015-12-01 08:51:48 -05:00
Loic Dachary
e27109ba39 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>
2015-12-01 14:44:02 +01:00
Drunkard Zhang
9fba402413 doc: typo fix in cephfs/quota 2015-12-01 17:15:29 +08:00
Jianpeng Ma
fd684ca15d librbd/JournalReplay: Only Send signal when aio completions queue empty.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-12-01 17:14:37 +08:00
Loic Dachary
ac20f38f1f Merge pull request #6697 from XinzeChi/wip-scrub-test
test: fix osd-scrub-snaps.sh

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-01 09:50:06 +01:00
Xinze Chi
2548ad8b67 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>
2015-12-01 11:10:10 +08:00
Xinze Chi
ce2d3c73ba test: add pg_scrub for ceph-helpers.sh
Signed-off-by: Xinze Chi <xinze@xsky.com>
2015-12-01 11:10:10 +08:00
Haomai Wang
c57ceff2e8 librbd: Fix rebase with new io flow
Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-12-01 10:04:06 +08:00
Haomai Wang
5cc9ff90f8 librbd: fix lttng tracing argument mismatch
Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-12-01 10:04:01 +08:00
Haomai Wang
1da3093543 librbd: Add set_event_notify to AioImageRequestWQ
Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-12-01 10:03:54 +08:00
Haomai Wang
bddab3ef21 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>
2015-12-01 10:03:48 +08:00
Haomai Wang
d625b89c0e Makefile: Add noinst headr files
Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-12-01 10:03:42 +08:00
Haomai Wang
97507d5cfd librbd: Make rbd header file uses independent enum definition
Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-12-01 10:03:37 +08:00
Haomai Wang
c42044af79 Librbd: Make AioCompletion complete doesn't unlock if callback
Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-12-01 10:03:31 +08:00
Haomai Wang
c470e0bce3 Librbd: fix return code of EventSocket init and notify
Signed-off-by: Haomai Wang <haomai@xsky.com>
2015-12-01 10:03:26 +08:00
Haomai Wang
d19deacc01 librbd: Add ictx check to avoid AIO_TYPE_NONE completion
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:03:20 +08:00
Haomai Wang
39327146be librbd: normalize notify return code
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:03:15 +08:00
Haomai Wang
6d114749ff librbd: Fix incorrect api declaration
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:03:10 +08:00
Haomai Wang
ca32fc5a8e librbd: check event_notify to avoid extra logic
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:03:04 +08:00
Haomai Wang
c7703db989 EventSocket: Add new event type pipe support
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:02:59 +08:00
Haomai Wang
0dc9321193 test: Add tests for getting arg of completion
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:02:53 +08:00
Haomai Wang
1ab727d194 librbd: Add interface to let user can get private data from comp
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:02:47 +08:00
Haomai Wang
e7a1506b30 tests: Add tests for user io event notify
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:02:42 +08:00
Haomai Wang
c3a1edbd2a librbd: Add event notify interfaces
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-12-01 10:02:27 +08:00
Loic Dachary
ce944e4cb1 Merge pull request #6741 from SUSE/wip-tyepdef-typo-fix
include/rados/librados.h: fix typo

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-01 00:58:30 +01:00
Nathan Cutler
3c6e692ca9 include/rados/librados.h: fix typo
This typo causes a warning when building the docs.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-12-01 00:26:08 +01:00
Josh Durgin
dcce366cd6 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>
2015-11-30 14:50:27 -08:00
Jason Dillaman
6f6fd2f2de librbd: utilize common flush helper when closing parent images
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-30 16:32:10 -05:00
Jason Dillaman
39c5b701dc librbd: only enqueue flush completion if a flush is pending
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-30 16:30:51 -05:00
Josh Durgin
55e743fd86 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>
2015-11-30 12:30:36 -08:00
Yehuda Sadeh
ee41d1da2e 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>
2015-11-30 12:30:21 -08:00
Jason Dillaman
4872353425 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>
2015-11-30 14:43:42 -05:00
Jason Dillaman
a722fa22fc Merge pull request #6715 from jcsp/wip-librbd-cmake
cmake: update for recent librbd changes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-11-30 14:02:57 -05:00
John Spray
304965f17e 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>
2015-11-30 17:53:51 +00:00
Josh Durgin
1ada4c3961 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>
2015-11-30 09:43:17 -08:00
Jason Dillaman
083fdbf86c librbd: check for presence of journal before attempting to remove
Fixes: #13912
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-30 12:36:13 -05:00
Jason Dillaman
ac35e84f25 journal: helper method to determine if journal exists
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-30 12:31:02 -05:00
Jason Dillaman
644d60006a librbd: not necessary to hold owner_lock while releasing snap id
Fixes: #13914
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-30 11:55:10 -05:00
Ilya Dryomov
9d0604149e 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>
2015-11-30 17:50:10 +01:00
Ilya Dryomov
d133f423c8 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>
2015-11-30 17:22:14 +01:00
Ilya Dryomov
1c8468168c 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>
2015-11-30 16:45:17 +01:00