]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agomds: remove unused MMDSCacheRejoin::{MISSING,FULL} 1742/head
Yan, Zheng [Mon, 5 May 2014 08:53:55 +0000 (16:53 +0800)]
mds: remove unused MMDSCacheRejoin::{MISSING,FULL}

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: properly wake up dentry waiters after fragmenting dirfrag
Yan, Zheng [Mon, 5 May 2014 08:23:14 +0000 (16:23 +0800)]
mds: properly wake up dentry waiters after fragmenting dirfrag

When active MDS wants to fragment a replica dirfrag, it should set
the 'replay' parameter of MDCache::adjust_dir_fragments() to false.
It makes sure that CDir::merge/split wake up any dentry waiter.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: choose MIX state if replica of scatterlock is in MIX state
Yan, Zheng [Mon, 5 May 2014 06:36:16 +0000 (14:36 +0800)]
mds: choose MIX state if replica of scatterlock is in MIX state

After ScatterLock::infer_state_from_strong_rejoin() set scatterlock
to LOCK_MIX state, don't change the scatterlock to other state.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: switch flushing ScatterLock to dirty ScatterLock after cache rejoin
Yan, Zheng [Sun, 4 May 2014 15:06:32 +0000 (23:06 +0800)]
mds: switch flushing ScatterLock to dirty ScatterLock after cache rejoin

Otherwise the flushing flag may confuse Locker::eval_gather() if MDS later
imports lock's parent inode.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: handle export freezen race
Yan, Zheng [Sun, 4 May 2014 02:40:25 +0000 (10:40 +0800)]
mds: handle export freezen race

handle following sequence of events:
- subtree becomes frozen, C_MDC_ExportFreeze is queued.
- export is cancelled
- C_MDC_ExportFreeze is executed.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: allow negetive rstat
Yan, Zheng [Sun, 4 May 2014 02:15:36 +0000 (10:15 +0800)]
mds: allow negetive rstat

When splitting dirfrag, delta rstat is always added to the first new
dirfrag. Ancestors of the dirfrag may have nagtive rstat before the
delta rstat has been propagated to them. For example:

inode 100 n(v1 b-4096)
|- dir 100 n(v1 b-4096)
   |- dentry
      |- inode 101 n(v1 b-4096)
         |- dir 101.0* n(v1)/n(v1 b-4096)
         |- dir 101.1* n(v1)

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: cancel fragmenting dirfrags when cluster is degraded
Yan, Zheng [Sat, 3 May 2014 02:46:50 +0000 (10:46 +0800)]
mds: cancel fragmenting dirfrags when cluster is degraded

when cluster is degraded, acquiring locking can take long time.
It is not good to keep dirfrags in frozen state for a long time.

To allow cancelling fragment operation at any time, this commit
also reorganizes the codes that freeze/fetch dirfrags.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: fix _rollback_repair_dir()
Yan, Zheng [Fri, 2 May 2014 17:31:09 +0000 (01:31 +0800)]
mds: fix _rollback_repair_dir()

_rollback_repair_dir() may increase dirfrag's rfiles/rsubdirs twice.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: fix root and mdsdir inodes' rsubdirs
Yan, Zheng [Fri, 2 May 2014 15:08:41 +0000 (23:08 +0800)]
mds: fix root and mdsdir inodes' rsubdirs

inode rstat accounts inode itself.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: ignore stale rstat/fragstat when splitting dirfrag
Yan, Zheng [Fri, 2 May 2014 14:21:30 +0000 (22:21 +0800)]
mds: ignore stale rstat/fragstat when splitting dirfrag

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: encode dirfrag base in cache rejoin ack
Yan, Zheng [Sat, 3 May 2014 00:53:01 +0000 (08:53 +0800)]
mds: encode dirfrag base in cache rejoin ack

Makes sure recovering MDS get uptodate fragstat/rstat for subtree root
dirfrags. it's required the codes that fix-up inode's fragstat/rstat.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: fix-up inode's fragstat/rstat according its dirfrags
Yan, Zheng [Fri, 2 May 2014 08:35:08 +0000 (16:35 +0800)]
mds: fix-up inode's fragstat/rstat according its dirfrags

Extend the code that fixup inode's fragstat/rstat to handle multiple
dirfrags

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: clear aborted flag before rollback slave requests
Yan, Zheng [Fri, 2 May 2014 02:43:02 +0000 (10:43 +0800)]
mds: clear aborted flag before rollback slave requests

