]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agolibrbd: check for presence of journal before attempting to remove 6737/head
Jason Dillaman [Mon, 30 Nov 2015 17:36:13 +0000 (12:36 -0500)]
librbd: check for presence of journal before attempting to remove

Fixes: #13912
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: helper method to determine if journal exists
Jason Dillaman [Mon, 30 Nov 2015 17:31:02 +0000 (12:31 -0500)]
journal: helper method to determine if journal exists

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6625 from dillaman/wip-12698
Josh Durgin [Wed, 25 Nov 2015 03:01:14 +0000 (19:01 -0800)]
Merge pull request #6625 from dillaman/wip-12698

librbd: integrate journaling for maintenance operations

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6687 from dillaman/wip-journal-replay-fixes
Josh Durgin [Wed, 25 Nov 2015 00:37:52 +0000 (16:37 -0800)]
Merge pull request #6687 from dillaman/wip-journal-replay-fixes

journal: support replaying beyond skipped splay objects

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6685 from dachary/wip-erasure-code-benchmark
Loic Dachary [Tue, 24 Nov 2015 20:25:42 +0000 (21:25 +0100)]
Merge pull request #6685 from dachary/wip-erasure-code-benchmark

qa: erasure-code benchmark plugin selection

Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>
9 years agoMerge pull request #6292 from dx9/wip-12406-res_nquery
Yehuda Sadeh [Tue, 24 Nov 2015 20:09:10 +0000 (12:09 -0800)]
Merge pull request #6292 from dx9/wip-12406-res_nquery

rgw/rgw_resolve: fallback to res_query when res_nquery not implemented

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #6236 from guangyy/err-msg
Sage Weil [Tue, 24 Nov 2015 20:00:07 +0000 (15:00 -0500)]
Merge pull request #6236 from guangyy/err-msg

osd: use pg id (without shard) when referring the PG

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6610 from ktdreyer/wip-build-doc-lxml
Sage Weil [Tue, 24 Nov 2015 17:49:08 +0000 (12:49 -0500)]
Merge pull request #6610 from ktdreyer/wip-build-doc-lxml

admin/build-doc: add lxml dependencies on debian

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6323 from dingshang/wip-cephfs-dingshang
Gregory Farnum [Tue, 24 Nov 2015 15:16:47 +0000 (10:16 -0500)]
Merge pull request #6323 from dingshang/wip-cephfs-dingshang

pybind/cephfs: add symlink and its unit test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge tag 'v10.0.0'
Sage Weil [Tue, 24 Nov 2015 13:41:04 +0000 (08:41 -0500)]
Merge tag 'v10.0.0'

v10.0.0

9 years agoMerge pull request #6684 from jcsp/wip-fix-scrub
Yan, Zheng [Tue, 24 Nov 2015 02:56:30 +0000 (10:56 +0800)]
Merge pull request #6684 from jcsp/wip-fix-scrub

mds: fix scrub_path

9 years agojournal: support replay passed skipped splay objects 6687/head
Jason Dillaman [Mon, 23 Nov 2015 22:46:55 +0000 (17:46 -0500)]
journal: support replay passed skipped splay objects

It's possible for a splay object within a set to be skipped
if the set is closed due to a full object within the set.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: verify that journal player can handle skipped journal objects
Jason Dillaman [Mon, 23 Nov 2015 19:35:43 +0000 (14:35 -0500)]
tests: verify that journal player can handle skipped journal objects

It's possible for a journal object to not exist if another journal object
within the same object set filled up before records were written.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #6605 from yuyuyu101/wip-13797
Gregory Farnum [Mon, 23 Nov 2015 22:33:20 +0000 (17:33 -0500)]
Merge pull request #6605 from yuyuyu101/wip-13797

ceph_test_msgr: Use send_message instead of keepalive to wakeup connection

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6495 from objoo/master
Loic Dachary [Mon, 23 Nov 2015 22:31:06 +0000 (23:31 +0100)]
Merge pull request #6495 from objoo/master

