]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoMerge pull request #6445 from ceph/wip-init-rbdmap
Kefu Chai [Thu, 5 Nov 2015 13:41:09 +0000 (21:41 +0800)]
Merge pull request #6445 from ceph/wip-init-rbdmap

Init rbdmap patchset.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6468 from cxwshawn/wip-mail-fix 6386/head
Loic Dachary [Thu, 5 Nov 2015 06:35:56 +0000 (07:35 +0100)]
Merge pull request #6468 from cxwshawn/wip-mail-fix

modify member info in mailmap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years ago[mailmap] add member info. 6468/head
Xiaowei Chen [Thu, 5 Nov 2015 01:54:54 +0000 (20:54 -0500)]
[mailmap] add member info.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
9 years agoMerge tag 'v9.2.0'
Sage Weil [Thu, 5 Nov 2015 00:40:17 +0000 (19:40 -0500)]
Merge tag 'v9.2.0'

v9.2.0

9 years agodoc/release-notes: edits from Nathan Cutler
Sage Weil [Wed, 4 Nov 2015 20:02:54 +0000 (15:02 -0500)]
doc/release-notes: edits from Nathan Cutler

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/release-notes: final infernalis notes
Sage Weil [Tue, 20 Oct 2015 16:15:36 +0000 (12:15 -0400)]
doc/release-notes: final infernalis notes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6334 from xinxinsh/wip-13533
Jason Dillaman [Wed, 4 Nov 2015 19:39:43 +0000 (14:39 -0500)]
Merge pull request #6334 from xinxinsh/wip-13533

rbd : fix clone isssue

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6465 from oritwas/wip-13596
Yehuda Sadeh [Wed, 4 Nov 2015 18:40:19 +0000 (10:40 -0800)]
Merge pull request #6465 from oritwas/wip-13596

radosgw-admin: metadata list user should return an empty list when user pool is empty

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoradosgw-admin: metadata list user should return an empty list when pool is empty 6465/head
Orit Wasserman [Wed, 4 Nov 2015 16:37:34 +0000 (17:37 +0100)]
radosgw-admin: metadata list user should return an empty list when pool is empty

Fixes: #13596
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #6340 from joaquimrocha/rados_write_benchmark_new_options
Loic Dachary [Wed, 4 Nov 2015 17:22:26 +0000 (18:22 +0100)]
Merge pull request #6340 from joaquimrocha/rados_write_benchmark_new_options

Rados write benchmark new options

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotest/test_rados_tool.sh: Add tests for the new bench's write options 6340/head
Joaquim Rocha [Wed, 4 Nov 2015 12:56:18 +0000 (13:56 +0100)]
test/test_rados_tool.sh: Add tests for the new bench's write options

Those are the combinations of --write-omap, --write-xattr and --write-object.

Signed-off-by: Joaquim Rocha <joaquim.rocha@cern.ch>
9 years agotools/rados/rados.cc: Add options to choose the benchmark's write destination
Joaquim Rocha [Mon, 19 Oct 2015 14:40:21 +0000 (16:40 +0200)]
tools/rados/rados.cc: Add options to choose the benchmark's write destination

Signed-off-by: Joaquim Rocha <joaquim.rocha@cern.ch>
9 years agotools/rados/rados.cc: Write to different destinations
Joaquim Rocha [Mon, 19 Oct 2015 13:31:45 +0000 (15:31 +0200)]
tools/rados/rados.cc: Write to different destinations

The write benchmark only writes the objects' contents, not the omap
nor the extended attributes, which is something also interesting to
measure depending on the cluster's configuration.

These changes add a way to specify where the contents should be
written, allowing to combine any of the destinations mentioned above.

Signed-off-by: Joaquim Rocha <joaquim.rocha@cern.ch>
9 years agoMerge pull request #6400 from ceph/wip-12997
Yehuda Sadeh [Wed, 4 Nov 2015 04:42:53 +0000 (20:42 -0800)]
Merge pull request #6400 from ceph/wip-12997

rgw: Add default quota config

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5738 from dwj192/dwj192_bkt_index
Yehuda Sadeh [Tue, 3 Nov 2015 19:27:18 +0000 (11:27 -0800)]
Merge pull request #5738 from dwj192/dwj192_bkt_index

