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,273 Commits 211 Branches 394 Tags 2.1 GiB
d66aad4269
Commit Graph

39273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sage Weil
7590387ea8 librados: add missing tracepoints 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-02-02 02:46:10 -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
Mykola Golub
65fbf22681 librbd: RemoteAsyncRequest: fix comparison operator 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-02-01 13:58:25 +02:00
Jason Dillaman
1cf30e6071 rbd: use IO hints for read/write operations 
Import, export, and benchmark operations now use the librados
IO hints to indicate the read/write pattern and whether caching
is required.

Fixes: #10462
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-02-01 08:42:48 +01:00
Josh Durgin
26ba4315af Merge remote-tracking branch 'origin/wip-4087' 
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/librbd/LibrbdWriteback.cc
 2015-02-01 07:36:05 +01:00
Sage Weil
4cd7448f0c Merge pull request #3545 from thesues/fix-cmp-xattr 
Fix ReplicatedPG do_xattr_cmp_u64

Backport: giant, firefly
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-31 14:08:10 -08:00
Sage Weil
e143ff7dca Merge pull request #3555 from ceph/wip-10106 
rgw: flush xml header on get acl request

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-31 14:01:03 -08:00
Sage Weil
3e7e21b07f Merge pull request #3527 from wonzhq/op-stat 
osd: don't log op stats for proxy read in the cache tier

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-31 13:16:15 -08:00
Sage Weil
b79c349067 Merge pull request #3503 from ceph/wip-pg-reqids 
osd: index PGLog with optional extra_reqids in each log entry

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Wang, Zhiqiang <zhiqiang.wang@intel.com>
 2015-01-31 13:15:47 -08:00
Josh Durgin
7ac2cdf621 Merge pull request #3554 from ceph/wip-10572 
rgw: finalize perfcounters after shutting down storage

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-31 12:09:55 +01:00
Josh Durgin
346b4b022e Merge pull request #3323 from ceph/wip-10445 
rgw: use gc for multipart abort

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-31 03:06:20 -08:00
Sage Weil
bd8671f604 ceph_test_rados: fix typo 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-31 02:17:38 -08:00
Josh Durgin
99c48de370 Merge pull request #3452 from majianpeng/iohint 
Iohint in librbd cache.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-31 01:03:48 -08:00
Kim Vandry
ac161bf38b librados: expose rados_{read|write}_op_assert_version() in C 
Previously, assert_version was only available in the C++ interface.

Signed-off-by: Kim Vandry <vandry@TZoNE.ORG>
 2015-01-31 15:00:31 +09:00
Kim Vandry
11b64247a3 Add test case for librados assert_version() 
Signed-off-by: Kim Vandry <vandry@TZoNE.ORG>
 2015-01-31 14:39:53 +09:00
Yehuda Sadeh
eb45f86134 rgw: flush xml header on get acl request 
Fixes: #10106
Backport: firefly, giant

dump_start() updates the formatter with the appropriate prefix, however,
we never flushed the formatter.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 18:42:40 -08:00
Yehuda Sadeh
de2e5fa048 rgw: finalize perfcounters after shutting down storage 
Fixes: #10572
Backport: giant, firefly
First disable the storage subsystem, then disable perfcounters.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 14:34:32 -08:00
Jianpeng Ma
cab246d001 librbd: Don't do readahead for random read. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-30 13:29:26 -08:00
Sage Weil
743436749e Merge pull request #3516 from ceph/wip-mdsmon-args 
mon/MDSMonitor: fix gid/rank/state parsing

Reviewed-by: Huang Jun <hjwsm1989@gmail.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
 2015-01-30 13:22:48 -08:00
Yehuda Sadeh
f0e82edec9 Merge pull request #3551 from ceph/wip-10698 
rgw: fail s3 POST auth if keystone not configured

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-01-30 13:14:38 -08:00
Samuel Just
77689f18ad ReplicatedPG::C_ProxyRead: fix dropped lock 
Fixes: 10633
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 12:54:47 -08:00
Samuel Just
0e3af8d8f9 ReplicatedPG: only populate_obc_watchers if active 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:45:37 -08:00
Samuel Just
b31221afa0 OSD: allow recovery in peered 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-01-30 11:45:37 -08:00
Samuel Just
818b91b7e2 osd/: go "peered" instead of "active" when < min_size 
In the case of a replicated pool, the pg will transition to "peered"
rather than "active", where it can perform backfill bringing itself up
to min_size peers.  To that end, most operations now require
is_peered rather than is_active (OSDOps being the primary exception).
Also, rather than using the query_epoch on the activation message as the
activation epoch (for last_epoch_started) on the replica, we instead
use the last_epoch_started in the info sent by the primary.  This
allows the primary to not advance last_epoch_started past the last
known actual activation.  This will prevent later peering epochs from
requiring the last_update from a peered epoch to go active (might be
divergent).

Fixes: #7862
Signed-off-by: Samuel Just <sam.just@inktank.com>
 2015-01-30 11:45:37 -08:00