Mailmap updates for infernalis.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agomailmap: Jenkins affiliation 6495/head
Yann Dupont [Sun, 8 Nov 2015 17:40:20 +0000 (18:40 +0100)]
mailmap: Jenkins affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
9 years agomailmap: Burkhard Linke affiliation
Yann Dupont [Sun, 8 Nov 2015 20:39:40 +0000 (21:39 +0100)]
mailmap: Burkhard Linke affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
9 years agomailmap: Chen Dihao affiliation
Yann Dupont [Sun, 8 Nov 2015 17:11:09 +0000 (18:11 +0100)]
mailmap: Chen Dihao affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
9 years agomailmap: Wei Qian affiliation
Yann Dupont [Sun, 8 Nov 2015 15:10:36 +0000 (16:10 +0100)]
mailmap: Wei Qian affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
9 years agoqa: erasure-code-benchmark technique and plugin selection 6685/head
Loic Dachary [Mon, 23 Nov 2015 19:59:28 +0000 (20:59 +0100)]
qa: erasure-code-benchmark technique and plugin selection

Update the PLUGINS variable that was no longer used. Add the TECHNIQUES
variable to control which techniques are compared.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoqa: erasure-code has --erasure-code-dir
Loic Dachary [Mon, 23 Nov 2015 19:21:42 +0000 (20:21 +0100)]
qa: erasure-code has --erasure-code-dir

It is used instead of the obsoleted --parameter directory= to specify
the location of the erasure code directory plugins.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomds: fix scrub_path 6684/head
John Spray [Mon, 23 Nov 2015 17:39:14 +0000 (17:39 +0000)]
mds: fix scrub_path

This was tripping up over calling
validate_disk_state with no ScrubHeader.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #6679 from suckowbiz/patch-1
Loic Dachary [Mon, 23 Nov 2015 16:33:52 +0000 (17:33 +0100)]
Merge pull request #6679 from suckowbiz/patch-1

Fixed typos

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc/release-notes: fix typo
Sage Weil [Mon, 23 Nov 2015 16:02:58 +0000 (11:02 -0500)]
doc/release-notes: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/release-notes: final v10.0.0 notes
Sage Weil [Mon, 23 Nov 2015 16:00:29 +0000 (11:00 -0500)]
doc/release-notes: final v10.0.0 notes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc: fix message typos in systemd 6679/head
suckowbiz [Mon, 23 Nov 2015 11:17:45 +0000 (12:17 +0100)]
doc: fix message typos in systemd

Signed-off-by: Tobias Suckow <tobias@suckow.biz>
9 years agoMerge branch 'master' of github.com:ceph/ceph
Sage Weil [Mon, 23 Nov 2015 14:01:30 +0000 (09:01 -0500)]
Merge branch 'master' of github.com:ceph/ceph

9 years agoMerge pull request #6666 from dachary/wip-release-notes
Sage Weil [Mon, 23 Nov 2015 14:01:48 +0000 (09:01 -0500)]
Merge pull request #6666 from dachary/wip-release-notes

release-notes: draft v10.0.0 release notes

9 years agoMerge branch 'wip-bigbang'
Sage Weil [Mon, 23 Nov 2015 13:39:46 +0000 (08:39 -0500)]
Merge branch 'wip-bigbang'

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotest/mon/osd-crush.sh: escape ceph tell mon.*
Sage Weil [Fri, 20 Nov 2015 15:17:37 +0000 (10:17 -0500)]
test/mon/osd-crush.sh: escape ceph tell mon.*

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: make some of the pg_temp methods/fields private
Sage Weil [Mon, 16 Nov 2015 17:17:48 +0000 (12:17 -0500)]
osd: make some of the pg_temp methods/fields private

Reported-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdc/Objecter: call notify completion only once
Sage Weil [Mon, 16 Nov 2015 16:32:34 +0000 (11:32 -0500)]
osdc/Objecter: call notify completion only once

If we race with a reconnect we could get a second notify message
before the notify linger op is torn down.  Ensure we only ever
call the notify completion once to prevent a segfault.