rgw: fix objects can not be displayed which object name does not cont…

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years ago9.2.0 v9.2.0
Jenkins Build Slave User [Tue, 3 Nov 2015 16:58:32 +0000 (16:58 +0000)]
9.2.0

9 years agoMerge pull request #6452 from dachary/wip-13664-test-ec
Loic Dachary [Tue, 3 Nov 2015 07:22:36 +0000 (08:22 +0100)]
Merge pull request #6452 from dachary/wip-13664-test-ec

tests: test/librados/test.cc must create profile

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6410 from Vicente-Cheng/ceph-disk-list-plain-single-failure
Loic Dachary [Tue, 3 Nov 2015 07:05:19 +0000 (08:05 +0100)]
Merge pull request #6410 from Vicente-Cheng/ceph-disk-list-plain-single-failure

ceph-disk: get Nonetype when ceph-disk list with --format plain on single device.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agorbd: fix clone issue when we specify image feature 6334/head
xinxin shu [Wed, 21 Oct 2015 06:56:17 +0000 (14:56 +0800)]
rbd: fix clone issue when we specify image feature

Fixes: #13553
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
9 years agotests: test/librados/test.cc must create profile 6452/head
Loic Dachary [Mon, 2 Nov 2015 23:21:51 +0000 (00:21 +0100)]
tests: test/librados/test.cc must create profile

Now that the create_one_ec_pool function removes the testprofile each
time it is called, it must create the testprofile erasure code profile
again for the test to use.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6446 from dachary/wip-13664-test-ec
Loic Dachary [Mon, 2 Nov 2015 22:12:31 +0000 (23:12 +0100)]
Merge pull request #6446 from dachary/wip-13664-test-ec

tests: destroy testprofile before creating one

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agotests: destroy testprofile before creating one 6446/head
Loic Dachary [Mon, 2 Nov 2015 19:24:51 +0000 (20:24 +0100)]
tests: destroy testprofile before creating one

The testprofile erasure code profile is destroyed before creating a new
one so that it does not fail when another testprofile erasure code
profile already exists with different parameters.

This must be done when creating erasure coded pools with the C++
interface, in the same way it's done with the C interface.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: add destroy_ec_profile{,_pp} helpers
Loic Dachary [Mon, 2 Nov 2015 19:23:52 +0000 (20:23 +0100)]
tests: add destroy_ec_profile{,_pp} helpers

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6444 from liewegas/wip-pg-key
Samuel Just [Mon, 2 Nov 2015 16:17:19 +0000 (08:17 -0800)]
Merge pull request #6444 from liewegas/wip-pg-key

osd/PG: tolerate missing epoch key

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #6406 from xiexingguo/xxg-wip-13626
David Zafman [Mon, 2 Nov 2015 16:14:37 +0000 (08:14 -0800)]
Merge pull request #6406 from xiexingguo/xxg-wip-13626

FileJournal:_fdump wrongly returns if journal is currently unreadable.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoceph.spec.in: We no longer need redhat-lsb-core 6445/head
Boris Ranto [Fri, 23 Oct 2015 14:39:16 +0000 (16:39 +0200)]
ceph.spec.in: We no longer need redhat-lsb-core

Drop the redhat-lsb-core dependency as it is no longer necessary on
fedora/rhel.

The other two init scripts do not use redhat-lsb-core either. The
init-ceph.in conditionally requires /lib/lsb/init-functions and does not
use any of the functions defined in that file (at least not directly).
The init-radosgw file includes /etc/rc.d/init.d/functions on non-debian
platforms instead of /lib/lsb/init-functions file so it does not require
redhat-lsb-core either.

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoinit-rbdmap: Rewrite to use logger + clean-up
Boris Ranto [Fri, 23 Oct 2015 13:31:27 +0000 (15:31 +0200)]
init-rbdmap: Rewrite to use logger + clean-up

This patch rewrites the init-rbdmap init script so that it uses logger
instead of the log_* functions. The patch also fixes various smaller
bugs like:
* MAP_RV was undefined if mapping already existed
* UMNT_RV and UMAP_RV were almost always empty (if they succeeded) ->
  removed them
* use of continue instead RET_OP in various places (RET_OP was not being
  checked after the switch to logger messages)
* removed use of DESC (used only twice and only one occurrence actually
  made sense)

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoosd/PG: tolerate missing epoch key 6444/head
Sage Weil [Sat, 24 Oct 2015 23:51:15 +0000 (19:51 -0400)]
osd/PG: tolerate missing epoch key

