Commit Graph

30209 Commits

Author SHA1 Message Date
Loic Dachary
5e0722fab5 crush: fix map->choose_tries boundary test
CrushWrapper::start_choose_profile allocates map->choose_tries with
choose_total_tries elements. When crush_choose_firstn sets a value, it
tests against map->choose_local_tries which could lead to memory
corruption if map->choose_total_tries is smaller than
map->choose_local_tries.

Another indesirable but non fatal side effect is that the output crushtool
--show-choose-tries will be truncated to choose_local_tries which is
set to a lower value than choose_total_tries by the default tuneables.

Signed-off-by: Loic Dachary <loic@dachary.org>
2013-12-08 17:00:54 +01:00
Sage Weil
94da2153d1 Merge pull request #869 from ceph/wip-crush
crush changes for erasure coding

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-12-07 20:59:22 -08:00
Noah Watkins
ef4061f0ad librbd: remove unused private variable
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 18:07:03 -08:00
Noah Watkins
ad3825c608 TrackedOp: remove unused private variable
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 18:07:03 -08:00
Noah Watkins
3b39a8a9f1 librbd: rename howmany to avoid conflict
A howmany macro exists on some platforms in standard headers, but there
really isn't any sort of standard that I've found. We just avoid the
conflict entirely this way.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 18:07:03 -08:00
Sage Weil
096f9b3268 Merge pull request #917 from ceph/port/compat
compat: define replacement TEMP_FAILURE_RETRY

Reviewed-by: Sage Weil <sage@inktank.com>
2013-12-07 14:01:14 -08:00
Sage Weil
96068bfad6 Merge pull request #919 from ceph/port/fdatasync
wbthrottle: use feature check for fdatasync

Reviewed-by: Sage Weil <sage@inktank.com>
2013-12-07 14:00:40 -08:00
Noah Watkins
539fe26109 wbthrottle: use feature check for fdatasync
Checking for fdatasync uses the same approach as the qemu configure
script. The relevant commit is d1722a27f552a22561104210e0afad4577878e53.
Here is a copy of the commit message which explains the check:

Under Darwin, a symbol exists for the fdatasync() function, so that our
link test succeeds. However _POSIX_SYNCHRONIZED_IO is set to '-1'.

According to POSIX:2008, a value of -1 means the feature is not
supported.
A value of 0 means supported at compilation time, and a value greater 0
means supported at both compilation and run time.

Enable fdatasync() only if _POSIX_SYNCHRONIZED_IO is '>0'.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 10:37:00 -08:00
Noah Watkins
663da61c02 rados_sync: fix mismatched tag warning
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 10:24:46 -08:00
Noah Watkins
60a25093a4 rados_sync: remove unused private variable
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 10:24:46 -08:00
Noah Watkins
43c1676778 mon: check for sys/vfs.h existence
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 10:24:20 -08:00
Noah Watkins
c99cf265fd make: increase maximum template recursion depth
With clang on OSX spirit blows up without this.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 10:22:54 -08:00
Noah Watkins
e2be099118 compat: define replacement TEMP_FAILURE_RETRY
Not all platforms have it.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-12-07 10:18:51 -08:00
Sage Weil
a52ef1df49 Merge remote-tracking branch 'gh/wip-fix-3x'
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-12-06 16:56:10 -08:00
Sage Weil
0386095ea0 Merge remote-tracking branch 'gh/wip-fix-tunables'
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-12-06 16:55:54 -08:00
Sage Weil
3b3cbf52fb crush/CrushCompiler: make current set of tunables 'safe'
We can reenable this error the next time we add new tunables.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 16:24:16 -08:00
Sage Weil
8535ceda03 crushtool: remove scary tunables messages
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 16:24:15 -08:00
Sage Weil
4eb8891d8d crush/CrushCompiler: start with legacy tunables when compiling
Ensure that a crush file always compiled deterministically, even though
the default values for *new* maps has changed.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 16:24:15 -08:00
Sage Weil
e8fdef217f crush: add indep data set to cli tests
This will help us catch things if we break the mapping.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 16:22:59 -08:00
Sage Weil
564de6ea05 osdmaptool: fix cli tests for 3x
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 16:22:26 -08:00
Sage Weil
6704be68d4 osd: default to 3x replication
3x is the recommendation; it should be the default too.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 16:21:37 -08:00
Sage Weil
308e4f9def Merge pull request #913 from dachary/wip-crush-unittest
CrushWrapper::move_bucket unittest and minor fixes

Reviewed-by: Sage Weil <sage@inktank.com>
2013-12-06 16:10:00 -08:00
Josh Durgin
8d0180b1b7 objecter: don't take extra throttle budget for resent ops
These ops have already taken their budget in the original op_submit().
It will be returned via put_op_budget() when they complete.
If there were many localized reads of missing objects from replicas,
or cache pool redirects, this would cause the objecter to use up all
of its op throttle budget and hang.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-12-06 16:03:20 -08:00
Sage Weil
38647f7627 Revert "osd: default to 3x replication"
This reverts commit cb26fbde52.

