RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-22 03:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,192 Commits 211 Branches 394 Tags 1.2 GiB
fb72b9e4b9
Commit Graph

38192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Just
fb72b9e4b9 Merge pull request #3148 from mslovy/optimazation_wbthrottle 
os: WBThrottle: optimize the map to unordered_map

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-01-12 08:23:26 -08:00
Sage Weil
538bad38d3 Merge pull request #2948 from ceph/wip-promote 
osd: promote_object separation; proxy read

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-11 07:55:08 -08:00
Sage Weil
f42ef1e370 ceph_test_rados: add some debug output 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:31 -08:00
Sage Weil
1554fbc87e osd/ReplicatedPG: improve proxy read cancelation 
Avoid taking the PG lock for a canceled read op (if we are lucky).  Recheck
after the lock is taken for good measure.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:31 -08:00
Sage Weil
1c8b679d0c osd/ReplicatedPG: put proxy read completion on finisher 
We can't use the synchronous completion callbacks (in fast dispatch
context) do to the proxy read completion work.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:30 -08:00
Zhiqiang Wang
650f1d989b osd: tiering: avoid duplicate promotion on proxy read 
Do not promote if it is already undergoing in maybe_handle_cache.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-01-10 20:35:30 -08:00
Zhiqiang Wang
43f13af614 osd: tiering: proxy instead of redirect read in writeback mode when the 
cache pool is full

To preserve read op order

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-01-10 20:35:30 -08:00
Zhiqiang Wang
bfb71a4e63 osd: tiering: cancel and requeue proxy read when needed 
Cancel and requeue proxy read on the following cases:
1) on_shutdown
2) on_change
3) background promotion is done

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>

Conflicts:
	src/osd/ReplicatedPG.cc
	src/osd/ReplicatedPG.h
 2015-01-10 20:35:30 -08:00
Sage Weil
759db93f16 osd/ReplicatedPG: allow reads to proxy etc even if blocked 
If we are not write ordered, continue with cache checks so that we can
(among other things) proxy reads while promoting.

Note that this may reorder reads for clients, but we've decided that's okay.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:30 -08:00
Zhiqiang Wang
ce14310c8a test: add proxy read test 
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-01-10 20:35:30 -08:00
Zhiqiang Wang
8e145e08ed osd: tiering: proxy reads during promote 
wip 9980. Do proxy read and async promotion for writeback.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-01-10 20:35:30 -08:00
Zhiqiang Wang
4dc9990e7e osd: tiering: add cache mode READPROXY 
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-01-10 20:35:30 -08:00
Zhiqiang Wang
70d3d08a0b osd: tiering: add proxy read support 
wip 9979

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-01-10 20:35:30 -08:00
Sage Weil
9ed2ac780e osd/ReplicatedPG: separate promotion from the triggering op 
Remove the triggering op from the internal promote machinery.

We keep the optional op arg to promote_object() only because we may
block on an object other than the original obc.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:03 -08:00
Sage Weil
a03d375ed0 osd/ReplicatedPG: pass promote error to all blocked operations 
This isn't the most elegant strategy, but it is the best we can do
right now.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:03 -08:00
Sage Weil
a4a414944e osd/ReplicatedPG: drop unnecessary cache_mode checks 
This currently enumerates all cache modes except none, and we don't
arrive in this function when caching is disabled.  And creating a whiteout
is not cache_mode dependent.  Simplify!

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:03 -08:00
Sage Weil
2a67b0a090 osd/ReplicatdPG: adjust braces (no semantic change) 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:03 -08:00
Sage Weil
5361bc043f osd/ReplicatedPG: factor out must_promote case from all cache modes 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:03 -08:00
Sage Weil
8645ed7664 osd/ReplicatedPG: factor out common exists case from all cache modes 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:03 -08:00
Sage Weil
1d89f18158 osd/ReplicatedPG: make op argument to promote_object optional 
For now, we still always pass it.  In preparation, however, we modify
promote_object() so that it will work when op is null.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-10 20:35:03 -08:00
Josh Durgin
9c50ed074d Merge pull request #3309 from trociny/wip-9483 
OSD: add a get_latest_osdmap command to the admin socket

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-10 15:25:10 -08:00
Mykola Golub
2bbab0592d OSD: add a get_latest_osdmap command to the admin socket 
The command blocks and ensures we have the latest map from the
mon. This is useful in testing and to "unstick" clusters in some
odd situations.

Fixes: #9483, #9484 (maybe)
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2015-01-10 15:56:35 +02:00
Wido den Hollander
d5e8ef5092 doc: Fix PHP librados documentation 2015-01-10 14:21:27 +01:00
Loic Dachary
b2a3c50508 Merge pull request #3348 from ceph/wip-mon-wishlist 
doc: mon janitorial list is now a wishlist

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-01-10 13:54:56 +01:00
Joao Eduardo Luis
a16e72cf44 doc: mon janitorial list is now a wishlist 
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
 2015-01-10 12:09:16 +00:00
