]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoceph_json: add decode / encoder for multimap 4351/head
Yehuda Sadeh [Mon, 13 Apr 2015 23:33:17 +0000 (16:33 -0700)]
ceph_json: add decode / encoder for multimap

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: use multimap to keep pending operations in bucket index
Yehuda Sadeh [Tue, 31 Mar 2015 00:34:57 +0000 (17:34 -0700)]
cls_rgw: use multimap to keep pending operations in bucket index

Fixes: #11256
Multiple concurrent requests might be sent using the same tag, need the
entry map to be able to hold multiple entries.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: generate new tag for object when setting object attrs
Yehuda Sadeh [Fri, 27 Mar 2015 23:32:48 +0000 (16:32 -0700)]
rgw: generate new tag for object when setting object attrs

Fixes: #11256
Backport: firefly, hammer

Beforehand we were reusing the object's tag, which is problematic as
this tag is used for bucket index updates, and we might be clobbering a
racing update (like object removal).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4350 from almightybeeij/master
Sage Weil [Mon, 13 Apr 2015 21:36:11 +0000 (14:36 -0700)]
Merge pull request #4350 from almightybeeij/master

Check that delta_sum.stats.sum.num_object_copies and delta_sum.stats.sum...

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4349 from ceph/wip-dist-systemd-tmpfiles-d
Sage Weil [Mon, 13 Apr 2015 17:43:09 +0000 (10:43 -0700)]
Merge pull request #4349 from ceph/wip-dist-systemd-tmpfiles-d

#11383: packaging: ship systemd/ceph.tmpfiles.d in tarballs

10 years agopackaging: ship systemd/ceph.tmpfiles.d in tarballs 4349/head
Ken Dreyer [Mon, 13 Apr 2015 15:43:11 +0000 (09:43 -0600)]
packaging: ship systemd/ceph.tmpfiles.d in tarballs

Prior to this commit, the tarballs did not contain
any files under the top-level "systemd" directory. This caused problems
with RPM builds on Fedora and RHEL 7, because as of commit
aa88364f30e2d2f254ade185a83ba263b48e2a73, those RPMs depend on the
systemd/ceph.tmpfiles.d file.

(Longer-term we might want to improve the tarball generation code to be
less complex/manual.)

http://tracker.ceph.com/issues/11383 Refe: #11383

Reported-by: Greg Farnum <gfarnum@redhat.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoCheck that delta_sum.stats.sum.num_object_copies and delta_sum.stats.sum.num_object... 4350/head
BJ Lougee [Mon, 13 Apr 2015 16:24:38 +0000 (11:24 -0500)]
Check that delta_sum.stats.sum.num_object_copies and delta_sum.stats.sum.num_object are greater than zero

This fixes division by zero.

Signed-off-by BJ Lougee <almightybeeij@gmail.com>

10 years agodoc/release-notes: v0.94.1
Sage Weil [Mon, 13 Apr 2015 15:31:40 +0000 (08:31 -0700)]
doc/release-notes: v0.94.1

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4317 from ceph/wip-rpm-with-systemd-comparison
branto1 [Mon, 13 Apr 2015 12:11:45 +0000 (14:11 +0200)]
Merge pull request #4317 from ceph/wip-rpm-with-systemd-comparison

ceph.spec.in: set _with_systemd on RHEL 7 and Fedora

10 years agoMerge pull request #4327 from dachary/wip-wheezy
Kefu Chai [Mon, 13 Apr 2015 10:06:28 +0000 (18:06 +0800)]
Merge pull request #4327 from dachary/wip-wheezy

install-deps.sh: Debian GNU/Linux wheezy needs backports

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4341 from dachary/wip-test-timeout
Loic Dachary [Mon, 13 Apr 2015 09:30:29 +0000 (11:30 +0200)]
Merge pull request #4341 from dachary/wip-test-timeout

tests: display ceph report when stuck

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoMerge pull request #4334 from smithfarm/master
Loic Dachary [Mon, 13 Apr 2015 09:20:34 +0000 (11:20 +0200)]
Merge pull request #4334 from smithfarm/master

do_autogen: add missing '--without-lttng' option to usage()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: display ceph report when stuck 4341/head
Loic Dachary [Sat, 11 Apr 2015 12:14:53 +0000 (14:14 +0200)]
tests: display ceph report when stuck

