]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agolibcephfs/test.cc: close fd before umount 3241/head
Yan, Zheng [Tue, 23 Dec 2014 02:22:00 +0000 (10:22 +0800)]
libcephfs/test.cc: close fd before umount

Fixes: #10415
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3200 from boydc2014/master
Loic Dachary [Mon, 22 Dec 2014 23:56:17 +0000 (00:56 +0100)]
Merge pull request #3200 from boydc2014/master

fix unmatched op code

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3222 from ceph/wip-watch-notify-2
Sage Weil [Mon, 22 Dec 2014 21:57:52 +0000 (13:57 -0800)]
Merge pull request #3222 from ceph/wip-watch-notify-2

librados: fix watch/notify event flushing

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados: warn about rados_watch_flush() prior to ioctx shutdown 3222/head
Sage Weil [Mon, 22 Dec 2014 21:56:07 +0000 (13:56 -0800)]
librados: warn about rados_watch_flush() prior to ioctx shutdown

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3114 from xiaoxichen/drop_incorrect_pool
Samuel Just [Mon, 22 Dec 2014 19:41:16 +0000 (11:41 -0800)]
Merge pull request #3114 from xiaoxichen/drop_incorrect_pool

Cleanup: Drop hobject_incorrect_pool

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3138 from ceph/wip-10029
Samuel Just [Mon, 22 Dec 2014 19:40:22 +0000 (11:40 -0800)]
Merge pull request #3138 from ceph/wip-10029

SimpleMessenger: Retry binding on addresses if binding fails

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3239 from ceph/wip-stop.sh-me
John Spray [Mon, 22 Dec 2014 19:23:41 +0000 (19:23 +0000)]
Merge pull request #3239 from ceph/wip-stop.sh-me

stop.sh: killall -u takes username, not uid

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agostop.sh: killall -u takes username, not uid 3239/head
Dan Mick [Mon, 22 Dec 2014 19:17:56 +0000 (11:17 -0800)]
stop.sh: killall -u takes username, not uid

Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agoMerge pull request #3183 from ceph/wip-10262
Samuel Just [Mon, 22 Dec 2014 18:16:58 +0000 (10:16 -0800)]
Merge pull request #3183 from ceph/wip-10262

osd: fix handling of create+delete transaction

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3238 from ceph/wip-10414
Gregory Farnum [Mon, 22 Dec 2014 18:00:18 +0000 (10:00 -0800)]
Merge pull request #3238 from ceph/wip-10414

client: fix uninitialized member

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoclient: fix uninitialized member 3238/head
John Spray [Mon, 22 Dec 2014 17:57:57 +0000 (17:57 +0000)]
client: fix uninitialized member

Fixes: #10414
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3237 from dachary/wip-10408-something-is-better-than-nothing
Sage Weil [Mon, 22 Dec 2014 16:21:42 +0000 (08:21 -0800)]
Merge pull request #3237 from dachary/wip-10408-something-is-better-than-nothing

osd: be_compare_scrubmaps uses incorrect j iterator

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3236 from ceph/wip-10409
Sage Weil [Mon, 22 Dec 2014 16:21:06 +0000 (08:21 -0800)]
Merge pull request #3236 from ceph/wip-10409

osd: fix 10409 (object checksums for ec backends)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd: be_compare_scrubmaps uses incorrect j iterator 3237/head
Loic Dachary [Mon, 22 Dec 2014 16:05:50 +0000 (17:05 +0100)]
osd: be_compare_scrubmaps uses incorrect j iterator

The code moved from be_select_auth_object to be_compare_scrubmaps
74bd8708dfbfd3c8e7ba3f41d8534609dcbc1237 but the j iterator is use
differently although it has the same type. Use map.begin() as a
fallback instead.

http://tracker.ceph.com/issues/10408 Fixes: #10408

Signed-off-by: Loic Dachary <ldachary@dachary.org>
10 years agoosd: scrub: only assume shard digest == oi digest for replicated pools 3236/head
Sage Weil [Mon, 22 Dec 2014 15:32:36 +0000 (07:32 -0800)]
osd: scrub: only assume shard digest == oi digest for replicated pools

For an EC object, the digest we get from scrub is for the *shard*, and that
is not the same as the *object* digest in the object_info_t.  Skip these
checks; we already have the per-shard digest that is verified in the EC
backend.