Fixes: #13805
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: change mon_osd_min_down_reporters from 1 -> 2
Sage Weil [Sat, 14 Nov 2015 03:34:12 +0000 (22:34 -0500)]
mon: change mon_osd_min_down_reporters from 1 -> 2

This makes more sense to me.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/OSDMonitor: simplify failure reporters vs reports logic
Sage Weil [Sat, 14 Nov 2015 03:27:14 +0000 (22:27 -0500)]
mon/OSDMonitor: simplify failure reporters vs reports logic

Since each OSD only sends a failure report for a given peer once,
we don't need to count reports vs reporters separately.  (This was
probably a bad idea anyway.)  Remove this logic and the associated
config option.

Reported-by: Greg Farnum <gfarnum@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: simplify pg creation
Sage Weil [Sat, 14 Nov 2015 03:11:17 +0000 (22:11 -0500)]
osd: simplify pg creation

We used to have a complicated pg creation process in which we
would query any previous mappings for the pg before we created the
new 'empty' pg locally.  The tracking of the prior mappings was
very simple (and broken), but it didn't really matter because the
mon would resend pg create messages periodically.  Now it doesn't,
so that broke.

However, none of this is necessary: the PG peering process does
all of the same things.  Namely, it

- enumerates past intervals
- determines which ones may have been rw
- queries OSDs from each one to gather any potential changes

This is a more robust version of what the creation code was (or
should have been doing).  So, let's rip it all out and let
peering handle it.  As long as the newly instantiated PG sets
last_epoch_started and _clean to the created epoch we will probe
and consider all of these prior mappings and find any previous
instance of the PG (if one existed).

Yay for removing unnecessary code!

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonClient: make _sub_got behave if we "got" old stuff
Sage Weil [Fri, 13 Nov 2015 18:03:16 +0000 (13:03 -0500)]
mon/MonClient: make _sub_got behave if we "got" old stuff

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/OSDMonitor: fix oldest_map in send_incremental
Sage Weil [Wed, 11 Nov 2015 03:19:48 +0000 (22:19 -0500)]
mon/OSDMonitor: fix oldest_map in send_incremental

This should be the oldest map on the sender (like every other
place that generates an MOSDMap message).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: avoid useless pg gets when pool is deleted
Sage Weil [Mon, 12 Oct 2015 02:06:33 +0000 (22:06 -0400)]
mon/PGMonitor: avoid useless pg gets when pool is deleted

If the .0 pg no longer exists, we know the entire pool was
deleted, and can avoid querying every other pg.  (This is a good
thing because leveldb and rocksdb can be very slow to query
missing keys.)

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: revamp how pg creates are tracked
Sage Weil [Thu, 8 Oct 2015 16:13:40 +0000 (12:13 -0400)]
mon/PGMonitor: revamp how pg creates are tracked

Previously we were calculating and managing in-core state that
wasn't committed as part of the pg_map, leading to all sorts of
ugliness that didn't really work.  Instead,

 * set mapping in all creating pgs in the committed pg_map
 * make all pg create message sending be based on committed state
 * update mappings for creating pgs every time we consume a new
   osdmap, so that we have a reliable/stable epoch to attach to
   it.

In particular, having that stable epoch means we have a reference
we can put in the pg create message that will also be used for
the subscription version.  That way OSDs get consistent creates
from any mon.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: only send pg create messages to up osds
Sage Weil [Thu, 8 Oct 2015 16:12:34 +0000 (12:12 -0400)]
mon/PGMonitor: only send pg create messages to up osds

If the OSD is down it will ignore the message.  If it gets marked up, we
will eventually consume that map and call check_subs().

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: only churn mapping_epoch if the primary changes
Sage Weil [Wed, 7 Oct 2015 05:07:34 +0000 (01:07 -0400)]
mon/PGMonitor: only churn mapping_epoch if the primary changes

This results is fewer resent pg create messages.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: a bunch of cosmetic cleanup
Sage Weil [Fri, 9 Oct 2015 21:25:00 +0000 (17:25 -0400)]
mon/PGMonitor: a bunch of cosmetic cleanup

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: drop old creating_pgs_by_osd
Sage Weil [Wed, 7 Oct 2015 04:39:41 +0000 (00:39 -0400)]
mon/PGMonitor: drop old creating_pgs_by_osd