When the cluster is stuck (wait_for_clean times out), display ceph
report to stderr for debugging purposes.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4239 from yuyuyu101/wip-librbd-conf
Josh Durgin [Sat, 11 Apr 2015 06:10:34 +0000 (23:10 -0700)]
Merge pull request #4239 from yuyuyu101/wip-librbd-conf

Wip librbd conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4323 from ceph/wip-11363
Josh Durgin [Sat, 11 Apr 2015 01:04:30 +0000 (18:04 -0700)]
Merge pull request #4323 from ceph/wip-11363

librbd: ImageWatcher should cancel in-flight ops on watch error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4140 from ceph/wip-rbd-rebuild-object-map
Josh Durgin [Sat, 11 Apr 2015 00:56:48 +0000 (17:56 -0700)]
Merge pull request #4140 from ceph/wip-rbd-rebuild-object-map

rbd: add ability to rebuild corrupt/missing object maps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4325 from wonzhq/async-resize-2
Josh Durgin [Sat, 11 Apr 2015 00:32:58 +0000 (17:32 -0700)]
Merge pull request #4325 from wonzhq/async-resize-2

librbd/AsyncResize: avoid dup incrementing refresh seq

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4336 from ceph/wip-11369
Josh Durgin [Sat, 11 Apr 2015 00:26:14 +0000 (17:26 -0700)]
Merge pull request #4336 from ceph/wip-11369

librbd: failure to update the object map should always return success

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoinstall-deps.sh: Debian GNU/Linux wheezy needs backports 4327/head
Loic Dachary [Fri, 10 Apr 2015 07:26:14 +0000 (09:26 +0200)]
install-deps.sh: Debian GNU/Linux wheezy needs backports

It is not enough for the backports to be available, they also need to be
explicitly allowed to take precedence whenever a package is installed
indirectly. This is causing problems with libp11-kit-dev pulled by
libcurl4-gnutls-dev.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4319 from ceph/wip-11348
Josh Durgin [Fri, 10 Apr 2015 21:07:43 +0000 (14:07 -0700)]
Merge pull request #4319 from ceph/wip-11348

librbd: update default image format to version 2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agodo_autogen.sh: add missing '--without-lttng' option to usage 4334/head
Nathan Cutler [Fri, 10 Apr 2015 14:05:20 +0000 (16:05 +0200)]
do_autogen.sh: add missing '--without-lttng' option to usage

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
10 years agolibrbd: notify of header update after rebuilding object map 4140/head
Jason Dillaman [Fri, 10 Apr 2015 19:43:45 +0000 (15:43 -0400)]
librbd: notify of header update after rebuilding object map

This will allow clients to detect that the object map is no longer
invalid and to reload the object map from disk.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: rebuilding object map shouldn't update piecemeal
Jason Dillaman [Fri, 10 Apr 2015 19:42:58 +0000 (15:42 -0400)]
librbd: rebuilding object map shouldn't update piecemeal

The object map is now rebuilt in-memory and written back to the
OSDs as a single operation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: add test case for cls_rbd object_map_save
Jason Dillaman [Fri, 10 Apr 2015 18:05:01 +0000 (14:05 -0400)]
tests: add test case for cls_rbd object_map_save

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd_client: add object_map_save helper method
Jason Dillaman [Fri, 10 Apr 2015 17:59:28 +0000 (13:59 -0400)]
cls_rbd_client: add object_map_save helper method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: add object_map_save method
Jason Dillaman [Fri, 10 Apr 2015 17:56:39 +0000 (13:56 -0400)]
cls_rbd: add object_map_save method

Allow the object map rebuild process to build the full object map
in memory and save it to disk with one operation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: add ImageWatcher test for new rebuild object map request
Jason Dillaman [Fri, 20 Mar 2015 17:12:49 +0000 (13:12 -0400)]
tests: add ImageWatcher test for new rebuild object map request

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: added rebuild_object_map test to test_librbd
Jason Dillaman [Fri, 20 Mar 2015 15:47:36 +0000 (11:47 -0400)]
tests: added rebuild_object_map test to test_librbd

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: librados_test_stub reads should deep-copy
Jason Dillaman [Fri, 6 Mar 2015 20:40:48 +0000 (15:40 -0500)]
tests: librados_test_stub reads should deep-copy