Fixes: #10409
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: clean up use of hex for digests
Sage Weil [Mon, 22 Dec 2014 15:27:10 +0000 (07:27 -0800)]
osd: clean up use of hex for digests

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/ECBackend: use correct seed for (empty) omap digest
Sage Weil [Mon, 22 Dec 2014 15:12:44 +0000 (07:12 -0800)]
osd/ECBackend: use correct seed for (empty) omap digest

This will be 0 on mixed OSD version PGs, -1 on current PGs.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge branch 'wip-10409-removed-object' of git://github.com/dachary/ceph
Sage Weil [Mon, 22 Dec 2014 14:58:19 +0000 (06:58 -0800)]
Merge branch 'wip-10409-removed-object' of git://github.com/dachary/ceph

10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Mon, 22 Dec 2014 14:51:14 +0000 (06:51 -0800)]
Merge remote-tracking branch 'gh/next'

Conflicts:
PendingReleaseNotes

10 years agoMerge pull request #3230 from ceph/wip-pg-stat
Sage Weil [Mon, 22 Dec 2014 14:46:21 +0000 (06:46 -0800)]
Merge pull request #3230 from ceph/wip-pg-stat

mon/PGMap: restructure 'pg stat' formatted output

Reviewed-by: John Spray <jspray@redhat.com>
10 years agomon/PGMap: restructure 'pg stat' formatted output 3230/head
Sage Weil [Mon, 22 Dec 2014 14:41:25 +0000 (06:41 -0800)]
mon/PGMap: restructure 'pg stat' formatted output

The + character, which appears in state names, is not a valid XML token.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3235 from dachary/wip-10410-port-7110
Sage Weil [Mon, 22 Dec 2014 14:39:20 +0000 (06:39 -0800)]
Merge pull request #3235 from dachary/wip-10410-port-7110

tests: use port 7111 for osd-copy-from.sh

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3234 from majianpeng/bug-fix
Sage Weil [Mon, 22 Dec 2014 14:38:30 +0000 (06:38 -0800)]
Merge pull request #3234 from majianpeng/bug-fix

objectstore: add fadvise_flags operations in ObjectStore::Transaction::append func.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoremove unmatched op code comparasion 3200/head
Lei Dong [Mon, 22 Dec 2014 13:33:34 +0000 (21:33 +0800)]
remove unmatched op code comparasion

Signed-off-by: Dong Lei <leidong@yahoo-inc.com>
10 years agotests: use port 7111 for osd-copy-from.sh 3235/head
Loic Dachary [Mon, 22 Dec 2014 13:20:58 +0000 (14:20 +0100)]
tests: use port 7111 for osd-copy-from.sh

Because port 7110 is already used by mkfs.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: recovery of a lost object in erasure coded pools 3233/head
Loic Dachary [Mon, 22 Dec 2014 11:34:19 +0000 (12:34 +0100)]
tests: recovery of a lost object in erasure coded pools

http://tracker.ceph.com/issues/10409 Refs: #10409

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoobjectstore: add fadvise_flags operations in 3234/head
Jianpeng Ma [Mon, 22 Dec 2014 12:50:50 +0000 (20:50 +0800)]
objectstore: add fadvise_flags operations in
ObjectStore::Transaction::append func.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agotests: remove spurious lines from osd-scrub-repair.sh
Loic Dachary [Mon, 22 Dec 2014 11:29:10 +0000 (12:29 +0100)]
tests: remove spurious lines from osd-scrub-repair.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3228 from dachary/wip-10401-docker-install-deps
Sage Weil [Sun, 21 Dec 2014 23:51:34 +0000 (15:51 -0800)]
Merge pull request #3228 from dachary/wip-10401-docker-install-deps

tests: oneliner to run make check in a container

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3231 from ceph/wip-mon-health
Loic Dachary [Sun, 21 Dec 2014 23:35:44 +0000 (00:35 +0100)]
Merge pull request #3231 from ceph/wip-mon-health

mon: make 'ceph -s' show pg state counts in reverse descending order

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: reduce centos docker intermediate steps 3228/head
Loic Dachary [Sun, 21 Dec 2014 16:51:05 +0000 (17:51 +0100)]
tests: reduce centos docker intermediate steps

Collapse multiple RUN statements related to systemd into a single line
to reduce the number of steps that are preserved by docker.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: add docker-test.sh --ref giant|firefly etc.
Loic Dachary [Sun, 21 Dec 2014 14:19:08 +0000 (15:19 +0100)]
tests: add docker-test.sh --ref giant|firefly etc.

