RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,228 Commits 211 Branches 394 Tags 2.1 GiB
ae434a3536
Commit Graph

33228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yan, Zheng
ae434a3536 client: check snap_caps in Incode::is_any_caps() 
Fixes: #8290
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
 2014-05-06 07:46:12 +08:00
Sage Weil
7f3a4206a3 Merge pull request #1764 from eile/master 
Fix installation into user home directory, broken by d3f0c0b

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-05 16:26:27 -07:00
John Wilkins
e68422b388 Merge pull request #1769 from ceph/wip-doc-cache-tier 
doc: Support for cache tiering.
 2014-05-05 15:26:27 -07:00
Josh Durgin
ea34f48cd9 Merge remote-tracking branch 'origin/wip-doc-radosgw-80' 
Conflicts:
	doc/radosgw/config.rst
 2014-05-05 15:14:22 -07:00
Samuel Just
3c9529ad3a Merge pull request #1760 from ceph/wip-8283 
osd/ReplicatedPG: fix trim of in-flight hit_sets

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-05 14:53:47 -07:00
John Wilkins
fc3318edb7 doc: Fix hyperlink. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-05 12:35:41 -07:00
John Wilkins
a7e7219345 doc: Index update and librados. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-05 12:34:59 -07:00
John Wilkins
fcbc5fa607 doc: Quotas for Admin Ops API. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-05 12:33:58 -07:00
John Wilkins
e97b56eb3a doc: New Admin Guide for Ceph Object Storage. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-05 12:33:30 -07:00
Stefan Eilemann
7539281037 Fix installation into user home directory, broken by d3f0c0b 
Signed-off-by: Stefan Eilemann <Stefan.Eilemann@epfl.ch>
 2014-05-05 09:54:19 +02:00
Yan, Zheng
24c5ea8df0 osd: check blacklisted clients in ReplicatedPG::do_op() 
OSD checks if client is blacklisted only when receiving OSD request.
It's possible that OSD request's sender get blacklisted while OSD
request in in some waiting list.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
(cherry picked from commit f92677c5b2)
 2014-05-03 15:14:39 -07:00
Sage Weil
b4dfd3d578 Merge pull request #1740 from ceph/wip-8155 
mon: OSDMonitor: disallow nonsensical cache-mode transitions

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-03 15:13:37 -07:00
Sage Weil
c64b67b56c ceph-object-corpus: rebase onto firefly corpus 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-03 07:59:28 -07:00
Sage Weil
af8a5298d3 Merge pull request #1762 from yuyuyu101/wip-8282 
Fix clone problem

Backport: firefly
Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-03 07:41:48 -07:00
Sage Weil
ca116a3e31 Merge pull request #1752 from ceph/wip-da-SCA-fixes-20140501 
Various fixes from SCA

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-03 06:49:56 -07:00
Sage Weil
00868514ec Merge pull request #1755 from eile/master 
Fix out of source builds

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-03 06:42:04 -07:00
Stefan Eilemann
8bd4e58242 Fix out of source builds 
Signed-off-by: Stefan Eilemann <Stefan.Eilemann@epfl.ch>
 2014-05-03 12:02:02 +02:00
Haomai Wang
3aee1e0ffe Fix clone problem 
When clone happened, the origin header also will be updated in GenericObjectMap,
so the new header wraper(StripObjectHeader) should be updated too.

Fix #8282
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
 2014-05-03 12:55:17 +08:00
Joao Eduardo Luis
fd970bbc95 mon: OSDMonitor: disallow nonsensical cache-mode transitions 
Fixes: 8155

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
 2014-05-03 03:42:19 +01:00
David Zafman
3e31458444 Merge pull request #1735 from ceph/wip-8113 
Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-02 19:26:30 -07:00
Samuel Just
4aa93dd12c Merge pull request #1698 from ceph/wip-snapmapper-debug 
osd/SnapMapper: debug

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-02 16:52:36 -07:00
Samuel Just
2700ebf83b Merge pull request #1694 from ceph/wip-throttle-snap-master 
osd: throttle snap trimmming with simple delay

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-02 16:48:10 -07:00
Danny Al-Gaaf
b45adc9894 Merge pull request #1759 from dachary/wip-mailmap 
DNM: mailmap updates

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:43:14 +02:00
Sage Weil
72fdd557c3 osd/ReplicatedPG: fix trim of in-flight hit_sets 
We normally need to stat the hit_set to know how many bytes to adjust the
stats by.  If the hit_set was just written, we will get ENOENT.

Get the obc instead, which will either get the in-memory copy (because the
repop is still in flight) or load it off of disk.

Fixes: #8283
Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-02 16:41:26 -07:00
Samuel Just
84728058db Revert "ReplicatedPG: block scrub on blocked object contexts" 
This reverts commit e66f2e36c0.
Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-02 16:36:42 -07:00
Sage Weil
f47f867952 osd: Prevent divide by zero in agent_choose_mode() 
Fixes: #8175
Backport: firefly