If a client of librados_test_stub modified a bufferlist
retrieved via a read call, the client will actually be
changing the contents of the file.  Therefore, read calls
should deep-copy the contents of the buffer::ptrs.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: allow snapshot object maps to be updated
Jason Dillaman [Sat, 21 Mar 2015 18:40:26 +0000 (14:40 -0400)]
librbd: allow snapshot object maps to be updated

Rebuild will need to be able to update/resize the object maps
for image snapshots.  This was previously not permitted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: update in-memory object map before on-disk update completes
Jason Dillaman [Fri, 20 Mar 2015 14:40:22 +0000 (10:40 -0400)]
librbd: update in-memory object map before on-disk update completes

When multiple IO updates are occurring within the same object, this
will allow only a single object map update request to be sent to the
OSD.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: treat zero-byte object maps as missing
Jason Dillaman [Fri, 20 Mar 2015 03:29:44 +0000 (23:29 -0400)]
cls_rbd: treat zero-byte object maps as missing

Acquiring the lock on a missing object map will create an
empty object. Treat the empty object as a non-existant
object map to support rebuilding corrupt object maps while
holding the exclusive lock.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agorbd: add object map rebuild command
Jason Dillaman [Thu, 12 Mar 2015 16:10:32 +0000 (12:10 -0400)]
rbd: add object map rebuild command

An invalid object map can now be rebuilt via the rbd CLI.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add rebuild_object_map to public API
Jason Dillaman [Fri, 20 Mar 2015 01:19:22 +0000 (21:19 -0400)]
librbd: add rebuild_object_map to public API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: add another overload of aio_operate
Jason Dillaman [Thu, 19 Mar 2015 20:28:34 +0000 (16:28 -0400)]
librados_test_stub: add another overload of aio_operate

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: connect async rebuild object map to state machine
Jason Dillaman [Thu, 19 Mar 2015 20:26:40 +0000 (16:26 -0400)]
librbd: connect async rebuild object map to state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: require callers to ObjectMap::aio_update to acquire lock
Jason Dillaman [Thu, 19 Mar 2015 19:35:59 +0000 (15:35 -0400)]
librbd: require callers to ObjectMap::aio_update to acquire lock

This is needed to allow an atomic compare and update operation
from the rebuild object map utility.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: added RebuildObjectMapRequest state machine
Jason Dillaman [Thu, 19 Mar 2015 19:33:07 +0000 (15:33 -0400)]
librbd: added RebuildObjectMapRequest state machine

It will verify the object map is properly sized, verify
the existence of each object within the image (snapshot),
and clear the invalid object map flag once complete.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: correct basic object map errors during refresh
Jason Dillaman [Fri, 20 Mar 2015 16:16:14 +0000 (12:16 -0400)]
librbd: correct basic object map errors during refresh

If the object map is corrupt on-disk or too small for the image,
correct these basic issues as soon as possible.  The object map
is still flagged as invalid, but there will be less required repair
work if future IO is able to properly update the object map.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: use generic helper for issuing async requests
Jason Dillaman [Wed, 18 Mar 2015 15:51:47 +0000 (11:51 -0400)]
librbd: use generic helper for issuing async requests

resize, flatten, and rebuild object map now use the same
bootstrap code for sending the request to the remote lock owner
or executing the request locally.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: connect ImageWatch rebuild request to async rebuild method
Jason Dillaman [Wed, 18 Mar 2015 15:08:23 +0000 (11:08 -0400)]
librbd: connect ImageWatch rebuild request to async rebuild method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add preliminary methods for rebuilding object map
Jason Dillaman [Wed, 18 Mar 2015 15:07:35 +0000 (11:07 -0400)]
librbd: add preliminary methods for rebuilding object map

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add hooks for rebuild object map to ImageWatcher
Jason Dillaman [Wed, 18 Mar 2015 14:38:09 +0000 (10:38 -0400)]
librbd: add hooks for rebuild object map to ImageWatcher

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add new notify payload for rebuild object map
Jason Dillaman [Wed, 18 Mar 2015 14:21:17 +0000 (10:21 -0400)]
librbd: add new notify payload for rebuild object map

The request will be sent to the client which owns the exclusive
lock to rebuild the object map for the current image HEAD.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: failure to update the object map should always return success 4336/head
Jason Dillaman [Fri, 10 Apr 2015 16:37:05 +0000 (12:37 -0400)]
librbd: failure to update the object map should always return success

