Commit Graph

40037 Commits

Author SHA1 Message Date
Josh Durgin
cb840cc47d librbd: remove unneeded assert from unregister_watch()
Calling this unconditionally in close_image() simplifies error
handling when open_image() fails due to an error like EPERM from
registering a watch.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-03-04 17:52:43 -08:00
Yehuda Sadeh
2cfcb5afff Merge pull request #3861 from guangyy/wip-11001
rgw: do not pre-fetch data for HEAD requests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-04 17:01:24 -08:00
Guang Yang
e32da3e7c8 rgw: do not pre-fetch data for HEAD requests
Backport: hammer

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
2015-03-05 00:58:12 +00:00
Sage Weil
8f2b9372a7 Merge pull request #3876 from ceph/wip-rpm-ceph-test-dependencies
#10989 ceph.spec.in: loosen ceph-test's dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-04 16:11:53 -08:00
Ken Dreyer
924f85f157 ceph.spec.in: loosen ceph-test's dependencies
In Debian, the ceph-test package can be installed with any version of
ceph-common.

Prior to this commit, in RHEL, we're much more strict about which
version of the dependencies we require. We depend directly on
librados2/librbd1/libcephfs1 instead of ceph-common, and we also require
the specific versions of these libraries to match the version of
ceph-test.

For testing Ceph, it is nice to have the ability to upgrade the
librados2/librbd1/libcephfs1 libraries on a host without having to also
upgrade the ceph-test package as well.

Remove the version number requirements, and change the dependencies from
librados2/librbd1/libcephfs1 to simply "ceph-common". That will make
/etc/ceph/ and /var/log/ceph present for the tests.

http://tracker.ceph.com/issues/10989 Refs: #10989

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-03-04 15:18:13 -07:00
Sage Weil
8dc0bf8a16 osdc/Objecter: clean up oncommit_sync (and fix leak)
This was broken by e0707180de, which doesn't
clean up oncommit_sync for a canceled (linger) request.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-04 11:48:22 -08:00
Sage Weil
f7d35b9351 osdc/Objecter: count oncommit_sync as uncommitted
Just be consistent.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-04 10:28:11 -08:00
Noah Watkins
099264fb17 hadoop: workunits don't need java path
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
(cherry picked from commit b3329a961b)

Conflicts:
	qa/workunits/hadoop/terasort.sh
2015-03-04 09:58:38 -08:00
Noah Watkins
2f2ace317c qa: update old replication tests
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
(cherry picked from commit 15da810086)
2015-03-04 09:58:37 -08:00
Samuel Just
569b12035a Merge pull request #3789 from athanatos/wip-9891
DBObjectMap: lock header_lock on sync()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-04 07:11:40 -08:00
John Spray
d44c24517c Merge pull request #3804 from Ved-vampir/master
common: add perf counters description

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-04 11:43:25 +00:00
Loic Dachary
a60c883b97 Merge pull request #3869 from tchaikov/print-help-on-osd
ceph.in: print help on 'osd' or 'mon'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-04 12:26:55 +01:00
Kefu Chai
a3af64c257 ceph.in: print help on 'osd' or 'mon'
Fixes: #10888
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-03-04 17:39:02 +08:00
Ved-vampir
69161f0802 common: add perf counters description
Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
2015-03-04 12:13:11 +03:00
Josh Durgin
8aafa04731 Merge pull request #3864 from ceph/wip-10968
librbd: delay completions for AioRequest

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-03 17:59:05 -08:00
Yan, Zheng
9539e93654 Merge pull request #3865 from ceph/wip-11011
mds: flush immediately in do_open_truncate
2015-03-04 09:52:44 +08:00
Kefu Chai
5e97992086 Merge pull request #3862 from ceph/wip-da-fix-python
Fix pep8 python issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-04 09:19:24 +08:00
John Spray
891f814f30 mds: flush immediately in do_open_truncate
Previously truncating opens were horribly laggy
for clients when the system was otherwise idle,
as they would wait for the next tick() before
proceeding.

Fixes: #11011
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-03 20:14:28 +00:00
Matt Benjamin
a6a6df6821 cmake: build fixes
* librbd
* test/ceph_dencoder

Signed-off-by: Matt Benjamin <matt@cohortfs.com>
(cherry picked from commit 9ad02c9303)
2015-03-03 11:22:42 -08:00
Jason Dillaman
137800a3c9 librbd: delay completion of AioRequest::read_from_parent
If the object map is enabled, it's possible for a read request to
instantly complete due to the skipped librados operations.  Now
AioRequest will block the completion of read_from_parent requests
to prevent the possibility of the parent image being closed while
the read_from_parent method invocation is in-progress.

