Yan, Zheng
da17394941
mds: fix root and mdsdir inodes' rsubdirs
...
inode rstat accounts inode itself.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-05-07 07:10:16 +08:00
Yan, Zheng
5283d80d32
mds: ignore stale rstat/fragstat when splitting dirfrag
...
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-05-07 07:10:16 +08:00
Yan, Zheng
4e844c948b
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>
2014-05-07 07:10:16 +08:00
Yan, Zheng
f7541067d0
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>
2014-05-07 07:10:16 +08:00
Yan, Zheng
a2caea7c91
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>
2014-05-07 07:10:16 +08:00
Yan, Zheng
a85bf8c960
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>
2014-05-07 07:10:16 +08:00
Yan, Zheng
c4f0f0510b
mds: tolerate bad sessionmap during journal replay
...
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-05-07 07:10:16 +08:00
Yan, Zheng
f386e16362
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>
2014-05-07 07:10:16 +08:00
Yan, Zheng
6d6d1889e0
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>
2014-05-07 07:10:16 +08:00
Yan, Zheng
7a066f8824
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>
2014-05-07 07:10:16 +08:00
Yan, Zheng
5b86a13c72
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>
2014-05-07 07:10:16 +08:00
Yan, Zheng
7d1fd6692c
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>
2014-05-07 07:10:16 +08:00
Sage Weil
b7134c9a2e
Merge pull request #1774 from ceph/wip-8296
...
osd/ReplicatedPG: fix whiteouts for other cache mode
Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-05-06 13:08:39 -07:00
Sage Weil
3e387d62ed
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>
2014-05-06 11:01:27 -07:00
Samuel Just
650051cd17
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>
2014-05-06 10:49:46 -07:00
Josh Durgin
2b48e52c4c
Merge pull request #1748 from onlyjob/docs
...
sample.ceph.conf update:
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-05-06 10:12:45 -07:00
Josh Durgin
9c0e92f0ea
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>
2014-05-06 10:10:59 -07:00
Sage Weil
f31e3ee00a
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>
2014-05-06 07:12:00 -07:00
Sage Weil
e65a9da93a
Revert "Fix installation into user home directory, broken by d3f0c0b"
...
This reverts commit 7539281037
.
This breaks mount.fuse.ceph installation.
2014-05-06 07:04:56 -07:00
John Wilkins
cdbbf86fa3
doc: Fixed artifacts from merge.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-05-06 03:54:45 -07:00
John Wilkins
a31b9e9c75
doc: Added sudo to setenforce. Restored merge artifact.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-05-06 03:54:08 -07:00
John Wilkins
515827223f
doc: Added erasure coding and cache tiering notes. Special thanks to Loic Dachary.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-05-06 03:53:03 -07:00
Daniel J. Hofmann
08a4e88897
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>
2014-05-06 09:51:37 +02:00
Sage Weil
38408f6b68
Merge pull request #1770 from ceph/wip-8290
...
client: check snap_caps in Incode::is_any_caps()
Reviewed-by: Sage Weil <sage@inktank.com>
2014-05-05 16:55:49 -07:00
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