]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agoqa/workunits: cephtool: only run heap profiler test if tcmalloc enabled
Joao Eduardo Luis [Wed, 25 Jun 2014 00:48:24 +0000 (01:48 +0100)]
qa/workunits: cephtool: only run heap profiler test if tcmalloc enabled

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: set +e for the tcmalloc tests
Joao Eduardo Luis [Tue, 24 Jun 2014 22:16:17 +0000 (23:16 +0100)]
qa/workunits: cephtool: set +e for the tcmalloc tests

Avoids failing the tests when tcmalloc is not present

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: delete unnecessary function calls
Joao Eduardo Luis [Tue, 24 Jun 2014 21:47:31 +0000 (22:47 +0100)]
qa/workunits: cephtool: delete unnecessary function calls

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: disable bash debug when not running tests
Joao Eduardo Luis [Tue, 24 Jun 2014 21:46:44 +0000 (22:46 +0100)]
qa/workunits: cephtool: disable bash debug when not running tests

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: allow running individual tests
Joao Eduardo Luis [Tue, 24 Jun 2014 21:39:34 +0000 (22:39 +0100)]
qa/workunits: cephtool: allow running individual tests

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: cleanup state after erasure-code-profile test
Joao Eduardo Luis [Tue, 24 Jun 2014 19:55:27 +0000 (20:55 +0100)]
qa/workunits: cephtool: cleanup state after erasure-code-profile test

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: add/remove comments
Joao Eduardo Luis [Wed, 25 Jun 2014 00:17:58 +0000 (01:17 +0100)]
qa/workunits: cephtool: add/remove comments

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: split into properly indented functions
Joao Eduardo Luis [Wed, 25 Jun 2014 23:55:46 +0000 (00:55 +0100)]
qa/workunits: cephtool: split into properly indented functions

The test was a big sequence of commands being run and it has been growing
organically for a while, even though it has maintained a sense of
locality with regard to the portions being tested.

This patch intends to split the commands into functions, allowing for a
better semantic context and easier expansion.  On the other hand, this
will also allow us to implement mechanisms to run specific portions of
the test instead of always having to run the whole thing just to test a
couple of lines down at the bottom (or have to creatively edit the test).

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: move test line to where it's more appropriate
Joao Eduardo Luis [Wed, 25 Jun 2014 00:12:55 +0000 (01:12 +0100)]
qa/workunits: cephtool: move test line to where it's more appropriate

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunits: cephtool: split into functions
Joao Eduardo Luis [Wed, 25 Jun 2014 00:11:52 +0000 (01:11 +0100)]
qa/workunits: cephtool: split into functions

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #2021 from ceph/wip-da-fix-make-check
Sage Weil [Wed, 25 Jun 2014 23:14:06 +0000 (16:14 -0700)]
Merge pull request #2021 from ceph/wip-da-fix-make-check

Fixes to get "make check" run on SUSE v2

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2001 from dachary/wip-tiermsg
Samuel Just [Wed, 25 Jun 2014 20:39:48 +0000 (13:39 -0700)]
Merge pull request #2001 from dachary/wip-tiermsg

mon: test that pools used in tiers cannot be removed

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1938 from dachary/wip-8071
Sage Weil [Wed, 25 Jun 2014 20:35:59 +0000 (13:35 -0700)]
Merge pull request #1938 from dachary/wip-8071

erasure-code: remove jerasure internals dependencies

11 years agoMerge pull request #2025 from ceph/wip-disable-static
Sage Weil [Wed, 25 Jun 2014 20:30:05 +0000 (13:30 -0700)]
Merge pull request #2025 from ceph/wip-disable-static

do_autogen.sh: --disable-static

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1967 from yuyuyu101/kvstore-fix-set-alloc-hint
Sage Weil [Wed, 25 Jun 2014 20:24:00 +0000 (13:24 -0700)]
Merge pull request #1967 from yuyuyu101/kvstore-fix-set-alloc-hint

Make KeyValueStore not use expected_write_size

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agotest/ceph-disk.sh: fix for SUSE 2021/head
Danny Al-Gaaf [Tue, 24 Jun 2014 17:54:17 +0000 (19:54 +0200)]
test/ceph-disk.sh: fix for SUSE

