]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agoqa: add run_xfstests_krbd.sh wrapper 1906/head
Ilya Dryomov [Tue, 27 May 2014 14:35:36 +0000 (18:35 +0400)]
qa: add run_xfstests_krbd.sh wrapper

As run_xfstests.sh does no longer accept test lists, wrap it to provide
an expunge file with a list of tests we want to skip for krbd runs.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoqa: catch up with xfstests changes
Ilya Dryomov [Tue, 27 May 2014 14:35:36 +0000 (18:35 +0400)]
qa: catch up with xfstests changes

Back in 2013 xfstests were rearranged, which also changed the way
./check parses test lists.  Catch up with those changes.  Note that
tests can no longer be listed in ranges, we only accept individual
tests and test groups (e.g. -g quick).

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoqa: cp run_xfstests.sh run_xfstests-obsolete.sh
Ilya Dryomov [Fri, 30 May 2014 09:37:04 +0000 (13:37 +0400)]
qa: cp run_xfstests.sh run_xfstests-obsolete.sh

run_xfstests.sh is going to be updated in the next commit to be able to
drive newer xfstests.  Among other things, the new xfstests proper
doesn't support listing tests in ranges, which is what the qemu wrapper
(run_xfstests_qemu.sh) relies on.  So keep a copy of the old
run_xfstests.sh around until the qemu vm image is regenerated and the
up-to-date exclusion list for that kernel is shaken out.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agodocumentation: update osd pool default size from 2 to 3. 1851/head
Florent Flament [Thu, 22 May 2014 12:08:54 +0000 (14:08 +0200)]
documentation: update osd pool default size from 2 to 3.

Fixes: #7725
Signed-off-by: Florent Flament <florent.flament@cloudwatt.com>
11 years agoMerge pull request #1815 from ceph/osd-metadata
Loic Dachary [Thu, 22 May 2014 08:58:07 +0000 (10:58 +0200)]
Merge pull request #1815 from ceph/osd-metadata

osd: include osd_objectstore in metadata reported to mon

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1793 from ceph/wip-multimds
Gregory Farnum [Thu, 22 May 2014 05:53:14 +0000 (22:53 -0700)]
Merge pull request #1793 from ceph/wip-multimds

Speed up several cross-MDS operations by reducing the number of two-phase commit disk accesses we have to go through.

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #1838 from ceph/wip-client-time
Sage Weil [Thu, 22 May 2014 00:29:52 +0000 (17:29 -0700)]
Merge pull request #1838 from ceph/wip-client-time

fs: include client timestamp in all mds requests

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #1835 from ceph/wip-8332
Sage Weil [Wed, 21 May 2014 20:20:45 +0000 (13:20 -0700)]
Merge pull request #1835 from ceph/wip-8332

HashIndex: in cleanup, interpret missing dir as completed merge

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1834 from ceph/wip-8334
Sage Weil [Wed, 21 May 2014 20:19:54 +0000 (13:19 -0700)]
Merge pull request #1834 from ceph/wip-8334

Wip 8334

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agodoc/release-notes: v0.67.9
Sage Weil [Wed, 21 May 2014 20:00:35 +0000 (13:00 -0700)]
doc/release-notes: v0.67.9

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1848 from yuyuyu101/librbd-flush
Sage Weil [Wed, 21 May 2014 17:22:35 +0000 (10:22 -0700)]
Merge pull request #1848 from yuyuyu101/librbd-flush

Avoid extra check for clean object

Backport: firefly, dumpling
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1849 from ceph/wip-mon-get-version
Sage Weil [Wed, 21 May 2014 15:40:16 +0000 (08:40 -0700)]
Merge pull request #1849 from ceph/wip-mon-get-version

mon: set MMonGetVersionReply tid

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoAvoid extra check for clean object 1848/head
Haomai Wang [Wed, 21 May 2014 10:12:22 +0000 (18:12 +0800)]
Avoid extra check for clean object