Add the --ref option to chose the git ref to which the working tree must
be reset instead of HEAD.

   test/docker-test.sh --ref giant make

is equivalent to

   test/docker-test.sh bash -c 'git reset --hard giant ; make'

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: avoid bash == --shell confusion in docker-test-helper.sh
Loic Dachary [Sun, 21 Dec 2014 13:22:31 +0000 (14:22 +0100)]
tests: avoid bash == --shell confusion in docker-test-helper.sh

Do not force interactive mode when the bash script is specified by the
user because it should be usable to run a small script instead of
starting an interactive shell session.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: add xmlstarlet in containers
Loic Dachary [Sun, 21 Dec 2014 09:58:39 +0000 (10:58 +0100)]
tests: add xmlstarlet in containers

It can be removed once https://github.com/ceph/ceph/pull/3228 is merged
and xmlstarlet is found in ceph.spec.in and debian/control.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: helpers to run make check in containers
Loic Dachary [Sun, 21 Dec 2014 09:01:59 +0000 (10:01 +0100)]
tests: helpers to run make check in containers

Add scripts that run make check in a container for a given operating
system version. They are a little more than oneliners and serve two
purposes:

  * help new developers who do not have to figure out which options
    should be used

  * run make check in containers in parallel with make -j2

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: run-make-check.sh arguments are passed to configure
Loic Dachary [Sun, 21 Dec 2014 08:47:57 +0000 (09:47 +0100)]
tests: run-make-check.sh arguments are passed to configure

All run-make-check.sh arguments are transparently given to the configure
command. For instance:

    run-make-check.sh --enable-root-make-check

implies

    ./configure --enable-root-make-check

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: replace --enable-docker with --enable-root-make-check
Loic Dachary [Sun, 21 Dec 2014 08:39:01 +0000 (09:39 +0100)]
tests: replace --enable-docker with --enable-root-make-check

The --enable-docker logic was that each test that needs privileges to
run uses a container to do so. The problem with this approach and
make -j8 check is that such tests compete for a single container.

The --enable-root-make-check activates tests that require privileges and
assume it is ok to use sudo to acquire privileges. The decision to run
in a container is then taken by the caller who will run something like:

   docker-tests.sh ./configure --enable-root-make-check
   docker-tests.sh make -j8 check

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: docker-test.sh commands are relative to git root
Loic Dachary [Sun, 21 Dec 2014 08:33:46 +0000 (09:33 +0100)]
tests: docker-test.sh commands are relative to git root

Instead of being in the src directory. Forcing the working directory to
src is convenient to run unittests individually without the need to
change directory, but it is confusing to the user.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: deprecate docker-test.sh --compile option
Loic Dachary [Sun, 21 Dec 2014 08:24:54 +0000 (09:24 +0100)]
tests: deprecate docker-test.sh --compile option

It is redundant with the run-make-check.sh script and imposes additional
limitations.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: enable password-less sudo in containers
Loic Dachary [Sun, 21 Dec 2014 08:21:59 +0000 (09:21 +0100)]
tests: enable password-less sudo in containers

If compilation is run with ./configuire --enable-root-make-check, sudo
is expected to work without human interaction.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph.spec.in or debian/control rebuild docker images
Loic Dachary [Sat, 20 Dec 2014 22:28:28 +0000 (23:28 +0100)]
tests: ceph.spec.in or debian/control rebuild docker images

If any of the files in test/$os_type is newer than the creation date of
a docker image, the image is removed and rebuilt from scratch. For
instance, when a package is added to debian/control, the debian based
images are rebuilt.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: docker images must use install-deps.sh
Loic Dachary [Sat, 20 Dec 2014 17:20:58 +0000 (18:20 +0100)]
tests: docker images must use install-deps.sh

The dockerfiles must run install-deps.sh instead of duplicating the
package list that is found in ceph.spec.in and debian/control.

A directory is created for each os_type and provided as a context for
docker build to use. The former $os_type.dockerfile is moved into
$os_type/Dockerfile.in (the .in as a reminder that it will be variable
substituted).

http://tracker.ceph.com/issues/10401 Fixes: #10401

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: run-make-check.sh install jq
Loic Dachary [Sat, 20 Dec 2014 18:30:59 +0000 (19:30 +0100)]
tests: run-make-check.sh install jq

