Commit Graph

28704 Commits

Author SHA1 Message Date
Yan, Zheng
862e0f12a6 mds: fix MDCache::truncate_inode_finish() journal
we should add projected parent directory's context to the journal

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2013-09-19 14:01:02 +08:00
Sage Weil
96010924cb os/FileStore: fix uninitialized var
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-18 20:38:51 -07:00
Sage Weil
ce723b5ad6 doc/release-notes: v0.69
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-18 12:31:42 -07:00
Gary Lowell
33671f3554 Merge branch 'next' 2013-09-18 09:11:02 +00:00
Gary Lowell
6ca6f2f9f7 v0.69 2013-09-18 01:40:51 +00:00
Gregory Farnum
b37f88c92d Merge pull request #586 from ceph/wip-copyfrom-big
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-09-17 11:14:26 -07:00
Sage Weil
a80f831b1f ceph_test_rados: identify write seq_num in output
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:28 -07:00
Sage Weil
3a00187860 librados: test copy_from without src_version specified
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:28 -07:00
Sage Weil
045b90292a osd: allow a copy_from without knowing the src_version
If we don't specify the version up front, learn the version after the first
chunk and enforce it thereafter to ensure we do not get torn content.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:28 -07:00
Sage Weil
83f12e4630 ceph_test_rados: submit a racing read with every COPY_FROM
Verify that the racing read completes after the COPY_FROM does (i.e., is
blocked by it).

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:27 -07:00
Sage Weil
d050596a0d ceph_test_rados: use get_version64() throughout
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:27 -07:00
Sage Weil
cdc637f0f1 osd: block requests on object during COPY_FROM
Block any request on an object (read or write) during the COPY_FROM
operation.

This could potentially be broken down into read vs write operations without
much difficulty, but blocking any op indescriminately is sufficient for
now, so let's keep it simple.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:27 -07:00
Sage Weil
f97277cc50 osd: add infrastructure to block io on an obc
Add an is_blocked() method for the obc, and add infrastructure to block
any operations if it returns true.  Clean up on_change(), and add a helper
to kick an obc when whatever condition leading to it being blocked is no
longer true.

For now, is_blocked() is always false...

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:27 -07:00
Sage Weil
df7c36ac08 osd/ReplicatedPG: factor some bits into finish_copy
This is a bit cleaner and hopefully more usable for osd-driven cache
promotion.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:27 -07:00
Sage Weil
5921703eb5 ceph_test_rados: more readable output
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:27 -07:00
Sage Weil
4e29e362e7 osd/ReplicatedPG: stage object chunks to replicas during COPY_FROM
As we get each chunk of data during the COPY_FROM operation, write it out
to a temporary object on the replicas.  When we get all the pieces, move
it into place.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 11:06:27 -07:00
John Wilkins
1f80d63272 doc: Replaced code-block with inline literal to fix auto numbering.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-09-17 10:39:24 -07:00
John Wilkins
7d5dfa2b58 doc: Made s3gw.fcgi paths consistent.
fixes: #6182

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-09-17 10:34:47 -07:00
Alexandre Oliva
59147be9ae osd: compute full ratio from kb_avail
On btrfs, kb_used + kb_avail can be much smaller than total kb, and
what really matters to avoid filling up the disk is how much space is
available, not how much we've used.  Thus, compute the ratio we use to
determine full or nearfull from kb_avail rather than from kb_used.

Signed-off-by: Alexandre Oliva <oliva@gnu.org>
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-17 06:31:48 -07:00
Josh Durgin
109cd50ca9 Merge pull request #601 from pipul/feature/develop_130917
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-09-16 21:06:32 -07:00
fangdong
3cef755428 fix some comments
Signed-off-by: fangdong <yp.fangdong@gmail.com>
2013-09-17 10:34:10 +08:00
John Wilkins
e55d59f826 doc: Updated usage.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-09-16 18:57:46 -07:00
John Wilkins
0be2c87a54 doc: Removed --fs-type option and text.
fixes: #6326

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-09-16 18:40:07 -07:00
John Wilkins
874186bacc doc: Updated the usage scenario and made a few syntax edits.
fixes: #6308

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-09-16 18:38:55 -07:00
Gregory Farnum
c9c710c1f4 Merge pull request #600 from dachary/fix-erasure-warning
ErasureCode: fix uninitialized variable warning
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-09-16 14:14:19 -07:00
Loic Dachary
abd2fcd54a ErasureCode: fix uninitialized variable warning
Signed-off-by: Loic Dachary <loic@dachary.org>
2013-09-16 23:04:23 +02:00
Gregory Farnum
4930ccb8a2 Merge pull request #597 from ceph/remove-hadoop-shim
This branch built fine on the gitbuilders and the list of removed files looks good to me.