An orphan PG may have an info attr but no epoch key.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5133 from stiopaa1/ThreadMoveCopyConstr
Kefu Chai [Mon, 2 Nov 2015 13:24:44 +0000 (21:24 +0800)]
Merge pull request #5133 from stiopaa1/ThreadMoveCopyConstr

Thread.h: disable copy constructor and assignment op

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6344 from dillaman/wip-13559-infernalis
Jason Dillaman [Sat, 31 Oct 2015 03:41:34 +0000 (23:41 -0400)]
Merge pull request #6344 from dillaman/wip-13559-infernalis

librbd: potential assertion failure during cache read

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6329 from dzafman/wip-zafman-ceph
Dan Mick [Sat, 31 Oct 2015 03:00:49 +0000 (20:00 -0700)]
Merge pull request #6329 from dzafman/wip-zafman-ceph

Wip zafman ceph

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoceph.in: Notify user that 'tell' can't be used in interactive mode 6329/head
David Zafman [Wed, 21 Oct 2015 01:10:39 +0000 (18:10 -0700)]
ceph.in: Notify user that 'tell' can't be used in interactive mode

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #6435 from ceph/docs-new-url
Ken Dreyer [Fri, 30 Oct 2015 22:28:16 +0000 (16:28 -0600)]
Merge pull request #6435 from ceph/docs-new-url

updates all http://ceph.com/ to download.ceph.com

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agodoc: update rpm links to download.ceph.com 6435/head
Alfredo Deza [Fri, 30 Oct 2015 21:48:21 +0000 (17:48 -0400)]
doc: update rpm links to download.ceph.com

Signed-off-by: Alfredo Deza <adeza@redhat.com>
9 years agodoc: update debian links to download.ceph.com
Alfredo Deza [Fri, 30 Oct 2015 21:46:12 +0000 (17:46 -0400)]
doc: update debian links to download.ceph.com

Signed-off-by: Alfredo Deza <adeza@redhat.com>
9 years agoMerge pull request #5783 from dzafman/wip-12738
David Zafman [Fri, 30 Oct 2015 20:14:49 +0000 (13:14 -0700)]
Merge pull request #5783 from dzafman/wip-12738

Fix scrub error handling and log output
Add set-size and remove-clone-metadata to ceph-objectstore-tool
Fix trim_object() to not crash on corrupt snapset
Add scrub clones test and add clones to ceph-objectstore-tool test

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agotest: osd-scrub-snaps.sh uses ceph-helpers.sh and added to make check 5783/head
David Zafman [Thu, 29 Oct 2015 04:34:44 +0000 (21:34 -0700)]
test: osd-scrub-snaps.sh uses ceph-helpers.sh and added to make check

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd: Use boost::optional instead of snap 0 for "all_clones"
David Zafman [Mon, 26 Oct 2015 18:36:43 +0000 (11:36 -0700)]
osd: Use boost::optional instead of snap 0 for "all_clones"

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd, test: When head missing a snapset, clones not an error
David Zafman [Mon, 26 Oct 2015 01:57:18 +0000 (18:57 -0700)]
osd, test: When head missing a snapset, clones not an error

Fix log message for this case and make into "info"

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd, test: Keep missing count and log number of missing clones
David Zafman [Sat, 24 Oct 2015 23:23:13 +0000 (16:23 -0700)]
osd, test: Keep missing count and log number of missing clones

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agotest: Eliminate check for bogus "obj13/head snaps empty" error
David Zafman [Tue, 20 Oct 2015 18:14:42 +0000 (11:14 -0700)]
test: Eliminate check for bogus "obj13/head snaps empty" error

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoceph-objectstore-tool: Add new remove-clone-metadata object op
David Zafman [Thu, 15 Oct 2015 03:34:28 +0000 (20:34 -0700)]
ceph-objectstore-tool: Add new remove-clone-metadata object op

Fixes: #12740
Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd: Fix trim_object() to not crash on corrupt snapset
David Zafman [Thu, 15 Oct 2015 03:42:48 +0000 (20:42 -0700)]
osd: Fix trim_object() to not crash on corrupt snapset

Add test case to check for trim_object() osd crash

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoceph-objectstore-tool: Improve object spec error handling
David Zafman [Wed, 14 Oct 2015 20:12:17 +0000 (13:12 -0700)]
ceph-objectstore-tool: Improve object spec error handling