We needn't to check clean object via buffer state, skip the clean object.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
11 years agomon: set MMonGetVersionReply tid 1849/head
Ilya Dryomov [Mon, 12 May 2014 08:30:45 +0000 (12:30 +0400)]
mon: set MMonGetVersionReply tid

Currently we don't set MMonGetVersionReply tid even if the original
MMonGetVersion message had a non-zero tid.  This is bad for the kernel
client, which has the infrastructure in place that relies on tids to
lookup message buffers and contexts.  To kick off transitioning away
from the workaround, set MMonGetVersionReply tid to the tid of the
original MMonGetVersion message.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoMerge pull request #1723 from ctheune/patch-1
Sage Weil [Wed, 21 May 2014 03:22:55 +0000 (20:22 -0700)]
Merge pull request #1723 from ctheune/patch-1

Fix formatting of header

11 years agoMerge pull request #1845 from wdneto/master
John Wilkins [Wed, 21 May 2014 00:40:29 +0000 (17:40 -0700)]
Merge pull request #1845 from wdneto/master

doc: Update manual-deployment.rst

11 years agoMerge pull request #1828 from nereocystis/faq-fix
John Wilkins [Wed, 21 May 2014 00:38:11 +0000 (17:38 -0700)]
Merge pull request #1828 from nereocystis/faq-fix

doc: fix link to FAQ

11 years agoMerge pull request #1829 from nereocystis/preflight-cleanup
John Wilkins [Wed, 21 May 2014 00:37:56 +0000 (17:37 -0700)]
Merge pull request #1829 from nereocystis/preflight-cleanup

doc: Clean up pre-flight documentation

11 years agoMerge pull request #1833 from nereocystis/admin-node-doc
John Wilkins [Wed, 21 May 2014 00:37:07 +0000 (17:37 -0700)]
Merge pull request #1833 from nereocystis/admin-node-doc

doc: mention admin-node in common documentation

11 years agoMerge pull request #1837 from nereocystis/quick-ceph-deploy-cleanup
John Wilkins [Wed, 21 May 2014 00:35:56 +0000 (17:35 -0700)]
Merge pull request #1837 from nereocystis/quick-ceph-deploy-cleanup

doc: quick-ceph-deploy cleanup

11 years agoMerge pull request #1841 from ceph/wip-8373
Sage Weil [Wed, 21 May 2014 00:10:39 +0000 (17:10 -0700)]
Merge pull request #1841 from ceph/wip-8373

Fixes for crush ruleset selection during pool creation (Wip 8373)

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1836 from ceph/wip-doc-openstack
John Wilkins [Wed, 21 May 2014 00:06:43 +0000 (17:06 -0700)]
Merge pull request #1836 from ceph/wip-doc-openstack

doc: Clarifications to Ceph Block Device and OpenStack documentation.

11 years agoMerge pull request #1842 from ceph/wip-buildroot
Sage Weil [Tue, 20 May 2014 22:27:26 +0000 (15:27 -0700)]
Merge pull request #1842 from ceph/wip-buildroot

ceph.spec.in: remove BuildRoot

11 years agoMerge pull request #1844 from onlyjob/hppa
Sage Weil [Tue, 20 May 2014 22:26:56 +0000 (15:26 -0700)]
Merge pull request #1844 from onlyjob/hppa

Define AO_REQUIRE_CAS (fixes FTBFS on 'hppa')

Backport: firefly
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoUpdate manual-deployment.rst 1845/head
Aristoteles Neto [Tue, 20 May 2014 22:20:55 +0000 (10:20 +1200)]
Update manual-deployment.rst

- When creating the OSD data, specify osd-uuid so that it matches when the osd is first created.
- Modify caps when adding osd auth to match what ceph-deploy does.

11 years agoDefine AO_REQUIRE_CAS (fixes FTBFS on 'hppa') 1844/head
Dmitry Smirnov [Tue, 20 May 2014 21:56:43 +0000 (07:56 +1000)]
Define AO_REQUIRE_CAS (fixes FTBFS on 'hppa')

 to fix FTBFS due to undeclared atomic functions.

