]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agotest: Wait for tier removal before next test starts 1540/head
David Zafman [Wed, 26 Mar 2014 23:04:40 +0000 (16:04 -0700)]
test: Wait for tier removal before next test starts

Fixes: #7860
Signed-off-by: David Zafman <david.zafman@inktank.com>
11 years agoMerge pull request #1535 from ceph/wip-7823
Samuel Just [Wed, 26 Mar 2014 18:48:07 +0000 (11:48 -0700)]
Merge pull request #1535 from ceph/wip-7823

osd: trim copy-get backend read to object size

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd: trim copy-get backend read to object size 1535/head
Sage Weil [Sat, 22 Mar 2014 22:39:26 +0000 (15:39 -0700)]
osd: trim copy-get backend read to object size

We are passing a big number to the backend to read and it is trimming it
to the stripe boundary, and then setting the cursor at a slightly smaller
offset bound by oi.size.  This is invalid, and will trigger an assert in
the _write_copy_chunk code:

     0> 2014-03-21 15:12:23.761509 7f8dd2324700 -1 osd/ReplicatedPG.cc: In function 'void ReplicatedPG::_write_copy_chunk(ReplicatedPG::CopyOpRef, PGBackend::PGTransaction*)' thread 7f8dd2324700 time 2014-03-21 15:12:23.758866
osd/ReplicatedPG.cc: 5554: FAILED assert(cop->data.length() + cop->temp_cursor.data_offset == cop->cursor.data_offset)

To fix this, trim the buffer to the correct length in the completion
context.

Fixes: #7823
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1518 from dachary/wip-mailmap
Loic Dachary [Wed, 26 Mar 2014 15:47:08 +0000 (16:47 +0100)]
Merge pull request #1518 from dachary/wip-mailmap

mailmap updates

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
11 years agoMerge remote-tracking branch 'gh/firefly'
Sage Weil [Wed, 26 Mar 2014 05:39:05 +0000 (22:39 -0700)]
Merge remote-tracking branch 'gh/firefly'

11 years agoosd: fix tests due to no default erasure-code ruleset
Sage Weil [Wed, 26 Mar 2014 00:35:01 +0000 (17:35 -0700)]
osd: fix tests due to no default erasure-code ruleset

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoRevert "osd: create the erasure-code ruleset in OSDMap::build_simple"
Sage Weil [Tue, 25 Mar 2014 23:55:02 +0000 (16:55 -0700)]
Revert "osd: create the erasure-code ruleset in OSDMap::build_simple"

This reverts commit b85330eb1d62632a1c3f2025b1f309816d54bd5a.

We can't have this in the OSDMap by default or else all clients will require
the new features.