On SUSE 'which' returns always the full path of (shell) commands and
not e.g. './ceph-conf' as on Debian. Add check also for full
path returned by which.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoosdmaptool/test-map-pgs.t: fix escaping to fix run
Danny Al-Gaaf [Wed, 25 Jun 2014 07:56:52 +0000 (09:56 +0200)]
osdmaptool/test-map-pgs.t: fix escaping to fix run

Run failed always running into the '|| cat $OUT' case due
to bad escaping of '\t'. This is caused by different shells
on different distros (e.g. bash on SUSE vs dash on Ubuntu).

Use 'grep -P ' and fix the regex to make it shell independet.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoRevert "Give meaningful error when submodules are not checked out"
Sage Weil [Wed, 25 Jun 2014 20:19:03 +0000 (13:19 -0700)]
Revert "Give meaningful error when submodules are not checked out"

This reverts commit 87f9dbaf78ee040bbe0f56d2ada5299b150916b2.

This breaks the gitbuilders.  Maybe it needs the base dir to be explicit?

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoMake <poolname> in "ceph osd tier --help" clearer.
Accela Zhao [Wed, 18 Jun 2014 09:17:03 +0000 (17:17 +0800)]
Make <poolname> in "ceph osd tier --help" clearer.

The ceph osd tier --help info on the left always says <poolname>.
It is unclear which one to put <tierpool> on the right.

$ceph osd tier --help
osd tier add <poolname> <poolname> {--   add the tier <tierpool> to base pool
force-nonempty}                          <pool>
osd tier add-cache <poolname>            add a cache <tierpool> of size <size>
<poolname> <int[0-]>                     to existing pool <pool>
...

This patch modifies description on the right to tell which <poolname>:

osd tier add <poolname> <poolname> {--   add the tier <tierpool> (the second
 force-nonempty}                          one) to base pool <pool> (the first
                                           one)
...

Fix: http://tracker.ceph.com/issues/8256

Signed-off-by: Yilong Zhao <accelazh@gmail.com>
11 years agoMerge pull request #1978 from adamcrume/master
Sage Weil [Wed, 25 Jun 2014 18:35:16 +0000 (11:35 -0700)]
Merge pull request #1978 from adamcrume/master

OSD bug fix and developer error message

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2023 from adamcrume/wip-8661
Sage Weil [Wed, 25 Jun 2014 18:32:40 +0000 (11:32 -0700)]
Merge pull request #2023 from adamcrume/wip-8661

doc: Fix malformed parameters in librados.h

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #1958 from jdurgin/wip-rbd-ro
Sage Weil [Wed, 25 Jun 2014 18:14:58 +0000 (11:14 -0700)]
Merge pull request #1958 from jdurgin/wip-rbd-ro

qa: add script to test krbd setting ro/rw ioctl

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge branch 'wip-mon-sanity-checks'
Sage Weil [Wed, 25 Jun 2014 18:11:30 +0000 (11:11 -0700)]
Merge branch 'wip-mon-sanity-checks'

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agomon: simplify output
Sage Weil [Wed, 25 Jun 2014 18:10:32 +0000 (11:10 -0700)]
mon: simplify output

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge commit '4225e2f6c9f69682d0e7288d7809851b61a17c70'
Sage Weil [Wed, 25 Jun 2014 18:05:50 +0000 (11:05 -0700)]
Merge commit '4225e2f6c9f69682d0e7288d7809851b61a17c70'

Conflicts:
PendingReleaseNotes

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #1973 from ceph/wip-8593
Sage Weil [Wed, 25 Jun 2014 17:55:25 +0000 (10:55 -0700)]
Merge pull request #1973 from ceph/wip-8593

mon: fix up health warnings

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1980 from ceph/wip-osd-stats
Sage Weil [Wed, 25 Jun 2014 17:52:51 +0000 (10:52 -0700)]
Merge pull request #1980 from ceph/wip-osd-stats