jq is useful to parse json from the command line. It is however not
packaged for all supported distributions (precise has it in the backport
repository which is usually not active) and cannot be conveniently added
to debian/control because it targets all distributions and has no
conditionals.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoinstall-deps.sh: do not require sudo when root
Loic Dachary [Sat, 20 Dec 2014 17:57:59 +0000 (18:57 +0100)]
install-deps.sh: do not require sudo when root

If the user is root, do not use sudo. The sudo package is not installed
by default on centos by default and when building from script it may be
that root is running install-deps.sh on a freshly install distribution.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3134 from ceph/wip-9059-checksums
Sage Weil [Sun, 21 Dec 2014 16:06:44 +0000 (08:06 -0800)]
Merge pull request #3134 from ceph/wip-9059-checksums

osd: record and validate whole-object checksums during deep scrub

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agomon: make 'ceph -s' show pg state counts in reverse descending order 3231/head
Sage Weil [Sun, 21 Dec 2014 15:43:57 +0000 (07:43 -0800)]
mon: make 'ceph -s' show pg state counts in reverse descending order

Because these are in an unordered_map we print this is random order.
Instead sort descending by count.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agolibrados: watch_flush() on shutdown
Sage Weil [Fri, 19 Dec 2014 19:50:38 +0000 (11:50 -0800)]
librados: watch_flush() on shutdown

Users can easily forget this. It makes shutdown potentially block, but if
they have racing callbacks they get what they ask for.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agolibrados: add rados_watch_flush() call
Sage Weil [Fri, 19 Dec 2014 19:48:27 +0000 (11:48 -0800)]
librados: add rados_watch_flush() call

Add a call so that callers can make sure all queued callbacks have
completed before shutting down the ioctx.  This avoids a segv triggered
by the LibRadosWatchNotifyPPTests/LibRadosWatchNotifyPP.WatchNotify2Timeout/1
test due to the ioctx being destroyed when the in-progress callback
does a notify_ack.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: scrub: wait for digest updates to apply before next scrub chunk 3134/head
Sage Weil [Wed, 17 Dec 2014 00:39:35 +0000 (16:39 -0800)]
osd: scrub: wait for digest updates to apply before next scrub chunk

Wait for any digest updates to apply before we scrub the next chunk.  This
bounds the number of repops we initiate by the size of the scrub chunk, and
it generally nicer to the cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: change omap data encoding in object_copy_data_t
Sage Weil [Wed, 17 Dec 2014 00:11:50 +0000 (16:11 -0800)]
osd: change omap data encoding in object_copy_data_t

Pass the omap data in the struct as an opaque (encoded) bufferlist.  This
avoids a decode into an STL map, simplifying the crc calculation.  The
win isn't huge (yet) because we still turn it into a map to pass it down
to the ObjectStore method, but that too will change in time.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agotest/osd/osd-copy-from: simple test of copy-from and error injection
Sage Weil [Sun, 14 Dec 2014 05:29:37 +0000 (21:29 -0800)]
test/osd/osd-copy-from: simple test of copy-from and error injection

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agorados: use copy_from for rados cp (and cppool) command
Sage Weil [Sun, 14 Dec 2014 05:25:31 +0000 (21:25 -0800)]
rados: use copy_from for rados cp (and cppool) command

A hammer CLI won't be able to run against a pre-firefly OSD, but I don't
think we care.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: add copyfrom error injection
Sage Weil [Sun, 14 Dec 2014 05:16:24 +0000 (21:16 -0800)]
osd: add copyfrom error injection

Unfortunately it's nontrivial to inject this from the usual
ceph_test_rados_api_* tests which need to run despite thrashing.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: pass and verify data+omap digest on copyfrom
Sage Weil [Sun, 14 Dec 2014 05:05:46 +0000 (21:05 -0800)]
osd: pass and verify data+omap digest on copyfrom

Two things here:

 1- Pass the original digest from the source across the wire, if it is
    present.
 2- Calculate a new digest as we receive it, and record that.

If there is a mismatch, we currently crash; need to turn this into an
EIO, most likely.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: EIO if a full-object read produces a bad digest
Sage Weil [Wed, 10 Dec 2014 20:50:52 +0000 (12:50 -0800)]
osd: EIO if a full-object read produces a bad digest

Add a tunable to control this.  Returning an EIO instead of garbled data
may not be the best approach in all environments.

