Commit Graph

33047 Commits

Author SHA1 Message Date
John Wilkins
44e4e3d59b doc: Added new cache tiering doc to main docs.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-04-22 17:30:26 -07:00
Sage Weil
009e874686 qa/workunits/rbd/copy.sh: skip some tests when tiering is enabled
The rados ls bit doesn't work.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-04-22 11:59:26 -07:00
Sage Weil
c0bff439f5 qa/workunits/rbd/copy.sh: fix test
I broke this in commit 9d64ac6608.

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2014-04-22 11:59:23 -07:00
Sage Weil
47866fd2d1 Merge pull request #1691 from ceph/wip-8139
osd_types: pg_t: allow is_split to handle checks for splits prior to the most recent

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-04-22 12:40:02 -07:00
Samuel Just
5daf53859c ECBackend: use std::swap for boost::optional
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-22 11:25:53 -07:00
Yehuda Sadeh
6cb5ce86cf Merge pull request #1710 from ceph/wip-coverity
a couple coverity fixes

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2014-04-22 09:02:33 -07:00
Sage Weil
f244109cb7 Merge pull request #1711 from ceph/wip-coverity-respawn
mds: make strncpy in ::respawn safer

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-22 08:37:21 -07:00
John Spray
cac15c7d8b mds: make strncpy in ::respawn safer
Previous code assumed null terminated argv[0]
was not longer than PATH_MAX and the resulting
strncpy was not strictly safe.

Modify the bounds to ensure that copy will not
result in an unterminated string if argv[0]
is oversized.

Signed-off-by: John Spray <john.spray@inktank.com>
2014-04-22 16:31:27 +01:00
Sage Weil
b4eb502508 osd/osd_types: RWState: initialize snaptrimmer_write_marker
** CID 1204295:  Uninitialized scalar field  (UNINIT_CTOR)
/osd/osd_types.h: 2716 in ObjectContext::RWState::RWState()()

Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-22 08:29:58 -07:00
Sage Weil
4e5f442028 osdc/Objecter: drop unused field
This as missed by 860d72770c.

** CID 1204296:  Uninitialized scalar field  (UNINIT_CTOR)
/osdc/Objecter.h: 1165 in Objecter::Op::Op(const object_t &, const
object_locator_t &, std::vector<OSDOp, std::allocator<OSDOp>> &, int, Context *,
Context *, unsigned long *)()
/osdc/Objecter.h: 1165 in Objecter::Op::Op(const object_t &, const
object_locator_t &, std::vector<OSDOp, std::allocator<OSDOp>> &, int, Context *,
Context *, unsigned long *)()

Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-22 08:28:52 -07:00
Sage Weil
124a663a0b doc/release-notes: a bit of prose about firefly
Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-22 08:27:35 -07:00
Sage Weil
18aded2ed4 osd/osd_types: pg_interval_t: include primaries in operator<<
Also make up vs acting explicit.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-21 21:26:26 -07:00
Sage Weil
931ae6b8a0 osd/osd_types: pg_interval_t: include up_primary in pg_interval_t
Nothing uses this, but it triggers a new interval, which makes it confusing
when it is not recording in the interval itself.  Let's add it now.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-21 21:26:26 -07:00
Sage Weil
66170f394d osd/osd_types: pg_interval_t: dump primary
Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-21 21:26:26 -07:00
Sage Weil
000233f732 osd: change in up set primary constitutes a peering interval change
In several places, a change in the up_primary triggers a new peering
interval, but the palces that actually generate the new past intervals,
including check_new_interval(), did not enforce that.  This becomes
somewhat obvious when you see that those callers are ignoring the
up_primary output argument for pg_to_up_acting_osds().

Fix this by adding arguments to check_new_interval and fixing the callers
to pass them in properly.  Add a unit test case to verify this.

Note that the past interval struct itself does not record who the
up_primary was; possibly it should.