osd: move osd_stat tracking into OSDService; fix minor bug

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2006 from ceph/wip-8603
Sage Weil [Wed, 25 Jun 2014 17:50:49 +0000 (10:50 -0700)]
Merge pull request #2006 from ceph/wip-8603

log the command that is being run with subprocess

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #1969 from ceph/wip-vstart-conf
Sage Weil [Wed, 25 Jun 2014 17:48:06 +0000 (10:48 -0700)]
Merge pull request #1969 from ceph/wip-vstart-conf

vstart.sh: echo CEPH_{CONF,KEYRING} exports if necessary

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2022 from ceph/wip-mon-perf
Sage Weil [Wed, 25 Jun 2014 17:34:27 +0000 (10:34 -0700)]
Merge pull request #2022 from ceph/wip-mon-perf

mon: shut down perfcounters last

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agodo_autogen.sh: --disable-static 2025/head
Sage Weil [Wed, 25 Jun 2014 17:27:07 +0000 (10:27 -0700)]
do_autogen.sh: --disable-static

This will make builds go ~2x as fast when developing.

Reported-by: Luis Pabon <lpabon@redhat.com>
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1944 from athanatos/wip-8396
Gregory Farnum [Wed, 25 Jun 2014 17:02:41 +0000 (10:02 -0700)]
Merge pull request #1944 from athanatos/wip-8396

Move the waiting_for_pg list down into the Sessions, and coordinate the updates so that we don't get races
between the Pipe and handle_map threads.

Fixes: #8396
Fixes: #8505
Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #2024 from dachary/wip-8630-inject-enxio
Sage Weil [Wed, 25 Jun 2014 16:24:08 +0000 (09:24 -0700)]
Merge pull request #2024 from dachary/wip-8630-inject-enxio

osd: workaround race condition in tests

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoosd: workaround race condition in tests 2024/head
Loic Dachary [Wed, 25 Jun 2014 16:07:47 +0000 (18:07 +0200)]
osd: workaround race condition in tests

Trying to "ceph tell" a newly created OSD sometime triggers an
ENXIO. The OSD creation function used for test scripts waits for the OSD
to report that it is up (according to ceph osd tree) before
returning. That reduces (maybe close ?) the condition that triggers the
error so that the tests do not randomly fail.

http://tracker.ceph.com/issues/8630 refs: #8630

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomon: shut down perfcounters last 2022/head
Sage Weil [Wed, 25 Jun 2014 15:43:32 +0000 (08:43 -0700)]
mon: shut down perfcounters last

In particular, remove_all_sessions updates the perfcounter stats, so we
need to stop those after.

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agodoc: Fix malformed parameters in librados.h 2023/head
Adam Crume [Wed, 25 Jun 2014 15:38:49 +0000 (08:38 -0700)]
doc: Fix malformed parameters in librados.h

Fixes parameters for rados_write_op_operate and rados_aio_write_op_operate

Fixes: #8661
Signed-off-by: Adam Crume <adamcrume@gmail.com>
11 years agoMerge pull request #1996 from dachary/wip-mailmap
Loic Dachary [Wed, 25 Jun 2014 14:54:14 +0000 (16:54 +0200)]
Merge pull request #1996 from dachary/wip-mailmap

mailmap updates

reviewed-by individual commits

11 years agoMerge pull request #2017 from ceph/wip-8654
Loic Dachary [Wed, 25 Jun 2014 13:13:21 +0000 (15:13 +0200)]
Merge pull request #2017 from ceph/wip-8654

Fix #8654 - OSD.cc: parse LSB data via lsb_release

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoosd/OSD.cc: parse lsb release data via lsb_release 2017/head
Danny Al-Gaaf [Tue, 24 Jun 2014 22:31:48 +0000 (00:31 +0200)]
osd/OSD.cc: parse lsb release data via lsb_release

Use lsb_release tool to be portable since parsing /etc/lsb-release
is not the same between different distributions. The old code failed
e.g. for SUSE products to parse LSB information.

Fixes: #8654
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoMerge pull request #2020 from ceph/wip-fix-rados-tool
Samuel Just [Wed, 25 Jun 2014 01:45:17 +0000 (18:45 -0700)]
Merge pull request #2020 from ceph/wip-fix-rados-tool