There is a special case that the MDRequest needs to be preserved after
rolling back slave rename. The preserved MDRequest will be used later.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: remove mdsdir in the final step of shutdown MDS
Yan, Zheng [Thu, 1 May 2014 21:22:35 +0000 (05:22 +0800)]
mds: remove mdsdir in the final step of shutdown MDS

Otherwise we may get bad subtree map if we restart the MDS before
the shutdown process finishes.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: tolerate bad sessionmap during journal replay
Yan, Zheng [Sun, 27 Apr 2014 03:53:13 +0000 (11:53 +0800)]
mds: tolerate bad sessionmap during journal replay

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: pre-allocate inode numbers less frequently
Yan, Zheng [Wed, 30 Apr 2014 07:51:19 +0000 (15:51 +0800)]
mds: pre-allocate inode numbers less frequently

no need to refill the pre-allocated inode numbers each time an inode
number is used.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: fix frozen inode check in MDCache::handle_discover()
Yan, Zheng [Tue, 29 Apr 2014 05:59:10 +0000 (13:59 +0800)]
mds: fix frozen inode check in MDCache::handle_discover()

When MDCache::handle_discover() encounters a frozen dirfrag, it should
proceed if the dirfrag is being merged, but the MDS hasn't frozen all
dirfrags yet. When MDCache::handle_discover() checks if a inode is
frozen, it should use CInode::is_frozen_inode() (which doesn't check if
inode's parent dirfrag is frozen).

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: include authpinned objects in remote authpin request
Yan, Zheng [Sun, 27 Apr 2014 15:20:53 +0000 (23:20 +0800)]
mds: include authpinned objects in remote authpin request

Server::handle_slave_auth_pin() may drop old authpins if it encounters
object that is not authpinable. So it is better to include objects that
have already been authpinned in the remote authpin reuqest.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: send dentry unlink message to replicas of stray dentry
Yan, Zheng [Sat, 26 Apr 2014 12:30:04 +0000 (20:30 +0800)]
mds: send dentry unlink message to replicas of stray dentry

stray dentry may have more replicas than the unlinked dentry has.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: maintain auth bits during replay
Yan, Zheng [Fri, 28 Mar 2014 05:30:07 +0000 (13:30 +0800)]
mds: maintain auth bits during replay

Objects' STATE_AUTH bits are set when replaying EImportStart event.
MDCache::trim_non_auth_subtree() clear objects' STATE_AUTH bits when
replaying EExport event.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoMerge pull request #1774 from ceph/wip-8296
Sage Weil [Tue, 6 May 2014 20:08:39 +0000 (13:08 -0700)]
Merge pull request #1774 from ceph/wip-8296

osd/ReplicatedPG: fix whiteouts for other cache mode

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd/ReplicatedPG: fix whiteouts for other cache mode 1774/head
Sage Weil [Tue, 6 May 2014 18:01:27 +0000 (11:01 -0700)]
osd/ReplicatedPG: fix whiteouts for other cache mode

We were special casing WRITEBACK mode for handling whiteouts; this needs to
also include the FORWARD and READONLY modes.  To avoid having to list
specific cache modes, though, just check != NONE.

Fixes: #8296
Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1601 from ceph/wip-7576
Samuel Just [Tue, 6 May 2014 17:49:46 +0000 (10:49 -0700)]
Merge pull request #1601 from ceph/wip-7576

osd: prevent pg map epochs from lagging too far behind

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1748 from onlyjob/docs
Josh Durgin [Tue, 6 May 2014 17:12:45 +0000 (10:12 -0700)]
Merge pull request #1748 from onlyjob/docs

sample.ceph.conf update:

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1653 from ceph/wip-7499
Josh Durgin [Tue, 6 May 2014 17:10:59 +0000 (10:10 -0700)]
Merge pull request #1653 from ceph/wip-7499

rgw, radosgw-admin: bucket link uses bucket instance id now

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1768 from daniel-j-h/code_quality
Sage Weil [Tue, 6 May 2014 14:12:00 +0000 (07:12 -0700)]
Merge pull request #1768 from daniel-j-h/code_quality

Variable length array of std::strings (not legal in C++) changed to std::vector<std::string>

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoRevert "Fix installation into user home directory, broken by d3f0c0b"
Sage Weil [Tue, 6 May 2014 14:04:56 +0000 (07:04 -0700)]
Revert "Fix installation into user home directory, broken by d3f0c0b"

This reverts commit 7539281037ce7a755ac8661ecb15aea32e5f79f6.

This breaks mount.fuse.ceph installation.

11 years agodoc: Fixed artifacts from merge.
John Wilkins [Tue, 6 May 2014 10:54:45 +0000 (03:54 -0700)]
doc: Fixed artifacts from merge.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added sudo to setenforce. Restored merge artifact.
John Wilkins [Tue, 6 May 2014 10:54:08 +0000 (03:54 -0700)]
doc: Added sudo to setenforce. Restored merge artifact.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added erasure coding and cache tiering notes. Special thanks to Loic Dachary.
John Wilkins [Tue, 6 May 2014 10:53:03 +0000 (03:53 -0700)]
doc: Added erasure coding and cache tiering notes. Special thanks to Loic Dachary.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoVariable length array of std::strings (not legal in C++) changed to std::vector<std... 1768/head
Daniel J. Hofmann [Mon, 5 May 2014 14:06:45 +0000 (16:06 +0200)]
Variable length array of std::strings (not legal in C++) changed to std::vector<std::string>

Signed-off-by: Daniel J. Hofmann <daniel@trvx.org>
11 years agoMerge pull request #1770 from ceph/wip-8290
Sage Weil [Mon, 5 May 2014 23:55:49 +0000 (16:55 -0700)]
Merge pull request #1770 from ceph/wip-8290

client: check snap_caps in Incode::is_any_caps()

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoclient: check snap_caps in Incode::is_any_caps() 1770/head
Yan, Zheng [Mon, 5 May 2014 23:44:45 +0000 (07:44 +0800)]
client: check snap_caps in Incode::is_any_caps()

Fixes: #8290
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoMerge pull request #1764 from eile/master
Sage Weil [Mon, 5 May 2014 23:26:27 +0000 (16:26 -0700)]
Merge pull request #1764 from eile/master

Fix installation into user home directory, broken by d3f0c0b

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1769 from ceph/wip-doc-cache-tier
John Wilkins [Mon, 5 May 2014 22:26:27 +0000 (15:26 -0700)]
Merge pull request #1769 from ceph/wip-doc-cache-tier

doc: Support for cache tiering.

11 years agoMerge remote-tracking branch 'origin/wip-doc-radosgw-80'
Josh Durgin [Mon, 5 May 2014 22:12:29 +0000 (15:12 -0700)]
Merge remote-tracking branch 'origin/wip-doc-radosgw-80'

Conflicts:
doc/radosgw/config.rst

11 years agoMerge pull request #1760 from ceph/wip-8283
Samuel Just [Mon, 5 May 2014 21:53:47 +0000 (14:53 -0700)]
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>
11 years agodoc: Fix hyperlink. 1767/head
John Wilkins [Mon, 5 May 2014 19:35:41 +0000 (12:35 -0700)]
doc: Fix hyperlink.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Index update and librados.
John Wilkins [Mon, 5 May 2014 19:34:59 +0000 (12:34 -0700)]
doc: Index update and librados.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Quotas for Admin Ops API.
John Wilkins [Mon, 5 May 2014 19:33:58 +0000 (12:33 -0700)]
doc: Quotas for Admin Ops API.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: New Admin Guide for Ceph Object Storage.
John Wilkins [Mon, 5 May 2014 19:33:30 +0000 (12:33 -0700)]
doc: New Admin Guide for Ceph Object Storage.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoFix installation into user home directory, broken by d3f0c0b 1764/head
Stefan Eilemann [Mon, 5 May 2014 07:54:19 +0000 (09:54 +0200)]
Fix installation into user home directory, broken by d3f0c0b

Signed-off-by: Stefan Eilemann <Stefan.Eilemann@epfl.ch>
11 years agoosd: check blacklisted clients in ReplicatedPG::do_op()
Yan, Zheng [Sat, 3 May 2014 21:17:15 +0000 (05:17 +0800)]
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 f92677c5b2cac03f42f15c826bfb809fec27830d)