If an object map update fails, the object map will be flagged as
invalid.  However, if a subsequent update failure occurs, the error
code will propagate back to the caller.

Fixes: #11369
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: librados_test_stub reads should deep-copy
Jason Dillaman [Fri, 6 Mar 2015 20:40:48 +0000 (15:40 -0500)]
tests: librados_test_stub reads should deep-copy

If a client of librados_test_stub modified a bufferlist
retrieved via a read call, the client will actually be
changing the contents of the file.  Therefore, read calls
should deep-copy the contents of the buffer::ptrs.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4330 from dachary/wip-hammer-release-notes
Loic Dachary [Fri, 10 Apr 2015 15:59:07 +0000 (17:59 +0200)]
Merge pull request #4330 from dachary/wip-hammer-release-notes

release-notes: draft v0.94.1 release notes

10 years agolibrbd: ImageWatcher should cancel in-flight ops on watch error 4323/head
Jason Dillaman [Fri, 20 Mar 2015 15:56:55 +0000 (11:56 -0400)]
librbd: ImageWatcher should cancel in-flight ops on watch error

Upon an watch error notification from librados, pending requests
should be canceled and in-flight IO should be flushed prior to
unlocking the image.

Fixes: #11363
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4333 from dachary/wip-fedora
Kefu Chai [Fri, 10 Apr 2015 13:33:13 +0000 (21:33 +0800)]
Merge pull request #4333 from dachary/wip-fedora

tests: add Dockerfile for fedora 21

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agotests: add Dockerfile for fedora 21 4333/head
Loic Dachary [Fri, 10 Apr 2015 13:09:00 +0000 (15:09 +0200)]
tests: add Dockerfile for fedora 21

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agorelease-notes: draft v0.94.1 release notes 4330/head
Loic Dachary [Fri, 10 Apr 2015 09:43:11 +0000 (11:43 +0200)]
release-notes: draft v0.94.1 release notes

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agolibrbd: Fix image_watcher test 4239/head
Haomai Wang [Fri, 10 Apr 2015 08:51:31 +0000 (16:51 +0800)]
librbd: Fix image_watcher test

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoLibrbd: Don't affect global md_config_t
Haomai Wang [Fri, 10 Apr 2015 07:25:33 +0000 (15:25 +0800)]
Librbd: Don't affect global md_config_t

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoLibrbd: Don't apply to global configserver
Haomai Wang [Thu, 9 Apr 2015 08:07:30 +0000 (16:07 +0800)]
Librbd: Don't apply to global configserver

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd/AsyncResize: avoid dup incrementing refresh seq 4325/head
Zhiqiang Wang [Fri, 10 Apr 2015 05:44:07 +0000 (13:44 +0800)]
librbd/AsyncResize: avoid dup incrementing refresh seq

The refresh_seq is incremented in notify_change when calling
notify_async_complete after the locker owner completes the resize
request.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge pull request #4306 from dachary/wip-ec-troubleshooting
Gregory Farnum [Thu, 9 Apr 2015 22:41:05 +0000 (15:41 -0700)]
Merge pull request #4306 from dachary/wip-ec-troubleshooting

doc: an erasure code crush ruleset can be dynamically modified

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4320 from liewegas/wip-crush-straw2-div0
Loic Dachary [Thu, 9 Apr 2015 22:05:36 +0000 (00:05 +0200)]
Merge pull request #4320 from liewegas/wip-crush-straw2-div0

crush/mapper: fix divide-by-0 in straw2

Reviewed-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agocrush/mapper: fix divide-by-0 in straw2 4320/head 4321/head
Sage Weil [Thu, 9 Apr 2015 21:42:34 +0000 (14:42 -0700)]
crush/mapper: fix divide-by-0 in straw2

If the item weight is 0 we don't want to divide; instead draw a minimal
value.

Fixes: #11357
Reported-by: Yann Dupont <yd@objoo.org>
Tested-by: Yann Dupont <yd@objoo.org>
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoqa/workunits/rbd/copy.sh: removed deprecated --new-format option 4319/head
Jason Dillaman [Thu, 9 Apr 2015 20:06:59 +0000 (16:06 -0400)]
qa/workunits/rbd/copy.sh: removed deprecated --new-format option

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: ensure old-format RBD tests still work
Jason Dillaman [Thu, 9 Apr 2015 19:06:27 +0000 (15:06 -0400)]
tests: ensure old-format RBD tests still work