rados.cc: fix pool alignment check

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agorados.cc: fix pool alignment check 2020/head
Samuel Just [Tue, 24 Jun 2014 17:11:21 +0000 (10:11 -0700)]
rados.cc: fix pool alignment check

Only check pool alignment if io_ctx is initialized.

Introduced in 304b08a23a3db57010078046955a786fe3589ef8
Fixes: #8652
Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge remote-tracking branch 'origin/next'
John Spray [Tue, 24 Jun 2014 23:00:28 +0000 (16:00 -0700)]
Merge remote-tracking branch 'origin/next'

11 years agoMerge pull request #2005 from ceph/wip-8624
John Spray [Tue, 24 Jun 2014 22:49:29 +0000 (15:49 -0700)]
Merge pull request #2005 from ceph/wip-8624

mon: MDSMonitor: do not allow ec pools to be used for data or metadata

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: John Spray <john.spray@redhat.com>
11 years agomon: MDSMonitor: print pool name along with id during 'newfs' errors 2005/head
Joao Eduardo Luis [Mon, 23 Jun 2014 22:27:05 +0000 (23:27 +0100)]
mon: MDSMonitor: print pool name along with id during 'newfs' errors

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoqa/workunit: cephtool: test mds newfs and add_data_pool with ec pools
Joao Eduardo Luis [Fri, 20 Jun 2014 15:25:35 +0000 (16:25 +0100)]
qa/workunit: cephtool: test mds newfs and add_data_pool with ec pools

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: MDSMonitor: do not allow ec pools to be used for data or metadata
Joao Eduardo Luis [Fri, 20 Jun 2014 15:13:28 +0000 (16:13 +0100)]
mon: MDSMonitor: do not allow ec pools to be used for data or metadata

Fixes: #8624
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agocommon: LogClient: output to derr (i.e., dout(-1)) on CLOG_ERROR 2016/head
Joao Eduardo Luis [Mon, 23 Jun 2014 22:05:02 +0000 (23:05 +0100)]
common: LogClient: output to derr (i.e., dout(-1)) on CLOG_ERROR

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: Monitor: observe conf changes and report on unsage option values
Joao Eduardo Luis [Mon, 23 Jun 2014 22:04:02 +0000 (23:04 +0100)]
mon: Monitor: observe conf changes and report on unsage option values

Fixes: #8605
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: Monitor: sanitize options at start
Joao Eduardo Luis [Sat, 21 Jun 2014 17:15:29 +0000 (18:15 +0100)]
mon: Monitor: sanitize options at start

Make sure some options have sane values.

Fixes: #8605
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoGive meaningful error when submodules are not checked out 1978/head
Adam Crume [Tue, 10 Jun 2014 17:47:46 +0000 (10:47 -0700)]
Give meaningful error when submodules are not checked out

Signed-off-by: Adam Crume <adamcrume@gmail.com>
11 years agoosd: Only normalize extent if op uses extent
Adam Crume [Tue, 17 Jun 2014 20:24:45 +0000 (13:24 -0700)]
osd: Only normalize extent if op uses extent

Code in ReplicatedPG was reading and modifying ceph_osd_op.extent,
even though that is a member of a union and only valid for some ops.

Signed-off-by: Adam Crume <adamcrume@gmail.com>
11 years agoosd: remove OSD-specific leveldb options 1952/head
Joao Eduardo Luis [Mon, 23 Jun 2014 21:41:35 +0000 (22:41 +0100)]
osd: remove OSD-specific leveldb options

OSDs will now rely on 'leveldb_*' config options.  We do keep however
leveldb's log enabled for OSDs by passing 'leveldb_log=""' as a default
argument to global_init() on ceph_osd.cc -- however, users will be able
to override this at their own discretion.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoceph-mon: override 'leveldb_*' config options for the monitor
Joao Eduardo Luis [Mon, 23 Jun 2014 20:59:13 +0000 (21:59 +0100)]
ceph-mon: override 'leveldb_*' config options for the monitor