Obsoleted by creating_pgs_by_osd_epoch.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: reduce mon_subscribe messages
Sage Weil [Sat, 14 Nov 2015 17:57:05 +0000 (12:57 -0500)]
osd: reduce mon_subscribe messages

1. MonClient remembers our subscriptions; only indicate we want
osd_pg_creates once, in init.

2. We don't need to re-request the latest osdmap each time we
reconnect.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonClient: only send new subscriptions
Sage Weil [Wed, 7 Oct 2015 04:09:18 +0000 (00:09 -0400)]
mon/MonClient: only send new subscriptions

Instead of resending all subscriptions, only send the new ones.  This
avoids races like

 - ask for 4+
 - mon sends maps 4-50
 - ask for 4+ and something else
 - mon has to resend same maps and the other thing

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: send pg creates via persistent subscriptions, not spam
Sage Weil [Wed, 7 Oct 2015 01:39:33 +0000 (21:39 -0400)]
mon/PGMonitor: send pg creates via persistent subscriptions, not spam

Generate and send pg create messages only for those OSDs who have
subscribed on this monitor.  This is N time more efficient (where there
are N monitors) than the previous method.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: only map and send pg creates post paxos update
Sage Weil [Wed, 7 Oct 2015 03:57:50 +0000 (23:57 -0400)]
mon/PGMonitor: only map and send pg creates post paxos update

These other call sites are no longer needed.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: remove map_pg_creates, send_pg_creates commands
Sage Weil [Fri, 9 Oct 2015 21:22:01 +0000 (17:22 -0400)]
mon/PGMonitor: remove map_pg_creates, send_pg_creates commands

These shouldn't be triggered manually.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomessages/MOSDPGCreate: make it more readable
Sage Weil [Wed, 7 Oct 2015 03:58:28 +0000 (23:58 -0400)]
messages/MOSDPGCreate: make it more readable

1- include the epoch
2- drop the 'pg'
3- hide the timestamp

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: subscribe to all pg creates, not just once on start
Sage Weil [Wed, 7 Oct 2015 00:48:38 +0000 (20:48 -0400)]
osd: subscribe to all pg creates, not just once on start

We want to know about all future pg creations, not just those pending
when we start.  (This only helps once the mon knows how to do this...)

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: track creating_pgs_by_osd_epoch
Sage Weil [Wed, 7 Oct 2015 00:37:06 +0000 (20:37 -0400)]
mon/PGMonitor: track creating_pgs_by_osd_epoch

Track pg creations, grouped by the first epoch they mapped to a particular
OSD.  This will be necessary to send messages only for new creations.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMap: assert our pg counts don't go negative
Sage Weil [Thu, 8 Oct 2015 16:15:01 +0000 (12:15 -0400)]
mon/PGMap: assert our pg counts don't go negative

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/OSDMonitor: do not prime pg_temp for creating pgs
Sage Weil [Thu, 8 Oct 2015 16:14:49 +0000 (12:14 -0400)]
mon/OSDMonitor: do not prime pg_temp for creating pgs

It will be less work for the old primary to ignore the create message
and the new one to query it and find nothing that for the slightly more
complicated peering and removal process to happen.  Also, this reduces
bloat in the OSDMap a bit.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMonitor: note mapping_epoch for creating pgs
Sage Weil [Tue, 6 Oct 2015 22:52:22 +0000 (18:52 -0400)]
mon/PGMonitor: note mapping_epoch for creating pgs

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: let peon mons send the osdmap replies
Sage Weil [Thu, 17 Sep 2015 01:44:04 +0000 (21:44 -0400)]
mon: let peon mons send the osdmap replies

Currently the leader mon often replies to OSDs by sending a set of
incremental OSDmaps (e.g., in response to an osd boot or failure).