Add test cases

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoceph-objectstore-tool: Add undocumented clear-snapset command for testing
David Zafman [Thu, 8 Oct 2015 00:25:44 +0000 (17:25 -0700)]
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>
9 years agoceph-objectstore-tool: Add set-size command for objects
David Zafman [Thu, 15 Oct 2015 04:59:50 +0000 (21:59 -0700)]
ceph-objectstore-tool: Add set-size command for objects

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoceph-objectstore-tool: Enhanced dump command replaces dump-info
David Zafman [Thu, 15 Oct 2015 05:04:05 +0000 (22:04 -0700)]
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>
9 years agotest: Add some clones to ceph-objectstore-tool test
David Zafman [Fri, 2 Oct 2015 20:39:29 +0000 (13:39 -0700)]
test: Add some clones to ceph-objectstore-tool test

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoceph-objectstore-tool: For corrupt objectstores, don't abort listing on errors
David Zafman [Fri, 2 Oct 2015 02:28:54 +0000 (19:28 -0700)]
ceph-objectstore-tool: For corrupt objectstores, don't abort listing on errors

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoceph-objectstore-tool: Improve some error messages
David Zafman [Tue, 13 Oct 2015 20:02:40 +0000 (13:02 -0700)]
ceph-objectstore-tool: Improve some error messages

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoceph-objectstore-tool: White space fixes
David Zafman [Thu, 3 Sep 2015 21:22:20 +0000 (14:22 -0700)]
ceph-objectstore-tool: White space fixes

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agotools/rados: Improve xattr import handling so future internal xattrs ignored
David Zafman [Tue, 13 Oct 2015 22:33:26 +0000 (15:33 -0700)]
tools/rados: Improve xattr import handling so future internal xattrs ignored

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agotest: Test scrubbing of snapshot problems
David Zafman [Wed, 30 Sep 2015 02:57:43 +0000 (19:57 -0700)]
test: Test scrubbing of snapshot problems

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd: Don't crash if OI_ATTR attribute is missing or corrupt
David Zafman [Mon, 28 Sep 2015 17:59:42 +0000 (10:59 -0700)]
osd: Don't crash if OI_ATTR attribute is missing or corrupt

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd: Additional _scrub() check for snapset inconsistency
David Zafman [Wed, 14 Oct 2015 01:02:32 +0000 (18:02 -0700)]
osd: Additional _scrub() check for snapset inconsistency

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd: Better SnapSet scrub checking (find issues instead of asserting)
David Zafman [Fri, 4 Sep 2015 02:43:35 +0000 (19:43 -0700)]
osd: Better SnapSet scrub checking (find issues instead of asserting)

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoosd: Make the _scrub routine produce good output and detect errors properly
David Zafman [Wed, 26 Aug 2015 20:58:09 +0000 (13:58 -0700)]
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>
9 years agoMerge pull request #5865 from dzafman/wip-13016
Samuel Just [Fri, 30 Oct 2015 15:17:59 +0000 (08:17 -0700)]
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>
9 years agoMerge pull request #6045 from Sandy4999/wip-13133
Yehuda Sadeh [Fri, 30 Oct 2015 04:43:46 +0000 (21:43 -0700)]
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>
9 years agoMerge pull request #6424 from badone/curl_easy_perform_fix
Yehuda Sadeh [Thu, 29 Oct 2015 15:28:37 +0000 (08:28 -0700)]
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>
9 years agoMerge pull request #6363 from ceph/wip-init-rbdmap
Kefu Chai [Thu, 29 Oct 2015 15:01:17 +0000 (23:01 +0800)]
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>
9 years agorgw: Fix typo in RGWHTTPClient::process error message 6424/head
Brad Hubbard [Thu, 29 Oct 2015 10:14:44 +0000 (20:14 +1000)]
rgw: Fix typo in RGWHTTPClient::process error message

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #6358 from dx9/wip-12406-cmake-arch-detection
Kefu Chai [Thu, 29 Oct 2015 08:31:51 +0000 (16:31 +0800)]
Merge pull request #6358 from dx9/wip-12406-cmake-arch-detection