Fix unit tests and do integration tests first; this may have unexpected
consequences.
2013-12-06 15:48:39 -08:00
Loic Dachary
cbeb1f4510 crush: detach_bucket must test item >= 0 not > 0
Since detach_bucket is a private helper solely used by move_bucket which
contains another ( correct ) safeguard, the code cannot be reached and
the problem can never happen. If another function uses detach_bucket,
it may happen.

Signed-off-by: Loic Dachary <loic@dachary.org>
2013-12-07 00:31:54 +01:00
Loic Dachary
2cd73f9d3e crush: remove obsolete comments from link_bucket
Probably copy/pasted from move_bucket.

Signed-off-by: Loic Dachary <loic@dachary.org>
2013-12-07 00:27:09 +01:00
Loic Dachary
e00324b2bc crush: remove redundant code from move_bucket
The following was introduced in 2012 by a2d0cff1b0

  // un-set the device name so we can use add_item later
  build_rmap(name_map, name_rmap);
  name_map.erase(id);
  name_rmap.erase(id_name);

when insert_item refused to move a bucket for which a name already
exists. It was changed in 2013 by
4e2557a038 and now supports it. The
TestCrushWrapper unittest for move_bucket pass.

Signed-off-by: Loic Dachary <loic@dachary.org>
2013-12-07 00:21:16 +01:00
Loic Dachary
8ef80a4c67 crush: unittest CrushWrapper::move_bucket
Signed-off-by: Loic Dachary <loic@dachary.org>
2013-12-07 00:20:31 +01:00
Sage Weil
865880b5b1 Merge pull request #888 from ceph/wip-crush-tunables
default to bobtail-era crush tunables.

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-12-06 14:45:57 -08:00
Sage Weil
650f896c4d Merge pull request #903 from ceph/wip-memstore
memstore: reference ObjectStore backend

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-12-06 14:38:15 -08:00
Sage Weil
a6d66f9c7f common/bloom_filter: fix copy ctor
We should not delete[] an uninitialized pointer.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:31 -08:00
Sage Weil
638b27447a ceph_test_rados_api_tier: add HitSetRead
Verify that the HitSet reflects a read (and never written) object.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:30 -08:00
Sage Weil
01cbbfaae6 ceph_test_rados_api_tier: HitSetRead -> HitSetWrite
This way it will pass despite thrashing.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:30 -08:00
Sage Weil
456daf2a61 ceph_test_rados_api_tier: add HitSet trim test
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:30 -08:00
Sage Weil
3ea9230a74 osd/HitSet: fix sealed initialization in Params ctor
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:30 -08:00
Sage Weil
f0cfd22975 ceph_test_rados_api_tier: make HitSetRead test less noisy
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:30 -08:00
Sage Weil
bf96a7eae0 osd/HitSet: fix copy ctor
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:30 -08:00
Sage Weil
01f3ff72d9 osd/HitSet: fix dump() of fpp
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:30 -08:00
Sage Weil
c941e82902 test/encoding/check-generated: test copy ctor, operator=
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:29 -08:00
Sage Weil
1c107d3cb0 ceph-dencoder: add 'copy' command to test operator=
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:29 -08:00
Sage Weil
c0eb95b888 mds/Capability: no copying
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:29 -08:00
Greg Farnum
1d0af14a5e test: add a HitSet unit test
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:29 -08:00
Sage Weil
c365cca4f3 osd/HitSet: track BloomHitSet::Params fpp in micros, not as a double
...and store it as a 32-bit value, so that it actually works!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:29 -08:00
Sage Weil
146e6aa777 osd/ReplicatedPG: archive hit_set if it is old and not full
This matches the condition under which we call _persist().

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:29 -08:00
Sage Weil
737533f270 osd: prevent zero BloomHitSet fpp
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:29 -08:00
Sage Weil
a72094d504 osd/HitSet: take Params as const ref to avoid confusion about ownership
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:29 -08:00
Sage Weil
68c44cbbdc mon/OSDMonitor: non-zero default bloom fpp
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:28 -08:00
Sage Weil
41e0f97005 osd/HitSet: make pg_pool_t and Params operator<< less parenthetical
pool 0 'data' rep size 2 min_size 1 crush_ruleset 0 object_hash rjenkins pg_num 8 pgp_num 8 last_change 8 owner 0 crash_replay_interval 45 hit_set bloom{false_positive_probability: 0, target size: 0, seed: 0} 10s x8

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:28 -08:00
Sage Weil
5da128581a osd/ReplicatedPG: apply log to new HitSet to capture writes after peering
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:28 -08:00
Greg Farnum
fa76d5e4a6 ReplicatedPG: do not seal() HitSets until we're done with them
We don't want to seal HitSets just because we're writing a
snapshot to disk; it potentially shrinks the in-memory one
we want to keep adding stuff to!

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:28 -08:00