Instead, send a small message to the proxying peon mon (if any)
with the epoch to start from and let *them* generate a suitable
reply.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomsg/simple/Pipe: show keepalives at level 2
Sage Weil [Tue, 6 Oct 2015 19:37:31 +0000 (15:37 -0400)]
msg/simple/Pipe: show keepalives at level 2

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: set mon_subscribe_interval to a day
Sage Weil [Tue, 6 Oct 2015 19:35:58 +0000 (15:35 -0400)]
mon: set mon_subscribe_interval to a day

This is only needed for legacy clients to avoid confusing them--
we don't actually need the renewals at all.  Make them infrequent
to reduce mon load.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: only ack subscriptions (and renew) if client or mon is old
Sage Weil [Tue, 6 Oct 2015 19:25:02 +0000 (15:25 -0400)]
mon: only ack subscriptions (and renew) if client or mon is old

Old client expect an ack so they can schedule renewal; send it for
them only.

Old mons expect renewals.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: remove old subscribe renewal-based timeouts
Sage Weil [Tue, 6 Oct 2015 19:19:33 +0000 (15:19 -0400)]
mon: remove old subscribe renewal-based timeouts

This is no longer needed/used.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: small cleanup in _ms_dispatch
Sage Weil [Tue, 6 Oct 2015 19:18:21 +0000 (15:18 -0400)]
mon: small cleanup in _ms_dispatch

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: new session_timeout mechanism that is not subscribe-based
Sage Weil [Tue, 6 Oct 2015 19:11:03 +0000 (15:11 -0400)]
mon: new session_timeout mechanism that is not subscribe-based

Simplify the session liveness detection:

 - renew on any message
 - renew on keepalive[2] messages (lightweight ping in msgr)

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomsg: make last_keepalive[_ack] lock safe
Sage Weil [Tue, 6 Oct 2015 19:10:02 +0000 (15:10 -0400)]
msg: make last_keepalive[_ack] lock safe

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomsg: track stamp of last keepalive[2] received
Sage Weil [Tue, 6 Oct 2015 19:08:57 +0000 (15:08 -0400)]
msg: track stamp of last keepalive[2] received

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocommon: mirror leveldb default tuning w/ rocksdb
Sage Weil [Tue, 6 Oct 2015 18:38:47 +0000 (14:38 -0400)]
common: mirror leveldb default tuning w/ rocksdb

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/MonClient: don't send log if we're reconnecting
Sage Weil [Tue, 6 Oct 2015 18:38:30 +0000 (14:38 -0400)]
mon/MonClient: don't send log if we're reconnecting

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon: disabled rocksdb compression when used as the backend
Sage Weil [Fri, 2 Oct 2015 13:15:33 +0000 (09:15 -0400)]
mon: disabled rocksdb compression when used as the backend

This significantly reduced CPU utilization on the bigbang scale
testing cluster at CERN.  Note that it is already disabled for
leveldb by default (in ceph_mon.cc).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: cap adjusted max mon report interval at 2/3 of timeout
Sage Weil [Fri, 2 Oct 2015 13:06:29 +0000 (09:06 -0400)]
osd: cap adjusted max mon report interval at 2/3 of timeout