Reviewed-by: Greg Farnum <greg@inktank.com>
2013-09-16 13:57:47 -07:00
athanatos
01ec6a3fdf Merge pull request #538 from dachary/wip-5879
jerasure-1.2A plugin

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-09-13 18:09:43 -07:00
Yehuda Sadeh
4216eac0f5 rgw: try to create log pool if doesn't exist
When using replica log, if the log pool doesn't exist all operations are
going to fail. Try to create it if doesn't exist.

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-09-13 15:35:26 -07:00
Noah Watkins
b86c068669 hadoop: remove hadoop shim
The in-tree Hadoop shim was a combination of libcephfs wrapper, and the
bits to support Hadoop. This has been replaced by src/java that
implements generic libcephfs wrappers, and externally, the hadoop shim
(see docs).

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-09-13 13:39:48 -07:00
Yehuda Sadeh
e7f7483192 rgw: NULL terminate buffer before parsing it
Fixes: #6175
Backport: dumpling
We get a buffer off the remote gateway which might
not be NULL terminated. The JSON parser needs the
buffer to be NULL terminated even though we provide
a buffer length as it calls strlen().

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-09-13 10:02:44 -07:00
Sage Weil
40e0cabcb4 Merge pull request #594 from ceph/fix-no-tcmalloc-build
make: add tmalloc lib dep in tcmalloc guard

Reviewed-by: Sage Weil <sage@inktank.com>
2013-09-13 08:57:16 -07:00
Noah Watkins
3f8c96902e make: add tmalloc lib dep in tcmalloc guard
Fixes --without-tcmalloc on boxes without libtcmalloc.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-09-13 08:29:41 -07:00
David Zafman
388dd1e201 Merge branch 'wip-6226' 2013-09-12 11:13:50 -07:00
David Zafman
daf417f9cc osd/ReplicatedPG.cc: Verify that recovery is truly complete
Backportable change to insure that even if no new ops started or
are running that indeed recovery is complete.  Prevents some
error condition or unforseen code path from crashing an osd.

Backport: dumpling, cuttlefish

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-09-12 11:12:24 -07:00
David Zafman
139a714e13 osd/OSD.cc: Use MIN() so that we don't exceed osd_recovery_max_active
Caused by 944f3b7353

Fixes: #6291

Backport: dumpling

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-09-12 11:11:08 -07:00
Gregory Farnum
a41aa9468f Merge pull request #589 from ceph/wip-6279
mon/MDSMonitor: don't reset incarnation when creating newfs
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-09-12 10:38:41 -07:00
Yan, Zheng
40613b700b mon/MDSMonitor: don't reset incarnation when creating newfs
Fixes: #6279

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2013-09-12 15:23:43 +08:00
Yehuda Sadeh
31e3a51e93 rgw: don't call list::size() in ObjectCache
Fixes: #6286
Use an external counter instead of calling list::size()

Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-09-11 22:51:32 -07:00
Yehuda Sadeh
626669afaa rgw: drain pending requests before completing write
Fixes: #6268
When doing aio write of objects (either regular or multipart parts) we
need to drain pending aio requests. Otherwise if gateway goes down then
object might end up corrupted.

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-09-11 18:54:39 -07:00
Sage Weil
25a608cdcc osd/ReplicatedPG: allow RepGathers with no version
If the repop has no version set, skip the updates to last_update and
last_update_{applied,ondisk} and last_complete_ondisk.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-11 15:56:12 -07:00
Sage Weil
155cdd29a3 osd: flag new/old temp objects in MOSDSubOp
Allow us to mark when we start and stop using a temporary object in a
sub_op.  If we start to use it, make sure the collection exists on the
replica.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-11 15:56:12 -07:00
Sage Weil
c4260fad29 osd/ReplicatedPG: drop unused issue_repop() arguments
These are cruft from the old parallelexec mode and can be removed.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-11 15:19:18 -07:00
Sage Weil
27ca5d2e06 osd/ReplicatedPG: drop dead code from parallelexec issue_repop
This is unused and references otherwise unused variables we can remove!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-11 15:19:18 -07:00
Sage Weil
c9885e7487 osd/ReplicatedPG: generate one-off unique temp object names
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-11 15:19:18 -07:00
Sage Weil
6cecd0db56 osd/osd_types: move coll_t::META_COLL definition
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-11 15:19:18 -07:00
Sage Weil
17c5d765d7 os/FileStore: implement collection_move_rename
This is similar to a collection_add + collection_move sequence in that we
apply the same replay guards.  The difference is that we roll it up into
a single operation, change the filename, and make the omap content carry
over by calling DBObjectMap->clone (as there is no rename function or
collection awareness in the DBObjectMap).

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-11 15:19:18 -07:00
Sage Weil
ef7cffc34f os/ObjectStore: add collection_move_rename
Add method to move an object between collections *and* change its name.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-11 15:09:14 -07:00
Yehuda Sadeh
73e626ccea Merge pull request #587 from kri5/master
rgw-admin: Adds --metadata-key option to help

Reviwed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-09-11 09:01:18 -07:00
Christophe Courtaut
288bef3329 rgw-admin: Adds --metadata-key option to help
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
2013-09-11 17:49:04 +02:00