Eventually we want to do something better here, like read from a replica
instead.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: scrub: set a min age before we update whole-object digest
Sage Weil [Wed, 10 Dec 2014 17:32:50 +0000 (09:32 -0800)]
osd: scrub: set a min age before we update whole-object digest

If an object is being actively updated, the whole-object digest will
quickly be invalidated.  On deep scrub, only record that digest if the
object is a few hours old.  Otherwise, we are wasting an IO.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: scrub: record whole-object digest on scrub
Sage Weil [Wed, 10 Dec 2014 17:25:54 +0000 (09:25 -0800)]
osd: scrub: record whole-object digest on scrub

If we do not have a whole-object digest, record one after a deep scrub.

Note that we make no particular attempt to avoid this on frequently
changing objects where the digest will quickly be invalidated.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: scrub: complain about bad digest in final pass auth check
Sage Weil [Wed, 10 Dec 2014 00:38:10 +0000 (16:38 -0800)]
osd: scrub: complain about bad digest in final pass auth check

This will only trigger if we choose an auth that is known bad, but that
currently can happen, so compalin here too.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: scrub: be explicit about whether bad digest is known bad
Sage Weil [Wed, 10 Dec 2014 00:37:33 +0000 (16:37 -0800)]
osd: scrub: be explicit about whether bad digest is known bad

The digest may just disagree with our best guess 'auth' shard, or it may
also disagree with the recorded oi digest.  Clarify which.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: scrub: disqualify shards with digests that disagree with oi digest
Sage Weil [Wed, 10 Dec 2014 00:36:15 +0000 (16:36 -0800)]
osd: scrub: disqualify shards with digests that disagree with oi digest

The auth may or may not know that the digest is truly bad.  Note that we
can only relate scrub digests to those in oi if the scrub used a seed of
-1; older OSDs use 0.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: scrub: share auth oi with caller and be_compare_scrub_objects
Sage Weil [Wed, 10 Dec 2014 00:28:52 +0000 (16:28 -0800)]
osd: scrub: share auth oi with caller and be_compare_scrub_objects

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: move scrub no good auth check out of helper
Sage Weil [Wed, 10 Dec 2014 00:27:50 +0000 (16:27 -0800)]
osd: move scrub no good auth check out of helper

This helps call out that this is an exceptional case and simplifies the
helper a bit.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: remove more (most? all?) of classic scrub
Sage Weil [Wed, 10 Dec 2014 00:02:49 +0000 (16:02 -0800)]
osd: remove more (most? all?) of classic scrub

Hopefully this is everything

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: use -1 for deep scrub digest seed on new OSDs
Sage Weil [Wed, 10 Dec 2014 00:00:56 +0000 (16:00 -0800)]
osd: use -1 for deep scrub digest seed on new OSDs

0 is a weak initial value for a CRC since it doesn't change with a sequence
of 0 bytes (which are relatively common).  -1 is better.  Use -1 when
everyone in the acting set supports it.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: drop vestigal invalid_snapcolls fields from scrub
Sage Weil [Tue, 9 Dec 2014 21:44:16 +0000 (13:44 -0800)]
osd: drop vestigal invalid_snapcolls fields from scrub

This isn't used.  Snapcolls are ancient.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: clean up scrub method debug output
Sage Weil [Tue, 9 Dec 2014 21:43:53 +0000 (13:43 -0800)]
osd: clean up scrub method debug output

Use __func__ instead of (usually inaccurate) names.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/osd_types: add {data,omap}_digest to object_info_t
Sage Weil [Mon, 3 Nov 2014 01:10:26 +0000 (17:10 -0800)]
osd/osd_types: add {data,omap}_digest to object_info_t

Also add flags to indicate whether the fields are valid.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/ReplicatedPG: kill some dead scrub code
Sage Weil [Mon, 3 Nov 2014 01:53:05 +0000 (17:53 -0800)]
osd/ReplicatedPG: kill some dead scrub code

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/ReplicatedPG: set and invalidate data/omap digests on osd ops
Sage Weil [Mon, 3 Nov 2014 01:11:45 +0000 (17:11 -0800)]
osd/ReplicatedPG: set and invalidate data/omap digests on osd ops

When we create an empty object, we have a known digest of -1.  In a few
cases, we also know the digest from the op (e.g., writefull).  The rest
of the time we invalidate any existing digest.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3227 from nilamdyuti/wip-doc-ceph-deploy
Loic Dachary [Sat, 20 Dec 2014 08:40:08 +0000 (09:40 +0100)]
Merge pull request #3227 from nilamdyuti/wip-doc-ceph-deploy