Fixes: #8139
Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-21 21:26:25 -07:00
Sage Weil
5562e26e65 osd: use parent pgid (as appropriate) in generate_past_intervals()
Feed in the ancestor pg_t (if any) when we are looking at intervals for
previous maps that may have preceded a recent split.

Fixes: #8139
Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-21 21:26:07 -07:00
Sage Weil
6230146238 Merge pull request #1651 from enovance/wip-brag
Few bug fixes in ceph-brag

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-21 20:49:43 -07:00
Sage Weil
025ab9f47b doc/release-notes: v0.80
Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-21 18:20:56 -07:00
Josh Durgin
c80f128c12 Merge pull request #1707 from ceph/wip-rbd-test
rbd: fix tests for cache pools

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-04-21 16:53:35 -07:00
Sage Weil
a80e66f932 qa/workunit/rbd/import_export.sh: skip list-objects tests with tiering
Listing objects isn't reliable with cache pools; skip that part of the
test if we see that rbd has tiering enabled.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-21 16:47:10 -07:00
Sage Weil
9d64ac6608 qa/workunit/rbd/copy.sh: do not delete/recreate rbd pool
Among other things, it breaks when tiering is enabled.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-21 16:26:23 -07:00
John Wilkins
c3833d7c41 doc: Fixed syntax to include 'pool'.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-04-21 15:43:23 -07:00
Samuel Just
f44e2c82e1 Merge pull request #1703 from ceph/wip-7942
Wip 7942

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-21 15:13:22 -07:00
Samuel Just
95394b60b8 ReplicatedPG::do_op: check for blocked snapset obj
Otherwise, we might use an invalid snapset in find_object_context.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 15:11:15 -07:00
Samuel Just
8259d87493 ReplicatedPG: in trim, grab w locks on obc and snapset_obc
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 15:11:12 -07:00
Samuel Just
0d5a539358 ReplicatedPG: if we get ENOENT on clone, remove clone from snapset
Fixes: #7916
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 15:11:04 -07:00
Samuel Just
f3df50188b ReplicatedPG: do not create whiteout clones
First, make_writeable treats whiteout heads like snapdir for
cloning purposes.  Second, to ensure that we send the correct
deletes on flush to the backing pool, we instead use oi.snaps
on any clone we are flushing to infer the snaps during which
head did not exist and send a delete as appropriate prior to
the copy_from.

Normally, we'd have a problem if the delete and the copy_from
completed, but an interval change intervened before the dirty
flag was cleared since we'd end up re-deleting the object.
To avoid that, we use the CEPH_OSD_FLAG_ORDERSNAP flag.

Additionally, we will use the correct snap_seq on the delete
or flush as appropriate to ensure that the previous clone
gets created with the same clone id as in the cache pool.

Fixes: #7942
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 15:11:04 -07:00
Samuel Just
caa63565dd ReplicatedPG,rados: add CEPH_OSD_[COPY_FROM]_MAP_SNAP_TO_CLONE
When promoting a clone, we want to use the provided snapid to specify
specify the clone id directly.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 15:11:01 -07:00
Sage Weil
bd39ecd610 Merge pull request #1705 from ceph/wip-8124
Wip 8124

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-21 14:28:43 -07:00
Sage Weil
2cb0bac697 qa/workunits/cephtool/test.sh: make set pg_num test non-racy
Loop while the pool is creating.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2014-04-21 14:18:21 -07:00
Samuel Just
506dce845b ReplicatedPG: do not use shard for hit_set object names
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 10:53:04 -07:00
Samuel Just
f7e7588025 ReplicatedPG::agent_load_hit_sets: take ondisk_read_lock
Otherwise, the hit_set might be not yet written due to a recently
completed recovery.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 10:53:04 -07:00
Samuel Just
16eccdd313 PG,PGLog: update hit_set during peering
Fixes: #8124
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 10:53:04 -07:00
Samuel Just
5821cc7e55 osd/: propogate hit_set history with repop
We don't actually send the whole info on each repop, just the log
entries, updated stats, and a few other bits.  For hit_set ops, we need
to also communicate the new hit_set history status atomically with the
log entries and the transaction.  Thus, we add a channel for an optional
pg_hit_set_history_t field in PGBackend::submit_transaction interface
and associated messages and implementations to update the hit_set info
field along with the log entries.