As reported

    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748571

by John David Anglin <dave.anglin@bell.net>

~~~~
./include/atomic.h: In member function 'size_t ceph::atomic_t::inc()':
./include/atomic.h:42:36: error: 'AO_fetch_and_add1' was not declared in this scope
       return AO_fetch_and_add1(&val) + 1;
                                    ^
./include/atomic.h: In member function 'size_t ceph::atomic_t::dec()':
./include/atomic.h:45:42: error: 'AO_fetch_and_sub1_write' was not declared in this scope
       return AO_fetch_and_sub1_write(&val) - 1;
                                          ^
./include/atomic.h: In member function 'void ceph::atomic_t::add(size_t)':
./include/atomic.h:48:36: error: 'AO_fetch_and_add' was not declared in this scope
       AO_fetch_and_add(&val, add_me);
                                    ^
./include/atomic.h: In member function 'void ceph::atomic_t::sub(int)':
./include/atomic.h:52:48: error: 'AO_fetch_and_add_write' was not declared in this scope
       AO_fetch_and_add_write(&val, (AO_t)negsub);
                                                ^
./include/atomic.h: In member function 'size_t ceph::atomic_t::dec()':
./include/atomic.h:46:5: warning: control reaches end of non-void function [-Wreturn-type]
     }
     ^
make[5]: *** [cls/user/cls_user_client.o] Error 1
~~~~

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
11 years agomon: Fix check of ruleset id on pool update 1841/head
John Spray [Tue, 20 May 2014 15:50:18 +0000 (16:50 +0100)]
mon: Fix check of ruleset id on pool update

This code was using CrushWrapper::rule_exists, which
checks for a *rule* existing, whereas the value being
set is a *ruleset*.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomon: Fix default replicated pool ruleset choice
John Spray [Tue, 20 May 2014 15:25:19 +0000 (16:25 +0100)]
mon: Fix default replicated pool ruleset choice

Specifically, in the case where the configured
default ruleset is CEPH_DEFAULT_CRUSH_REPLICATED_RULESET,
instead of assuming ruleset 0 exists, choose the lowest
numbered ruleset.

In the case where an explicit ruleset is passed to
OSDMonitor::prepare_pool_crush_ruleset, verify
that it really exists.

The idea is to eliminate cases where a pool could
exist with its crush ruleset set to something
other than a value ruleset ID.

Fixes: #8373
Signed-off-by: John Spray <john.spray@inktank.com>
11 years agomds: remove unused Mutation::now 1838/head
Sage Weil [Tue, 20 May 2014 22:04:53 +0000 (15:04 -0700)]
mds: remove unused Mutation::now

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: use mds_stamp for mksnap
Sage Weil [Tue, 20 May 2014 22:07:07 +0000 (15:07 -0700)]
mds: use mds_stamp for mksnap

Use the server timestamp for the snapshot timestamp.  This could arguably
be the client timestamp, but I think snapshot creation times are a bit
more important to have accurate timestamps on, and this should not be
something that existing client apps will strongly depend on.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: reset mds_stamp for readdir, rename, link
Sage Weil [Tue, 20 May 2014 22:04:03 +0000 (15:04 -0700)]
mds: reset mds_stamp for readdir, rename, link

These ops to complicated work prior to starting the real operation, like
fetching missing directories, or opening remote dirfrags, creating
snaprealms.  Reset the mds timestamp after this slow work has completed.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: use real timestamp for readdir leases
Sage Weil [Tue, 20 May 2014 22:00:37 +0000 (15:00 -0700)]
mds: use real timestamp for readdir leases

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: use client-provided time stamp for user-visible file metadata
Sage Weil [Tue, 20 May 2014 21:59:35 +0000 (14:59 -0700)]
mds: use client-provided time stamp for user-visible file metadata