Override the RBD default image format back to version 1
to ensure tests properly cover the old format.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agorbd: deprecate --new-format command-line option
Jason Dillaman [Thu, 9 Apr 2015 18:59:59 +0000 (14:59 -0400)]
rbd: deprecate --new-format command-line option

Image formats can be explicitly chosen via the --image-format X
command-line option.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocommon/config_opts: updated rbd_default_format
Jason Dillaman [Thu, 9 Apr 2015 18:59:04 +0000 (14:59 -0400)]
common/config_opts: updated rbd_default_format

New images will now default to format 2 RBD images.

Fixes: #11348
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: added rados_ioctx_cct implementation
Jason Dillaman [Thu, 9 Apr 2015 18:58:16 +0000 (14:58 -0400)]
librados_test_stub: added rados_ioctx_cct implementation

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4174 from trociny/wip-10976.master
Samuel Just [Thu, 9 Apr 2015 18:25:03 +0000 (11:25 -0700)]
Merge pull request #4174 from trociny/wip-10976.master

osd: fix PG::all_unfound_are_queried_or_lost for non-existent osds

Reviewed-by: Kefu Chai <tchaikov@gmail.com
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4111 from wonzhq/hitsets-check
Samuel Just [Thu, 9 Apr 2015 18:22:55 +0000 (11:22 -0700)]
Merge pull request #4111 from wonzhq/hitsets-check

osd/ReplicatedPG: correct the checking if the promoting object is in other hit sets

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
10 years agoMerge pull request #4136 from XinzeChi/wip-pg-delete-sleep
Samuel Just [Thu, 9 Apr 2015 18:21:37 +0000 (11:21 -0700)]
Merge pull request #4136 from XinzeChi/wip-pg-delete-sleep

osd: return fast if PG::deleting is true in snap_trimmer and PG::scrub

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4178 from XinzeChi/wip-tracker-message
Samuel Just [Thu, 9 Apr 2015 18:21:20 +0000 (11:21 -0700)]
Merge pull request #4178 from XinzeChi/wip-tracker-message

osd: more useful message to find out potential unhealth osd

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4155 from wonzhq/prdop
Samuel Just [Thu, 9 Apr 2015 18:20:24 +0000 (11:20 -0700)]
Merge pull request #4155 from wonzhq/prdop

osd/ReplicatedPG: don't check order in finish_proxy_read

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4139 from Ved-vampir/oscnt
Samuel Just [Thu, 9 Apr 2015 18:19:23 +0000 (11:19 -0700)]
Merge pull request #4139 from Ved-vampir/oscnt

Perf counters descriptions

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3928 from dmitryya/rados_bench_with_iops_metric
Samuel Just [Thu, 9 Apr 2015 18:17:55 +0000 (11:17 -0700)]
Merge pull request #3928 from dmitryya/rados_bench_with_iops_metric

