RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-18 17:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,305 Commits 216 Branches 394 Tags 1.8 GiB
2884d8b4b5
Commit Graph

46305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Drunkard Zhang
9fba402413 doc: typo fix in cephfs/quota 2015-12-01 17:15:29 +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
Ilya Dryomov
5ce663f1d3 cmake: librbd needs libjournal and libcls_journal_client 
Commit 4719696cad ("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>
 2015-11-30 16:29:56 +01:00
Jason Dillaman
56e58e558c 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>
 2015-11-30 10:12:57 -05:00
Loic Dachary
fe3d8552bf Merge pull request #6734 from accelazh/master 
Correct typo 'restared' to 'restarted'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-11-30 16:11:25 +01:00
Accela Zhao
117e63041a 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>
 2015-11-30 22:24:26 +08:00
Loic Dachary
99d180478f Merge pull request #6733 from tchaikov/wip-fixcodingstyle 
CodingStyle: fix broken URLs

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-11-30 15:00:04 +01:00
Kefu Chai
691199bd37 CodingStyle: fix broken URLs 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2015-11-30 21:12:37 +08:00
Loic Dachary
2af7c9f719 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>
 2015-11-29 17:01:14 +01:00
Chengyuan Li
06b3b47ebc 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 18713e60ed)
 2015-11-29 09:28:48 -05:00
Ruifeng Yang
b2eefcac07 os: FileStore::_destroy_collection may hide the real mistake. 
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
(cherry picked from commit 9e9770ca87)
 2015-11-29 09:27:05 -05:00