'leveldb_*' options are currently used both by the monitor and the osd.
However, the monitor has quite different requirements from those of the
osds.

We need to specify some default values that must squash the defaults we
have for 'leveldb_*' options, while allowing users to overriding them too.
We take this not-exactly-ideal-but-still-good-enough approach of
defining the monitor-specific defaults in the 'default arguments' to
global_init(), thus allowing the user's options to take precedence over
whatever we define.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: MonitorDBStore: remove mon-specific leveldb options.
Joao Eduardo Luis [Mon, 23 Jun 2014 18:28:07 +0000 (19:28 +0100)]
mon: MonitorDBStore: remove mon-specific leveldb options.

From this point onward, users should use leveldb's options and add them
to the appropriate config sections of their configuration file.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1998 from ceph/wip-disk-ioprio
Samuel Just [Mon, 23 Jun 2014 18:25:55 +0000 (11:25 -0700)]
Merge pull request #1998 from ceph/wip-disk-ioprio

osd: allow io priority for (background) disk threadpool to be set

Backport: firefly, dumpling
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agomon: DataHealthService: s/mon_leveldb_size_warn/mon_data_size_warn/
Joao Eduardo Luis [Mon, 23 Jun 2014 18:24:55 +0000 (19:24 +0100)]
mon: DataHealthService: s/mon_leveldb_size_warn/mon_data_size_warn/

Make the option name independent from the store mechanism used underneath.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #2015 from ceph/wip-8610
Samuel Just [Mon, 23 Jun 2014 18:08:31 +0000 (11:08 -0700)]
Merge pull request #2015 from ceph/wip-8610

osd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately 1972/head 2015/head
Sage Weil [Mon, 23 Jun 2014 17:47:24 +0000 (10:47 -0700)]
osd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1979 from ceph/wip-backfill-priority
Sage Weil [Mon, 23 Jun 2014 16:09:49 +0000 (09:09 -0700)]
Merge pull request #1979 from ceph/wip-backfill-priority

osd: improve backfill prioritization

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd: allow io priority to be set for the disk_tp 1998/head
Sage Weil [Thu, 19 Jun 2014 19:34:36 +0000 (12:34 -0700)]
osd: allow io priority to be set for the disk_tp

The disk_tp covers scrubbing, pg deletion, and snap trimming

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/WorkQueue: allow io priority to be set for wq
Sage Weil [Wed, 18 Jun 2014 18:02:09 +0000 (11:02 -0700)]
common/WorkQueue: allow io priority to be set for wq

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/Thread: allow io priority to be set for a Thread
Sage Weil [Wed, 18 Jun 2014 18:01:42 +0000 (11:01 -0700)]
common/Thread: allow io priority to be set for a Thread

Ideally, set this before starting the thread.  If you set it after, we
could potentially race with create() itself.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/io_priority: wrap ioprio_set() and gettid()
Sage Weil [Wed, 18 Jun 2014 18:01:09 +0000 (11:01 -0700)]
common/io_priority: wrap ioprio_set() and gettid()

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/wip-misc-fixes'
Sage Weil [Mon, 23 Jun 2014 15:56:39 +0000 (08:56 -0700)]
Merge remote-tracking branch 'gh/wip-misc-fixes'

Conflicts:
src/mon/Monitor.cc

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #2009 from kevincox/election-int
Sage Weil [Mon, 23 Jun 2014 15:15:33 +0000 (08:15 -0700)]
Merge pull request #2009 from kevincox/election-int

Use sized integer.

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2011 from dachary/wip-osd-bench
Loic Dachary [Mon, 23 Jun 2014 07:57:08 +0000 (09:57 +0200)]
Merge pull request #2011 from dachary/wip-osd-bench

osd: tests for osd bench

Reviewed-by: Huang Jun <hjwsm1989@gmail.com>
11 years agoosd: tests for osd bench 2011/head
Loic Dachary [Sat, 21 Jun 2014 15:03:00 +0000 (17:03 +0200)]
osd: tests for osd bench