This ensures that we don't throttle back mon reports so much that
the mon times out out due to no pg stat reports.  Since there is
little value is having a lower max anyway, just set this at an
upper bound (relative to the mon's timeout value).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: protect mon reporting with mon_report_lock
Sage Weil [Wed, 30 Sep 2015 01:03:53 +0000 (21:03 -0400)]
osd: protect mon reporting with mon_report_lock

We need an exclusive lock over paths that update state related to
mon reports, lest they step on fields like up_thru_*, *stats_ack*,
last_mon_report, and so on.  Everybody still needs a read lock
on map_lock too to get a stable OSDMap epoch.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: fix reconnect behavior from booting state
Sage Weil [Mon, 23 Nov 2015 13:38:44 +0000 (08:38 -0500)]
osd: fix reconnect behavior from booting state

We don't need to restart the boot process unless we are in preboot;
if we are in booting state we just need to resend the boot
message.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: move the monitor report to OSD::tick_without_osd_lock
Guang Yang [Tue, 22 Sep 2015 20:59:28 +0000 (20:59 +0000)]
osd: move the monitor report to OSD::tick_without_osd_lock

Fixes: #12722
Reviewed-by: Guang Yang <yguang@yahoo-inc.com>
9 years agoosd: _got_mon_epochs - refactor the lock scope to avoid a race (which fail make check)
Guang Yang [Tue, 29 Sep 2015 22:26:14 +0000 (22:26 +0000)]
osd: _got_mon_epochs - refactor the lock scope to avoid a race (which fail make check)

Reviewed-by: Guang Yang <yguang@yahoo-inc.com>
9 years agoosd: don't send dup subscribes so much
Sage Weil [Mon, 28 Sep 2015 21:22:01 +0000 (17:22 -0400)]
osd: don't send dup subscribes so much

The subscribe MonClient service is stateful--we don't need to
force a new subscribe send unless sub_want() says we need to.

Keep forcing it for instances where we request an *old* map.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: introduce explicit preboot stage
Sage Weil [Wed, 23 Sep 2015 21:58:15 +0000 (17:58 -0400)]
osd: introduce explicit preboot stage

We want to separate the stage where we do a bunch of work
prior to booting (but intend to eventually boot), like when we
get maps and wait to be healthy, from the point after we've sent
the boot message while we are just waiting for a response (so that
we can avoid resending that boot message needlessly).

- start at PREBOOT in start_boot()
- transition to BOOTING in _send_boot()
- only call _preboot() while in PREBOOT state

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: skip osdmap version query if we can
Sage Weil [Wed, 23 Sep 2015 21:31:50 +0000 (17:31 -0400)]
osd: skip osdmap version query if we can

If we get OSDmaps from the mon we *also* learn the oldest/newest
map epochs; no need to query again.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: make [_]maybe_boot lockless variant
Sage Weil [Wed, 23 Sep 2015 21:33:28 +0000 (17:33 -0400)]
osd: make [_]maybe_boot lockless variant

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: only send boot if booting on getversion completion
Sage Weil [Tue, 22 Sep 2015 15:16:15 +0000 (11:16 -0400)]
osd: only send boot if booting on getversion completion

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: do not resend pg_temp requests
Sage Weil [Fri, 18 Sep 2015 17:27:49 +0000 (13:27 -0400)]
osd: do not resend pg_temp requests

Send each pg_temp request once (per mon session); no need to
resend everything that is pending every time.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: do not send dup failure reports
Sage Weil [Fri, 18 Sep 2015 01:45:16 +0000 (21:45 -0400)]
osd: do not send dup failure reports

If a failure report is already pending, we do not need to resend
it.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: resend pending failure reports with a new mon session
Sage Weil [Fri, 18 Sep 2015 01:48:30 +0000 (21:48 -0400)]
osd: resend pending failure reports with a new mon session

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: fix send_failures() locking
Sage Weil [Fri, 18 Sep 2015 01:42:53 +0000 (21:42 -0400)]
osd: fix send_failures() locking

It is unsafe to check failure_queue.empty() without the lock.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: backoff the max reporting interval, too
Sage Weil [Thu, 17 Sep 2015 21:47:54 +0000 (17:47 -0400)]
osd: backoff the max reporting interval, too

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: no need for regular send_pg_temps
Sage Weil [Thu, 17 Sep 2015 21:47:43 +0000 (17:47 -0400)]
osd: no need for regular send_pg_temps

This is done by process_peering_events.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: just send alive when it is queue
Sage Weil [Fri, 18 Sep 2015 18:24:27 +0000 (14:24 -0400)]
osd: just send alive when it is queue

No need to futz with last_mon_report or resend it again later.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: fix pg stat reporting
Sage Weil [Wed, 16 Sep 2015 15:00:57 +0000 (11:00 -0400)]
osd: fix pg stat reporting

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6565 from chenji-kael/patch-1
Loic Dachary [Mon, 23 Nov 2015 09:30:13 +0000 (10:30 +0100)]
Merge pull request #6565 from chenji-kael/patch-1

Update .organizationmap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6673 from dzafman/wip-rand-scrub-fix
David Zafman [Mon, 23 Nov 2015 01:11:47 +0000 (17:11 -0800)]
Merge pull request #6673 from dzafman/wip-rand-scrub-fix

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoosd: Only add random deep scrubs when NOT user initiated scrub 6673/head
David Zafman [Sun, 22 Nov 2015 18:14:12 +0000 (10:14 -0800)]
osd: Only add random deep scrubs when NOT user initiated scrub

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoRevert "test: osd-scrub-snaps.sh: Randomized deep-scrubs can now happen during a...
David Zafman [Sun, 22 Nov 2015 18:13:18 +0000 (10:13 -0800)]
Revert "test: osd-scrub-snaps.sh: Randomized deep-scrubs can now happen during a scrub"

This reverts commit 0fe26c25c5fefd12628fcdba67be047f640b4afc.

9 years agoMerge pull request #6219 from joejulian/master_fix_13438_parted_must_contain_dev
Loic Dachary [Sun, 22 Nov 2015 12:42:26 +0000 (13:42 +0100)]
Merge pull request #6219 from joejulian/master_fix_13438_parted_must_contain_dev

Compare parted output with the dereferenced path

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #6671 from dzafman/wip-jenkins-fix
Loic Dachary [Sun, 22 Nov 2015 09:41:50 +0000 (10:41 +0100)]
Merge pull request #6671 from dzafman/wip-jenkins-fix

Fix Jenkins make check errors due to deep-scrub randomization

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotest: osd-scrub-snaps.sh: Randomized deep-scrubs can now happen during a scrub 6671/head
David Zafman [Sat, 21 Nov 2015 04:45:21 +0000 (20:45 -0800)]
test: osd-scrub-snaps.sh: Randomized deep-scrubs can now happen during a scrub

Signed-off-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #6659 from cholcombe973/master
Loic Dachary [Sat, 21 Nov 2015 17:18:22 +0000 (18:18 +0100)]
Merge pull request #6659 from cholcombe973/master

Doc: Typo in the apt-get command

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoTypo in the apt-get command. 6659/head
Chris Holcombe [Thu, 19 Nov 2015 23:05:12 +0000 (15:05 -0800)]
Typo in the apt-get command.
Signed-off-by: Chris Holcombe <xfactor973@gmail.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Fri, 20 Nov 2015 15:44:39 +0000 (10:44 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #6553 from ukernel/wip-13777
John Spray [Fri, 20 Nov 2015 14:25:28 +0000 (14:25 +0000)]
Merge pull request #6553 from ukernel/wip-13777

mds: properly set STATE_STRAY/STATE_ORPHAN for stray dentry/inode

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoscripts: ceph-release-notes for development versions 6666/head
Loic Dachary [Fri, 20 Nov 2015 14:12:20 +0000 (15:12 +0100)]
scripts: ceph-release-notes for development versions

Relax the requirements for titles and issues when --strict is not set.
Collect and display the merge messages when they are not the same as the
PR title.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agorelease-notes: draft v10.0.0 release notes
Loic Dachary [Fri, 20 Nov 2015 13:55:08 +0000 (14:55 +0100)]
release-notes: draft v10.0.0 release notes

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #6603 from ukernel/wip-13782
John Spray [Fri, 20 Nov 2015 13:59:06 +0000 (13:59 +0000)]
Merge pull request #6603 from ukernel/wip-13782

client: avoid creating orphan object in Client::check_pool_perm()

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agolibrbd: commit journal op events immediately 6625/head
Jason Dillaman [Fri, 20 Nov 2015 13:44:53 +0000 (08:44 -0500)]
librbd: commit journal op events immediately

Op events are split into a start and finish record, so they can
be immediately marked as committed within the journal.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge branch 'osd-op-create' of git://github.com/majianpeng/ceph
Sage Weil [Fri, 20 Nov 2015 12:01:19 +0000 (07:01 -0500)]
Merge branch 'osd-op-create' of git://github.com/majianpeng/ceph

Conflicts:
src/osd/ReplicatedPG.cc

Reviewed-by: Sage Weil <sage@redhat.com>