Commit Graph

45528 Commits

Author SHA1 Message Date
David Zafman
caf2d5970b ceph-objectstore-tool: Improve object spec error handling
Add test cases

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
b6302acdd3 ceph-objectstore-tool: Add undocumented clear-snapset command for testing
Add test cases using new feature to corrupt SnapSet

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
138a33b894 ceph-objectstore-tool: Add set-size command for objects
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
1688debf78 ceph-objectstore-tool: Enhanced dump command replaces dump-info
Show object stat information from objectstore
Show SnapSet if present
Add --head for search by object name

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
b4ba3e6654 test: Add some clones to ceph-objectstore-tool test
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
d276d32865 ceph-objectstore-tool: For corrupt objectstores, don't abort listing on errors
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
b0c884ba8b ceph-objectstore-tool: Improve some error messages
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
0564f39826 ceph-objectstore-tool: White space fixes
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
9222f56403 tools/rados: Improve xattr import handling so future internal xattrs ignored
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
e5ad33ec07 test: Test scrubbing of snapshot problems
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:50 -07:00
David Zafman
e0b3965002 osd: Don't crash if OI_ATTR attribute is missing or corrupt
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:41 -07:00
David Zafman
9e48e1801e osd: Additional _scrub() check for snapset inconsistency
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:27 -07:00
David Zafman
3b381caaad osd: Better SnapSet scrub checking (find issues instead of asserting)
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:24 -07:00
David Zafman
a23036c6fd osd: Make the _scrub routine produce good output and detect errors properly
Catch decode errors so osd doesn't crash on corrupt OI_ATTR or SS_ATTR
Use boost::optional<> to make current state clearer
Create next_clone as needed using head/curclone
Add equivalent logic after getting to end of scrubmap.objects

Fixes: #12738

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-30 13:01:23 -07:00
Samuel Just
e74183ea88 Merge pull request #5865 from dzafman/wip-13016
osd: Add config option osd_read_ec_check_for_errors for testing

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-10-30 08:17:59 -07:00
Yehuda Sadeh
7f8ab9134f Merge pull request #6045 from Sandy4999/wip-13133
rgw: refuse to calculate digest when the s3 secret key is empty

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-29 21:43:46 -07:00
Yehuda Sadeh
d9640e1b3d Merge pull request #6424 from badone/curl_easy_perform_fix
rgw: Fix typo in RGWHTTPClient::process error message

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-29 08:28:37 -07:00
Kefu Chai
3af21a1432 Merge pull request #6363 from ceph/wip-init-rbdmap
Drop redhat-lsb-core dependency

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-10-29 23:01:17 +08:00
Brad Hubbard
b698a7660e rgw: Fix typo in RGWHTTPClient::process error message
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-10-29 20:14:44 +10:00
Kefu Chai
f9fdf47e9f Merge pull request #6358 from dx9/wip-12406-cmake-arch-detection
cmake: Use uname instead of arch.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-10-29 16:31:51 +08:00
Gregory Farnum
d7fe0ca7e7 Merge pull request #6310 from dx9/wip-12406-test-libcephfs-flock
test/libcephfs/flock: add sys/file.h include for flock operations

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-10-28 23:12:01 -07:00
Kefu Chai
57b7b987e2 Merge pull request #6377 from xiexingguo/wip-xxg-13597
FileStore: potential memory leak if _fgetattrs fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-10-29 13:40:38 +08:00
Sage Weil
6784c9cb01 Merge pull request #6414 from dzafman/wip-13625
messages/MOSDOp: Cast in assert to eliminate warnings

Reviewed-by: Sage Weil <sage@redhat.com>
2015-10-29 01:00:54 -04:00
Loic Dachary
f0e0606a59 Merge pull request #6418 from tchaikov/wip-fix-ceph-monstore-update-crush
tools: ceph-monstore-update-crush: add "--test" when testing crushmap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-10-29 13:38:29 +09:00
Kefu Chai
8160af6284 tools: ceph-monstore-update-crush: add "--test" to crushtool
in addition to testing the references to unknown name/type, we should
perform necessary test the crushmap when looking for a good crushmap

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-10-29 11:18:46 +08:00
Vicente Cheng
83afe15cef test: ceph-disk: coverage list_format_dev_plain() new behavior.
modify the unittest to coverage the list_format_dev_plain()
    new behavior.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