11 years agoMerge pull request #1740 from ceph/wip-8155
Sage Weil [Sat, 3 May 2014 22:13:37 +0000 (15:13 -0700)]
Merge pull request #1740 from ceph/wip-8155

mon: OSDMonitor: disallow nonsensical cache-mode transitions

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoceph-object-corpus: rebase onto firefly corpus
Sage Weil [Sat, 3 May 2014 14:59:28 +0000 (07:59 -0700)]
ceph-object-corpus: rebase onto firefly corpus

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1762 from yuyuyu101/wip-8282
Sage Weil [Sat, 3 May 2014 14:41:48 +0000 (07:41 -0700)]
Merge pull request #1762 from yuyuyu101/wip-8282

Fix clone problem

Backport: firefly
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1752 from ceph/wip-da-SCA-fixes-20140501
Sage Weil [Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)]
Merge pull request #1752 from ceph/wip-da-SCA-fixes-20140501

Various fixes from SCA

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1755 from eile/master
Sage Weil [Sat, 3 May 2014 13:42:04 +0000 (06:42 -0700)]
Merge pull request #1755 from eile/master

Fix out of source builds

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoFix out of source builds 1755/head
Stefan Eilemann [Fri, 2 May 2014 12:10:48 +0000 (14:10 +0200)]
Fix out of source builds

