Commit Graph

39712 Commits

Author SHA1 Message Date
Ilya Dryomov
c365cac767 rbd: regenerate rbd(8) man page
merge-diff and status commands, --image-features and --image-shared
options, other stuff.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 356a749f63)
2015-03-12 14:37:00 -07:00
Josh Durgin
4304951b58 Merge pull request #3981 from ceph/wip-librbd-invalidate-object-map
librbd: invalid snapshot object maps should only affect the snapshot

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-12 14:27:37 -07:00
Loic Dachary
1cba9b821f Merge pull request #3978 from tchaikov/hammer-sca-fixes
sca fixes ported from master

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-12 22:06:15 +01:00
Jason Dillaman
ba77bda554 librbd: invalidating snapshot object maps should set snapshot flag
Instead of setting the HEAD image flag to indicate an invalid
object map, set the flag for the specific snapshot that is
invalid.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-12 13:20:59 -04:00
Jason Dillaman
ba4bb22bc1 test_cls_rbd: verify set_flags updates snapshots
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-12 13:02:54 -04:00
Jason Dillaman
fa25b84ede cls_rbd_client: add snap_id param to set_flags
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-12 12:59:17 -04:00
Jason Dillaman
2d86898de1 cls_rbd: set_flags can now update snapshots
It's possible for an object map to be invalid only for
a snapshot, so allow snapshot flags to be updated. This
will also be required when rebuilding the object map and
clearing the invalid flag.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-12 12:56:14 -04:00
Danny Al-Gaaf
c1892a0195 rgw_main.cc: fix null-deref in case get_storage() fails
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 921c08fce5)
2015-03-12 17:38:10 +08:00
Danny Al-Gaaf
f5b01515d0 rgw/rgw_op.cc: fix potential null-deref in strcmp()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit de7bcfd8d0)
2015-03-12 17:37:59 +08:00
Sage Weil
3e1023a697 Merge branch 'wip-add-cache' into hammer
Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-10 20:16:26 -07:00
Jianpeng Ma
5a8d4c5068 qa,cephtool: add test case for 'ceph osd tier add-cache'
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-03-10 20:15:49 -07:00
Jianpeng Ma
83d0581539 mon: Don't forget set read_tier/write_tier for 'osd tier add-cache'.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-03-10 20:15:49 -07:00
Josh Durgin
3651be6b97 Merge branch 'wip-11067' into hammer
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-10 15:42:21 -07:00
Jason Dillaman
23d79912b3 tests: add unit test for multiple concurrent resize ops
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
194fcfd04f librbd: retrieve image size at start of resize op
For the case where multiple resize requests were pending,
queued resizes should use the most recent value for the
current image size -- not the image size when the resize
was queued.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
0212ae4651 librbd: do not invalidate oversized object map
If the object map is too large for the current image, it implies
that a resize operation was interrupted.  It should only be
considered invalid if the object map is smaller than the image,
which shouldn't be possible.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
7f246b8962 librbd: avoid canceling object map / header updates
During a resize, reduce the possibility that the object map
and the header will get out-of-sync during a resize operation
that is canceled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
85737ab8c6 librbd: update size / parent overlap after resize completes
Update the in-memory image metadata for size and parent
overlap after updating the on-disk image metadata. Also
schedule an image refresh in case multiple resizes are
enqueued -- since ictx_refresh isn't async.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
1d2989096e librbd: use image size and parent overlap from active shrink op
If a shrink operation is in progress, all operations should use
the new size and new parent overlap for IO operations.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
9c5c665bc7 librbd: queue multiple resize requests
Only allow a single resize request to be executed concurrently.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
6bc47eb900 xlist: add const versions of front / back
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
e7f9e3bdd9 librbd: use ImageCtx::get_parent_overlap helper function
Replace all direct references to ImageCtx::parent_md.overlap
with the helper method.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
286b38527f librbd: resize/flatten should validate image is R/W
When proxying resize/flatten requests, the current image
R/W state is not validated.  Also ensure the proper locks
are held when reading image metadata.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:46 -07:00
Jason Dillaman
9dcd517ff9 librbd: hold write snap_lock when refreshing object map
If the object map needs to be invalidated, a write lock on
snap_lock is required.