Use the op_stamp from the MDRequest, populated by the MClientRequest when
possible, for setting timestamps on user-visible metadata (like ctime,
mtime).

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: do the balancer and propagation timers based on mds_stmap
Sage Weil [Tue, 20 May 2014 21:57:30 +0000 (14:57 -0700)]
mds: do the balancer and propagation timers based on mds_stmap

Use the (more) stable time stamp for doing the balancer's temperature
tracking and associated decay.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: do rstat timestamps (rctime, fragstat mtime) in terms of op stamp
Sage Weil [Tue, 20 May 2014 21:55:05 +0000 (14:55 -0700)]
mds: do rstat timestamps (rctime, fragstat mtime) in terms of op stamp

Use the op (client) timestamp for the recursive stats, for santity's sake.
Note that since this is monotonically increasing, the danger here is
that we lose track of nested changes due to skewed client clocks.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: make sure mds_stamp is set when we journal
Sage Weil [Tue, 20 May 2014 21:52:59 +0000 (14:52 -0700)]
mds: make sure mds_stamp is set when we journal

This is a catch-all that we are carrying over from before.  It may not
be strictly necessary, but I'm not inclined to check the code for
Mutation users who didn't call acquire_locks().

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: set mds_stamp on lock acquisition
Sage Weil [Tue, 20 May 2014 21:51:35 +0000 (14:51 -0700)]
mds: set mds_stamp on lock acquisition

Normally acquire_locks() will set this for us.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: add {mds,op}_stamp to Mutation
Sage Weil [Tue, 20 May 2014 21:50:46 +0000 (14:50 -0700)]
mds: add {mds,op}_stamp to Mutation

With getters, setters.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoceph.spec.in: remove BuildRoot 1842/head
Sage Weil [Tue, 20 May 2014 20:41:35 +0000 (13:41 -0700)]
ceph.spec.in: remove BuildRoot

Deprecated

Fixes: #8143
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoFix formatting of header 1723/head
Christian Theune [Thu, 24 Apr 2014 07:42:35 +0000 (09:42 +0200)]
Fix formatting of header

The header was displaying the newline as a simple "n" due to quoting in the doc.

Signed-off-by: Christian Theune <ct@gocept.com>
11 years agoMerge pull request #1839 from ceph/wip-8338
Gregory Farnum [Mon, 19 May 2014 23:53:55 +0000 (16:53 -0700)]
Merge pull request #1839 from ceph/wip-8338

OSD: verify that client ops are targeted correctly in the current epoch

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoclient: set timestamp in MDS requests
Sage Weil [Mon, 19 May 2014 22:36:14 +0000 (15:36 -0700)]
client: set timestamp in MDS requests

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomds: include timestamp in MClientRequest
Sage Weil [Mon, 19 May 2014 22:36:00 +0000 (15:36 -0700)]
mds: include timestamp in MClientRequest

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1830 from salehe/docfix-1
Josh Durgin [Mon, 19 May 2014 22:31:43 +0000 (15:31 -0700)]
Merge pull request #1830 from salehe/docfix-1

rados.py: clarify documentation of recent change on write return value

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agodoc: clarify openstack cow sentence 1836/head
Josh Durgin [Mon, 19 May 2014 22:25:37 +0000 (15:25 -0700)]
doc: clarify openstack cow sentence

Missing subject, and now applies to disks in general.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
11 years agodoc: note cinder multi-backend restriction
Josh Durgin [Mon, 19 May 2014 22:21:12 +0000 (15:21 -0700)]
doc: note cinder multi-backend restriction

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
11 years agodoc: link to ephemeral rbd patches
Josh Durgin [Mon, 19 May 2014 22:14:29 +0000 (15:14 -0700)]
doc: link to ephemeral rbd patches