Signed-off-by: Stefan Eilemann <Stefan.Eilemann@epfl.ch>
11 years agoFix clone problem 1762/head
Haomai Wang [Sat, 3 May 2014 04:53:06 +0000 (12:53 +0800)]
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>
11 years agomon: OSDMonitor: disallow nonsensical cache-mode transitions 1740/head
Joao Eduardo Luis [Sat, 3 May 2014 02:42:19 +0000 (03:42 +0100)]
mon: OSDMonitor: disallow nonsensical cache-mode transitions

Fixes: 8155
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1735 from ceph/wip-8113
David Zafman [Sat, 3 May 2014 02:26:30 +0000 (19:26 -0700)]
Merge pull request #1735 from ceph/wip-8113

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1698 from ceph/wip-snapmapper-debug
Samuel Just [Fri, 2 May 2014 23:52:36 +0000 (16:52 -0700)]
Merge pull request #1698 from ceph/wip-snapmapper-debug

osd/SnapMapper: debug

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1694 from ceph/wip-throttle-snap-master
Samuel Just [Fri, 2 May 2014 23:48:10 +0000 (16:48 -0700)]
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>
11 years agoMerge pull request #1759 from dachary/wip-mailmap
Danny Al-Gaaf [Fri, 2 May 2014 23:43:14 +0000 (01:43 +0200)]
Merge pull request #1759 from dachary/wip-mailmap

DNM: mailmap updates

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoosd/ReplicatedPG: fix trim of in-flight hit_sets 1760/head
Sage Weil [Fri, 2 May 2014 23:41:26 +0000 (16:41 -0700)]
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>
11 years agoRevert "ReplicatedPG: block scrub on blocked object contexts"
Samuel Just [Fri, 2 May 2014 23:21:26 +0000 (16:21 -0700)]
Revert "ReplicatedPG: block scrub on blocked object contexts"

This reverts commit e66f2e36c06ca00c1147f922d3513f56b122a5c0.
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoosd: Prevent divide by zero in agent_choose_mode() 1735/head
Sage Weil [Thu, 1 May 2014 23:53:17 +0000 (16:53 -0700)]
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>
11 years agoosd, common: If agent_work() finds no objs to work on delay 5 (default) secs
David Zafman [Tue, 22 Apr 2014 06:52:04 +0000 (23:52 -0700)]
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>
11 years agorados.cc: fix typo in help output 1752/head
Danny Al-Gaaf [Thu, 1 May 2014 22:49:59 +0000 (00:49 +0200)]
rados.cc: fix typo in help output

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoDumper::dump_entries(): reduce scope of 'got_data'
Danny Al-Gaaf [Thu, 1 May 2014 22:43:11 +0000 (00:43 +0200)]
Dumper::dump_entries(): reduce scope of 'got_data'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoPG::read_info(): pass 'const coll_t coll' by reference
Danny Al-Gaaf [Thu, 1 May 2014 22:35:02 +0000 (00:35 +0200)]
PG::read_info(): pass 'const coll_t coll' by reference

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoPGBackend::be_compare_scrubmaps(): pass pgid by reference
Danny Al-Gaaf [Thu, 1 May 2014 22:29:19 +0000 (00:29 +0200)]
PGBackend::be_compare_scrubmaps(): pass pgid by reference

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoosd_types.h: pass eversion_t by reference to operator<<
Danny Al-Gaaf [Thu, 1 May 2014 22:23:43 +0000 (00:23 +0200)]
osd_types.h: pass eversion_t by reference to operator<<

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoSimpleLock.h: remove unused private function clear_more()
Danny Al-Gaaf [Thu, 1 May 2014 22:08:41 +0000 (00:08 +0200)]
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>
11 years agoSimpleLock.h: remove twice included osd_types.h
Danny Al-Gaaf [Thu, 1 May 2014 22:04:32 +0000 (00:04 +0200)]
SimpleLock.h: remove twice included osd_types.h

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agolinux_fiemap.h: remove twice included int_types.h
Danny Al-Gaaf [Thu, 1 May 2014 22:03:11 +0000 (00:03 +0200)]
linux_fiemap.h: remove twice included int_types.h

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoDumper::dump_entries(): remove not needed variable
Danny Al-Gaaf [Wed, 30 Apr 2014 22:00:26 +0000 (00:00 +0200)]
Dumper::dump_entries(): remove not needed variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agorgw_bucket.cc: return error if update_containers_stats() fails
Danny Al-Gaaf [Fri, 2 May 2014 23:34:10 +0000 (01:34 +0200)]
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>
11 years agomon/PGMonitor: set tid on no-op PGStatsAck
Sage Weil [Fri, 2 May 2014 22:10:43 +0000 (15:10 -0700)]
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>
11 years agomon/OSDMonitor: share latest map with osd on dup boot message
Sage Weil [Fri, 2 May 2014 22:00:11 +0000 (15:00 -0700)]
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>
11 years agomon/MonClient: remove stray _finish_hunting() calls
Sage Weil [Fri, 2 May 2014 21:48:35 +0000 (14:48 -0700)]
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>
11 years agomailmap: Florent Bautista affiliation 1759/head
Loic Dachary [Fri, 2 May 2014 22:42:24 +0000 (00:42 +0200)]
mailmap: Florent Bautista affiliation

