Commit Graph

39156 Commits

Author SHA1 Message Date
Yehuda Sadeh
e274e10970 rgw: fix replica log indexing
Fixes: #8251

Previously we were indexing the replica log only by bucket name, even
though we were provided with the bucket instance id. Fix that, and also
add the option to be able to revert to the old behavior. For
radosgw-admin we can do it if --replicalog-index-by-instance=false is
provided. For the replica log REST api we now have the index-by-instance
http param (defaults to true).

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2015-01-27 16:24:59 -08:00
Sage Weil
a3eedc2a86 Merge pull request #3480 from liewegas/wip-10617
osd: continue interrupted pg deletion on pool removal (bug 10617)

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-27 13:04:38 -08:00
Sage Weil
8b22bf6cec Merge pull request #3454 from hjwsm1989/optracker-op-wq
use shardid as a key of the shardinfo when "dump_op_pq_state".

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:58:29 -08:00
Sage Weil
533b458966 Merge pull request #3430 from majianpeng/misc
Misc

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:57:36 -08:00
Sage Weil
74e584b258 Merge pull request #3311 from xinxinsh/fix1
disable tcmalloc by default when enable jemalloc

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:56:00 -08:00
Sage Weil
496a37e665 Merge pull request #3394 from ceph/wip-10555
mon: Do not allow empty pool names when creating

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:55:11 -08:00
Greg Farnum
0be7925a95 Update PendingReleaseNotes for ceph-fuse change in Giant
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-01-27 12:55:04 -08:00
Sage Weil
4d3c7ecc9d Merge pull request #3444 from ceph/wip-mon-pgtemp
osd: OSDMap: remove pg temps for inexistent pools

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:54:47 -08:00
Sage Weil
f1c9b24fe7 Merge pull request #3465 from liewegas/wip-mon-features
mon/OSDMonitor: validate crush features for osd (not just mon)

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-27 12:54:28 -08:00
Sage Weil
597c18ad46 Merge pull request #3475 from tchaikov/osdmap-remove-unused-variables
osd/OSDMap: remove unused variables

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-27 12:54:03 -08:00
Sage Weil
dba0abbd68 Merge pull request #3477 from liewegas/wip-noreuse
librados: add NOREUSE fadvise hint

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-01-27 12:53:30 -08:00
Josh Durgin
5064787697 Merge pull request #3504 from ceph/wip-10553
rgw: fix partial GET in swift

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-27 12:46:08 -08:00
Yehuda Sadeh
fc896760ff Merge pull request #3471 from yuandong1222/rgw-format-mtime
rgw: format mtime of radosgw-admin bucket stats

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-27 10:23:03 -08:00
Haomai Wang
77bd883bed test_msgr: add auth enabled basic test
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-28 00:24:57 +08:00
Haomai Wang
408db6519a async_msgr: crc configuration in messenger
Add new header_crc and data_crc configuration booleans, and use
them consistently to govern whether CRC is performed in the
Message encode, decode, and transit paths.

Learn from 2ffacbe6ef

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-28 00:01:52 +08:00
Haomai Wang
ce941f6c07 async: Delete authorizer when connected
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-27 23:12:44 +08:00
Loic Dachary
af266c02d3 Merge pull request #3497 from trociny/test-10439
tests: bring back useful test 'ceph tell osd.foo'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-27 14:12:36 +01:00
John Spray
a8e257975a common: filtering in perf dump
So that we can get out a particular subsystem
or particular counter without dumping
everything.  Should make tests that watch perf
counters much less spammy!

`logger` and `counter` params are used with
an exact comparison here but the interface
should be amenable to extending to e.g. globbing
if we wanted to in the future.

Also tidy up some iterator while()s into for()s.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-27 11:17:10 +00:00
Mykola Golub
e5ddc502d9 tests: bring back useful test 'ceph tell osd.foo'
The test was removed in 1189138 (mon: make ceph tell mon.* version
work) as it began to fail due to #10439. After it fixed in c4548f6
(pybind: ceph_argparse: validate incorrectly formed targets), the test
can be restored.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-27 10:51:07 +02:00
Xinze Chi
7c59bc0abe cleanup: replace some length() with !empty()
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-01-27 07:33:47 +00:00
Xinze Chi
17add06727 cleanup: replace some size() with !empty()
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-01-27 07:17:44 +00:00
Josh Durgin
5a654e321f Merge pull request #2563 from ceph/wip-7467
rgw: support multiple host names

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-26 22:34:24 -08:00
Josh Durgin
d5cb91e508 Merge pull request #3492 from ceph/wip-gmock
tests: add Google C++ Mocking Framework

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-26 11:50:05 -08:00
Josh Durgin
9408d0f743 Merge pull request #3493 from ceph/wip-10637
librbd: trim header update not using AIO

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-26 11:07:20 -08:00
Loic Dachary
e62569685f Merge pull request #3388 from dachary/wip-make-check
tests: centos7 needs nc to run make check
2015-01-26 18:43:12 +01:00
Ken Dreyer
b36b5c9e70 Merge pull request #3345 from dachary/wip-install-epel
tests: better EPEL installation method

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-01-26 10:24:53 -07:00
Loic Dachary
9a9670c2c3 tests: better EPEL installation method
It does not depend on a specific version of the EPEL release package.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-01-26 10:22:57 -07:00
Loic Dachary
1798803292 Merge pull request #3455 from bveuille/wip-documentation
doc: Change Availability text in all of the man pages

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-26 12:42:32 +01:00
Jason Dillaman
bf05ec186a tests: replace existing gtest 1.5.0 with gmock/gtest 1.7.0
Google Testing Framework is included by default within the Google
C++ Mocking Framework.  Update makefiles to use new gmock/gtest
libraries and remove old gtest source code.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-25 23:09:03 -05:00
Jason Dillaman
5301b2b705 librbd: trim header update not using AIO
The original trim header update code was using blocking IO to
update the header.  After migrating to an asynchronous trim
which performs all work in librados callbacks, it exposed a
potential deadlock in the librados_test_stub when attempting
to do blocking IO within a librados callback.  This commit
changes the header update to use AIO.

