RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,137 Commits 211 Branches 394 Tags 2.1 GiB
e0883ebf7a
Commit Graph

39137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Wilkins
e0883ebf7a Merge pull request #3262 from dachary/wip-jerasure 
erasure-code: update links to jerasure upstream

Reviewed-by: John Wilkins <jowilkin@redhat.com>
 2015-02-03 09:21:56 -08:00
Loic Dachary
9eea764947 Merge pull request #3601 from dachary/wip-10729-fedora-install-deps 
install-deps.sh: get lsb_release if needed

Reviewed-by: Haïkel Guémar <hguemar@redhat.com>
 2015-02-03 16:39:53 +01:00
Sage Weil
65c7e07aca doc/release-notes: v0.92 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-02-03 07:37:05 -08:00
Loic Dachary
f4d65150d0 install-deps.sh: get lsb_release if needed 
Fedora does not have lsb_release installed by default.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-02-03 16:35:13 +01:00
Sage Weil
5a08179384 Merge remote-tracking branch 'gh/next' 2015-02-03 06:52:07 -08:00
Sage Weil
b9412def9d Merge commit '4ada7cc8e908a26b4640497b64b2ed9986889a92' into next 2015-02-03 06:50:22 -08:00
Jason Dillaman
9e9356b1d8 librbd: fixed object map issues discovered via fsx 
The object map wasn't being properly refreshed after setting
the snapshot context on the parent image. Additionally fixed
a potential deadlock that could have occurred if no object
map update was required when trimming an image.

Fixes: #10706
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-03 13:15:00 +01:00
Sage Weil
225a19fa67 vstart.sh: fix .ceph_port typo 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-02-03 03:23:28 -08:00
Loic Dachary
dbd2e7d98b Merge pull request #3597 from karelstriegel/master 
rdb: update init-rbdmap to fix duplicate mount point

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-02-03 11:52:31 +01:00
Karel Striegel
be05d9dc5e rdb: update init-rbdmap to fix duplicate mount point 
According to the manual 'mount -f' adds an entry in /etc/mtab.
Therefore the 'mount -v' command needs the flag -n to avoid
duplicate entries in /etc/mtab.

Signed-off-by: Karel Striegel <karel@striegel.be>
 2015-02-03 11:42:06 +01:00
Josh Durgin
352ad94842 Merge remote-tracking branch 'origin/hammer' 2015-02-03 10:28:50 +01:00
Jason Dillaman
14424c8aab librbd: removing objects can lead to infinite loop 
The AioRemove state machine is not properly advanced from
_PRE to _FLAT.  This will result in an infinite state machine
loop.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-03 10:25:01 +01:00
Jason Dillaman
bb8c9ae29d librbd: pending AIO operations are now flushed asynchronously 
If exclusive locking was enabled, the librbd aio_flush command
would block waiting for queued AIO operations to proceed once
the exclusive lock was obtained.  Now librbd will no longer
block when aio_flush is invoked and AIO operations are waiting
on the exclusive lock.

Fixes: #10714
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-03 10:21:50 +01:00
Sage Weil
25bbecdf26 Merge pull request #3594 from ceph/wip-10707 
test/cls_rgw: fix test

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-03 00:22:52 -08:00
Sage Weil
c65e1b072a Merge remote-tracking branch 'gh/hammer' 2015-02-03 00:12:23 -08:00
Sage Weil
3dfc0cd87b Merge remote-tracking branch 'gh/next' 2015-02-03 00:12:17 -08:00
Sage Weil
4ada7cc8e9 Merge pull request #3590 from ceph/wip-10722 
rgw: move perf cleanup before context cleanup

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-03 00:09:48 -08:00
Billy Olsen
60b019f69a Fix memory leak in python rados bindings 
A circular reference was inadvertently created when using the
CFUNCTYPE binding for callbacks for the asynchronous i/o callbacks.
This commit refactors the usage of the callbacks such that the
Ioctx object does not have a class reference to the callbacks.

Fixes: #10723
Backport: giant, firefly, dumpling
Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-03 06:51:16 +01:00
Yehuda Sadeh
7dd2de8fe6 test/cls_rgw: fix test 
Test needed to be updated, now using meta.accounted_size for object
size.

Fixes: #10707

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-02-02 17:10:19 -08:00
Loic Dachary
961cd0efea Merge pull request #3593 from ceph/wip-autogen 
Fix do_autogen.sh so that -L is allowed

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-02-03 01:42:34 +01:00
David Zafman
e0f12d9a8c Fix do_autogen.sh so that -L is allowed 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-02-02 16:40:46 -08:00
Yehuda Sadeh
cfab01e394 rgw: move perf cleanup before context cleanup 
Fixes: #10722
Fixes: #10572
Backport: giant, firefly