Fixes a typo in ceph-deploy man page

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Adds updated ceph-deploy man page under man/ 3227/head
Nilamdyuti Goswami [Sat, 20 Dec 2014 08:20:06 +0000 (13:50 +0530)]
doc: Adds updated ceph-deploy man page under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Fixes a typo in ceph-deploy man page.
Nilamdyuti Goswami [Sat, 20 Dec 2014 08:17:55 +0000 (13:47 +0530)]
doc: Fixes a typo in ceph-deploy man page.

Lack of a single space was restricting the proper rendering of an option in
html. Fixes the error.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #3225 from dachary/wip-10400-quota-info-t
Dan Mick [Sat, 20 Dec 2014 00:36:54 +0000 (16:36 -0800)]
Merge pull request #3225 from dachary/wip-10400-quota-info-t

mds: add default ctor for quota_info_t

10 years agomds: add default ctor for quota_info_t 3225/head
Loic Dachary [Sat, 20 Dec 2014 00:08:33 +0000 (01:08 +0100)]
mds: add default ctor for quota_info_t

http://tracker.ceph.com/issues/10400 Fixes: #10400

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3121 from ceph/wip-10277
Gregory Farnum [Fri, 19 Dec 2014 22:45:44 +0000 (14:45 -0800)]
Merge pull request #3121 from ceph/wip-10277

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agodoc/release-notes: v0.90
Sage Weil [Fri, 19 Dec 2014 22:21:09 +0000 (14:21 -0800)]
doc/release-notes: v0.90

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Fri, 19 Dec 2014 19:55:58 +0000 (11:55 -0800)]
Merge remote-tracking branch 'gh/next'

10 years agoosdc/Objecter: do notify completion callback in fast-dispatch context
Sage Weil [Fri, 19 Dec 2014 16:37:00 +0000 (08:37 -0800)]
osdc/Objecter: do notify completion callback in fast-dispatch context

The notify completion has exactly one user, the librados caller which
does nothing but take a local (inner) lock and signal a Cond.  Do this
in the fast-dispatch context for simplicity.

Notably, this makes the notify completion (and timeout) trigger a
notify2() return (with ETIMEDOUT) even when the finisher queue that
normally delivers notify is busy.. for example with a notify that is
being very slow.  In our case, the unit test is doing a sleep(3) to
test timeouts but also prevented the ETIMEDOUT notification from
being delivered to the caller.  This patch resolves that.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3199 from ceph/wip-qa-empty-xattr
John Spray [Fri, 19 Dec 2014 17:03:25 +0000 (17:03 +0000)]
Merge pull request #3199 from ceph/wip-qa-empty-xattr

qa: test zero size xattr

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge remote-tracking branch 'gh/wip-fs-quota'
Sage Weil [Fri, 19 Dec 2014 15:45:02 +0000 (07:45 -0800)]
Merge remote-tracking branch 'gh/wip-fs-quota'

Conflicts:
src/client/Client.cc

10 years agoMerge pull request #3218 from dachary/wip-10383-disable-unittest-msgr
Sage Weil [Fri, 19 Dec 2014 15:42:48 +0000 (07:42 -0800)]
Merge pull request #3218 from dachary/wip-10383-disable-unittest-msgr

tests: temporarily disable unittest_msgr

10 years agotests: temporarily disable unittest_msgr 3218/head
Loic Dachary [Fri, 19 Dec 2014 15:21:50 +0000 (16:21 +0100)]
tests: temporarily disable unittest_msgr

http://tracker.ceph.com/issues/10383 Refs: #10383

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2976 from ceph/wip-pgmeta
Sage Weil [Fri, 19 Dec 2014 15:19:05 +0000 (07:19 -0800)]
Merge pull request #2976 from ceph/wip-pgmeta

osd: move PG metadata to a per-PG object

Passed rados and upgrade tests.

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3212 from ceph/wip-10255-wusui
Sage Weil [Fri, 19 Dec 2014 15:09:33 +0000 (07:09 -0800)]
Merge pull request #3212 from ceph/wip-10255-wusui

Remove sepia dependency (use fqdn)

Backport: giant
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3214 from xinxinsh/wip-cleanup
Sage Weil [Fri, 19 Dec 2014 15:02:39 +0000 (07:02 -0800)]
Merge pull request #3214 from xinxinsh/wip-cleanup