Sage Weil
585efcb7e4 Merge remote-tracking branch 'gh/next' 2015-01-09 21:43:49 -08:00
Sage Weil
58b5e02890 Merge pull request #3327 from ceph/wip-peeringqueue 
osd: fix peering queue bug

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-01-09 21:43:04 -08:00
Josh Durgin
18d6a08331 Merge pull request #3344 from ceph/wip-librbd-snap-unprotect 
librbd: shadow variable in snap_unprotect

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-09 16:56:39 -08:00
Yehuda Sadeh
d375532436 rgw: return InvalidAccessKeyId instead of AccessDenied 
Fixes: #10334

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 56af795b10)
 2015-01-09 15:13:51 -08:00
Yehuda Sadeh
dd57af2f0a rgw: return SignatureDoesNotMatch instead of AccessDenied 
Fixes: #10329

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit ef75d720f2)
 2015-01-09 15:13:43 -08:00
John Wilkins
c1080b22fa doc: Clean up pool usage. 
Signed-off-by: John Wilkins <jowilkin@redhat.com>
 2015-01-09 14:54:30 -08:00
John Wilkins
38f424d7a1 doc: Cleanup RGW pool usage. 
Signed-off-by: John Wilkins <jowilkin@redhat.com>
 2015-01-09 14:54:06 -08:00
Gregory Farnum
8b9c58c4e8 Merge pull request #3341 from liewegas/wip-10504 
client: add ceph version to metadata

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-01-09 14:52:19 -08:00
Sage Weil
e6a4ab1391 client: include ceph and git version in client metadata 
Fixes: #10504
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-01-09 14:41:34 -08:00
Josh Durgin
ac6674c107 Merge pull request #3325 from ceph/wip-nits 
allow 'ops' instead of 'dump_ops_in_flight'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-09 14:30:44 -08:00
Josh Durgin
3fb080ffa5 Merge pull request #3250 from ceph/wip-10372 
osdc/Objecter: improve pool deletion detection

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-09 14:12:22 -08:00
Yehuda Sadeh
f90c48f271 Revert "rgw: switch to new watch/notify API" 
This reverts commit dc67cd6960.

Conflicts:
	src/rgw/rgw_rados.cc
 2015-01-09 14:18:32 -08:00
Gregory Farnum
6d7acd3710 Merge pull request #3313 from ceph/wip-asok-get-subtrees 
Add MDS "get subtrees" asok command

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
 2015-01-09 13:45:26 -08:00
Gregory Farnum
fe56c43927 Merge pull request #3312 from ceph/wip-mdscacheobject-const 
mds: support constness in MDSCacheObjects

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-01-09 13:29:59 -08:00
Loic Dachary
7f3497b0a1 Merge pull request #3248 from dachary/wip-table-formatter 
add table to Formatter

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-01-09 19:34:35 +01:00
John Wilkins
f88781726f doc: Added section to install priorities/preferences. 
Signed-off-by: John Wilkins <jowilkin@redhat.com>
 2015-01-09 10:26:51 -08:00
Josh Durgin
7d17a17dbd Merge pull request #3324 from mattrichards/rados_translate_op_flag 
librados: Translate operation flags from C APIs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-09 09:13:09 -08:00
Sage Weil
7c5faceb6e Merge pull request #3328 from xiaoxichen/memstore_size_u64 
Bump memstore_device_bytes from U32 to U64

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-09 07:52:20 -08:00
Haomai Wang
ca87973f03 Merge pull request #3337 from dachary/wip-10494-disable-unittest-msgr 
tests: temporarily disable unittest_msgr
 2015-01-09 23:42:05 +08:00
Loic Dachary
55a5c5f292 tests: temporarily disable unittest_msgr 
http://tracker.ceph.com/issues/10494 Refs: #10494

Signed-off-by: Loic Dachary <ldachary@redhat.com>
 2015-01-09 16:21:19 +01:00
Haomai Wang
d4aec89e13 Merge pull request #3331 from dachary/wip-10493-async-port 
msg: initialize AsyncConnection::port

Reviewed-by: Haomai Wang<haomaiwang@gmail.com>
 2015-01-09 22:48:19 +08:00
John Spray
26e7d5fab6 mds: add asok command for getting subtreemap 
For when we want to inspect this from a test or
during debugging.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-01-09 14:27:15 +00:00
John Spray
1c1897e6ac mds: give CDir a dump() method for JSON output 
Useful when listing subtrees via admin socket.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-01-09 14:27:15 +00:00
John Spray
a58d104288 mds: support constness in MDSCacheObjects 
So that one can have const CInode and CDir references
from time to time.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-01-09 14:20:59 +00:00
Jason Dillaman
e9033bb121 librbd: shadow variable in snap_unprotect and list_children 
The shadow variable prevented snap_unprotect from returning the
correct error return code.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-01-09 08:28:18 -05:00