2015-10-29 08:27:35 +08:00
xiexingguo
6253aea4b9 FileJournal:_fdump wrongly returns if journal is currently unreadable.
_fdump wrongly returns if journal is currently unreadable, and fix some other errors also.
Fixes: #13626
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-10-29 07:23:24 +08:00
Orit Wasserman
e3921a8396 Merge pull request #5875 from Aran85/parsemetadatakey
rgw:modify the conditional statement in parse_metadata_key method.
2015-10-28 17:13:41 +01:00
Loic Dachary
e3fdc3a57a Merge pull request #6409 from dachary/wip-mailmap
mailmap: Xie Xingguo affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-10-29 01:04:43 +09:00
Yehuda Sadeh
9b013d02f6 Merge pull request #5879 from H3C/wip-rgw-bugfix1
rgw/rgw_admin: Checking the legality of the parameters

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-28 08:33:43 -07:00
David Zafman
39fb7f12cb messages/MOSDOp: Cast in assert to eliminate warnings
Fixes: #13625
Caused by 0bf2a79e

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-10-28 08:22:13 -07:00
Yehuda Sadeh
b4cde262ac Merge pull request #5262 from jmunhoz/wip-12352
rgw: remove extra check in RGWGetObj::execute

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-28 07:32:20 -07:00
Daniel Gryniewicz
3047b5690e rgw: Add default quota config
Add a default quota config that is applied when no specific quota is
enabled.  There are both per-bucket and per-user defaults.  Defaults are
enabled if either max count or max size is enabled.

This fixes issues 12912 and 12997.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2015-10-28 08:53:55 -04:00
Vicente Cheng
570285bd08 ceph-disk: get Nonetype when ceph-disk list with --format plain on single device.
with dmcrypt device, ceph-disk list will get Nonetype with the real device
    i.e. /dev/sdb1 for /dev/dm-1, `ceph-disk --list /dev/sdb1` will get Nonetype

    that because the holder we query is `dm-x`, the devices includ the path
    is `sdX`, it cannot match.

    if we list format plain and meet dmcrypt device, query again with the
    holder (dm-x).

    Also change the list_devices() parameter to let other function to use it
    easily.

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
2015-10-28 18:29:53 +08:00
Loic Dachary
f22f4ac293 mailmap: Xie Xingguo affiliation
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-10-28 18:06:08 +09:00
Loic Dachary
451e3d568a Merge pull request #6320 from JiYou/mything
Fix examples/librados/Makefile error.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-10-28 15:51:12 +09:00
Loic Dachary
b49d663bc1 Merge pull request #6381 from xiexingguo/xxg-wip-fs-cleanup
FileStore: remove unused local variable 'handle'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-10-28 15:16:56 +09:00
Loic Dachary
1d1ecb86f3 Merge pull request #6384 from ktdreyer/wip-doc-download-gpg-key
doc: download GPG key from download.ceph.com

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-10-28 15:14:18 +09:00
Sage Weil
b54f9aa886 Merge pull request #6246 from liewegas/wip-13477
crush: validate bucket id before indexing buckets array

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-10-27 20:57:01 -04:00
Sage Weil
93ec538e8a crush/mapper: ensure take bucket value is valid
Ensure that the take argument is a valid bucket ID before indexing the
buckets array.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-27 20:55:29 -04:00
Sage Weil
976a24a326 crush/mapper: ensure bucket id is valid before indexing buckets array
We were indexing the buckets array without verifying the index was within
the [0,max_buckets) range.  This could happen because a multistep rule
does not have enough buckets and has CRUSH_ITEM_NONE
for an intermediate result, which would feed in CRUSH_ITEM_NONE and
make us crash.

Fixes: #13477
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-27 20:55:26 -04:00
Yehuda Sadeh
7c51b2931e Merge pull request #6239 from zhouyuan/swift_testing_access
vstart.sh: grant full access to Swift testing account

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-27 13:35:28 -07:00
Yehuda Sadeh
eeb94c9093 Merge pull request #6303 from dx9/wip-12406-use-freopen
test_rgw_admin:  Use freopen for output redirection.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-10-27 13:33:08 -07:00
Loic Dachary
870730e5cd Merge pull request #6387 from dachary/wip-test-ports
tests: port uniqueness reminder

Reviewed-by: Vicente Cheng <freeze.bilsted@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-10-27 17:40:29 +09:00
Loic Dachary
f14144441b tests: port uniqueness reminder
When copy/pasting a tests, it is easy to forget (or not know) that the
port used must be unique to allow for multiple tests to run in
parallel (make -j8). Add a reminder next to each port.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-10-27 17:38:17 +09:00
Loic Dachary
26dbcd6f6f Merge pull request #6379 from tchaikov/wip-13554
rocksdb: remove rdb source files from dist tarball

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-10-27 11:52:25 +09:00
Loic Dachary
0e24474291 Merge pull request #6258 from swamireddy/wip-v910-mailmap
mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-10-27 11:09:47 +09:00
xiexingguo
deb41b3718 FileStore: remove unused local variable 'handle'
Remove unused local variable 'handle' in FileStore::collection_empty
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-10-27 07:34:02 +08:00
xiexingguo
ace7dd096b FileStore: potential memory leak if _fgetattrs fails
Memory leak happens if _fgetattrs encounters some error and simply returns.
Fixes: #13597
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-10-27 07:29:35 +08:00
Samuel Just
7a7eaf0c27 Merge pull request #6366 from liewegas/wip-osd-fixboot-infernalis
osd: fix OSDService vs Objecter init order

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-10-26 12:23:40 -07:00