Signed-off-by: David Zafman <david.zafman@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-02 16:35:49 -07:00
David Zafman
b7d31e5f59 osd, common: If agent_work() finds no objs to work on delay 5 (default) secs 
Add config osd_agent_delay_time of 5 seconds
Honor delay by ignoring agent_choose_mode() calls
Add tier_delay to logger
Treat restart after delay like we were previously idle

Fixes: #8113
Backport: firefly

Signed-off-by: David Zafman <david.zafman@inktank.com>
 2014-05-02 16:35:49 -07:00
Danny Al-Gaaf
fe0031d96a rados.cc: fix typo in help output 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:29 +02:00
Danny Al-Gaaf
8bf039d09b Dumper::dump_entries(): reduce scope of 'got_data' 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:28 +02:00
Danny Al-Gaaf
296b8ed0af PG::read_info(): pass 'const coll_t coll' by reference 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:28 +02:00
Danny Al-Gaaf
8fad144c4d PGBackend::be_compare_scrubmaps(): pass pgid by reference 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:28 +02:00
Danny Al-Gaaf
1e7eb1a1f8 osd_types.h: pass eversion_t by reference to operator<< 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:28 +02:00
Danny Al-Gaaf
be5a99d69b SimpleLock.h: remove unused private function clear_more() 
Remove unused private function clear_more(), it's replaced by
try_clear_more().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:28 +02:00
Danny Al-Gaaf
70a4a73d61 SimpleLock.h: remove twice included osd_types.h 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:28 +02:00
Danny Al-Gaaf
4fe31c1b8b linux_fiemap.h: remove twice included int_types.h 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:27 +02:00
Danny Al-Gaaf
b05e04ec5a Dumper::dump_entries(): remove not needed variable 
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:35:27 +02:00
Danny Al-Gaaf
9a716d88bb rgw_bucket.cc: return error if update_containers_stats() fails 
In case need_stats is set on rgw_read_user_buckets() and the
update_containers_stats() call fails with !-ENOENT, not only
print out a message but also return the error to the function
caller.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-03 01:34:10 +02:00
Sage Weil
5a6ae2a978 mon/PGMonitor: set tid on no-op PGStatsAck 
The OSD needs to know the tid.  Both generally, and specifically because
the flush_pg_stats may be blocking on it.

Fixes: #8280
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
 2014-05-02 15:43:29 -07:00
Sage Weil
2e6b24868d mon/OSDMonitor: share latest map with osd on dup boot message 
If we get a dup boot message, share the newer maps with the osd so that
they know they are living in the past.

Fixes: #8279
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
 2014-05-02 15:43:15 -07:00
Sage Weil
77a6f0aefe mon/MonClient: remove stray _finish_hunting() calls 
Callig _finish_hunting() clears out the bool hunting flag, which means we
don't retry by connection to another mon periodically.  Instead, we send
keepalives every 10s.  But, since we aren't yet in state HAVE_SESSION, we
don't check that the keepalives are getting responses.  This means that an
ill-timed connection reset (say, after we get a MonMap, but before we
finish authenticating) can drop the monc into a black hole that does not
retry.

Instead, we should *only* call _finish_hunting() when we complete the
authentication handshake.

Fixes: #8278
Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
 2014-05-02 15:42:58 -07:00
Loic Dachary
d0245947f2 mailmap: Florent Bautista affiliation 
and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-05-03 00:42:24 +02:00
Loic Dachary
61a2f064e9 mailmap: Warren Usui name normalization 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-05-03 00:35:42 +02:00
Loic Dachary
7b192f7db2 mailmap: Guang Yang name normalization 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-05-03 00:35:04 +02:00
Sage Weil
331869a019 Merge pull request #1754 from nereocystis/hardware-to-glossary 
doc: Include links from hardware-recommendations to glossary
 2014-05-02 14:22:17 -07:00
David Zafman
9cf470cac8 osd/ReplicatedPG: agent_work() fix next if finished early due to start_max 
Backport: firefly

Signed-off-by: David Zafman <david.zafman@inktank.com>
 2014-05-01 19:21:01 -07:00
Sage Weil
9f1a916883 osd/SnapMapper: pass snaps set by const ref 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-01 17:31:05 -07:00
Sage Weil
6105c3556f osd/SnapMapper: debug 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-01 17:29:46 -07:00
Kevin Dalley
c879e895da doc: Include links from hardware-recommendations to glossary 
Included :term: in parts of hardware-recommendations so that glossary
links appear.
Signed-off-by: Kevin Dalley <kevin@kelphead.org>
 2014-05-01 17:04:43 -07:00
Danny Al-Gaaf
c6ada53a14 Merge pull request #1749 from hufman/fix-typo-releasenotes-pyramind 
Fixes a very minor typo in the release notes

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2014-05-02 01:06:26 +02:00
Sage Weil
cc043225f8 mds: note MDiscoverReply encoding change in corpus 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-01 15:07:50 -07:00