This also means that hit_set_(persist|trim) update an
updated_hit_set_history field on the OpContext instead of directly
modifying the info field.

Fixes: #8124
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 10:53:04 -07:00
Samuel Just
7bb2011542 encoding: use unqualified name for encode/decode in boost::optional encoding
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 10:53:04 -07:00
Samuel Just
e4a048c42a ECMsgTypes::ECSubWrite: fix at_version indentation
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 10:53:04 -07:00
Samuel Just
ddf1e986dc osd: track the number of hit_set archive objects in a pg
Also, use this value in agent_choose_mode instead of the max
number.

Related: #8124
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 10:52:58 -07:00
Samuel Just
1fb90c94b3 ReplicatedPG::hit_set_persist: clean up degraded check
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-04-21 10:46:11 -07:00
Sage Weil
7a61cdbfd5 buffer: adjust #include order
The pthread.h include is somehow clobbering things, although it is not
clear how.  :(

Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-18 17:33:52 -07:00
Samuel Just
74f4d57347 Merge pull request #1696 from ceph/wip-8097
buffer: use Mutex instead of Spinlock for raw crcs

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-04-18 15:12:09 -07:00
Sage Weil
0234bcfca7 Merge pull request #1697 from ceph/wip-num_objects_omap
osd_types::object_stat_sum_t: fix add/sub for num_objects_omap

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-18 14:24:06 -07:00
Sage Weil
e087eae868 Merge pull request #1695 from ceph/wip-8153
Revert "ReplicatedPG::get_snapset_context: assert snap obj is not missin...

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-18 14:09:37 -07:00
Samuel Just
f9e9365fda Revert "ReplicatedPG::get_snapset_context: assert snap obj is not missing"
This breaks mark_lost_unfound_revert.

This reverts commit 0d2177a180.
2014-04-18 13:59:22 -07:00
Sage Weil
dec77c3407 Merge pull request #1693 from ceph/wip-7997
mon: fix get_version race (more)

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-04-18 13:54:30 -07:00
Greg Farnum
82edda23aa test: handle the create-pg delay when testing cache split syntax
Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-04-18 13:41:00 -07:00
Sage Weil
d07ce84148 Merge pull request #1692 from ceph/wip-7784
mon: OSDMonitor: HEALTH_WARN on 'mon osd down out interval == 0'

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-18 11:47:59 -07:00
Joao Eduardo Luis
b2112d5087 mon: OSDMonitor: HEALTH_WARN on 'mon osd down out interval == 0'
A 'status' or 'health' request will return a HEALTH_WARN whenever the
monitor handling the request has the option set to zero.

Fixes: 7784

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-04-18 19:15:52 +01:00
Sage Weil
09985d25a8 mon: wait for PaxosService readable in handle_get_version
We were waiting for the election to finish, but we need to *also* wait for
paxos to recover.  Being a peon or leader is not sufficient and we may
return a map that is still old.

Fixes: #7997
Signed-off-by: Sage Weil <sage@inktank.com>
2014-04-18 11:12:23 -07:00
Sage Weil
7251983d8e Merge pull request #1676 from ceph/wip-8092
Wip 8092

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-17 21:21:59 -07:00
Sage Weil
375e4ee8e8 Merge pull request #1678 from ceph/wip-8108
osd: OSDMap: have osdmap json dump print valid boolean instead of string

Reviewed-by: Sage Weil <sage@inktank.com>
2014-04-17 21:19:33 -07:00