cmake: Use uname instead of arch.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6310 from dx9/wip-12406-test-libcephfs-flock 6485/head
Gregory Farnum [Thu, 29 Oct 2015 06:12:01 +0000 (23:12 -0700)]
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>
9 years agoMerge pull request #6377 from xiexingguo/wip-xxg-13597
Kefu Chai [Thu, 29 Oct 2015 05:40:38 +0000 (13:40 +0800)]
Merge pull request #6377 from xiexingguo/wip-xxg-13597

FileStore: potential memory leak if _fgetattrs fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6414 from dzafman/wip-13625
Sage Weil [Thu, 29 Oct 2015 05:00:54 +0000 (01:00 -0400)]
Merge pull request #6414 from dzafman/wip-13625

messages/MOSDOp: Cast in assert to eliminate warnings

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6418 from tchaikov/wip-fix-ceph-monstore-update-crush
Loic Dachary [Thu, 29 Oct 2015 04:38:29 +0000 (13:38 +0900)]
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>
9 years agotools: ceph-monstore-update-crush: add "--test" to crushtool 6418/head
Kefu Chai [Tue, 27 Oct 2015 02:54:30 +0000 (10:54 +0800)]
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>
9 years agotest: ceph-disk: coverage list_format_dev_plain() new behavior. 6410/head
Vicente Cheng [Thu, 29 Oct 2015 00:27:35 +0000 (08:27 +0800)]
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>
9 years agoFileJournal:_fdump wrongly returns if journal is currently unreadable. 6406/head
xiexingguo [Wed, 28 Oct 2015 06:26:42 +0000 (14:26 +0800)]
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>
9 years agoMerge pull request #5875 from Aran85/parsemetadatakey
Orit Wasserman [Wed, 28 Oct 2015 16:13:41 +0000 (17:13 +0100)]
Merge pull request #5875 from Aran85/parsemetadatakey

rgw:modify the conditional statement in parse_metadata_key method.

9 years agoMerge pull request #6409 from dachary/wip-mailmap
Loic Dachary [Wed, 28 Oct 2015 16:04:43 +0000 (01:04 +0900)]
Merge pull request #6409 from dachary/wip-mailmap

mailmap: Xie Xingguo affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5879 from H3C/wip-rgw-bugfix1
Yehuda Sadeh [Wed, 28 Oct 2015 15:33:43 +0000 (08:33 -0700)]
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>
9 years agomessages/MOSDOp: Cast in assert to eliminate warnings 6414/head
David Zafman [Wed, 28 Oct 2015 04:17:15 +0000 (21:17 -0700)]
messages/MOSDOp: Cast in assert to eliminate warnings

Fixes: #13625
Caused by 0bf2a79e

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #5262 from jmunhoz/wip-12352
Yehuda Sadeh [Wed, 28 Oct 2015 14:32:20 +0000 (07:32 -0700)]
Merge pull request #5262 from jmunhoz/wip-12352

rgw: remove extra check in RGWGetObj::execute

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: Add default quota config 6400/head
Daniel Gryniewicz [Fri, 25 Sep 2015 15:02:20 +0000 (11:02 -0400)]
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>
9 years agoceph-disk: get Nonetype when ceph-disk list with --format plain on single device.
Vicente Cheng [Wed, 28 Oct 2015 10:29:53 +0000 (18:29 +0800)]
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>
9 years agomailmap: Xie Xingguo affiliation 6409/head
Loic Dachary [Wed, 28 Oct 2015 09:06:08 +0000 (18:06 +0900)]
mailmap: Xie Xingguo affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6320 from JiYou/mything
Loic Dachary [Wed, 28 Oct 2015 06:51:12 +0000 (15:51 +0900)]
Merge pull request #6320 from JiYou/mything

Fix examples/librados/Makefile error.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6381 from xiexingguo/xxg-wip-fs-cleanup
Loic Dachary [Wed, 28 Oct 2015 06:16:56 +0000 (15:16 +0900)]
Merge pull request #6381 from xiexingguo/xxg-wip-fs-cleanup

FileStore: remove unused local variable 'handle'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6384 from ktdreyer/wip-doc-download-gpg-key
Loic Dachary [Wed, 28 Oct 2015 06:14:18 +0000 (15:14 +0900)]
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>
9 years agoMerge pull request #6246 from liewegas/wip-13477
Sage Weil [Wed, 28 Oct 2015 00:57:01 +0000 (20:57 -0400)]
Merge pull request #6246 from liewegas/wip-13477