Fixes: #10968
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-03 11:33:03 -05:00
Danny Al-Gaaf
26b6b01307 rados.py: fix pep8 E502, remove redundant '\' in brackets
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
1396ac95c3 rados.py: fix pep E711
Fix for:
- E711 comparison to None should be 'if cond is None:'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
41a8c07923 rados.py: fix pep8 indent issues
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
12da819695 rados.py: fix (white)space issues
Fixes for:
- E202 whitespace before '}'
- E221 multiple spaces before operator
- E223 tab before operator
- E226 missing whitespace around arithmetic operator
- E251 unexpected spaces around keyword / parameter equals
- E261 at least two spaces before inline comment
- W293 blank line contains whitespace

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
6d078a3a76 rados.py: fix pep8 E111 indentation (spaces/tab)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
13afbc3543 ceph_rest_api.py: fix pep8 indentation errors
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
e13d4dfe34 ceph_rest_api.py: fix pep8 whitespace issues
Fixes for:
- E226 missing whitespace around arithmetic operator
- E231 missing whitespace after ':' and ','
- E265 block comment should start with '#

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
8c8cdf2854 ceph_argparse.py: pep8 E721 don't compare types, use 'isinstance()'
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:46 +01:00
Danny Al-Gaaf
0cc142393f python: fix pep8 'E713 test for membership should be 'not in'
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 13:01:45 +01:00
Danny Al-Gaaf
c64d491601 ceph_argparse.py: fix pep8 indentation errors
Fix for:
- E126 continuation line over-indented for hanging indent
- E128 continuation line under-indented for visual indent
- E129 visually indented line with same indent as next logical line
- E131 continuation line unaligned for hanging indent

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:31 +01:00
Danny Al-Gaaf
1dad726411 ceph_argparse.py: fix pep8 E502, remove redundant '\' in brackets
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:31 +01:00
Danny Al-Gaaf
a1b05f1f19 ceph_argparse.py: fix pep8 whitespace issues
Fixes for:
- E231 missing whitespace after ':'
- E231 missing whitespace after ','
- E226 missing whitespace around arithmetic operator

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:31 +01:00
Danny Al-Gaaf
afd0f42c17 cephfs.py: fix pep8 E127/E128 intended lines
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:31 +01:00
Danny Al-Gaaf
d2dd6dd558 cephfs.py: pep8 E225. add missing whitespace around operator
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Danny Al-Gaaf
c0d2fcf549 cephfs.py: fix pep8 E202 whitespaces
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Danny Al-Gaaf
02b99585a1 cephfs.py: fix inline comments
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Danny Al-Gaaf
eb4f72a717 rbd.py: remove superfluous-parens around if
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Danny Al-Gaaf
3f3011491d add tox.ini for pep8 with some errors to be ignored
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Danny Al-Gaaf
80f1ed9432 rbd.py: fix pep8 E101/W191 wrong intended lines
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Danny Al-Gaaf
f4b204004b rbd.py: fix pep8 E128 under-indented lines
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Danny Al-Gaaf
fa93154f1d rbd.py: fix pep8 E127 over-indented line
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Danny Al-Gaaf
1f211ca777 python: fix pep8 E302, add missing lines
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-03 12:59:30 +01:00
Kefu Chai
b8699a3bce Merge pull request #3842 from dachary/wip-docker-build
tests: keep intermediate docker build layers

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-03 16:53:39 +08:00
Yan, Zheng
2e86094352 Merge pull request #3856 from ceph/wip-10982
RFC Client: do not require successful remount when unmounting
2015-03-03 15:16:56 +08:00
Greg Farnum
71f2686252 Client: do not require successful remount when unmounting
Fixes: #10982

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-03-02 22:38:06 -08:00
Sage Weil
f2b3192f36 doc/release-notes: add v0.92->0.93 upgrade note
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-02 21:14:27 -08:00
Jason Dillaman
7d2fe5b8f3 librbd: allow AioCompletions to be blocked
Blocked AioCompletions will not fire their callback until unblocked.
This is an expansion / replacement of the previous 'building' flag
used to block completions while additional requests were added to the
completion.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 21:18:39 -05:00
Jason Dillaman
416ce7621d librbd: delete Contexts when object map aio_update not required
If an object map update is not required when modifying an image,
properly free the memory allocated for the callback Context.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 21:18:39 -05:00
Jason Dillaman
1bfd760898 librbd: handle possible aio_read return error code
AioRead and CopyupRequest were not properly handling possible
error codes from aio_read.  They now correctly free the completion
and invoke the callback context.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 21:18:39 -05:00
Jason Dillaman
fb2caa0141 librbd: add log message for completion of AioRequest
The log message will simplify future debugging activities.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 21:18:39 -05:00