RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,146 Commits 212 Branches 394 Tags 1.5 GiB
48e38ac632
Commit Graph

34146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sage Weil
b24ee49739 Merge pull request #2009 from kevincox/election-int 
Use sized integer.

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-06-23 08:15:33 -07:00
Loic Dachary
cd12394750 Merge pull request #2011 from dachary/wip-osd-bench 
osd: tests for osd bench

Reviewed-by: Huang Jun <hjwsm1989@gmail.com>
 2014-06-23 09:57:08 +02:00
Loic Dachary
3e93d4a1cd 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>
 2014-06-23 09:10:52 +02:00
Loic Dachary
791a6b95a1 Merge pull request #1974 from hjwsm1989/osd-bench 
Fix EINVAL err when use "ceph tell osd.* bench"

Reviewed-by: Loic Dachary <loic@dachary.org>
 2014-06-21 17:06:07 +02:00
Kevin Cox
74be320a07 Use sized integer. 
Signed-off-by: Kevin Cox <kevincox@kevincox.ca>
 2014-06-20 16:53:09 -04:00
Loic Dachary
31eefebdec Merge pull request #1961 from ceph/wip-6703 
support dmcrypt partitions when activating

Reviewed-by: Loic Dachary <loic@dachary.org>
 2014-06-20 19:45:58 +02:00
John Wilkins
2cb19172dc 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
 2014-06-20 10:05:35 -07:00
George Ryall
66a5f3b9ea doc: Fixed Typo in pools documentation - replaced '-' with '_' in example set-quota comands. 2014-06-20 17:54:47 +01:00
Alfredo Deza
e189a66828 log the command that is being run with subprocess 
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
 2014-06-20 11:14:25 -04:00
Loic Dachary
78cbac43cc mailmap: Dmitry Smirnov name normalization 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:15 +02:00
Loic Dachary
efefbfd195 mailmap: koleosfuscus affiliation 
Patrick McGarry, Sage Weil and Loic Dachary know who this nickname
belongs to

Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:15 +02:00
Loic Dachary
1cdea987c5 mailmap: Walter Huf name normalization 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:15 +02:00
Loic Dachary
a58fbf792d mailmap: Colin Mattson affliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:15 +02:00
Loic Dachary
41c536f9f8 mailmap: Dominik Hannen affiliation 
and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:15 +02:00
Loic Dachary
1f96cb72cd mailmap: Harpreet Dhillon affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:14 +02:00
Loic Dachary
3716f5884b mailmap: Lluis Pamies-Juarez affiliation 
and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:14 +02:00
Loic Dachary
4222f29e67 mailmap: Wei Luo affiliation 
and name normalization

Reviewed-by: Wei Luo <luowei@yahoo-inc.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:14 +02:00
Loic Dachary
009f01dcc7 mailmap: Sahid Orentino Ferdjaoui name normalization 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:14 +02:00
Loic Dachary
06734f19c4 mailmap: Stephen F Taylor affiliation 
and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:14 +02:00
Loic Dachary
43442953c1 mailmap: Sushma Gurram affiliation 
and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:14 +02:00
Loic Dachary
2eddee7332 mailmap: Sylvain Munaut affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:23:14 +02:00
Loic Dachary
22c028d079 mailmap: Red Hat acquires InkTank 
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:22:58 +02:00
Loic Dachary
c2701723e1 mailmap: Sebastien Ponce affiliation 
Reviewed-by: Sebastien Ponce <sebastien.ponce@cern.ch>
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 10:21:30 +02:00
Loic Dachary
39a4b78177 mon: test that pools used in tiers cannot be removed 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-06-20 09:52:31 +02:00
Loic Dachary
2c8ff50fb1 Merge pull request #1997 from ceph/wip-tiermsg 
mon: name instead of id in "has tiers" message

Reviewed-by: Loic Dachary <loic@dachary.org>
 2014-06-20 09:49:32 +02:00
Joao Eduardo Luis
1de9071dae 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>
 2014-06-19 18:39:07 +01:00
Joao Eduardo Luis
363496ad87 osd: use appropriate json types instead of stream when dumping info 
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
 2014-06-19 18:39:07 +01:00
John Spray
97772c2f53 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>
 2014-06-19 13:16:23 -04:00
Loic Dachary
34ba8faf75 Merge pull request #1988 from dachary/wip-warnings 
test: fix -Wsign-compare warnings

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
 2014-06-19 18:06:49 +02:00
Joao Eduardo Luis
4d5469acc4 osd: ECMsgTypes: dump json bools instead of strings 
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
 2014-06-19 16:53:00 +01:00
Joao Eduardo Luis
3f0ea9512b 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>
 2014-06-19 16:52:06 +01:00
Loic Dachary
708776cc35 Merge pull request #1993 from dachary/fix_ut 
autotools: avoid check_SCRIPTS duplication

Reviewed-by: Wei Luo <luowei@yahoo-inc.com>
 2014-06-19 17:41:25 +02:00
Joao Eduardo Luis
debaf615fc mon: dump 'epoch' as json unsigned instead of int 
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
 2014-06-19 16:31:27 +01:00
Joao Eduardo Luis
1a120e981a mon: PGMonitor: dump 'epoch' as json int instead of string 
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
 2014-06-19 16:05:07 +01:00