Commit Graph

40069 Commits

Author SHA1 Message Date
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
Loic Dachary
1e3f814869 mon: ignore crushtool validation if too long
The crushtool is aborted if it takes more than mon lease seconds. Since
the monitor blocks while running it, this is mandatory otherwise the
monitor will be considered down and new elections triggered.

http://tracker.ceph.com/issues/10947 Fixes: #10947

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-03 02:13:27 +01:00
Loic Dachary
7a5a635ffb mon: do not hardwire crushtool command line
Make crushtool a configuration value that defaults to crushtool and
allow it to be injected. It helps with testing: the command can be
replaced with another that misbehaves in various ways.

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-03-03 02:13:08 +01:00
Josh Durgin
8a83c824a0 Merge pull request #3850 from ceph/wip-10962
test/cli-integration/rbd: updated to new CLI 

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-02 16:53:29 -08:00
Jason Dillaman
eca153e910 test/cli-integration/rbd: updated to new CLI
rbd CLI now includes rbd image flags and no longer defaults
to enabling the new exclusive locking feature.

Fixes: #10962
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 18:47:54 -05:00
Jason Dillaman
6c2d92948c rbd: permit v2 striping for clones and imports
rbd did not previously support specifying striping params
for cloned and imported images.  Extend the behavior to
these other CLI commands.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 18:46:56 -05:00
Josh Durgin
0d468ae352 Merge pull request #3831 from dachary/wip-qemu-iotests
Maipo should also use the local qemu clone

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-02 15:34:39 -08:00
Jason Dillaman
b5050b6ac5 rbd: fixed formatted output of rbd image features
All feature flags were being displayed when using JSON/XML
formatted output.  Now use the same formatting routing for
plain/JSON/XML output for features and flags.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 17:39:20 -05:00
Josh Durgin
172f24ccc6 Merge pull request #3848 from ceph/wip-10990
qa/workunits/rbd/copy.sh: remove all image locks

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-02 14:28:47 -08:00
Jason Dillaman
6cff494e18 qa/workunits/rbd/copy.sh: remove all image locks
If the exclusive lock feature is enabled, all locks need
to be removed prior removing the image.

Fixes: #10990
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 16:24:17 -05:00
Danny Al-Gaaf
be7b4c38e3 update some .gitignore files
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-02 21:10:35 +01:00
Danny Al-Gaaf
a7b344388b submodules: --recursive needed for gtest in gmock
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-02 21:10:24 +01:00
Danny Al-Gaaf
dbcd55f93f gmock: add git submodule
Add gmock submodule and point to ceph-release-1.7.0 branch.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-02 21:08:46 +01:00
Danny Al-Gaaf
7b41871171 gmock: remove in-tree code copy
Step needed to replace by git submodules.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-02 21:05:46 +01:00
Jason Dillaman
0e584635f9 librbd: missing callback log message for CopyupRequest object map update
Add log message to assist in future debugging of the CopyupRequest
state machine.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 14:19:06 -05:00
Jason Dillaman
ed9e358244 librbd: hide flush log message if no flushes are pending
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 14:19:06 -05:00
Yehuda Sadeh
fea8ea057a Merge pull request #3818 from rzarzynski/wip-10661
rgw: generate Content-Length in response for POST on Swift containter/object

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-02 10:55:34 -08:00
Yehuda Sadeh
522a8f99fe Merge pull request #3761 from rzarzynski/wip-10873
rgw: generate the "Date" HTTP header.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-02 10:50:42 -08:00
Dmytro Iurchenko
d3a3d5ae58 rgw: Swift API. Complement the response to "show container details"
OpenStack Object Storage API v1 states that X-Container-Object-Count, X-Container-Bytes-Used and user-defined metadata headers should be included in a response.

Fixes: #10666
Backport: hammer
Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
2015-03-02 10:32:04 -08:00