and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Warren Usui name normalization
Loic Dachary [Fri, 2 May 2014 22:35:42 +0000 (00:35 +0200)]
mailmap: Warren Usui name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Guang Yang name normalization
Loic Dachary [Fri, 2 May 2014 22:35:04 +0000 (00:35 +0200)]
mailmap: Guang Yang name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1754 from nereocystis/hardware-to-glossary
Sage Weil [Fri, 2 May 2014 21:22:17 +0000 (14:22 -0700)]
Merge pull request #1754 from nereocystis/hardware-to-glossary

doc: Include links from hardware-recommendations to glossary

11 years agosample.ceph.conf update: 1748/head
Dmitry Smirnov [Thu, 1 May 2014 01:53:36 +0000 (11:53 +1000)]
sample.ceph.conf update:

 * corrected URLs.
 * added [client] section.
 * more options and descriptions.
 * filestore settings were moved under [osd].
 * cephx settings to reflect lack of support for authentication in RBD client.
 * many minor corrections and updates.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
11 years agoosd/ReplicatedPG: agent_work() fix next if finished early due to start_max
David Zafman [Fri, 2 May 2014 01:54:30 +0000 (18:54 -0700)]
osd/ReplicatedPG: agent_work() fix next if finished early due to start_max

Backport: firefly

Signed-off-by: David Zafman <david.zafman@inktank.com>
11 years agoosd/SnapMapper: pass snaps set by const ref 1698/head
Sage Weil [Fri, 2 May 2014 00:31:05 +0000 (17:31 -0700)]
osd/SnapMapper: pass snaps set by const ref

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/SnapMapper: debug
Sage Weil [Fri, 2 May 2014 00:29:46 +0000 (17:29 -0700)]
osd/SnapMapper: debug

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomon/OSDMonitor: do not reply to MOSDMarkMeDown if ack is not requested 1601/head
Sage Weil [Thu, 3 Apr 2014 18:52:27 +0000 (11:52 -0700)]
mon/OSDMonitor: do not reply to MOSDMarkMeDown if ack is not requested

If a reply isn't requested, do not bother to send one.  Note that old
clients did not request an ack, but we will infer that they do from the
message encoding (see previous commit).

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: fix 'ack' to be 'request_ack' in MOSDMarkMeDown
Sage Weil [Thu, 3 Apr 2014 18:51:45 +0000 (11:51 -0700)]
osd: fix 'ack' to be 'request_ack' in MOSDMarkMeDown

This field was passed along but always set to false.  It did not seem to
indicate whether this was/wasn't an ack (the reply message kept the same
value) or whether an ack was requested (it was always false but we always
reply).

Change this by bumping the message encoding, renaming the field, and
making old messages that are decoded force request_ack to true.  Reply
messages will always have request_ack false (although that part doesn't
matter much since the fact that it is a reply is clear from context).

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: ignore MarkMeDown message if we aren't in PREPARING_TO_STOP state
Sage Weil [Thu, 3 Apr 2014 05:34:48 +0000 (22:34 -0700)]
osd: ignore MarkMeDown message if we aren't in PREPARING_TO_STOP state