rados bench: Add IOPS metric to `rados bench'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4253 from majianpeng/scrub-fix2
Samuel Just [Thu, 9 Apr 2015 18:16:56 +0000 (11:16 -0700)]
Merge pull request #4253 from majianpeng/scrub-fix2

Scrub bug fix

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoceph.spec.in: set _with_systemd on RHEL 7 and Fedora 4317/head
Ken Dreyer [Thu, 9 Apr 2015 17:10:52 +0000 (11:10 -0600)]
ceph.spec.in: set _with_systemd on RHEL 7 and Fedora

Commit 71a5090bca049a43e30a7f0cf99141950ef9c5dd added a "_with_systemd"
conditional to the RPMs, but I erred with the version comparison
operator, so this only applied to RHEL 8+, not RHEL 7+.

Adjust the conditional so that it will really apply to RHEL 7+. While
we're here, add Fedora as well.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Reported-by: Boris Ranto <branto@redhat.com>
10 years agoMerge pull request #4224 from rzarzynski/wip-10682_bucketlisting
Yehuda Sadeh [Thu, 9 Apr 2015 17:02:08 +0000 (10:02 -0700)]
Merge pull request #4224 from rzarzynski/wip-10682_bucketlisting

rgw: add support for end_marker parameter for GET on Swift container.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4305 from Ved-vampir/rgw
Yehuda Sadeh [Thu, 9 Apr 2015 16:55:25 +0000 (09:55 -0700)]
Merge pull request #4305 from Ved-vampir/rgw

rgw: add perf counters descriptions

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4240 from 9seconds/post_check_quotas
Yehuda Sadeh [Thu, 9 Apr 2015 16:51:35 +0000 (09:51 -0700)]
Merge pull request #4240 from 9seconds/post_check_quotas

rgw: Quota not respected in POST object

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4268 from guangyy/wip-11322
Yehuda Sadeh [Thu, 9 Apr 2015 16:50:02 +0000 (09:50 -0700)]
Merge pull request #4268 from guangyy/wip-11322

rgw : Issue AIO for next chunk first before flush the (cached) data.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4315 from dachary/wip-workflow
Loic Dachary [Thu, 9 Apr 2015 12:39:14 +0000 (14:39 +0200)]
Merge pull request #4315 from dachary/wip-workflow

doc: development workflows

Reviewed-by: Alistair Israel <aisrael@gmail.com>
10 years agodoc: when and why publish a point release 4315/head
Loic Dachary [Thu, 9 Apr 2015 11:53:13 +0000 (13:53 +0200)]
doc: when and why publish a point release

Explain who decides when to cut a point release and the tradeoffs
involved.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: add Hammer to the release timeline
Loic Dachary [Thu, 9 Apr 2015 11:51:15 +0000 (13:51 +0200)]
doc: add Hammer to the release timeline

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoLibrbd: aware_metadata_confs->apply_metadata_confs
Haomai Wang [Thu, 9 Apr 2015 08:06:06 +0000 (16:06 +0800)]
Librbd: aware_metadata_confs->apply_metadata_confs

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoLibrbd: Use boost:assign to init aware_confs
Haomai Wang [Thu, 9 Apr 2015 08:04:07 +0000 (16:04 +0800)]
Librbd: Use boost:assign to init aware_confs

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4233 from ceph/wip-librbd-aio-request
Josh Durgin [Wed, 8 Apr 2015 22:19:24 +0000 (15:19 -0700)]
Merge pull request #4233 from ceph/wip-librbd-aio-request

librbd: simplify AioRequest constructor parameters

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge remote-tracking branch 'origin/wip-2862'
Josh Durgin [Wed, 8 Apr 2015 20:51:31 +0000 (13:51 -0700)]
Merge remote-tracking branch 'origin/wip-2862'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/common/ceph_argparse.cc
src/rbd.cc

10 years agoMerge pull request #4307 from dzafman/wip-dz-cmd-fix
Dan Mick [Wed, 8 Apr 2015 20:28:12 +0000 (13:28 -0700)]
Merge pull request #4307 from dzafman/wip-dz-cmd-fix

osd: Fix wrong usage for "ceph tell osd.* debug dump_missing"

Reviewed-by: Dan Mick <dmick@redhat.com>
10 years agoosd: Fix wrong usage for "ceph tell osd.* debug dump_missing" 4307/head
David Zafman [Wed, 8 Apr 2015 19:45:37 +0000 (12:45 -0700)]
osd: Fix wrong usage for "ceph tell osd.* debug dump_missing"

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4304 from Ved-vampir/mds
John Spray [Wed, 8 Apr 2015 18:12:05 +0000 (19:12 +0100)]
Merge pull request #4304 from Ved-vampir/mds

mds: add perf counters descriptions

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agorgw: add perf counters descriptions 4305/head
Ved-vampir [Wed, 8 Apr 2015 17:27:16 +0000 (20:27 +0300)]
rgw: add perf counters descriptions

Sign-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
10 years agodoc: an erasure code crush ruleset can be dynamically modified 4306/head
Loic Dachary [Wed, 8 Apr 2015 17:33:05 +0000 (19:33 +0200)]
doc: an erasure code crush ruleset can be dynamically modified

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: add perf counters descriptions 4304/head
Ved-vampir [Wed, 8 Apr 2015 17:08:09 +0000 (20:08 +0300)]
mds: add perf counters descriptions

Sign-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
10 years agodoc/release-notes: note about SHEC
Sage Weil [Wed, 8 Apr 2015 16:52:59 +0000 (09:52 -0700)]
doc/release-notes: note about SHEC

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4274 from liewegas/wip-osd-cleanup
Kefu Chai [Wed, 8 Apr 2015 15:56:54 +0000 (23:56 +0800)]
Merge pull request #4274 from liewegas/wip-osd-cleanup

osd: remove some dead(ish) code

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4301 from nilamdyuti/wip-doc-ceph-object-gateway
Ken Dreyer [Wed, 8 Apr 2015 13:32:41 +0000 (07:32 -0600)]
Merge pull request #4301 from nilamdyuti/wip-doc-ceph-object-gateway

doc: Corrects rgw.conf file path for Debian-based and RPM-based distros
in radosgw man page.

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodoc: Corrects rgw.conf file path for Debian-based and RPM-based distros 4301/head
Nilamdyuti Goswami [Wed, 8 Apr 2015 10:18:39 +0000 (15:48 +0530)]
doc: Corrects rgw.conf file path for Debian-based and RPM-based distros
in radosgw man page.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4294 from ktdreyer/wip-readme-rm-old-ubuntu
Loic Dachary [Wed, 8 Apr 2015 08:55:37 +0000 (10:55 +0200)]
Merge pull request #4294 from ktdreyer/wip-readme-rm-old-ubuntu

README: rm references to old Ubuntu distros

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4289 from dachary/wip-docker-user
Kefu Chai [Wed, 8 Apr 2015 08:28:51 +0000 (16:28 +0800)]
Merge pull request #4289 from dachary/wip-docker-user

tests: allow multiple users of docker-tests.sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4210 from trociny/fix-11261
Kefu Chai [Wed, 8 Apr 2015 07:19:29 +0000 (15:19 +0800)]
Merge pull request #4210 from trociny/fix-11261

ceph_argparse: return false instead exiting when argument is missed

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoTestCase: Change in testcase output
Rajesh Nambiar [Wed, 8 Apr 2015 06:40:58 +0000 (23:40 -0700)]
TestCase: Change in testcase output

For the local sanity test to pass this change is needed as the output message changes.

Signed-off-by: Rajesh Nambiar <rajesh.n@msystechnologies.com>
10 years ago Fix to some of the command line parsing (including rbd)
Rajesh Nambiar [Wed, 8 Apr 2015 06:39:07 +0000 (23:39 -0700)]
 Fix to some of the command line parsing (including rbd)

Fix#: 2862

Changes to some of the common files for command line parsing

Change to ceph_argparse.cc
-------------------------

Added function ceph_arg_value_type()
  Given an input it will determine
   i) If that input is an option or not
   ii) If input is numeric in nature or not.

  It will set the flag bool_option and bool_numeric appropriately.
  This function is called by ceph_argparse_witharg() to figure out if
  the input parameter to those functions are numeric in nature and not
  an option.  If the input parameter to ceph_argparse_witharg()
  happens to be an option then it implies that user didn't supply
  value to the option.

Changes to strol.cc
-------------------
Changes to strict_strtoll() and strict_strtol()

  Both these functions reponsibility is to convert the string to long or to int.
  I felt it may be not be good for it to display error message within this function,
  rather caller of this function who has better understanding of the function's purpose
  can display the error message.

  Made change in this function to just create a generic error message,Its the
  caller of this function decides what to do with this message.

Signed-off-by: Rajesh Nambiar <rajesh.n@msystechnologies.com>
10 years agorbd: create command throws inappropriate error messages
Rajesh Nambiar [Wed, 8 Apr 2015 06:31:48 +0000 (23:31 -0700)]
rbd: create command throws inappropriate error messages

Fixes: #2862
Changes related to rbd file

Changes to rbd.cc
-----------------

Change 1: line# 2744 to 2747

 If the option is --order then do the check of its value if its less
 than 12 or greaterthan 25 then throw error. Correct value of --order
 is 12 to 25.

Change 2: Removal of validation from line# 3205 to 3209

  Since the check for correct value of --order is done before hence the
  check here is not needed.

Signed-off-by: Rajesh Nambiar <rajesh.n@msystechnologies.com>
10 years agoMerge pull request #4288 from fullerdj/wip-rbd-xfstests-201504
Josh Durgin [Wed, 8 Apr 2015 00:04:43 +0000 (17:04 -0700)]
Merge pull request #4288 from fullerdj/wip-rbd-xfstests-201504

RBD: build xfsdump and xfsprogs from source; set new expunge set for xfstests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>