Fixes: #10637
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-25 22:15:07 -05:00
Jason Dillaman
5cbe0c57f0 gmock: use Google C++ Mocking Framework for unit tests
The 'src/gmock' directory is extracted from the 1.7.0
release located at https://code.google.com/p/googlemock/

gmock is licensed under the New BSD license, see
src/gmock/LICENSE

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-25 20:06:55 -05:00
Josh Durgin
c602a8547b Merge pull request #3486 from ceph/wip-librbd-trim-error
librbd: trim would not complete if exclusive lock is lost

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-25 12:55:24 -08:00
Gregory Farnum
e1aecdf822 Merge pull request #3487 from ceph/wip-install-deps
install-deps: fix LC_ALL setting

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-25 11:59:16 -08:00
Noah Watkins
ca1d21e392 install-deps: fix LC_ALL setting
On my box LC_ALL=C# includes the '#' in the value without
a space between C and '#' and things go completely bonkers.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2015-01-25 11:45:48 -08:00
Josh Durgin
e4a97c60e3 librados_test_stub: add IoCtx::get_instance_id()
This fixes make check

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-01-24 23:12:18 -08:00
Josh Durgin
f6406c99d8 qa: small improvements to merge-diff test
* Use set -e to detect errors
* no need to retry cleanup in a loop now that rbd-fuse closes images
* use --no-progress for long-running operations
* add output at the start of each test

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-01-24 23:10:16 -08:00
Josh Durgin
4e88414468 rbd-fuse: clean up when shutdown
Close all open images and librados state. This cleans up watches so we
don't need to wait for them to timeout in tests.

rbd-fuse is still a rough prototype, but this makes it slightly more
usable for testing.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-01-24 15:39:20 -08:00
Josh Durgin
75bdfecda1 librados: fix typo in docs
There is no rados_destroy(), only rados_ioctx_destroy().

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-01-24 15:39:20 -08:00
Josh Durgin
f3bdd385ff Merge branch 'wip-8902'
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-24 15:37:09 -08:00
Jason Dillaman
4ac3cd729c librbd: throttle async progress callbacks
Ensure that no more than one outstanding progress callback
is queued for notification.  This will allow remote progress
updates to be sent at a rate in which all watch/notify
clients can support.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 15:05:49 -08:00
Jason Dillaman
cd9d8eb79a librbd: add more robust retry handling to maintenance ops
When image locking is enabled, snapshot create, resize, and
flatten are coordinated with the lock owner.  Previously, if the
the lock owner changed during one of this operations, the
operation would fail.  Now librbd will attempt to restart the
operation with the new lock owner (or become the owner itself).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 15:05:49 -08:00
Jason Dillaman
1b6467b79f librbd: assert header lock ownership for maint operations
The resize, flatten, and snapshot maintenance operations now
use the new assert_lock feature to ensure that the current
client still owns the header lock when making changes.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 15:05:49 -08:00
Jason Dillaman
71e84e048f cls_lock: New assert_locked operation
The assert_locked operation can be combined with other
RADOS ops to prevent an update to a locked object when
the client doesn't own the lock.  It will not attempt to
acquire the lock if the object is not currently locked.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 15:05:49 -08:00
Jason Dillaman
376c7e0f14 librbd: Coordinate maintenance through exclusive lock leader
When the exclusive lock feature is enabled, only a single client can
modify the image.  As a result, certain maintenance activities
need to be proxied from the maintenance client to the active
leader.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 15:05:49 -08:00
Jason Dillaman
dfa96c5801 librbd: Add maintenance operation requests to ImageWatcher
Snapshot, flatten, and resize maintenance operations can now
be coordinated via the client holding the exclusive lock for the
image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 15:05:49 -08:00
Jason Dillaman
e6f12805c2 librados: Expose RadosClient instance id through librados
Allow librados clients to utilize the global id of the RadosClient.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 15:03:44 -08:00
Jason Dillaman
398bc9648d librbd: Create async versions of long-running maintenance operations
Resize and flatten now have async versions. The existing resize
and flatten operations now use the async versions internally. The
async operations will be used by the client holding the exclusive
lock when it receives maintenance requests from other clients.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 15:03:44 -08:00
Dong Yuan
87ef46207b rgw: format mtime of radosgw-admin bucket stats
use formatter.dump_stream to format mtime

Change-Id: Ib1747b5389e29a4c5ab0499fcdb8cbaa926ae30c
Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
2015-01-24 08:33:28 +00:00
Josh Durgin
48910a5232 Merge pull request #3479 from ceph/wip-librbd-close-deadlock
librbd: potential deadlock on close_image

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-23 23:51:37 -08:00
Jason Dillaman
dc1630e9f2 librbd: trim would not complete if exclusive lock is lost
The trim completion context was not properly invoked if the
image's exclusive lock was lost between issuing a librados call
and receiving its completion.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-24 02:28:07 -05:00