cleanup : remove sync_epoch

Reviewed-by: Sage Weil <sage@redhat.com>
10 years ago0.90 v0.90
Jenkins [Fri, 19 Dec 2014 14:56:22 +0000 (06:56 -0800)]
0.90

10 years agodoc: Instead of using admin socket, use 'ceph daemon' command.
Wido den Hollander [Fri, 19 Dec 2014 14:51:49 +0000 (15:51 +0100)]
doc: Instead of using admin socket, use 'ceph daemon' command.

10 years agoMerge pull request #3193 from nilamdyuti/wip-doc-ceph-disk
Loic Dachary [Fri, 19 Dec 2014 14:36:39 +0000 (15:36 +0100)]
Merge pull request #3193 from nilamdyuti/wip-doc-ceph-disk

Changes format style in ceph-disk to improve readability as html

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3210 from ceph/wip-osdmap
Loic Dachary [Fri, 19 Dec 2014 14:07:56 +0000 (15:07 +0100)]
Merge pull request #3210 from ceph/wip-osdmap

osd: only verify OSDMap crc if it is known

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3216 from cstavr/master
Loic Dachary [Fri, 19 Dec 2014 13:57:11 +0000 (14:57 +0100)]
Merge pull request #3216 from cstavr/master

ceph-disk: Fix wrong string formatting

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-disk: Fix wrong string formatting 3216/head
Christos Stavrakakis [Fri, 19 Dec 2014 11:46:44 +0000 (13:46 +0200)]
ceph-disk: Fix wrong string formatting

Signed-off-by: Christos Stavrakakis <stavr.chris@gmail.com>
10 years agocleanup : remove sync_epoch 3214/head
xinxin shu [Fri, 19 Dec 2014 01:07:52 +0000 (09:07 +0800)]
cleanup : remove sync_epoch

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoRemove sepia dependency (use fqdn) 3212/head
Warren Usui [Wed, 17 Dec 2014 06:01:26 +0000 (22:01 -0800)]
Remove sepia dependency (use fqdn)

Fixes: #10255
Signed-off-by: Warren Usui <warren.usui@inktank.com>
10 years agoMerge pull request #3209 from dmick/wip-stop.sh-me
Loic Dachary [Fri, 19 Dec 2014 00:54:42 +0000 (01:54 +0100)]
Merge pull request #3209 from dmick/wip-stop.sh-me

stop.sh: only try killing processes that belong to me

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd: only verfy OSDMap crc if it is known 3210/head
Sage Weil [Fri, 19 Dec 2014 00:49:06 +0000 (16:49 -0800)]
osd: only verfy OSDMap crc if it is known

Only verify we encode a full map with the correct CRC if we actually
have the value in the Incremental.  Otherwise, any map from an old
mon will fail.  And we'll try to request a full map with a message the
old mon doesn't understand.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agostop.sh: only try killing processes that belong to me 3209/head
Dan Mick [Fri, 19 Dec 2014 00:14:43 +0000 (16:14 -0800)]
stop.sh: only try killing processes that belong to me

Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agoMerge pull request #3207 from ceph/wip-cot-rename
Loic Dachary [Fri, 19 Dec 2014 00:12:10 +0000 (01:12 +0100)]
Merge pull request #3207 from ceph/wip-cot-rename

ceph_objectstore_tool: Rename generated binary to ceph-objectstore-tool

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3208 from ceph/wip-10326
Dan Mick [Fri, 19 Dec 2014 00:10:34 +0000 (16:10 -0800)]
Merge pull request #3208 from ceph/wip-10326

qa/workunits/rest/test.py: fix pg stat test

10 years agoqa/workunits/rest/test.py: fix pg stat test 3208/head
Sage Weil [Thu, 18 Dec 2014 23:45:48 +0000 (15:45 -0800)]
qa/workunits/rest/test.py: fix pg stat test

Back in e27b0d9e42b7ac3de896c3398689bbdbe03f1bbb we changed pg stat to
not dump everything when a formatter is used.

Fixes: #10326
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3195 from nilamdyuti/wip-doc-ceph-deploy
John Wilkins [Thu, 18 Dec 2014 23:01:50 +0000 (15:01 -0800)]
Merge pull request #3195 from nilamdyuti/wip-doc-ceph-deploy

doc: Changes format style in ceph-deploy to improve readability as html.

Reviewed-by: John Wilkins <jowilkin@redhat.com>