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

39066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Yehuda Sadeh
e6c2c82306 Merge pull request #3476 from ktdreyer/wip-rpm-radosgw-logrotate 
ceph.spec.in: move rgw logrotate to rgw subpackage

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-30 09:11:36 -08:00
Yehuda Sadeh
6cffebd4dd Merge pull request #3437 from diurchenko/patch-2 
rgw: fix doc, wrong HTTP header name

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 09:09:17 -08:00
Yehuda Sadeh
f33f664003 Merge pull request #3546 from zhouyuan/204_post_container 
rgw: Response 204 when post on containers

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 08:43:46 -08:00
Yehuda Sadeh
cbf0691b4a rgw: fail s3 POST auth if keystone not configured 
Fixes: #10698
This fixes issue introduced in 8b3dfc9472,
where if user does not exist, we try keystone authentication. However,
if keystone is not configured we justt fall through without failing.
This would have failed later on due to bucket permissions, unless bucket
had a public write permissions.

Reported-by: Valery Tschopp <valery.tschopp@switch.ch>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-30 07:39:24 -08:00
John Wilkins
10ddab8a24 doc: Fixed hyperlink. 
Signed-off-by: John Wilkins <jowilkin@redhat.com>
 2015-01-30 06:18:25 -08:00
Yuan Zhou
a0a5185b6b rgw: Response 204 when post on containers 
Currently POST request on container returns 202 if success. But in Swift
the code is 204. Let's use 204 to keep align with the Swift API.

Fixes #10667
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
 2015-01-30 20:00:54 +08:00
Jianpeng Ma
7c80248760 ObjectCacher: Only r >= 0, it need the read data. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 13:23:27 +08:00
Jianpeng Ma
ef48a70d55 osdc: only external_call can touch object. 
In fact if there is retry reading, the touch_bh also touch object.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 13:23:16 +08:00
Jianpeng Ma
ed209a5ea2 osdc: For read w/ DONTNEED, if read data contain all cached data, move this object into the tail of LRU. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 13:21:44 +08:00
Jianpeng Ma
3dca5ef508 osdc: Make ObjectCahce can hanle read with DONTNEED. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:49:21 +08:00
Jianpeng Ma
3d38e1f56c osdc: touch hit bh although there are missing or rx bh. 
Avoid losing the hit bh when later read, it should touch hit bh like rx bh.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:44:11 +08:00
Jianpeng Ma
3687dcbcd1 osdc: Make ObjectCahce can hanle write with DONTNEED. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:36:50 +08:00
Jianpeng Ma
28e73a7b8d osdc: Make ObjectCache can accept fadvise_flags. 
The field flags of OSDRead/OSDWrite don't use anymore. Replace it with
fadvise_flags.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:29:46 +08:00
Jianpeng Ma
fc76c89d1b osdc: add new filed dontneed in BufferHead. 
For read/write op with LIBRADOS_OP_FLAG_FADVISE_DONTNEED,
the hit bh set this as true and later move into the tail of LRU in
order to remove in case in short future no ony access.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-01-30 11:29:00 +08:00
Dongmao Zhang
3373249974 Fix ReplicatedPG do_xattr_cmp_u64 
1. bufferlist.c_str() will return a string which is longer than its real length.
This could cause an error result from do_xattr_cmp_u64. So use
std::string to receive the xattr
2. s/atoll/strtoull

Signed-off-by: Dongmao Zhang <deanraccoon@gmail.com>
 2015-01-30 11:20:50 +08:00
Yehuda Sadeh
7e5e1ea1a5 Merge pull request #3526 from ceph/wip-rgw-versioning-4 
Wip rgw versioning 4

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-29 16:42:32 -08:00
Yehuda Sadeh
4c50f6a7fc rgw: more merge related fixes 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 16:24:33 -08:00
Yehuda Sadeh
01cc9d54d0 rgw: fix merge artifact 
s/XMLArgs/RGWHTTPArgs

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-29 16:07:41 -08:00