These are necessary for using ephemeral rbd with Havana and Icehouse.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
11 years agodoc: quick-ceph-deploy cleanup 1837/head
Kevin Dalley [Mon, 19 May 2014 22:03:35 +0000 (15:03 -0700)]
doc: quick-ceph-deploy cleanup
Improve documentation in quick-ceph-deploy.rst
Use admin-node consistently.
ceph should be installed on admin-node for the following reasons:
 "ceph-deploy admin admin-node" assumes that /etc/ceph exists.
 "ceph health" requires the use of ceph

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agoMerge pull request #1804 from ceph/wip-8104
Samuel Just [Mon, 19 May 2014 21:41:17 +0000 (14:41 -0700)]
Merge pull request #1804 from ceph/wip-8104

Wip 8104

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agodoc: mention admin-node in common documentation 1833/head
Kevin Dalley [Mon, 19 May 2014 21:36:56 +0000 (14:36 -0700)]
doc: mention admin-node in common documentation

This change uses admin-node in the quick-common.rst file, including
the graph. This name is already used in
quick-ceph-deploy.rst.

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agoReplicatedPG::start_flush: fix clone deletion case 1832/head 1834/head
Samuel Just [Fri, 16 May 2014 23:56:33 +0000 (16:56 -0700)]
ReplicatedPG::start_flush: fix clone deletion case

dsnapc.snaps will be non-empty most of the time if there
have been snaps before prev_snapc.  What we really want to
know is whether there are any snaps between oi.snaps.back()
and prev_snapc.

Fixes: 8334
Backport: firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoHashIndex: in cleanup, interpret missing dir as completed merge 1831/head 1835/head
Samuel Just [Fri, 16 May 2014 03:53:27 +0000 (20:53 -0700)]
HashIndex: in cleanup, interpret missing dir as completed merge

If we stop between unlinking the empty subdir and removing the root
merge marker, we get ENOENT on the get_info.  That's actually fine.

Backport: firefly
Fixes: 8332
Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agorados.py: clarify recent change on write return value 1830/head
Mohammad Salehe [Thu, 8 May 2014 08:03:42 +0000 (12:33 +0430)]
rados.py: clarify recent change on write return value

Signed-off-by: Mohammad Salehe <salehe+dev@gmail.com>
11 years agodoc: Clean up pre-flight documentation 1829/head
Kevin Dalley [Mon, 19 May 2014 20:38:31 +0000 (13:38 -0700)]
doc: Clean up pre-flight documentation
Mention recent Ceph releases.
Move important message about sudo and ceph-deploy closer to the use of
ceph-deploy.
Mention files created by ceph-deploy comment
Separate apt-get from yum command

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agodoc: fix link to FAQ 1828/head
Kevin Dalley [Mon, 19 May 2014 18:59:46 +0000 (11:59 -0700)]
doc: fix link to FAQ
The location of the ceph wiki FAQ has changed.
Now, the link from ceph documentation matches the current FAQ location

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agoMerge pull request #1820 from ceph/wip-osd-refs
Gregory Farnum [Mon, 19 May 2014 18:24:05 +0000 (11:24 -0700)]
Merge pull request #1820 from ceph/wip-osd-refs

osd: fix a session ref leak, and an unlikely race

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agodoc: Restored glance_api_version=2 setting.
John Wilkins [Mon, 19 May 2014 18:18:44 +0000 (11:18 -0700)]
doc: Restored glance_api_version=2 setting.

