]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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 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 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>
11 years agomds: export file locks together with inode
Yan, Zheng [Wed, 5 Mar 2014 06:39:05 +0000 (14:39 +0800)]
mds: export file locks together with inode

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: re-issue caps after importing caps (rename)
Yan, Zheng [Wed, 5 Mar 2014 05:00:59 +0000 (13:00 +0800)]
mds: re-issue caps after importing caps (rename)

After importing inode, the issued caps can be less than the caps
client wants. So re-issue caps after importing inode.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: fix open remote dirfrag deadlock
Yan, Zheng [Wed, 5 Mar 2014 01:14:56 +0000 (09:14 +0800)]
mds: fix open remote dirfrag deadlock

During subtree migration, the importer may need to open subtree
bound dirfrags. Opening subtree bound dirfrags happens after the
exporter freeze the exporting subtee. So the discover message for
opening subtree bound dirfrags should not wait for any freezing
tree/directory, otherwise deadlock can happen.

In MDCache::handle_discover(), there are two cases can cause
discover messages wait for freezing tree/directory. One case is
fetching bare-bone dirfrags. Another case is, when merging dirfrags,
some of the dirfrags are frozen, some are freezing.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: properly initialize MDCache::fragment_info_t
Yan, Zheng [Tue, 4 Mar 2014 11:32:40 +0000 (19:32 +0800)]
mds: properly initialize MDCache::fragment_info_t

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: avoid issuing zero caps to client
Yan, Zheng [Tue, 4 Mar 2014 08:46:57 +0000 (16:46 +0800)]
mds: avoid issuing zero caps to client

make sure CEPH_CAP_PIN exists in stale caps.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: drop auth pins before waiting for dir unfreeze
Yan, Zheng [Mon, 3 Mar 2014 02:03:35 +0000 (10:03 +0800)]
mds: drop auth pins before waiting for dir unfreeze

Otherwise deadlock can happen

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: fix stack overflow caused by nested dispatch
Yan, Zheng [Thu, 20 Feb 2014 02:54:45 +0000 (10:54 +0800)]
mds: fix stack overflow caused by nested dispatch

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: rollback slave request after slave prepare is journalled
Yan, Zheng [Wed, 19 Feb 2014 05:12:09 +0000 (13:12 +0800)]
mds: rollback slave request after slave prepare is journalled

Resolve ack message can abort slave requests that are being journalled.
The slave rollback does not handle this case properly. The fix is mark
slave request aborted in this case. The slave rollback code is executed
after slave prepare is safely journalled.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: treat flushing as dirty when rejoining scattered locks
Yan, Zheng [Wed, 19 Feb 2014 01:59:39 +0000 (09:59 +0800)]
mds: treat flushing as dirty when rejoining scattered locks

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoChange tid_t to ceph_tid_t to avoid conflicts with a popular type 1500/head
Dan Mick [Fri, 28 Feb 2014 01:29:28 +0000 (17:29 -0800)]
Change tid_t to ceph_tid_t to avoid conflicts with a popular type

Signed-off-by: Dan Mick <dan.mick@inktank.com>
11 years agoAdd NO_VERSION to avoid rebuilding ceph_ver.h and relinking 1499/head
Dan Mick [Thu, 13 Feb 2014 03:28:30 +0000 (19:28 -0800)]
Add NO_VERSION to avoid rebuilding ceph_ver.h and relinking

Signed-off-by: Dan Mick <dan.mick@inktank.com>
11 years agoMakefiles: remove libkeyutils from every binary except two 1498/head
Dan Mick [Thu, 6 Mar 2014 22:33:39 +0000 (14:33 -0800)]
Makefiles: remove libkeyutils from every binary except two

Only rbd and mount_ceph need secret.c, and only secret.c needs libkeyutils;
remove it from LIBCOMMON_DEPS so it's not a dependency for everything,
remove secret.c from libcommon.a, and add it to mount.ceph/rbd's sources;
add LIBKEYID_LIB to mount.ceph/rbd's LDADD.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
11 years agoMerge pull request #1497 from dachary/wip-jerasure
Loic Dachary [Tue, 18 Mar 2014 23:56:36 +0000 (00:56 +0100)]
Merge pull request #1497 from dachary/wip-jerasure