Fixes: #11067
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-10 15:41:45 -07:00
Sage Weil
c35f422f74 Merge pull request #3923 from ceph/wip-11079
crush: fix get_weight and destroy for straw2 buckets

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-10 08:44:31 -07:00
Sage Weil
ac527a2677 crushtool: improve straw2 compile/decompile test
This way it catches #11079.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-10 06:46:56 -07:00
Sage Weil
6445d9ee72 crush: fix crush_get_bucket_item_weight and bucket destroy for straw2
Fixes: #11079
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-10 06:46:52 -07:00
Sage Weil
b686edae8c crushtool: fix straw2 cli test
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-10 06:46:49 -07:00
Kefu Chai
9b4b350695 Merge pull request #3917 from dachary/wip-rhel6-doc
doc: rhel6.5 is rhel6

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-03-10 16:02:12 +08:00
Sage Weil
955bd114fc Merge pull request #3845 from ceph/wip-wn-rgw-hammer
Wip wn rgw hammer

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-09 19:49:21 -07:00
Sage Weil
05bb9c9870 Merge pull request #3911 from athanatos/wip-11057
ReplicatedPG: block write on degraded object if there are waiters

Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-09 19:43:02 -07:00
Loic Dachary
e3616a5515 doc: rhel6.5 is rhel6
RHEL 6.5 is actually  http://ceph.com/rpm-giant/rhel6/

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-10 02:06:10 +01:00
Loic Dachary
b780048c48 Merge pull request #3909 from dachary/wip-11068-debian-jessie
deb: add zlib1g-dev to Build-Depends for Debian/jessie

Reviewed-by: Yann Dupont <yann@objoo.org>
2015-03-09 23:40:04 +01:00
Loic Dachary
147b1db43f deb: add zlib1g-dev to Build-Depends for Debian/jessie
The zlib1g-dev is installed indirectly for Ubuntu 12.04 or Ubuntu 14.04
but it is only suggested in Debian/jessie. Adding it to the
Build-depends is redundant and harmless for Ubuntu and resolves the
missing dependency for Debian.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 15:51:53 +01:00
Loic Dachary
387887893f Merge pull request #3882 from dachary/wip-install-deps-alternatives
install-deps.sh: strip | in the list of packages

Reviewed-by: Reviewed-by: Sage Weil <sage@redhat.com>
2015-03-09 13:53:25 +01:00
Sage Weil
bb9133af17 Merge pull request #3897 from ceph/wip-11015
crush: fix compilation of strwa2 buckets (fixes 11015)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-09 05:41:21 -07:00
Sage Weil
023558bbfa Merge pull request #3899 from yuyuyu101/hammer-test
TestAsyncDriver: Fix typo in ceph_test_async_driver
2015-03-09 05:40:49 -07:00
Sage Weil
549a112c3d Merge pull request #3874 from ceph/wip-10828
objecter: fix linger cancel link bug 10828

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-03-08 21:04:19 -07:00
Haomai Wang
84f05c0f39 TestAsyncDriver: Fix typo in ceph_test_async_driver
Fix: #11058
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-03-07 17:14:31 +08:00
Samuel Just
b6326a05ee ReplicatedPG: block write on degraded object if there are waiters
Suppose we have min_size of 2 and size of 3, foo exists only on the
primary.
- block op 1 on foo due to < min_size
- start recovery on foo for replicas 1 and 2
- complete push to replica 1 (2 copies now)
- allow op 2 on foo through since we have 2 copies
- complete recovery on foo, requeue op 1

Fixes: 11057
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-03-06 18:02:25 -08:00
Sage Weil
7acfdaccb1 crushtool: test compilation of a rule with straw2 buckets
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-06 17:47:03 -08:00
Sage Weil
61308cc473 crush: parse alg names that include a digit
The str_p("straw2") won't parse straw2, it seems because the digit is throwing
it off.  Use the existing name rule instead which is more robust.  Note that
not constraining the alg value here is better anyway because instead of a
'cannot parse' error that is hard to debug we instead get a 'unknown alg foo'
error when doing the semantic pass.

Fixes: #11015
Signed-off-by: Sage Weil <sage@redhat.com>
2015-03-06 17:43:11 -08:00
Loic Dachary
cb6813cc16 tests: add Debian jessie dockerfile
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-07 02:40:13 +01:00
Loic Dachary
657844ac89 tests: DEBIAN_FRONTEND=noninteractive apt-get install
Go into non interactive mode when installing the compilation
dependencies, in case a package has a different default mode.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-07 02:40:13 +01:00
Loic Dachary
f8dec723f7 tests: jq is not available on Ubuntu precise
It should be installed from precise-backports but since it is not
currently used, just remove it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-07 02:40:13 +01:00
Loic Dachary
4add63c92e install-deps.sh: strip | in the list of packages
Alternatives were introduced lately and the | needs to be stripped from
the list of packages to install otherwise apt-get will try to install
all packages.

Signed-off-by: Yann Dupont <yann@objoo.org>
2015-03-07 02:40:13 +01:00
Yehuda Sadeh
dbe2b24c41 rgw: flush watch after unregistering
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-03-06 17:24:14 -08:00
Sage Weil
3a1ba9368f Merge pull request #3835 from ceph/wip-mon-datahealth-fix.hammer
[hammer] mon: initialize data store stats structs to avoid weird behaviors
2015-03-06 16:20:52 -08:00
Gregory Farnum
060ff1536c Merge pull request #3877 from ceph/hammer-backports-hadoop
Hammer backports hadoop

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-03-06 09:29:22 -08:00
Greg Farnum
3530a25ae7 Client: do not require successful remount when unmounting
Fixes: #10982

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 71f2686252)
2015-03-06 09:27:21 -08:00