crush: validate bucket id before indexing buckets array

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agocrush/mapper: ensure take bucket value is valid 6246/head
Sage Weil [Tue, 13 Oct 2015 13:55:01 +0000 (09:55 -0400)]
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>
9 years agocrush/mapper: ensure bucket id is valid before indexing buckets array
Sage Weil [Wed, 28 Oct 2015 00:55:26 +0000 (20:55 -0400)]
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>
9 years agoMerge pull request #6239 from zhouyuan/swift_testing_access
Yehuda Sadeh [Tue, 27 Oct 2015 20:35:28 +0000 (13:35 -0700)]
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>
9 years agoMerge pull request #6303 from dx9/wip-12406-use-freopen
Yehuda Sadeh [Tue, 27 Oct 2015 20:33:08 +0000 (13:33 -0700)]
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>
9 years agoMerge pull request #6387 from dachary/wip-test-ports
Loic Dachary [Tue, 27 Oct 2015 08:40:29 +0000 (17:40 +0900)]
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>
9 years agotests: port uniqueness reminder 6387/head
Loic Dachary [Tue, 27 Oct 2015 03:48:23 +0000 (12:48 +0900)]
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>
9 years agoMerge pull request #6379 from tchaikov/wip-13554
Loic Dachary [Tue, 27 Oct 2015 02:52:25 +0000 (11:52 +0900)]
Merge pull request #6379 from tchaikov/wip-13554

rocksdb: remove rdb source files from dist tarball

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6258 from swamireddy/wip-v910-mailmap
Loic Dachary [Tue, 27 Oct 2015 02:09:47 +0000 (11:09 +0900)]
Merge pull request #6258 from swamireddy/wip-v910-mailmap

mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoFileStore: remove unused local variable 'handle' 6381/head
xiexingguo [Mon, 26 Oct 2015 13:45:15 +0000 (21:45 +0800)]
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>
9 years agoFileStore: potential memory leak if _fgetattrs fails 6377/head
xiexingguo [Mon, 26 Oct 2015 10:38:01 +0000 (18:38 +0800)]
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>
9 years agoMerge pull request #6366 from liewegas/wip-osd-fixboot-infernalis
Samuel Just [Mon, 26 Oct 2015 19:23:40 +0000 (12:23 -0700)]
Merge pull request #6366 from liewegas/wip-osd-fixboot-infernalis

osd: fix OSDService vs Objecter init order

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agodoc: download GPG key from download.ceph.com 6384/head
Ken Dreyer [Mon, 26 Oct 2015 19:18:19 +0000 (13:18 -0600)]
doc: download GPG key from download.ceph.com

Fixes: #13603
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agodoc/release-notes: v0.94.5
Sage Weil [Sat, 24 Oct 2015 12:31:46 +0000 (08:31 -0400)]
doc/release-notes: v0.94.5

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorelease-notes: draft v0.94.5 release notes
Loic Dachary [Fri, 23 Oct 2015 18:52:22 +0000 (20:52 +0200)]
release-notes: draft v0.94.5 release notes

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agorocksdb: remove rdb source files from dist tarball 6379/head
Kefu Chai [Mon, 26 Oct 2015 11:44:03 +0000 (04:44 -0700)]
rocksdb: remove rdb source files from dist tarball

rdb is based on NodeJS, and we don't build rdb to use rocksdb as
a keyvaluestore backend.

Fixes: #13554
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agovstart.sh: grant full access to Swift testing account 6239/head
Yuan Zhou [Tue, 13 Oct 2015 02:58:40 +0000 (10:58 +0800)]
vstart.sh: grant full access to Swift testing account

This makes Swift testing more convinent.

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
9 years agoMerge pull request #6375 from david-z/wip-fix-kv-stripe-size-conf
Kefu Chai [Mon, 26 Oct 2015 07:15:24 +0000 (15:15 +0800)]
Merge pull request #6375 from david-z/wip-fix-kv-stripe-size-conf

KeyValueStore: fix the name's typo of keyvaluestore_default_strip_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoKeyValueStore: fix the name's typo of keyvaluestore_default_strip_size 6375/head
Zhi Zhang [Mon, 26 Oct 2015 07:04:55 +0000 (15:04 +0800)]
KeyValueStore: fix the name's typo of keyvaluestore_default_strip_size

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>