Check that the safeguards against timeouts work as expected and that the
default hardcoded values are valid.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1974 from hjwsm1989/osd-bench
Loic Dachary [Sat, 21 Jun 2014 15:06:07 +0000 (17:06 +0200)]
Merge pull request #1974 from hjwsm1989/osd-bench

  Fix EINVAL err when use "ceph tell osd.* bench"

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoUse sized integer. 2009/head
Kevin Cox [Fri, 20 Jun 2014 19:52:20 +0000 (15:52 -0400)]
Use sized integer.

Signed-off-by: Kevin Cox <kevincox@kevincox.ca>
11 years agoMerge pull request #1961 from ceph/wip-6703
Loic Dachary [Fri, 20 Jun 2014 17:45:58 +0000 (19:45 +0200)]
Merge pull request #1961 from ceph/wip-6703

support dmcrypt partitions when activating

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #2007 from GRyall/master
John Wilkins [Fri, 20 Jun 2014 17:05:35 +0000 (10:05 -0700)]
Merge pull request #2007 from GRyall/master

doc: Fixed Typo in pools documentation - replaced '-' with '_' in eg

Reviewed-by: John Wilkins john.wilkins@inktank.com
11 years agodoc: Fixed Typo in pools documentation - replaced '-' with '_' in example set-quota... 2007/head
George Ryall [Fri, 20 Jun 2014 16:45:00 +0000 (17:45 +0100)]
doc: Fixed Typo in pools documentation - replaced '-' with '_' in example set-quota comands.

11 years agolog the command that is being run with subprocess 2006/head
Alfredo Deza [Fri, 20 Jun 2014 15:14:25 +0000 (11:14 -0400)]
log the command that is being run with subprocess

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
11 years agomailmap: Dmitry Smirnov name normalization 1996/head
Loic Dachary [Thu, 19 Jun 2014 13:18:11 +0000 (15:18 +0200)]
mailmap: Dmitry Smirnov name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: koleosfuscus affiliation
Loic Dachary [Thu, 19 Jun 2014 13:15:32 +0000 (15:15 +0200)]
mailmap: koleosfuscus affiliation

Patrick McGarry, Sage Weil and Loic Dachary know who this nickname
belongs to

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Walter Huf name normalization
Loic Dachary [Thu, 19 Jun 2014 13:14:06 +0000 (15:14 +0200)]
mailmap: Walter Huf name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Colin Mattson affliation
Loic Dachary [Thu, 19 Jun 2014 12:58:09 +0000 (14:58 +0200)]
mailmap: Colin Mattson affliation

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Dominik Hannen affiliation
Loic Dachary [Thu, 19 Jun 2014 12:47:22 +0000 (14:47 +0200)]
mailmap: Dominik Hannen affiliation

and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Harpreet Dhillon affiliation
Loic Dachary [Thu, 19 Jun 2014 12:44:03 +0000 (14:44 +0200)]
mailmap: Harpreet Dhillon affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Lluis Pamies-Juarez affiliation
Loic Dachary [Thu, 19 Jun 2014 12:31:28 +0000 (14:31 +0200)]
mailmap: Lluis Pamies-Juarez affiliation

and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Wei Luo affiliation
Loic Dachary [Thu, 19 Jun 2014 12:25:58 +0000 (14:25 +0200)]
mailmap: Wei Luo affiliation

and name normalization

Reviewed-by: Wei Luo <luowei@yahoo-inc.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Sahid Orentino Ferdjaoui name normalization
Loic Dachary [Thu, 19 Jun 2014 12:23:36 +0000 (14:23 +0200)]
mailmap: Sahid Orentino Ferdjaoui name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Stephen F Taylor affiliation
Loic Dachary [Thu, 19 Jun 2014 12:20:26 +0000 (14:20 +0200)]
mailmap: Stephen F Taylor affiliation

and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Sushma Gurram affiliation
Loic Dachary [Thu, 19 Jun 2014 12:17:51 +0000 (14:17 +0200)]
mailmap: Sushma Gurram affiliation