This fixes a regression introduced in commit
de2e5fa048.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-02-02 15:37:37 -08:00
Samuel Just
0f9f4e536e Merge remote-tracking branch 'upstream/next' 2015-02-02 14:18:52 -08:00
Jenkins
00a3ac3b67 0.92 2015-02-02 10:35:28 -08:00
Sage Weil
3c7500b60c Merge pull request #3588 from athanatos/wip-10693 
Wip 10693

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-02 09:21:26 -08:00
Sage Weil
c02e293911 Merge pull request #3587 from athanatos/wip-10633 
ReplicatedPG::C_ProxyRead: fix dropped lock

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-02 09:19:42 -08:00
Samuel Just
1350b30416 Merge pull request #3538 from athanatos/wip-7862 
osd: allow recovery below min size

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-02 09:18:58 -08:00
Samuel Just
1f1c6b5e53 Merge pull request #3539 from athanatos/wip-7861 
osd: allow writes on degraded objects

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-02 09:18:22 -08:00
Yehuda Sadeh
dd5b1dc213 Merge remote-tracking branch 'origin/next' 
Conflicts:
	src/rgw/rgw_op.cc
	src/rgw/rgw_rados.cc
	src/rgw/rgw_rados.h
 2015-02-02 09:33:03 -08:00
Josh Durgin
ba1ea157d7 Merge pull request #3578 from ceph/wip-10709 
rbd: watch command should unwatch before exiting

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-02 17:16:35 +01:00
Sage Weil
c58307bbcf Merge pull request #3583 from jdurgin/wip-qemu-iotests 
qa: use correct binary path on rpm-based systems

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-02 07:54:53 -08:00
Sage Weil
0a8f1fe027 Merge pull request #3584 from ceph/wip-optional-encoding 
encoding: ignore uninitialized instantiation in boost::optional decode

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-02 07:52:13 -08:00
Josh Durgin
05ce2aa1bf qa: use correct binary path on rpm-based systems 
Fixes: #10715
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-02 16:45:14 +01:00
Jason Dillaman
eb526af773 rbd: watch command should unwatch before exiting 
Switched the rbd CLI tool to use the new watch/unwatch API
and properly unwatch the image before exiting. Additionally,
the watch command opened the image twice -- once R/W and another
R/O.  This resulted in two watches being created for the image.
Cleaned up old/new format detection by using the existing API
methods.

Fixes: #10709
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-02-02 10:05:20 -05:00
Josh Durgin
2a0e9b77b0 encoding: ignore uninitialized instantiation in boost::optional decode 
POD types won't be initialized until the decode writes to them.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-02 13:06:12 +01:00
Loic Dachary
a63cccce11 Merge pull request #3562 from liewegas/wip-lttng 
do_autogen.sh: default to --with-lttng, -L to build without

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-02-02 12:12:15 +01:00
Sage Weil
0af16c3672 Merge pull request #3485 from jdurgin/wip-merge-diff-testing 
Improve merge-diff test
 2015-02-02 03:07:36 -08:00
Sage Weil
f40ee8c940 do_autogen.sh: default to --with-lttng, -L to build without 
Get developers building with LTTNG by default.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-02-02 03:04:48 -08:00
Sage Weil
de3b5c4888 Merge pull request #3549 from Ved-vampir/master 
Ceph: Fix

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-02-02 02:55:39 -08:00
Ved-vampir
57bac8ea88 osd: change pg_stat plain to display CRUSH_ITEM_NONE in pgmap output section. 
Fixes: #10519
Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
 2015-02-02 12:29:42 +02:00
Haomai Wang
082551ba0e Merge pull request #3501 from yuyuyu101/wip-fix-async 
AsyncMessenger: Fix mix auth assert failed
 2015-02-02 18:26:08 +08:00
Josh Durgin
0d6963b3bc Merge branch 'wip-rbd-listwatchers' 
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-02 10:33:32 +01:00
Yunchuan Wen
4aa9f3f745 man: add rbd status to doc/man/8/rbd.rst 
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
 2015-02-02 10:32:23 +01:00
John Spray
b357ce2778 Merge pull request #3533 from ceph/wip-disaster-doc 
doc: add cephfs disaster recovery guidance

Reviewed-by: Greg Farnum <gfarnum@redhat.com
 2015-02-02 10:04:32 +01:00
John Spray
a007c529e8 doc: add cephfs disaster recovery guidance 
This is a place to put some useful notes about
the new offline recovery tooling.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-02-02 09:56:14 +01:00
Yunchuan Wen
9dbd37bcd5 test: add rbd status to src/test/cli/rbd/help.t 
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
 2015-02-02 05:51:23 +00:00
Yunchuan Wen
6fc0b80ac8 rbd: add status command to list the watchers of an image 
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
 2015-02-02 05:51:23 +00:00
Josh Durgin
b40cb61653 Merge branch 'librbd-cache-iohint' of git://github.com/majianpeng/ceph 
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/librbd/ImageCtx.cc
	src/librbd/ImageCtx.h
	src/osdc/ObjectCacher.cc
	src/osdc/ObjectCacher.h
 2015-02-01 21:30:57 +01:00
Josh Durgin
d0de79842f Merge pull request #3556 from trociny/image_watcher-fixup 
librbd: RemoteAsyncRequest: fix comparison operator

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-01 13:54:52 +01:00
Loic Dachary
c4886cc04e Merge pull request #3537 from ceph/wip-10688-boost-157 
#10688: support Boost 1.57.0

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-02-01 13:16:34 +01:00