]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
John Spray [Tue, 17 Nov 2015 12:18:03 +0000 (12:18 +0000)]
tools/cephfs: use snprintf in Dumper
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 17 Nov 2015 12:00:21 +0000 (12:00 +0000)]
tools/cephfs: enlarge dump header
This was never big enough for largest possible
numbers in the %llu formats.
Not being backwards compatible for this tool.
Signed-off-by: John Spray <john.spray@redhat.com>
Jason Dillaman [Mon, 9 Nov 2015 14:06:05 +0000 (09:06 -0500)]
tests: fix typo in TestClsRbd.snapshots test case
Fixes: #13727
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3b39226709b2fd7122b75fdab79a3cb87ec72d49 )
Josh Durgin [Wed, 11 Nov 2015 05:43:52 +0000 (21:43 -0800)]
Merge pull request #6525 from dillaman/wip-13636-jewel
WorkQueue: new PointerWQ base class for ContextWQ
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jason Dillaman [Tue, 7 Jul 2015 16:11:13 +0000 (12:11 -0400)]
WorkQueue: new PointerWQ base class for ContextWQ
The existing work queues do not properly function if added to a running
thread pool. librbd uses a singleton thread pool which requires
dynamically adding/removing work queues as images are opened and closed.
Fixes: #13636
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Josh Durgin [Tue, 10 Nov 2015 07:28:46 +0000 (23:28 -0800)]
Merge pull request #6508 from dillaman/wip-13726
librbd: deadlock while attempting to flush AIO requests
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jason Dillaman [Mon, 9 Nov 2015 16:22:24 +0000 (11:22 -0500)]
librbd: fixed deadlock while attempting to flush AIO requests
In-flight AIO requests might force a flush if a snapshot was created
out-of-band. The flush completion was previously invoked asynchronously,
potentially via the same thread worker handling the AIO request. This
resulted in the flush operation deadlocking since it can't complete.
Fixes: #13726
Backport: infernalis, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Mon, 9 Nov 2015 15:48:10 +0000 (10:48 -0500)]
tests: new test case to catch deadlock on RBD image refresh
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Yehuda Sadeh [Fri, 6 Nov 2015 21:48:43 +0000 (13:48 -0800)]
Merge pull request #5938 from zhuangzeqiang/rgw-cerr
rgw: clarify the error message when trying to create an existed user
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Sage Weil [Fri, 6 Nov 2015 21:24:26 +0000 (16:24 -0500)]
Merge pull request #6479 from ceph/wip-systemd-rbdmap
rbdmap: systemd support
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jason Dillaman [Fri, 6 Nov 2015 19:39:58 +0000 (14:39 -0500)]
Merge pull request #6467 from fullerdj/wip-13697
cls_rbd: change object_map_update to return 0 on success, add logging
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yehuda Sadeh [Fri, 6 Nov 2015 19:33:40 +0000 (11:33 -0800)]
Merge pull request #6059 from dwj192/dwj-master-tip
rgw:mdlog trim add usage prompt
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 6 Nov 2015 19:00:51 +0000 (11:00 -0800)]
Merge pull request #6408 from dwj192/swift-civetweb-ssl
rgw:swift use Civetweb ssl can not get right url
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Douglas Fuller [Thu, 5 Nov 2015 00:58:12 +0000 (16:58 -0800)]
cls_rbd: change object_map_update to return 0 on success, add logging
The rbd_object_map_update class method returns the size of the data read
from the object map when no update is necessary. Change this to return 0
on success. Add error logging to differentiate error cases.
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
Kefu Chai [Fri, 6 Nov 2015 12:54:21 +0000 (20:54 +0800)]
Merge pull request #6483 from ceph/wip-fix-doc-build
doc/releases-notes: fix build error
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Fri, 6 Nov 2015 12:52:21 +0000 (20:52 +0800)]
doc/releases-notes: fix build error
also change the release year of infernalis from 2014 to 2015
Signed-off-by: Kefu Chai <kchai@redhat.com>
Boris Ranto [Mon, 2 Nov 2015 13:07:47 +0000 (14:07 +0100)]
rbdmap: systemd support
Fixes: #13374
Signed-off-by: Boris Ranto <branto@redhat.com>
Kefu Chai [Fri, 6 Nov 2015 08:35:51 +0000 (16:35 +0800)]
Merge pull request #6476 from xiexingguo/xxg-wip-13703
librados: wrongly passed in argument for stat command
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jason Dillaman [Thu, 5 Nov 2015 21:09:40 +0000 (16:09 -0500)]
Merge pull request #5645 from xinxinsh/wip-snap-rename
implement snapshot rename
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Boris Ranto [Fri, 30 Oct 2015 17:33:36 +0000 (18:33 +0100)]
rbdmap: Move do_map and do_unmap shell functions to rbdmap script
This patch creates rbdmap shell script that is called from init-rbdmap
init script. The patch also renames src/rbdmap configuration file to
src/etc-rbdmap so that rbdmap shell script can be installed via build
system directly. Finally, the patch accomodates these changes in spec
file and build system.
Fixes: #13374
Signed-off-by: Boris Ranto <branto@redhat.com>
Jason Dillaman [Thu, 5 Nov 2015 17:25:49 +0000 (12:25 -0500)]
Merge pull request #5856 from runsisi/wip-misc-remove-dup-test
librbd: remove duplicate read_only test in librbd::async_flatten
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 5 Nov 2015 15:34:53 +0000 (10:34 -0500)]
Merge pull request #6339 from xinxinsh/wip-13558
librbd : fix enable objectmap feature issue
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
xiexingguo [Thu, 5 Nov 2015 14:59:00 +0000 (22:59 +0800)]
librados: wrongly passed in argument for stat command
The first argument of io_ctx_impl->stat() requires an obj(of type object_t), but an oid(of type string) is directly passed in instead.
Fixes: #13703
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
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>
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>
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>
Sage Weil [Thu, 5 Nov 2015 00:40:17 +0000 (19:40 -0500)]
Merge tag 'v9.2.0'
v9.2.0
xinxin shu [Wed, 21 Oct 2015 11:01:21 +0000 (19:01 +0800)]
librbd : fix enable objectmap feature issue
Fixes: #13558
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Jenkins Build Slave User [Tue, 3 Nov 2015 16:58:32 +0000 (16:58 +0000)]
9.2.0
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Weijun Duan [Fri, 30 Oct 2015 01:46:02 +0000 (21:46 -0400)]
rgw:swift use Civetweb ssl can not get right url
Fixes: #13628
Signed-off-by: Weijun Duan <duanweijun@h3c.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>