remove gf-complete / jerasure sub modules

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoremove gf-complete / jerasure sub modules 1497/head
Loic Dachary [Tue, 18 Mar 2014 23:12:43 +0000 (00:12 +0100)]
remove gf-complete / jerasure sub modules

and add the source files in the tree.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1494 from dachary/wip-gitmodule-mirrors
Sage Weil [Tue, 18 Mar 2014 22:59:26 +0000 (15:59 -0700)]
Merge pull request #1494 from dachary/wip-gitmodule-mirrors

build: add gf-complete/jerasure to gitmodule_mirrors

11 years agoReplicatedPG::do_op: delay if snapdir is unreadable 1508/head
Samuel Just [Tue, 18 Mar 2014 22:47:44 +0000 (15:47 -0700)]
ReplicatedPG::do_op: delay if snapdir is unreadable

Since all we really need on a snapdir is the context, we really only
need it to be !missing.  However, it might become !missing before it
becomes !unreadable.  That allows ops to end up in the
waiting_for_degraded queue before one in waiting_for_unreadable is
woken, which allows the ops to be reordered.  Rather than reintroduce an
extra waiting_for_missing queue, simply require !unreadable for snapdir
(which implies !misssing).

Fixes: #7777
Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1125 from ceph/wip-mon-docs
João Eduardo Luís [Tue, 18 Mar 2014 22:26:34 +0000 (22:26 +0000)]
Merge pull request #1125 from ceph/wip-mon-docs

wip-mon-docs: Better explain required number of monitors & how to troubleshoot a monitor

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agomds/Locker: fix null deref on cap import 1496/head
Sage Weil [Tue, 18 Mar 2014 21:54:26 +0000 (14:54 -0700)]
mds/Locker: fix null deref on cap import

The session Connection* may be NULL.

Fixes: #7708
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agobuild: add gf-complete/jerasure to gitmodule_mirrors 1494/head
Loic Dachary [Tue, 18 Mar 2014 21:04:13 +0000 (22:04 +0100)]
build: add gf-complete/jerasure to gitmodule_mirrors

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoosd: dump priority queue state on dequeue at level 30 1510/head
Sage Weil [Tue, 18 Mar 2014 20:44:26 +0000 (13:44 -0700)]
osd: dump priority queue state on dequeue at level 30

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: fix OpWQ dump locking
Sage Weil [Tue, 18 Mar 2014 20:20:56 +0000 (13:20 -0700)]
osd: fix OpWQ dump locking

The pqueue is protected by the wq lock, not by qlock; for example, see
OpWQ::_enqueue.  qlock protects the pg_for_processing map only.

Fixes: #7735
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/PrioritizedQueue: include first item's cost in dump
Sage Weil [Tue, 18 Mar 2014 20:21:21 +0000 (13:21 -0700)]
common/PrioritizedQueue: include first item's cost in dump

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/PrioritizedQueue: constify a few things
Sage Weil [Tue, 18 Mar 2014 04:41:40 +0000 (21:41 -0700)]
common/PrioritizedQueue: constify a few things

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/PrioritizedQueue: fix remove_by_class() corner case
Sage Weil [Sat, 15 Mar 2014 03:26:04 +0000 (20:26 -0700)]
common/PrioritizedQueue: fix remove_by_class() corner case

If i is the first entry, then setting cur = begin() sets us up to point at
something that we are about to delete.  Move the check to the end to avoid
this.

Backport: emperor, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agodoc/dev/cache-pool: describe the tiering agent
Sage Weil [Tue, 18 Mar 2014 20:09:29 +0000 (13:09 -0700)]
doc/dev/cache-pool: describe the tiering agent

Signed-off-by: Sage Weil <sage@inktank.com>