If we aren't waiting for this, ignore it.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: prevent pgs from getting too far ahead of the min pg epoch
Sage Weil [Fri, 2 May 2014 00:24:48 +0000 (17:24 -0700)]
osd: prevent pgs from getting too far ahead of the min pg epoch

Bound the range of PG epochs between the slowest and fastest pg
(epoch-wise) with 'osd map max advance'.  This value should be set to
something less than 'osd map cache size' so that the maps we are
processing will be in memory as many PGs advance forward in time in
loose synchrony.

This is part of the solution to #7576.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: track per-pg epochs, min
Sage Weil [Wed, 2 Apr 2014 21:29:08 +0000 (14:29 -0700)]
osd: track per-pg epochs, min

Add some simple tracking so that we can quickly determine what the min
pg osdmap epoch is.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agodoc: Include links from hardware-recommendations to glossary 1754/head
Kevin Dalley [Fri, 2 May 2014 00:04:43 +0000 (17:04 -0700)]
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>
11 years agoMerge pull request #1749 from hufman/fix-typo-releasenotes-pyramind
Danny Al-Gaaf [Thu, 1 May 2014 23:06:26 +0000 (01:06 +0200)]
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>
11 years agomds: note MDiscoverReply encoding change in corpus
Sage Weil [Thu, 1 May 2014 22:07:50 +0000 (15:07 -0700)]
mds: note MDiscoverReply encoding change in corpus

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: bump protocol
Sage Weil [Thu, 1 May 2014 20:46:40 +0000 (13:46 -0700)]
mds: bump protocol

In commit f689e5f049736bb0a0fa437e05936f6c1b9c1bb6 we change the encoding
and semantics for MDiscoverReply.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1738 from ceph/wip-8147
Samuel Just [Thu, 1 May 2014 17:46:31 +0000 (10:46 -0700)]
Merge pull request #1738 from ceph/wip-8147

osd: automatically scrub PGs with invalid stats

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
11 years agodoc/release-notes: changelog link
Sage Weil [Thu, 1 May 2014 16:59:37 +0000 (09:59 -0700)]
doc/release-notes: changelog link

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agodoc/release-notes: final v0.67.8 notes and changelog
Sage Weil [Thu, 1 May 2014 15:36:42 +0000 (08:36 -0700)]
doc/release-notes: final v0.67.8 notes and changelog

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1750 from nereocystis/doc-link-to-involved
John Wilkins [Thu, 1 May 2014 06:07:53 +0000 (23:07 -0700)]
Merge pull request #1750 from nereocystis/doc-link-to-involved

doc: documenting links to get-involved

11 years agoFixes a very minor typo in the release notes 1749/head
Walter Huf [Thu, 1 May 2014 05:25:00 +0000 (00:25 -0500)]
Fixes a very minor typo in the release notes

pyramind -> pyramid

11 years agodoc: documenting links to get-involved 1750/head
Kevin Dalley [Thu, 1 May 2014 04:31:06 +0000 (21:31 -0700)]
doc: documenting links to get-involved
Create a link from documenting-ceph so that it is easy to find the
github repository used for ceph.

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agoReplicatedPG: block scrub on blocked object contexts
Samuel Just [Fri, 18 Apr 2014 00:26:17 +0000 (17:26 -0700)]
ReplicatedPG: block scrub on blocked object contexts

Fixes: #8011
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1745 from ceph/wip-7941
Sage Weil [Wed, 30 Apr 2014 22:09:45 +0000 (15:09 -0700)]
Merge pull request #1745 from ceph/wip-7941

rados.h,ReplicatedPG: add CEPH_OSD_FLAG_ENFORCE_SNAPC and use on flush

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1744 from ceph/wip-8161
Sage Weil [Wed, 30 Apr 2014 22:07:51 +0000 (15:07 -0700)]
Merge pull request #1744 from ceph/wip-8161

ECBackend::continue_recovery_op: handle a source shard going down

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1746 from ceph/wip-8086
Sage Weil [Wed, 30 Apr 2014 22:03:45 +0000 (15:03 -0700)]
Merge pull request #1746 from ceph/wip-8086

Wip 8086

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agorgw_common.cc: reduce scope of 'fpos' variable
Danny Al-Gaaf [Wed, 30 Apr 2014 21:37:56 +0000 (23:37 +0200)]
rgw_common.cc: reduce scope of 'fpos' variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>