[Fixed up #include for strmap]

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1530 from onlyjob/fix-defaultweight
Sage Weil [Wed, 26 Mar 2014 04:44:19 +0000 (21:44 -0700)]
Merge pull request #1530 from onlyjob/fix-defaultweight

fix bug in 'defaultweight' calculation on OSD start.

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agofix bug in 'defaultweight' calculation on OSD start. 1530/head
Dmitry Smirnov [Tue, 25 Mar 2014 10:51:01 +0000 (21:51 +1100)]
fix bug in 'defaultweight' calculation on OSD start.

  awk: cmd. line:1: { d=$2/1073741824 ; r = sprintf(\"%.2f\", d); print r }
  awk: cmd. line:1:                                 ^ backslash not last character on line
  awk: cmd. line:1: { d=$2/1073741824 ; r = sprintf(\"%.2f\", d); print r }
  awk: cmd. line:1:                                 ^ syntax error

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
11 years agoMerge branch 'wip-7676-firefly' into firefly
Josh Durgin [Tue, 25 Mar 2014 23:40:47 +0000 (16:40 -0700)]
Merge branch 'wip-7676-firefly' into firefly

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1533 from ceph/wip-7863-wusui
SandonV [Tue, 25 Mar 2014 23:36:43 +0000 (16:36 -0700)]
Merge pull request #1533 from ceph/wip-7863-wusui

Make sure s3_utilities are found.

11 years agoMake sure s3_utilities are found. 1533/head
Warren Usui [Tue, 25 Mar 2014 23:30:03 +0000 (16:30 -0700)]
Make sure s3_utilities are found.

Add FindBin code to rgw/s3 tests to include s3_utilites.pm properly.

Fixes: 7863
Signed-off-by: Warren Usui <warren.usui@inktank.com>
11 years agoMerge pull request #1527 from ceph/wip-6465
Sage Weil [Tue, 25 Mar 2014 22:29:18 +0000 (15:29 -0700)]
Merge pull request #1527 from ceph/wip-6465

be nitpicky about missing references

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1531 from onlyjob/debian
Sage Weil [Tue, 25 Mar 2014 21:59:46 +0000 (14:59 -0700)]
Merge pull request #1531 from onlyjob/debian

minor corrections from Debian

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1363 from ceph/wip-3863
Gregory Farnum [Tue, 25 Mar 2014 17:49:51 +0000 (10:49 -0700)]
Merge pull request #1363 from ceph/wip-3863

Add ceph-client-debug inode lookup

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agominor corrections to package descriptions 1531/head
Dmitry Smirnov [Tue, 25 Mar 2014 11:23:13 +0000 (22:23 +1100)]
minor corrections to package descriptions

11 years agominor init.d scripts lintianisation:
Dmitry Smirnov [Tue, 25 Mar 2014 11:10:48 +0000 (22:10 +1100)]
minor init.d scripts lintianisation:

 * init.d-script-does-not-source-init-functions
 * init.d-script-does-not-implement-required-option
 * init.d-script-missing-lsb-description

11 years agorgw: don't modify rgw_bucket for data extra pool
Yehuda Sadeh [Tue, 11 Mar 2014 22:05:07 +0000 (15:05 -0700)]
rgw: don't modify rgw_bucket for data extra pool

This cleans up the interface, as we don't have this ugly implicit
structure modification when we deal with object that resides on the data
extra pool. Replcae lot's of calls to get_obj_bucket_and_oid_key() to a
cleaner get_obj_ref() that uses a struct to hold the updated fields, and
update the relevant callers.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: multipart meta object uses extra data pool
Yehuda Sadeh [Tue, 11 Mar 2014 20:24:55 +0000 (13:24 -0700)]
rgw: multipart meta object uses extra data pool

Fixes: #7676
We need the extra data pool since EC backends cannot handle the omap
operations that are needed for the multipart meta object.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: zone placement info includes extra data pool
Yehuda Sadeh [Tue, 11 Mar 2014 19:26:23 +0000 (12:26 -0700)]
rgw: zone placement info includes extra data pool

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: add data_extra pool to bucket
Yehuda Sadeh [Tue, 11 Mar 2014 19:01:31 +0000 (12:01 -0700)]
rgw: add data_extra pool to bucket

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoMerge pull request #1528 from ceph/wip-dz-watch-test
David Zafman [Mon, 24 Mar 2014 21:18:53 +0000 (14:18 -0700)]
Merge pull request #1528 from ceph/wip-dz-watch-test

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agomailmap: Inktank jenkins bot 1518/head
Loic Dachary [Sun, 23 Mar 2014 14:15:34 +0000 (15:15 +0100)]
mailmap: Inktank jenkins bot

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Huang Jun name normalization
Loic Dachary [Fri, 21 Mar 2014 23:55:40 +0000 (00:55 +0100)]
mailmap: Huang Jun name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Tyler Brekke name normalization
Loic Dachary [Fri, 21 Mar 2014 23:02:31 +0000 (00:02 +0100)]
mailmap: Tyler Brekke name normalization

Reviewed-by: Tyler Brekke <tyler.brekke@inktank.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Guang Yang affiliation
Loic Dachary [Fri, 21 Mar 2014 22:59:04 +0000 (23:59 +0100)]
mailmap: Guang Yang affiliation

and name normalization

Reviewed-by: Guang Yang <yguang@yahoo-inc.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: James Ryan Cresawn affiliation
Loic Dachary [Fri, 21 Mar 2014 22:53:55 +0000 (23:53 +0100)]
mailmap: James Ryan Cresawn affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Mohammad Salehe affiliation
Loic Dachary [Fri, 21 Mar 2014 22:50:05 +0000 (23:50 +0100)]
mailmap: Mohammad Salehe affiliation

Reviewed-by: Mohammad Salehe <salehe+dev@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Sharif Olorin affiliation
Loic Dachary [Fri, 21 Mar 2014 22:44:11 +0000 (23:44 +0100)]
mailmap: Sharif Olorin affiliation

Reviewed-by: Sharif Olorin <sio@tesser.org>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Stephan Renatus affiliation
Loic Dachary [Fri, 21 Mar 2014 22:36:04 +0000 (23:36 +0100)]
mailmap: Stephan Renatus affiliation

Reviewed-by: Stephan Renatus <s.renatus@x-ion.de>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoqa: Add ceph_multi_stress_watch for rep and ec 1528/head
David Zafman [Fri, 21 Mar 2014 22:13:41 +0000 (15:13 -0700)]
qa: Add ceph_multi_stress_watch for rep and ec

Fixes: #7438
Signed-off-by: David Zafman <david.zafman@inktank.com>
11 years agoMerge pull request #1525 from ceph/wip-listxattr
Sage Weil [Mon, 24 Mar 2014 20:54:14 +0000 (13:54 -0700)]
Merge pull request #1525 from ceph/wip-listxattr

client: don't include ceph.{file,dir}.layout vxattr in listxattr()

Reviwed-by: Sage Weil <sage@inktank.com>
11 years agoensure pybind is in the PYTHONPATH 1527/head
Alfredo Deza [Mon, 24 Mar 2014 18:23:54 +0000 (14:23 -0400)]
ensure pybind is in the PYTHONPATH

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
11 years agoMerge pull request #1523 from ceph/wip-7827
Gregory Farnum [Mon, 24 Mar 2014 17:03:46 +0000 (10:03 -0700)]
Merge pull request #1523 from ceph/wip-7827

msg: set recv stamp for local delivery

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agobe nitpicky about missing references
Alfredo Deza [Fri, 13 Dec 2013 14:27:39 +0000 (09:27 -0500)]
be nitpicky about missing references

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
11 years agoMerge pull request #1526 from ceph/wip-status-function-names
Sage Weil [Mon, 24 Mar 2014 16:56:01 +0000 (09:56 -0700)]
Merge pull request #1526 from ceph/wip-status-function-names

mon: Monitor: change 'status' function names for clarity's sake

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoRevert "erasure-code: gf-complete detects SSE at runtime"
Sage Weil [Mon, 24 Mar 2014 01:58:55 +0000 (18:58 -0700)]
Revert "erasure-code: gf-complete detects SSE at runtime"

This reverts commit dbcf4471838fbf5dce2ee06fc73493f513dbf9f0.

11 years agoMerge pull request #1524 from dachary/wip-sse
Sage Weil [Mon, 24 Mar 2014 15:32:57 +0000 (08:32 -0700)]
Merge pull request #1524 from dachary/wip-sse

erasure-code: deactivate SSE optimizations

11 years agomon: Monitor: s/_mon_status()/get_mon_status()/ 1526/head
Joao Eduardo Luis [Mon, 24 Mar 2014 10:48:37 +0000 (10:48 +0000)]
mon: Monitor: s/_mon_status()/get_mon_status()/

'Monitor::_mon_status()' provides status specific to the monitor being
poked.  This is information that does not necessarily relate with
cluster status, and can even be obtained when there's no quorum (via the
admin socket).

We change the function name to make the distinction between mon-specific
status and cluster-status, which is obtained via a different function.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: Monitor: s/get_status()/get_cluster_status()/
Joao Eduardo Luis [Mon, 24 Mar 2014 10:47:20 +0000 (10:47 +0000)]
mon: Monitor: s/get_status()/get_cluster_status()/

Monitor::get_status() is actually used to obtain 'cluster status' (i.e.,
status about *all* the monitors, maps, IO, overall healthiness).

Just make that clear in the function name, avoiding confusion between
multiple 'status-related' functions in the monitor.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoclient: don't include ceph.{file,dir}.layout vxattr in listxattr() 1525/head
Yan, Zheng [Mon, 24 Mar 2014 11:33:52 +0000 (19:33 +0800)]
client: don't include ceph.{file,dir}.layout vxattr in listxattr()

This avoids 'cp -a' modifying layout of new files/directories.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoerasure-code: deactivate SSE optimizations 1524/head
Loic Dachary [Mon, 24 Mar 2014 08:14:22 +0000 (09:14 +0100)]
erasure-code: deactivate SSE optimizations

Workaround until the bug is diagnosed and fixed

http://tracker.ceph.com/issues/7826 refs #7826

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1521 from ceph/wip-7810
Sage Weil [Mon, 24 Mar 2014 04:50:07 +0000 (21:50 -0700)]
Merge pull request #1521 from ceph/wip-7810

mds: reset connection priv after connection's session is removed

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agomsg: set recv stamp for local delivery 1523/head
Sage Weil [Mon, 24 Mar 2014 04:32:21 +0000 (21:32 -0700)]
msg: set recv stamp for local delivery

Fixes: #7827
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomailmap: Allen Samuels affiliation
Loic Dachary [Fri, 21 Mar 2014 22:34:47 +0000 (23:34 +0100)]
mailmap: Allen Samuels affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Warren Usui is with Inktank
Loic Dachary [Fri, 21 Mar 2014 22:32:37 +0000 (23:32 +0100)]
mailmap: Warren Usui is with Inktank

Reviewed-by: Warren Usui <warren.usui@inktank.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomds: reset connection priv after connection's session is removed 1521/head
Yan, Zheng [Sun, 23 Mar 2014 02:42:25 +0000 (10:42 +0800)]
mds: reset connection priv after connection's session is removed

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoMerge tag 'v0.78'
Sage Weil [Sat, 22 Mar 2014 17:24:25 +0000 (10:24 -0700)]
Merge tag 'v0.78'

v0.78

11 years agodoc/release-notes: 0.78 final notes
Sage Weil [Fri, 21 Mar 2014 23:57:09 +0000 (16:57 -0700)]
doc/release-notes: 0.78 final notes

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1515 from ceph/wip-rgw-less-alloc
Sage Weil [Fri, 21 Mar 2014 23:32:27 +0000 (16:32 -0700)]
Merge pull request #1515 from ceph/wip-rgw-less-alloc

Wip rgw less alloc

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agodoc/release-notes: final 0.78
Sage Weil [Fri, 21 Mar 2014 22:43:30 +0000 (15:43 -0700)]
doc/release-notes: final 0.78

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agorgw: get rid of a memory allocation 1515/head
Yehuda Sadeh [Fri, 21 Feb 2014 18:43:37 +0000 (10:43 -0800)]
rgw: get rid of a memory allocation

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: remove memory allocation
Yehuda Sadeh [Fri, 21 Feb 2014 00:54:06 +0000 (16:54 -0800)]
rgw: remove memory allocation

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years ago0.78 v0.78
Jenkins [Fri, 21 Mar 2014 22:05:12 +0000 (22:05 +0000)]
0.78

11 years agoMerge pull request #1512 from dachary/wip-jerasure-sse
Sage Weil [Fri, 21 Mar 2014 21:51:30 +0000 (14:51 -0700)]
Merge pull request #1512 from dachary/wip-jerasure-sse

 erasure-code: gf-complete detects SSE at runtime

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1513 from ceph/wip-7438
Loic Dachary [Fri, 21 Mar 2014 21:06:30 +0000 (22:06 +0100)]
Merge pull request #1513 from ceph/wip-7438

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1510 from ceph/wip-pq
Samuel Just [Fri, 21 Mar 2014 20:39:50 +0000 (13:39 -0700)]
Merge pull request #1510 from ceph/wip-pq

osd: some PrioritizedQueue cleanups; dump locking fix; debug pqueue state at high debug level

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoRevert "ReplicatedPG: disallow trans which atomically create and remove an object"
Sage Weil [Fri, 21 Mar 2014 18:57:03 +0000 (11:57 -0700)]
Revert "ReplicatedPG: disallow trans which atomically create and remove an object"

This reverts commit 9ee108428176c93fe48ae5ae95b160eadabca9b6.

This appears to break rgw in its current state; test and fix soon.

11 years agodoc/release-notes: 0.78 notes
Sage Weil [Fri, 21 Mar 2014 15:59:10 +0000 (08:59 -0700)]
doc/release-notes: 0.78 notes

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/wip-multimds-fixes'
Sage Weil [Fri, 21 Mar 2014 15:21:21 +0000 (08:21 -0700)]
Merge remote-tracking branch 'gh/wip-multimds-fixes'

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoerasure-code: gf-complete detects SSE at runtime 1512/head
Loic Dachary [Fri, 21 Mar 2014 13:56:30 +0000 (14:56 +0100)]
erasure-code: gf-complete detects SSE at runtime

And the gf-complete code has been updated to rely on the
gf_internal_t::sse flag instead of #if conditionals.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoautotools: AX_SSE detects the compiler SSE capabilities
Loic Dachary [Fri, 21 Mar 2014 12:07:32 +0000 (13:07 +0100)]
autotools: AX_SSE detects the compiler SSE capabilities

For each SSE feature supported by the compiler

* add the corresponding -msse* flag
* define HAVE_SSE*

Remove AX_EXT because it decides based on the CPU capabilities of the
machine compiling the binary which may or may not be the one running
them.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agotest: Add erasure coding to stress watch test 1513/head
David Zafman [Wed, 19 Mar 2014 23:01:19 +0000 (16:01 -0700)]
test: Add erasure coding to stress watch test

Fixes: #7438
Signed-off-by: David Zafman <david.zafman@inktank.com>
11 years agotest: Reorg multi_stress_watch to prepare for ec option
David Zafman [Wed, 19 Mar 2014 02:35:55 +0000 (19:35 -0700)]
test: Reorg multi_stress_watch to prepare for ec option

If old options are specified maintain backward compatibility

Signed-off-by: David Zafman <david.zafman@inktank.com>
11 years agotest: Fix ceph_filestore_dump.sh test for new EC pool creation
David Zafman [Fri, 21 Mar 2014 02:14:34 +0000 (19:14 -0700)]
test: Fix ceph_filestore_dump.sh test for new EC pool creation

Signed-off-by: David Zafman <david.zafman@inktank.com>
11 years agoMerge pull request #1500 from ceph/wip-tid_t
Sage Weil [Thu, 20 Mar 2014 23:07:29 +0000 (16:07 -0700)]
Merge pull request #1500 from ceph/wip-tid_t

Change tid_t to ceph_tid_t to avoid conflicts with a popular type

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1465 from ceph/wip-s3pm-wusui
Sage Weil [Thu, 20 Mar 2014 23:05:48 +0000 (16:05 -0700)]
Merge pull request #1465 from ceph/wip-s3pm-wusui

Remove code duplication from s3 tests.

11 years agoMerge pull request #1511 from dachary/wip-exclamation
Sage Weil [Thu, 20 Mar 2014 23:04:59 +0000 (16:04 -0700)]
Merge pull request #1511 from dachary/wip-exclamation

tests: use ^ instead of ! as invalid char

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agotests: use ^ instead of ! as invalid char 1511/head
Loic Dachary [Thu, 20 Mar 2014 22:29:29 +0000 (23:29 +0100)]
tests: use ^ instead of ! as invalid char

Because !!! is incorrectly interpreted as an error by gitbuilder.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agodoc/release-notes: stop confusing sphinx
Sage Weil [Thu, 20 Mar 2014 21:42:59 +0000 (14:42 -0700)]
doc/release-notes: stop confusing sphinx

ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/release-notes.rst:594: Unknown target name: "debug".

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1503 from dachary/wip-jerasure-submodules
Sage Weil [Thu, 20 Mar 2014 21:11:44 +0000 (14:11 -0700)]
Merge pull request #1503 from dachary/wip-jerasure-submodules

 erasure-code: add gf-complete / jerasure submodules

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1505 from ceph/wip-7728
Samuel Just [Thu, 20 Mar 2014 21:05:47 +0000 (14:05 -0700)]
Merge pull request #1505 from ceph/wip-7728

Wip 7728

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/firefly'
Sage Weil [Thu, 20 Mar 2014 17:42:26 +0000 (10:42 -0700)]
Merge remote-tracking branch 'gh/firefly'

11 years agoMerge pull request #1509 from guangyy/wip-folder-merge
Samuel Just [Thu, 20 Mar 2014 17:13:05 +0000 (10:13 -0700)]
Merge pull request #1509 from guangyy/wip-folder-merge

Make it possible for FileStore to be in a state which never do merge and keep it backward compatible

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1506 from ceph/wip-7755
Sage Weil [Thu, 20 Mar 2014 16:24:26 +0000 (09:24 -0700)]
Merge pull request #1506 from ceph/wip-7755

PG::find_best_info: fix log_tail component

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1507 from ceph/wip-7733
Sage Weil [Thu, 20 Mar 2014 16:19:58 +0000 (09:19 -0700)]
Merge pull request #1507 from ceph/wip-7733

PG::start_peering_interval: always send_notify if !primary

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1508 from ceph/wip-7777
Sage Weil [Thu, 20 Mar 2014 16:19:10 +0000 (09:19 -0700)]
Merge pull request #1508 from ceph/wip-7777

ReplicatedPG::do_op: delay if snapdir is unreadable

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1312 from cernceph/master
Josh Durgin [Wed, 19 Mar 2014 18:00:58 +0000 (11:00 -0700)]
Merge pull request #1312 from cernceph/master

rados.py: add aio_remove

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1504 from ceph/wip-7780
Josh Durgin [Wed, 19 Mar 2014 17:47:05 +0000 (10:47 -0700)]
Merge pull request #1504 from ceph/wip-7780

objecter: waive OSDMAP_FULL check for MDS

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1476 from ceph/wip-scrub-lock
Samuel Just [Wed, 19 Mar 2014 17:46:32 +0000 (10:46 -0700)]
Merge pull request #1476 from ceph/wip-scrub-lock

osd: do not queue scrub for non-primary

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1502 from ceph/wip-flush-journal-asok
Josh Durgin [Wed, 19 Mar 2014 17:40:47 +0000 (10:40 -0700)]
Merge pull request #1502 from ceph/wip-flush-journal-asok

wip-flush-journal-asok

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoobjecter: waive OSDMAP_FULL check for MDS 1504/head
John Spray [Wed, 19 Mar 2014 11:21:21 +0000 (11:21 +0000)]
objecter: waive OSDMAP_FULL check for MDS

The MDS expects to be able to perform writes to OSDs even
if the full ratio has been reached, in order to journal
file deletions to free space.

Fixes: #7780
Signed-off-by: John Spray <john.spray@inktank.com>
11 years agoqa: test_alloc_hint: flush journal before prodding the FS 1502/head
Ilya Dryomov [Tue, 18 Mar 2014 16:06:12 +0000 (18:06 +0200)]
qa: test_alloc_hint: flush journal before prodding the FS

OSDs that for some reason get behind on processing their op queue break
expect_alloc_hint_eq(), as it pokes the FS and not the journal.  Fix it
by flushing the journal before proceeding with anything else.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoosd: add flush_journal admin socket command
Ilya Dryomov [Tue, 18 Mar 2014 16:06:12 +0000 (18:06 +0200)]
osd: add flush_journal admin socket command

Add flush_journal admin socket command to be able to flush journal to
the permanent store for online osds.  (For offline osds we already have
ceph-osd --flush-journal.)

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agomds: fix typo in MDCache::handle_cache_rejoin_strong 1501/head
Yan, Zheng [Wed, 19 Mar 2014 08:20:21 +0000 (16:20 +0800)]
mds: fix typo in MDCache::handle_cache_rejoin_strong

It should invent dirfrags according to the dirfragtree

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoerasure-code: add gf-complete / jerasure submodules 1503/head
Loic Dachary [Wed, 19 Mar 2014 06:56:41 +0000 (07:56 +0100)]
erasure-code: add gf-complete / jerasure submodules

Instead of copying the files in the ceph repository, which is less
convenient.

When building the headers are ignored, even though they do
not exist. When creating the tarbal with make dist, it fails because
they cannot be found. I misread src/gf_int.h to be include/gf_int.h and
wrongfully thought the submodules were to blame. This is why they were
removed shortly after being added.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoerasure-code: remove copy of gf-complete / jerasure
Loic Dachary [Wed, 19 Mar 2014 06:38:41 +0000 (07:38 +0100)]
erasure-code: remove copy of gf-complete / jerasure

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomds: fix NULL pointer dereference in Server::handle_client_rename
Yan, Zheng [Wed, 19 Mar 2014 06:26:08 +0000 (14:26 +0800)]
mds: fix NULL pointer dereference in Server::handle_client_rename

Inode's parent dentry can be NULL, which causes segment fault in
Locker::acquire_locks

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: avoid infinite loop in MDLog::submit_entry()
Yan, Zheng [Wed, 19 Mar 2014 03:24:53 +0000 (11:24 +0800)]
mds: avoid infinite loop in MDLog::submit_entry()

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoMerge pull request #1496 from ceph/wip-7708
Yan, Zheng [Wed, 19 Mar 2014 04:25:05 +0000 (12:25 +0800)]
Merge pull request #1496 from ceph/wip-7708

mds/Locker: fix null deref on cap import

11 years agoMerge pull request #1499 from ceph/wip-no-version
Sage Weil [Wed, 19 Mar 2014 04:03:01 +0000 (21:03 -0700)]
Merge pull request #1499 from ceph/wip-no-version

Add NO_VERSION to avoid rebuilding ceph_ver.h and relinking

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1498 from ceph/wip-limit-libkeyutils
Sage Weil [Wed, 19 Mar 2014 04:01:13 +0000 (21:01 -0700)]
Merge pull request #1498 from ceph/wip-limit-libkeyutils

Makefiles: remove libkeyutils from every binary except two

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agomds: fix potential invalid pointer dereference
Yan, Zheng [Fri, 14 Mar 2014 08:26:34 +0000 (16:26 +0800)]
mds: fix potential invalid pointer dereference

pin importing inode until subtree importing finishes

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: rdlock dirfragtree lock when renaming directory
Yan, Zheng [Thu, 13 Mar 2014 01:53:04 +0000 (09:53 +0800)]
mds: rdlock dirfragtree lock when renaming directory

This make sure inode importer and inode exporter have consistent
view of dirfrags.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: don't mark scatter locks dirty when dirfrag is dirty
Yan, Zheng [Wed, 19 Mar 2014 03:09:07 +0000 (11:09 +0800)]
mds: don't mark scatter locks dirty when dirfrag is dirty

The journal reply code has check that decides which scatter locks
should be marked as dirty. So don't unconditionally mark scatter
locks dirty when dirfrag is dirty

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: trim other MDS' mdsdir during recovery
Yan, Zheng [Tue, 11 Mar 2014 02:24:06 +0000 (10:24 +0800)]
mds: trim other MDS' mdsdir during recovery

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: remove wrong assertion
Yan, Zheng [Thu, 6 Mar 2014 03:25:33 +0000 (11:25 +0800)]
mds: remove wrong assertion

when handling resolve message, it's possible that bound dirfrags
are missing.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agofragtree_t: fix get_leaves_under()
Yan, Zheng [Thu, 6 Mar 2014 03:20:56 +0000 (11:20 +0800)]
fragtree_t: fix get_leaves_under()

If fragtree is (*^1) and the caller wants leaves under frag 00*.
get_leaves_under() should return empty list.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: improve success rate of subtree exporting
Yan, Zheng [Wed, 5 Mar 2014 10:56:01 +0000 (18:56 +0800)]
mds: improve success rate of subtree exporting

When exporting a subtree, the migrator acquires the required locks,
then freezes the subtree and releases the locks. After subtree is
frozen, it try acquiring the same locks again.

This patch make scatter locks keep in their old states if inode has
exporting dirfrag. It improves the chance that migrator acquires all
required locks when subtree is frozen.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: cleanup CInode::decode_import()
Yan, Zheng [Wed, 5 Mar 2014 07:06:43 +0000 (15:06 +0800)]
mds: cleanup CInode::decode_import()

We have bumped protocol version several times, no need to maintain
compatibility for ancient message.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>