Fixes: #8347
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Mon, 19 May 2014 16:49:28 +0000 (09:49 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agoMerge pull request #1823 from dachary/wip-mailmap
Loic Dachary [Mon, 19 May 2014 12:58:49 +0000 (14:58 +0200)]
Merge pull request #1823 from dachary/wip-mailmap

mailmap: Sahid Orentino Ferdjaoui affiliation

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agomailmap: Sahid Orentino Ferdjaoui affiliation 1823/head
Loic Dachary [Mon, 19 May 2014 12:49:01 +0000 (14:49 +0200)]
mailmap: Sahid Orentino Ferdjaoui affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1822 from sahid/master
Loic Dachary [Mon, 19 May 2014 12:40:00 +0000 (14:40 +0200)]
Merge pull request #1822 from sahid/master

Ensure autogen.sh to be executed at the top-level

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoEnsure autogen.sh to be executed at the top-level 1822/head
Sahid Orentino Ferdjaoui [Mon, 19 May 2014 11:55:36 +0000 (13:55 +0200)]
Ensure autogen.sh to be executed at the top-level

The commit adds a test to ensure that user executes
'autogen.sh' at the top-level of the directory.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agomds: queue waiters in MDCache::force_dir_fragment() 1793/head
Yan, Zheng [Sun, 18 May 2014 06:44:33 +0000 (14:44 +0800)]
mds: queue waiters in MDCache::force_dir_fragment()

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: fix remote auth pin race
Yan, Zheng [Wed, 14 May 2014 06:32:34 +0000 (14:32 +0800)]
mds: fix remote auth pin race

When removing auth unpinned objects from mdr->remote_auth_pins,
Server::handle_slave_auth_pin() checks object's authority to decide
if the object was auth pinned by a given MDS. This method isn't
reliable because when object isn't auth pinned, its authority may
change.

The fix is remember from which MDS an objects was auth pinned.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoMerge pull request #1821 from ceph/mds-optracker-fixes
Yan, Zheng [Sun, 18 May 2014 05:42:51 +0000 (13:42 +0800)]
Merge pull request #1821 from ceph/mds-optracker-fixes

mds: fix Server::submit_mdlog_entry()

11 years agomds: fix Server::submit_mdlog_entry() 1821/head
Yan, Zheng [Sun, 18 May 2014 05:38:19 +0000 (13:38 +0800)]
mds: fix Server::submit_mdlog_entry()

mdr can be NULL when rolling back slave update

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: drop locks after removing import/export state
Yan, Zheng [Sat, 10 May 2014 05:42:33 +0000 (13:42 +0800)]
mds: drop locks after removing import/export state

dropping locks can dispatch requests, which may export the same
dirfrag again.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: try trimming exported objects
Yan, Zheng [Fri, 9 May 2014 07:07:45 +0000 (15:07 +0800)]
mds: try trimming exported objects

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: journal rename source inode when rollback rename
Yan, Zheng [Fri, 9 May 2014 01:21:16 +0000 (09:21 +0800)]
mds: journal rename source inode when rollback rename

rename changes the source inode's ctime. rollback changes ctime back
to its original value.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: allow early reply when there is no journaled slave update
Yan, Zheng [Thu, 8 May 2014 09:02:18 +0000 (17:02 +0800)]
mds: allow early reply when there is no journaled slave update

Early reply should be Ok when there were slave requests, but none
of them modifies any object.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: skip journaling slave rename when possible
Yan, Zheng [Thu, 8 May 2014 07:14:43 +0000 (15:14 +0800)]
mds: skip journaling slave rename when possible

Rename operation can affect three dentries and two inodes. For MDS
who receives rename slave request, but isn't authority of any of
these dentries/inodes and doesn't have any auth subtree under these
dentries/inodes, journaling slave rename can be skipped.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: include all of directory inode's replicas in rmdir witnesses
Yan, Zheng [Thu, 8 May 2014 05:55:25 +0000 (13:55 +0800)]
mds: include all of directory inode's replicas in rmdir witnesses

If a MDS crashed after journaling a rmdir operation, but before sending
MDentryUnlink messages. Survivor MDS may have incorrect linkage for the
removed directory. Later when the MDS recovers, the incorrect linkage
can cause survivor MDS crash.

The fix is include all of directory inode's replicas in rmdir witnesses
list. When receiving a rmdir slave request, MDS who has no auth subtree
in the directory only need to update its cache and send reply (doesn't
need to journal the slave request).

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agomds: journal EImportFinish after adjusting subtree auth
Yan, Zheng [Wed, 7 May 2014 02:54:07 +0000 (10:54 +0800)]
mds: journal EImportFinish after adjusting subtree auth

Submitting EImportFinish may journal an extra ESubtreeMap as side
effect. The ESubtreeMap should reflects subtree state after import
is finished.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agoosd: fix narrow session refcount race 1820/head
Sage Weil [Sun, 18 May 2014 01:33:36 +0000 (18:33 -0700)]
osd: fix narrow session refcount race

The set_priv() call consumes a ref.  Technically the local 's' is not
actually owned by use by the time we get to the con_front set_priv().

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: fix session leak in ms_handle_fast_connect
Sage Weil [Sun, 18 May 2014 01:32:20 +0000 (18:32 -0700)]
osd: fix session leak in ms_handle_fast_connect

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1809 from ceph/wip-4354-mds-optracker
Gregory Farnum [Fri, 16 May 2014 22:17:00 +0000 (15:17 -0700)]
Merge pull request #1809 from ceph/wip-4354-mds-optracker

MDS OpTracker

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMDS: add admin socket cleanup on shutdown 1809/head
Greg Farnum [Fri, 16 May 2014 22:15:55 +0000 (15:15 -0700)]
MDS: add admin socket cleanup on shutdown

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #1817 from ceph/wip-osdmon-pa-wait
Ilya Dryomov [Fri, 16 May 2014 16:37:05 +0000 (20:37 +0400)]
Merge pull request #1817 from ceph/wip-osdmon-pa-wait

OSDMonitor: set next commit in mon primary-affinity reply

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoOSDMonitor: set next commit in mon primary-affinity reply 1817/head
Ilya Dryomov [Fri, 16 May 2014 15:03:13 +0000 (19:03 +0400)]
OSDMonitor: set next commit in mon primary-affinity reply

Commit 8c5c55c8b47e ("mon: set next commit in mon command replies")
fixed MMonCommand replies to include the right version, but the
primary-affinity handler was authored before that.  Fix it.

Backport: firefly
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoMerge pull request #1816 from onlyjob/docs
Gregory Farnum [Fri, 16 May 2014 14:08:53 +0000 (07:08 -0700)]
Merge pull request #1816 from onlyjob/docs

sample.ceph.conf: minor update

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agosample.ceph.conf: minor update 1816/head
Dmitry Smirnov [Fri, 16 May 2014 10:26:38 +0000 (20:26 +1000)]
sample.ceph.conf: minor update

 * Moved filestore settings above [osd.*] declarations otherwise
   (if uncommented) those settings might be applied only to last
   OSD which is not very obvious.
 * Few options added.

11 years agoOSD: fix an osdmap_subscribe interface misuse
Greg Farnum [Thu, 15 May 2014 23:50:43 +0000 (16:50 -0700)]
OSD: fix an osdmap_subscribe interface misuse

When calling osdmap_subscribe, you have to pass an epoch newer than the
current map's. _maybe_boot() was not doing this correctly -- we would
fail a check for being *in* the monitor's existing map range, and then
pass along the map prior to the monitor's range. But if we were exactly
one behind, that value would be our current epoch, and the request would
get dropped. So instead, make sure we are not *in contact* with the monitor's
existing map range.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd: include osd_objectstore in metadata reported to mon 1815/head
Sage Weil [Thu, 15 May 2014 21:44:05 +0000 (14:44 -0700)]
osd: include osd_objectstore in metadata reported to mon

Provide visibility into the OSD backend.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoworkunits: provide some output in the dirfrag.sh test
Greg Farnum [Wed, 14 May 2014 21:20:19 +0000 (14:20 -0700)]
workunits: provide some output in the dirfrag.sh test

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #1803 from onlyjob/java-gcj
Gregory Farnum [Wed, 14 May 2014 20:24:20 +0000 (13:24 -0700)]
Merge pull request #1803 from onlyjob/java-gcj

Java GCJ fixes

Reviewed-by: Greg Farnum <greg@inktank.com>
Acked-by: Noah Watkins <noahwatkins@gmail.com>
11 years agoosd_types: remove the pool_id argument from (is|check)_new_interval 1804/head
Samuel Just [Wed, 14 May 2014 20:16:45 +0000 (13:16 -0700)]
osd_types: remove the pool_id argument from (is|check)_new_interval

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoPG: replace is_split, acting_up_affected with should_restart_peering
Samuel Just [Wed, 7 May 2014 18:03:15 +0000 (11:03 -0700)]
PG: replace is_split, acting_up_affected with should_restart_peering

This way, we restart peering using the same criteria as
check_new_interval.

Fixes: #8104
Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoosd_types: factor out is_new_interval from check_new_interval
Samuel Just [Wed, 7 May 2014 18:02:16 +0000 (11:02 -0700)]
osd_types: factor out is_new_interval from check_new_interval

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1806 from ceph/wip-8011
Samuel Just [Wed, 14 May 2014 19:12:44 +0000 (12:12 -0700)]
Merge pull request #1806 from ceph/wip-8011

ReplicatedPG: block scrub on blocked object contexts

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agodoc: Clarified Debian uses sysvinit.
John Wilkins [Wed, 14 May 2014 07:23:22 +0000 (00:23 -0700)]
doc: Clarified Debian uses sysvinit.

Fixes: #7182
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added rgw print continue guidance.
John Wilkins [Wed, 14 May 2014 07:14:30 +0000 (00:14 -0700)]
doc: Added rgw print continue guidance.

Fixes: #7731
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Minor edit.
John Wilkins [Wed, 14 May 2014 07:13:41 +0000 (00:13 -0700)]
doc: Minor edit.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added clarifying text to CRUSH add command.
John Wilkins [Wed, 14 May 2014 07:02:09 +0000 (00:02 -0700)]
doc: Added clarifying text to CRUSH add command.

Fixes: #8322
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Omitted glance_api_version=2 to fix creating images from volumes.
John Wilkins [Wed, 14 May 2014 06:20:36 +0000 (23:20 -0700)]
doc: Omitted glance_api_version=2 to fix creating images from volumes.

Fixes: #8347
11 years agodoc: Changed example to use virtio and put key usage into one line.
John Wilkins [Wed, 14 May 2014 06:18:50 +0000 (23:18 -0700)]
doc: Changed example to use virtio and put key usage into one line.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoMerge pull request #1802 from ceph/wip-mds-misc
Sage Weil [Wed, 14 May 2014 01:46:12 +0000 (18:46 -0700)]
Merge pull request #1802 from ceph/wip-mds-misc

Wip mds misc

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1810 from ceph/wip-fedora
Sage Weil [Wed, 14 May 2014 01:11:11 +0000 (18:11 -0700)]
Merge pull request #1810 from ceph/wip-fedora

doc: update instructions for RPM distros

11 years agoImprove Bash completion for various tools
Wido den Hollander [Tue, 13 May 2014 21:48:25 +0000 (23:48 +0200)]
Improve Bash completion for various tools

11 years agotest: fix some templates to match new output code
Greg Farnum [Tue, 13 May 2014 20:15:28 +0000 (13:15 -0700)]
test: fix some templates to match new output code

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agodoc: update instructions for RPM distros 1810/head
John Spray [Tue, 13 May 2014 16:32:03 +0000 (17:32 +0100)]
doc: update instructions for RPM distros

Fix RPM building instructions: this has been broken since
libs3 was included inline in the ceph repo as a submodule.
"rpmbuild -tb" was concatenating the ceph.spec and
libs3.spec files, resulting in something that didn't work.

Also, the instructions suggested downloading a .tar.gz file
whereas the specfile requires a .tar.bz2 file.

Also, add a convenient yum command line for getting the compile
dependencies on Fedora 20.

Signed-off-by: John Spray <john.spray@inktank.com>