and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Sylvain Munaut affiliation
Loic Dachary [Thu, 19 Jun 2014 12:14:33 +0000 (14:14 +0200)]
mailmap: Sylvain Munaut affiliation

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Red Hat acquires InkTank
Loic Dachary [Thu, 19 Jun 2014 12:07:57 +0000 (14:07 +0200)]
mailmap: Red Hat acquires InkTank

Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomailmap: Sebastien Ponce affiliation
Loic Dachary [Thu, 19 Jun 2014 11:53:11 +0000 (13:53 +0200)]
mailmap: Sebastien Ponce affiliation

Reviewed-by: Sebastien Ponce <sebastien.ponce@cern.ch>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agomon: test that pools used in tiers cannot be removed 2001/head
Loic Dachary [Fri, 20 Jun 2014 07:38:39 +0000 (09:38 +0200)]
mon: test that pools used in tiers cannot be removed

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1997 from ceph/wip-tiermsg
Loic Dachary [Fri, 20 Jun 2014 07:49:32 +0000 (09:49 +0200)]
Merge pull request #1997 from ceph/wip-tiermsg

mon: name instead of id in "has tiers" message

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoosd/osd_types.cc: dump correct pg_log_entry_t member variable 2004/head
Joao Eduardo Luis [Thu, 19 Jun 2014 17:29:31 +0000 (18:29 +0100)]
osd/osd_types.cc: dump correct pg_log_entry_t member variable

We were dumping 'version' twice: for 'version' and 'prior_version'.  We
do have a member variable called 'prior_version', which is assumed to
be the correct one to be dumped.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoosd: use appropriate json types instead of stream when dumping info
Joao Eduardo Luis [Thu, 19 Jun 2014 17:27:49 +0000 (18:27 +0100)]
osd: use appropriate json types instead of stream when dumping info

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: name instead of id in "has tiers" message 1997/head
John Spray [Tue, 3 Jun 2014 09:12:41 +0000 (10:12 +0100)]
mon: name instead of id in "has tiers" message

Instead of "Pool foo has tiers 1 2" print
"Pool foo has tiers bar baz".

Signed-off-by: John Spray <jspray@redhat.com>
11 years agoMerge pull request #1988 from dachary/wip-warnings
Loic Dachary [Thu, 19 Jun 2014 16:06:49 +0000 (18:06 +0200)]
Merge pull request #1988 from dachary/wip-warnings

test: fix -Wsign-compare warnings

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoosd: ECMsgTypes: dump json bools instead of strings
Joao Eduardo Luis [Thu, 19 Jun 2014 15:53:00 +0000 (16:53 +0100)]
osd: ECMsgTypes: dump json bools instead of strings

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoosd: have 'tid' dumped as a json unsigned int where appropriate
Joao Eduardo Luis [Thu, 19 Jun 2014 15:52:06 +0000 (16:52 +0100)]
osd: have 'tid' dumped as a json unsigned int where appropriate

Most of the places dumping it would dump it as a string. Others as an int.
Just a couple would dump it as an unsigned int.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1993 from dachary/fix_ut
Loic Dachary [Thu, 19 Jun 2014 15:41:25 +0000 (17:41 +0200)]
Merge pull request #1993 from dachary/fix_ut

autotools: avoid check_SCRIPTS duplication

Reviewed-by: Wei Luo <luowei@yahoo-inc.com>
11 years agomon: dump 'epoch' as json unsigned instead of int
Joao Eduardo Luis [Thu, 19 Jun 2014 15:31:27 +0000 (16:31 +0100)]
mon: dump 'epoch' as json unsigned instead of int

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: PGMonitor: dump 'epoch' as json int instead of string
Joao Eduardo Luis [Thu, 19 Jun 2014 15:05:07 +0000 (16:05 +0100)]
mon: PGMonitor: dump 'epoch' as json int instead of string

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: OSDMonitor: dump 'up' as json array instead of string
Joao Eduardo Luis [Thu, 19 Jun 2014 14:59:43 +0000 (15:59 +0100)]
mon: OSDMonitor: dump 'up' as json array instead of string

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: OSDMonitor: dump 'acting' as json array instead of string
Joao Eduardo Luis [Thu, 19 Jun 2014 14:56:06 +0000 (15:56 +0100)]
mon: OSDMonitor: dump 'acting' as json array instead of string

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>