Commit Graph

34288 Commits

Author SHA1 Message Date
Accela Zhao
9695535158 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>
2014-06-25 13:15:47 -07:00
Sage Weil
381aac5420 Merge pull request #1978 from adamcrume/master
OSD bug fix and developer error message

Reviewed-by: Sage Weil <sage@redhat.com>
2014-06-25 11:35:16 -07:00
Sage Weil
1b9805d975 Merge pull request #2023 from adamcrume/wip-8661
doc: Fix malformed parameters in librados.h

Reviewed-by: Sage Weil <sage@redhat.com>
2014-06-25 11:32:40 -07:00
Sage Weil
394d51233d 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>
2014-06-25 11:14:58 -07:00
Sage Weil
5ed892aa02 Merge branch 'wip-mon-sanity-checks'
Reviewed-by: Sage Weil <sage@redhat.com>
2014-06-25 11:11:30 -07:00
Sage Weil
76361b8024 mon: simplify output
Signed-off-by: Sage Weil <sage@inktank.com>
2014-06-25 11:10:32 -07:00
Sage Weil
4958786c6a Merge commit '4225e2f6c9f69682d0e7288d7809851b61a17c70'
Conflicts:
	PendingReleaseNotes

Reviewed-by: Sage Weil <sage@redhat.com>
2014-06-25 11:05:50 -07:00
Sage Weil
31b59d6626 Merge pull request #1973 from ceph/wip-8593
mon: fix up health warnings

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-06-25 10:55:25 -07:00
Sage Weil
589d9d7686 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>
2014-06-25 10:52:51 -07:00
Sage Weil
31721eef40 Merge pull request #2006 from ceph/wip-8603
log the command that is being run with subprocess

Reviewed-by: Sage Weil <sage@redhat.com>
2014-06-25 10:50:49 -07:00
Sage Weil
a7e1ad428f 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>
2014-06-25 10:48:06 -07:00
Sage Weil
6a461a2d97 Merge pull request #2022 from ceph/wip-mon-perf
mon: shut down perfcounters last

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-06-25 10:34:27 -07:00
Sage Weil
385fd6c532 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>
2014-06-25 10:27:07 -07:00
Gregory Farnum
2546683958 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>
2014-06-25 10:02:41 -07:00
Jenkins
14085f42dd 0.82 2014-06-25 16:47:51 +00:00
Sage Weil
eb16198ff0 Merge pull request #2024 from dachary/wip-8630-inject-enxio
osd: workaround race condition in tests

Reviewed-by: Sage Weil <sage@redhat.com>
2014-06-25 09:24:08 -07:00
Loic Dachary
152bbd6a58 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>
2014-06-25 18:11:51 +02:00
Sage Weil
cb740b3990 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>
2014-06-25 08:43:32 -07:00
Adam Crume
524700fd62 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>
2014-06-25 08:38:49 -07:00
Danny Al-Gaaf
56cad1a8a5 libcephfs/test.cc: fix use after free
Don't call ceph_shutdown() after ceph_release().

CID 1219651 (#1 of 1): Use after free (USE_AFTER_FREE)
  17. deref_arg: Calling ceph_shutdown dereferences freed
  pointer cmount.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-06-25 17:04:25 +02:00
Danny Al-Gaaf
a5c704b28c RadosStriperImpl.cc: catch exception by reference
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-06-25 17:04:18 +02:00
Danny Al-Gaaf
6d798639ff rgw/rgw_rados.h: use static_cast instead of c-style cast
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-06-25 17:04:14 +02:00
Loic Dachary
e0f94138b5 Merge pull request #1996 from dachary/wip-mailmap
mailmap updates

reviewed-by individual commits
2014-06-25 16:54:14 +02:00
Loic Dachary
5d7add930c 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>
2014-06-25 15:13:21 +02:00
Danny Al-Gaaf
0b3a3987d3 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>
2014-06-25 15:06:09 +02:00
Samuel Just
391d24110c Merge pull request #2020 from ceph/wip-fix-rados-tool
rados.cc: fix pool alignment check

Reviewed-by: Sage Weil <sage@inktank.com>
2014-06-24 18:45:17 -07:00
Samuel Just
d7350a3741 rados.cc: fix pool alignment check
Only check pool alignment if io_ctx is initialized.

Introduced in 304b08a23a
Fixes: #8652
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-06-24 18:23:35 -07:00
John Spray
e5c565d3c1 Merge remote-tracking branch 'origin/next' 2014-06-24 16:00:28 -07:00
John Spray
4f7e26f2be 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>
2014-06-24 15:49:29 -07:00
Joao Eduardo Luis
2b007c25bc mon: MDSMonitor: print pool name along with id during 'newfs' errors
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-06-24 00:48:43 +01:00
Joao Eduardo Luis
378b5add22 qa/workunit: cephtool: test mds newfs and add_data_pool with ec pools
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-06-24 00:48:43 +01:00
Joao Eduardo Luis
d6f68132ce 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>
2014-06-23 23:12:29 +01:00
Joao Eduardo Luis
20a1664bc9 common: LogClient: output to derr (i.e., dout(-1)) on CLOG_ERROR
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-06-23 23:09:30 +01:00
Joao Eduardo Luis
9804360884 mon: Monitor: observe conf changes and report on unsage option values
Fixes: #8605

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-06-23 23:09:21 +01:00
Joao Eduardo Luis
ec73888f09 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>
2014-06-23 23:08:55 +01:00
Adam Crume
87f9dbaf78 Give meaningful error when submodules are not checked out
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-06-23 15:07:55 -07:00
Adam Crume
58212b1245 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>
2014-06-23 15:06:50 -07:00
Joao Eduardo Luis
4225e2f6c9 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>
2014-06-23 22:41:35 +01:00
Joao Eduardo Luis
52b147c8b3 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>
2014-06-23 21:59:13 +01:00
Joao Eduardo Luis
d42d19df2a 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>
2014-06-23 19:28:07 +01:00
Samuel Just
235f4ca6dc 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>
2014-06-23 11:25:55 -07:00
Joao Eduardo Luis
9844885d4c 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>
2014-06-23 19:24:55 +01:00
Samuel Just
66b0b0e68f 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>
2014-06-23 11:08:31 -07:00
Sage Weil
57c5d05827 osd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately
Signed-off-by: Sage Weil <sage@inktank.com>
2014-06-23 10:47:24 -07:00
Sage Weil
f317684326 Merge pull request #1979 from ceph/wip-backfill-priority
osd: improve backfill prioritization

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-06-23 09:09:49 -07:00
Sage Weil
d9073f4865 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>
2014-06-23 09:03:04 -07:00
Sage Weil
dd6badcb5e common/WorkQueue: allow io priority to be set for wq
Signed-off-by: Sage Weil <sage@inktank.com>
2014-06-23 09:01:55 -07:00
Sage Weil
1b8741022c 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>
2014-06-23 09:01:55 -07:00
Sage Weil
a2b49110ef common/io_priority: wrap ioprio_set() and gettid()
Signed-off-by: Sage Weil <sage@inktank.com>
2014-06-23 09:01:55 -07:00
Sage Weil
c3393434cf 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>
2014-06-23 08:56:39 -07:00