]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoerasure-code: preload the default plugins in the mon 2356/head
Loic Dachary [Fri, 29 Aug 2014 16:13:08 +0000 (18:13 +0200)]
erasure-code: preload the default plugins in the mon

The commit 164f1a1959a863848319585fa752250c7b261381 preloads the
jerasure plugin in the OSD. They must also be preloaded in the mon for
the same reasons.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agomds: fix FP error in ROUND_UP_TO
John Spray [Tue, 26 Aug 2014 16:36:16 +0000 (17:36 +0100)]
mds: fix FP error in ROUND_UP_TO

Explicitly handle case where denominator is 0, instead of
passing into ROUND_UP_TO.

Regression from 9449520b121fc6ce0c64948386d4ff77f46f4f5f

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit bf3e4835dabc057982def1b5c9a6499c04ac5312)

10 years agomon: generate cluster_fingerprint if null
Sage Weil [Thu, 21 Aug 2014 18:14:39 +0000 (11:14 -0700)]
mon: generate cluster_fingerprint if null

This triggers after an upgrade of a legacy cluster that has no fingerprint.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b245d600163f6337af15aedd1fea68f4e2a668a8)

10 years agomon: add a cluster fingerprint
Sage Weil [Wed, 20 Aug 2014 15:59:46 +0000 (08:59 -0700)]
mon: add a cluster fingerprint

Generate it on cluster creations with the initial monmap.  Include it in
the report.  Provide no way for this uuid to be fed in to the cluster
(intentionally or not) so that it can be assumed to be a truly unique
identifier for the cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 675b0042eff0ad5e1453838410210b1206c39004)

10 years agoMerge pull request #2244 from dachary/wip-9044-use-ruleset-firefly
Sage Weil [Tue, 26 Aug 2014 20:13:08 +0000 (13:13 -0700)]
Merge pull request #2244 from dachary/wip-9044-use-ruleset-firefly

erasure-code: OSDMonitor::crush_ruleset_create_erasure needs ruleset (firefly)

10 years agoReplicatedPG::cancel_copy: clear cop->obc
Samuel Just [Tue, 12 Aug 2014 23:41:38 +0000 (16:41 -0700)]
ReplicatedPG::cancel_copy: clear cop->obc

Otherwise, an objecter callback might still be hanging
onto this reference until after the flush.

Fixes: #8894
Introduced: 589b639af7c8834a1e6293d58d77a9c440107bc3
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 5040413054e923d6d5a2b4928162dba140d980e0)

10 years agoMerge pull request #2203 from ceph/wip-scrub-firefly
Samuel Just [Tue, 26 Aug 2014 17:30:14 +0000 (10:30 -0700)]
Merge pull request #2203 from ceph/wip-scrub-firefly

backport scrub throttling to firefly

Reviewed-by: Samuel Just <sam.just@inktank.com>
10 years agoos/FileStore: fix mount/remount force_sync race
Sage Weil [Sat, 16 Aug 2014 19:42:33 +0000 (12:42 -0700)]
os/FileStore: fix mount/remount force_sync race

Consider:

 - mount
 - sync_entry is doing some work
 - umount
   - set force_sync = true
   - set done = true
 - sync_entry exits (due to done)
   - ..but does not set force_sync = false
 - mount
 - journal replay starts
 - sync_entry sees force_sync and does a commit while op_seq == 0
 ...crash...

Fixes: #9144
Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit dd11042f969b94f7a461d02e1475794031c79f61)

Conflicts:
src/os/FileStore.cc

10 years agoAdd random_cache.hpp to Makefile.am
Haomai Wang [Thu, 10 Jul 2014 02:32:17 +0000 (10:32 +0800)]
Add random_cache.hpp to Makefile.am

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit a3e5c6d632119febd2150944a6f2cbce33cfda3a)

10 years agoos/KeyValueStore, MemStore: fix warning
Sage Weil [Tue, 26 Aug 2014 13:42:12 +0000 (06:42 -0700)]
os/KeyValueStore, MemStore: fix warning

os/MemStore.cc: In member function 'void MemStore::_do_transaction(ObjectStore::Transaction&)':
os/MemStore.cc:956:18: warning: unused variable 'expected_object_size' [-Wunused-variable]
os/MemStore.cc:957:18: warning: unused variable 'expected_write_size' [-Wunused-variable]
os/KeyValueStore.cc: In member function 'unsigned int KeyValueStore::_do_transaction(ObjectStore::Transaction&, KeyValueStore::BufferTransaction&, ThreadPool::TPHandle*)':
os/KeyValueStore.cc:1426:18: warning: unused variable 'expected_object_size' [-Wunused-variable]
os/KeyValueStore.cc:1427:18: warning: unused variable 'expected_write_size' [-Wunused-variable]

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: automatically scrub PGs with invalid stats
Sage Weil [Tue, 29 Apr 2014 18:23:58 +0000 (11:23 -0700)]
osd: automatically scrub PGs with invalid stats

If a PG has recnetly split and has invalid stats, scrub it now, even if
it has scrubbed recently.  This helps the stats become valid again soon.

Fixes: #8147
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 68b440d66539e820c9ce86a6942c3188be4ee1ec)

10 years agoMerge pull request #2328 from dachary/wip-9209-round-up-to-firefly
Sage Weil [Tue, 26 Aug 2014 13:38:34 +0000 (06:38 -0700)]
Merge pull request #2328 from dachary/wip-9209-round-up-to-firefly

common: ROUND_UP_TO accepts any rounding factor (firefly)

10 years agoMerge pull request #2326 from yuyuyu101/wip-kvstore-firefly
Sage Weil [Tue, 26 Aug 2014 13:09:17 +0000 (06:09 -0700)]
Merge pull request #2326 from yuyuyu101/wip-kvstore-firefly

Backport from master to Firefly(KeyValueStore)

10 years agocommon: ROUND_UP_TO accepts any rounding factor 2328/head
Loic Dachary [Mon, 25 Aug 2014 15:05:04 +0000 (17:05 +0200)]
common: ROUND_UP_TO accepts any rounding factor

The ROUND_UP_TO function was limited to rounding factors that are powers
of two. This saves a modulo but it is not used where it would make a
difference. The implementation is changed so it is generic.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 9449520b121fc6ce0c64948386d4ff77f46f4f5f)

10 years agoRemove exclusive lock on GenericObjectMap 2326/head
Haomai Wang [Thu, 20 Mar 2014 06:09:49 +0000 (14:09 +0800)]
Remove exclusive lock on GenericObjectMap

Now most of GenericObjectMap interfaces use header as argument not the union of
coll_t and ghobject_t. So caller should be responsible for maintain the
exclusive header.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agocommon/RandomCache: Fix inconsistence between contents and count
Haomai Wang [Wed, 23 Jul 2014 03:26:18 +0000 (11:26 +0800)]
common/RandomCache: Fix inconsistence between contents and count

The add/clear method may cause count inconsistent with the real size of
contents.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAdd random cache and replace SharedLRU in KeyValueStore
Haomai Wang [Tue, 26 Aug 2014 04:41:28 +0000 (04:41 +0000)]
Add random cache and replace SharedLRU in KeyValueStore

SharedLRU plays pool performance in KeyValueStore with large header cache size,
so a performance optimized RandomCache could improve it.

RandomCache will record the lookup frequency of key. When evictint element,
it will randomly compare several elements's frequency and evict the least
one.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Conflicts:

src/common/config_opts.h
src/os/KeyValueStore.cc

10 years agoAdd Header cache to KeyValueStore
Haomai Wang [Tue, 26 Aug 2014 04:40:16 +0000 (04:40 +0000)]
Add Header cache to KeyValueStore

In the performance statistic recently, the header lookup becomes the main time
consuming for the read/write operations. Most of time it occur 50% to deal with
header lookup, decode/encode logics.

Now adding header cache using SharedLRU structure which will maintain the header
cache and caller will get the pointer to the real header. It also avoid too much
header copy operations overhead.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Conflicts:

src/os/KeyValueStore.cc
src/os/KeyValueStore.h

10 years agoFix write operation on a deleted object in the same transaction
Haomai Wang [Wed, 26 Feb 2014 09:46:07 +0000 (17:46 +0800)]
Fix write operation on a deleted object in the same transaction

If the following op happened:
touch obj
delete obj
write obj

KeyValueStore will fail at "write" operation.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoRemove SequencerPosition from KeyValueStore
Haomai Wang [Tue, 26 Aug 2014 04:35:57 +0000 (04:35 +0000)]
Remove SequencerPosition from KeyValueStore

Now KeyValueStore expects kv backend to ensure consistency and there is unusable
for KeyValueStore to store a SequencerPosition.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Conflicts:

src/os/KeyValueStore.cc
src/os/KeyValueStore.h

10 years agoFix keyvaluestore fiemap bug
Haomai Wang [Wed, 4 Jun 2014 04:58:07 +0000 (12:58 +0800)]
Fix keyvaluestore fiemap bug

The result of fiemap is wrong and the offset get from
"StripObjectMap::file_to_extents" need to multiply by sequence number

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agomon: fix occasional message leak after session reset
Sage Weil [Thu, 21 Aug 2014 20:05:35 +0000 (13:05 -0700)]
mon: fix occasional message leak after session reset

Consider:

 - we get a message, put it on a wait list
 - the client session resets
 - we go back to process the message later and discard
   - _ms_dispatch returns false, but nobody drops the msg ref

Since we call _ms_dispatch() a lot internally, we need to always return
true when we are an internal caller.

Fixes: #9176
Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 19df386b2d36d716be2e6d02de0386fac9e7bc1f)

10 years agoMerge pull request #2298 from dachary/wip-9153-jerasure-upgrade-firefly
Sage Weil [Thu, 21 Aug 2014 17:14:18 +0000 (10:14 -0700)]
Merge pull request #2298 from dachary/wip-9153-jerasure-upgrade-firefly

erasure-code: preload the jerasure plugin variant (sse4,sse3,generic)

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoerasure-code: preload the jerasure plugin variant (sse4,sse3,generic) 2298/head
Loic Dachary [Thu, 21 Aug 2014 12:41:55 +0000 (14:41 +0200)]
erasure-code: preload the jerasure plugin variant (sse4,sse3,generic)

The preloading of the jerasure plugin ldopen the plugin that is in
charge of selecting the variant optimized for the
CPU (sse4,sse3,generic). The variant plugin itself is not loaded because
it does not happen at load() but when the factory() method is called.

The JerasurePlugin::preload method is modified to call the factory()
method to load jerasure_sse4 or jerasure_sse3 or jerasure_generic as a
side effect.

Indirectly loading another plugin in the factory() method is error prone
and should be moved to the load() method instead. This change should be
done in a separate commit.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoFix set_alloc_hint op cause KeyValueStore crash problem
Haomai Wang [Tue, 20 May 2014 06:32:18 +0000 (14:32 +0800)]
Fix set_alloc_hint op cause KeyValueStore crash problem

Now KeyValueStore doesn't support set_alloc_hit op, the implementation of
_do_transaction need to consider decoding the arguments. Otherwise, the
arguments will be regarded as the next op.

Fix the same problem for MemStore.

Fix #8381

Reported-by: Xinxin Shu <xinxin.shu5040@gmail.com>
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit c08adbc98ff5f380ecd215f8bd9cf3cab214913c)

10 years agoMerge pull request #2286 from dachary/wip-9153-jerasure-upgrade-firefly
Sage Weil [Wed, 20 Aug 2014 17:10:08 +0000 (10:10 -0700)]
Merge pull request #2286 from dachary/wip-9153-jerasure-upgrade-firefly

erasure-code: preload the jerasure plugin (firefly)

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoerasure-code: preload the jerasure plugin 2286/head
Loic Dachary [Mon, 18 Aug 2014 23:30:15 +0000 (01:30 +0200)]
erasure-code: preload the jerasure plugin

Load the jerasure plugin when ceph-osd starts to avoid the following
scenario:

* ceph-osd-v1 is running but did not load jerasure

* ceph-osd-v2 is installed being installed but takes time : the files
  are installed before ceph-osd is restarted

* ceph-osd-v1 is required to handle an erasure coded placement group and
  loads jerasure (the v2 version which is not API compatible)

* ceph-osd-v1 calls the v2 jerasure plugin and does not reference the
  expected part of the code and crashes

Although this problem shows in the context of teuthology, it is unlikely
to happen on a real cluster because it involves upgrading immediately
after installing and running an OSD. Once it is backported to firefly,
it will not even happen in teuthology tests because the upgrade from
firefly to master will use the firefly version including this fix.

While it would be possible to walk the plugin directory and preload
whatever it contains, that would not work for plugins such as jerasure
that load other plugins depending on the CPU features, or even plugins
such as isa which only work on specific CPU.

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

Backport: firefly
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit 9b802701f78288ba4f706c65b853415c69002d27)

Conflicts:
src/test/erasure-code/test-erasure-code.sh
src/common/config_opts.h

10 years agoWork around an apparent binding bug (GCC 4.8).
Matt Benjamin [Thu, 29 May 2014 14:34:20 +0000 (10:34 -0400)]
Work around an apparent binding bug (GCC 4.8).

A reference to h->seq passed to std::pair ostensibly could not bind
because the header structure is packed.  At first this looked like
a more general unaligned access problem, but the only location the
compiler rejects is a false positive.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
(cherry picked from commit c930a1f119069a424af28a618b0abff4947c221f)

10 years agoqa/workunits/rbd/qemu-iotests: touch common.env
Sage Weil [Mon, 18 Aug 2014 03:54:28 +0000 (20:54 -0700)]
qa/workunits/rbd/qemu-iotests: touch common.env

This seems to be necessary on trusty.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 055be68cf8e1b84287ab3631a02e89a9f3ae6cca)

10 years agounittest_strtol: fix compilation warning
Joao Eduardo Luis [Fri, 23 May 2014 15:52:08 +0000 (16:52 +0100)]
unittest_strtol: fix compilation warning

Was fixed in master by a4923f5bc373d530d1ffdf6c58a4d88139daedd2

Signed-off-by: Sage Weil <sage@redhat.com>
10 years ago Fix EINVAL err when use "ceph tell osd.* bench"
huangjun [Tue, 17 Jun 2014 05:12:58 +0000 (13:12 +0800)]
  Fix EINVAL err when use "ceph tell osd.* bench"

Signed-off-by: huangjun <hjwsm1989@gmail.com>
(cherry picked from commit 7dc93a9651f602d9c46311524fc6b54c2f1ac595)

10 years agoqa/workunits/cephtool/test.sh: fix get erasure_code_profile test
Ma Jianpeng [Thu, 17 Jul 2014 00:48:34 +0000 (17:48 -0700)]
qa/workunits/cephtool/test.sh: fix get erasure_code_profile test

Manual backport of 4d6899c7560e990650959b442980a7249f0ba4c1

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomon: OSDMonitor: add 'osd pool get-quota' command
Joao Eduardo Luis [Fri, 27 Jun 2014 20:41:18 +0000 (21:41 +0100)]
mon: OSDMonitor: add 'osd pool get-quota' command

Enables us to obtain current quotas for a given pool.

Fixes: #8523
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 714a9bb5a058b2553f3be3e4cfb7e7f30150e75a)

10 years agomon: name instead of id in "has tiers" message
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>
(cherry picked from commit 97772c2f53f726bd71710d0d3e34159d2679390a)

10 years agocommon/config.cc: allow integer values to be parsed as SI units
Joao Eduardo Luis [Fri, 23 May 2014 16:01:38 +0000 (17:01 +0100)]
common/config.cc: allow integer values to be parsed as SI units

We are allowing this for all and any integer values; that is, OPT_INT,
OPT_LONGLONG, OPT_U32 and OPT_U64.

It's on the user to use appropriate units.  For instance, the user should
not use 'E(xabyte)' when setting a signed int, and use his best judgment
when setting options that, for instance, ought to receive seconds.

Fixes: 8265
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 5500437e064cd6b4b45d63ee9396193df87f4d44)

10 years agotest/strtol.cc: Test 'strict_strtosi()'
Joao Eduardo Luis [Fri, 23 May 2014 15:52:08 +0000 (16:52 +0100)]
test/strtol.cc: Test 'strict_strtosi()'

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 40587d4792fd55db72d33870aae8b6a806c9baaf)

10 years agocommon/strtol.cc: strict_strtosi() converts str with SI units to uint64_t
Joao Eduardo Luis [Fri, 23 May 2014 15:51:37 +0000 (16:51 +0100)]
common/strtol.cc: strict_strtosi() converts str with SI units to uint64_t

Accepts values with a suffix (B, K, M, G, T, P, E) and returns the
appropriate byte value.

E.g., 10B = 10, while 10K = 10240.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 67dc5751ba9a4e527ff12ea65000d1ba45d956f6)

10 years agoceph-disk: linter cleanup
Alfredo Deza [Wed, 13 Aug 2014 19:50:20 +0000 (15:50 -0400)]
ceph-disk: linter cleanup

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit d74ed9d53fab95f27a9ad8e9f5dab7192993f6a3)

10 years agoceph-disk: warn about falling back to sgdisk (once)
Sage Weil [Wed, 13 Aug 2014 19:00:50 +0000 (12:00 -0700)]
ceph-disk: warn about falling back to sgdisk (once)

This way the user knows something funny might be up if dmcrypt is in use.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6f7798e37e098de38fbc73f86c4c6ee705abbe38)

10 years agoceph-disk: only fall back to sgdisk for 'list' if blkid seems old
Sage Weil [Wed, 13 Aug 2014 18:40:34 +0000 (11:40 -0700)]
ceph-disk: only fall back to sgdisk for 'list' if blkid seems old

If the blkid doesn't show us any ID_PART_ENTRY_* fields but we know it is
a GPT partition, *then* fallback.  Otherwise, don't bother.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b1651afb34d9d2c324db3bf5f54ac9ce001c6af9)

10 years agoceph-disk: add get_partition_base() helper
Sage Weil [Wed, 13 Aug 2014 18:39:47 +0000 (11:39 -0700)]
ceph-disk: add get_partition_base() helper

Return the base devices/disk for a partition device.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b75e8a340c49cbc067baa19790b994a5f904bb4f)

10 years agoceph-disk: display information about dmcrypted data and journal volumes
Sage Weil [Wed, 13 Aug 2014 00:26:07 +0000 (17:26 -0700)]
ceph-disk: display information about dmcrypted data and journal volumes

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c7a1ceba441fa99a82e19ed2cd3c6782a5d77636)

10 years agoceph-disk: move fs mount probe into a helper
Sage Weil [Wed, 13 Aug 2014 00:25:42 +0000 (17:25 -0700)]
ceph-disk: move fs mount probe into a helper

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f80ed26d2403ba12e80da6459fc45c22584f72de)

10 years agoceph-disk: use partition type UUIDs, and blkid
Sage Weil [Wed, 13 Aug 2014 00:25:10 +0000 (17:25 -0700)]
ceph-disk: use partition type UUIDs, and blkid

Use blkid to give us the GPT partition type.  This lets us distinguish
between dmcrypt and non-dmcrypt partitions.  Fake it if blkid doesn't
give us what we want and try with sgdisk.  This isn't perfect (it can't
tell between dmcrypt and not dmcrypt), but such is life, and we are better
off than before.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6c77f5f2f994c881232d76ce9c69af80d10772bd)

10 years agoceph-disk: fix log syntax error
Sage Weil [Tue, 12 Aug 2014 20:53:16 +0000 (13:53 -0700)]
ceph-disk: fix log syntax error

  File "/usr/sbin/ceph-disk", line 303, in command_check_call
    LOG.info('Running command: %s' % ' '.join(arguments))
TypeError: sequence item 2: expected string, NoneType found

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1088d6cd11b476cd67ed30e07edd363c4057a003)

10 years agoRevert "Fix for bug #6700"
Sage Weil [Mon, 11 Aug 2014 22:58:15 +0000 (15:58 -0700)]
Revert "Fix for bug #6700"

This reverts commit 673394702b725ff3f26d13b54d909208daa56d89.

This appears to break things when the journal and data disk are *not* the same.
And I can't seem to reproduce the original failure...

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2edf01ffa4a7425af2691b4e94bc5fd0bfab1e5b)

10 years agoceph-disk: fix verify_no_in_use check
Sage Weil [Mon, 11 Aug 2014 22:57:52 +0000 (15:57 -0700)]
ceph-disk: fix verify_no_in_use check

We only need to verify that partitions aren't in use when we want to
consume the whole device (osd data), not when we want to create an
additional partition for ourselves (osd journal).

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d6e6ba198efc4b3afff0c70af53497a70c6b3f19)

10 years agobetter error reporting on incompatible device requirements
Alfredo Deza [Thu, 22 May 2014 21:04:28 +0000 (17:04 -0400)]
better error reporting on incompatible device requirements

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit 1ac3a503a15ddf7f7c1a33310a468fac10a1b7b6)

10 years agoceph-disk: fix list for encrypted or corrupt volume
Stuart Longland [Tue, 6 May 2014 21:06:36 +0000 (14:06 -0700)]
ceph-disk: fix list for encrypted or corrupt volume

Continue gracefully if an fs type is not detected, either because it is
encrypted or because it is corrupted.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 09beebe3f1fd1b179547743648049b891cb8bc56)

10 years agosupport dmcrypt partitions when activating
Alfredo Deza [Fri, 13 Jun 2014 13:37:33 +0000 (09:37 -0400)]
support dmcrypt partitions when activating

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit ef8a1281512c4ee70a3764b28891da691a183804)

10 years agoinit-ceph: don't use bashism
Sage Weil [Fri, 15 Aug 2014 23:41:43 +0000 (16:41 -0700)]
init-ceph: don't use bashism

       -z STRING
              the length of STRING is zero

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0d6d1aa7e0c5e0b5f99c9b548a1f890c511b4299)

10 years agoosd: fix feature requirement for mons
Sage Weil [Fri, 15 Aug 2014 21:28:57 +0000 (14:28 -0700)]
osd: fix feature requirement for mons

These features should be set on the client_messenger, not
cluster_messenger.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ae0b9f17760eda9a7e09a6babac50bfe8ebb4b36)

10 years agounittest_osdmap: test EC rule and pool features
Sage Weil [Fri, 15 Aug 2014 20:54:11 +0000 (13:54 -0700)]
unittest_osdmap: test EC rule and pool features

TODO: tiering feature bits.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2f0e2951d773b6acce781b4b991d6d8e817ee2f9)

10 years agounittest_osdmap: create an ec pool in test osdmap
Sage Weil [Fri, 15 Aug 2014 21:04:05 +0000 (14:04 -0700)]
unittest_osdmap: create an ec pool in test osdmap

This is part of 7294e8c4df6df9d0898f82bb6e0839ed98149310.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: only require crush features for rules that are actually used
Sage Weil [Fri, 15 Aug 2014 15:55:10 +0000 (08:55 -0700)]
osd: only require crush features for rules that are actually used

Often there will be a CRUSH rule present for erasure coding that uses the
new CRUSH steps or indep mode.  If these rules are not referenced by any
pool, we do not need clients to support the mapping behavior.  This is true
because the encoding has not changed; only the expected CRUSH output.

Fixes: #8963
Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 16dadb86e02108e11a970252411855d84ab0a4a2)

10 years agocrush: add is_v[23]_rule(ruleid) methods
Sage Weil [Fri, 15 Aug 2014 15:52:37 +0000 (08:52 -0700)]
crush: add is_v[23]_rule(ruleid) methods

Add methods to check if a *specific* rule uses v2 or v3 features.  Refactor
the existing checks to use these.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1d95486780a54c85a5c88936a4da4bdc3576a7b8)

10 years agoPGLog: fix clear() to avoid the IndexLog::zero() asserts
Samuel Just [Mon, 30 Jun 2014 20:40:07 +0000 (13:40 -0700)]
PGLog: fix clear() to avoid the IndexLog::zero() asserts

Introduced in:
  c5b8d8105d965da852c79add607b69d5ae79a4d4
  ac11ca40b4f4525cbe9b1778b1c5d9472ecb9efa
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 959f2b25910360b930183fbf469ce984a48542dd)

10 years agoosd: allow io priority to be set for the disk_tp 2203/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>
(cherry picked from commit d9073f486527ca13cdb2774745c4c63c218333ad)

10 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>
(cherry picked from commit dd6badcb5eedfec6748b3e6ca4d46e3b266038f6)

Conflicts:

src/common/WorkQueue.cc

10 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>
(cherry picked from commit 1b8741022c5a2ebae38905215dadee696433e931)

10 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>
(cherry picked from commit a2b49110ef65efd526c3430ad03c988ca9dde768)

10 years agoosd: introduce simple sleep during scrub
Sage Weil [Tue, 17 Jun 2014 17:47:24 +0000 (10:47 -0700)]
osd: introduce simple sleep during scrub

This option is similar to osd_snap_trim_sleep: simply inject an optional
sleep in the thread that is doing scrub work.  This is a very kludgey and
coarse knob for limiting the impact of scrub on the cluster, but can help
until we have a more robust and elegant solution.

Only sleep if we are in the NEW_CHUNK state to avoid delaying processing of
an in-progress chunk.  In this state nothing is blocked on anything.
Conveniently, chunky_scrub() requeues itself for each new chunk.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit c4e8451cc5b4ec5ed07e09c08fb13221e31a7ac6)

10 years agoosd: add sanity check/warning on a few key configs
Sage Weil [Sat, 14 Jun 2014 17:30:50 +0000 (10:30 -0700)]
osd: add sanity check/warning on a few key configs

Warn when certain config values are set to bad values.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit f3ec7d0b23fdee39a34bda7595cd2a79c08daf8a)

10 years agoosd: prevent pgs from getting too far ahead of the min pg epoch
Sage Weil [Fri, 2 May 2014 00:24:48 +0000 (17:24 -0700)]
osd: prevent pgs from getting too far ahead of the min pg epoch

Bound the range of PG epochs between the slowest and fastest pg
(epoch-wise) with 'osd map max advance'.  This value should be set to
something less than 'osd map cache size' so that the maps we are
processing will be in memory as many PGs advance forward in time in
loose synchrony.

This is part of the solution to #7576.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit cf25bdf6b0090379903981fe8cee5ea75efd7ba0)

10 years agoosd: fix pg epoch floor tracking
Sage Weil [Fri, 8 Aug 2014 00:42:06 +0000 (17:42 -0700)]
osd: fix pg epoch floor tracking

If you call erase() on a multiset it will delete all instances of a value;
we only want to delete one of them.  Fix this by passing an iterator.

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a52a855f6c92b03dd84cd0cc1759084f070a98c2)

10 years agoosd: track per-pg epochs, min
Sage Weil [Wed, 2 Apr 2014 21:29:08 +0000 (14:29 -0700)]
osd: track per-pg epochs, min

Add some simple tracking so that we can quickly determine what the min
pg osdmap epoch is.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 81e4c47722255ac3d46f701a80e104cc390e766c)

10 years agomon: fix divide by zero when pg_num adjusted and no osds
Sage Weil [Wed, 13 Aug 2014 20:31:10 +0000 (13:31 -0700)]
mon: fix divide by zero when pg_num adjusted and no osds

Fixes: #9052
Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 239401db7b51541a57c59a261b89e0f05347c32d)

10 years agoceph_test_rados_api_tier: fix cache cleanup (ec too)
Sage Weil [Sun, 10 Aug 2014 19:48:29 +0000 (12:48 -0700)]
ceph_test_rados_api_tier: fix cache cleanup (ec too)

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d7fb7bf5f2059f411633751e376c2270e6040fba)

10 years agoceph_test_rados_api: fix cleanup of cache pool
Sage Weil [Sun, 10 Aug 2014 19:15:38 +0000 (12:15 -0700)]
ceph_test_rados_api: fix cleanup of cache pool

We can't simply try to delete everything in there because some items may
be whiteouts.  Instead, flush+evict everything, then remove overlay, and
*then* delete what remains.

Fixes: #9055
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ebbe8aab17cfa2281902f167a706639535da4010)

10 years agolibrados/TestCase: inheret cleanup_default_namespace
Sage Weil [Sun, 10 Aug 2014 18:41:23 +0000 (11:41 -0700)]
librados/TestCase: inheret cleanup_default_namespace

No need to duplicate this code.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1d199fb1173dc9685dba96c22b83e4e9edf51a11)

10 years agoosd/ReplicatedPG: only do agent mode calculations for positive values
Sage Weil [Wed, 13 Aug 2014 17:34:53 +0000 (10:34 -0700)]
osd/ReplicatedPG: only do agent mode calculations for positive values

After a split we can get negative values here.  Only do the arithmetic if
we have a valid (positive) value that won't through the floating point
unit for a loop.

Fixes: #9082
Tested-by: Karan Singh <karan.singh@csc.fi>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5be56ff86d9f3ab2407a258a5285d0b8f52f041e)

10 years agoMerge pull request #2231 from ceph/wip-8944-firefly
Sage Weil [Wed, 13 Aug 2014 04:15:26 +0000 (21:15 -0700)]
Merge pull request #2231 from ceph/wip-8944-firefly

Wip 8944 firefly

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoOSD: add require_same_peer_inst(OpRequestRef&,OSDMap&) helper
Greg Farnum [Tue, 29 Jul 2014 01:33:56 +0000 (18:33 -0700)]
OSD: add require_same_peer_inst(OpRequestRef&,OSDMap&) helper

Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit e99acf9810976b1fc74b84ad289773af43be973f)

Conflicts:

src/osd/OSD.cc

10 years agoOSD: introduce require_self_aliveness(OpRequestRef&,epoch_t) function
Greg Farnum [Mon, 28 Jul 2014 21:19:59 +0000 (14:19 -0700)]
OSD: introduce require_self_aliveness(OpRequestRef&,epoch_t) function

Take the self-aliveness checks out of require_same_or_newer_map() and use
the new function for that and for require_up_osd_peer().

Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit e179e9227b4a4482d8359682092fd7f426b9a919)

Conflicts:

src/osd/OSD.cc

10 years agoOSD: use OpRequestRef& for a few require_* functions
Greg Farnum [Mon, 28 Jul 2014 21:08:30 +0000 (14:08 -0700)]
OSD: use OpRequestRef& for a few require_* functions

Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit eb2f1ea2c33647934af878b504383829f5a198ce)

10 years agoOSD: introduce require_up_osd_peer() function for gating replica ops
Greg Farnum [Tue, 22 Jul 2014 23:57:00 +0000 (16:57 -0700)]
OSD: introduce require_up_osd_peer() function for gating replica ops

This checks both that a Message originates from an OSD, and that the OSD
is up in the given map epoch.
We use it in handle_replica_op so that we don't inadvertently add operations
from down peers, who might or might not know it.

Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit ccd0eec50103b919b3eb6eea96f7dc6438520ed3)

10 years agoinit-ceph: conditionally update after argparsing
Alfredo Deza [Fri, 8 Aug 2014 14:16:20 +0000 (10:16 -0400)]
init-ceph: conditionally update  after argparsing

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit 44ed1885fb588aad7e4729373e06c5933178b5e5)

10 years agomake ceph-disk use the new init flag for cluster
Alfredo Deza [Thu, 7 Aug 2014 15:11:57 +0000 (11:11 -0400)]
make ceph-disk use the new init flag for cluster

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit d0ccb1cbef86b8ccd8967af892e3582ee80edd55)

10 years agoallow passing a --cluster flag to the init script
Alfredo Deza [Thu, 7 Aug 2014 14:48:09 +0000 (10:48 -0400)]
allow passing a --cluster flag to the init script

It will fallback to looking at /etc/ceph/$cluster.conf
otherwise.

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit 23b4915fa252852cf02cc42a1b6143e2cd61b445)

10 years agouse cluster name when checking the host
Alfredo Deza [Wed, 6 Aug 2014 19:30:30 +0000 (15:30 -0400)]
use cluster name when checking the host

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit bdf5f30010117c71a227855a47fe22ab55b3e0b8)

10 years agouse name in /var/lib/ceph paths
Alfredo Deza [Wed, 6 Aug 2014 19:30:09 +0000 (15:30 -0400)]
use  name in /var/lib/ceph paths

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit 3fb25c28e8e3cc62bc541538cc11f5ed41471611)

10 years agowhen starting an OSD, pass in the cluster name
Alfredo Deza [Wed, 6 Aug 2014 19:29:42 +0000 (15:29 -0400)]
when starting an OSD, pass in the cluster name

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
(cherry picked from commit 9e08e3a7794ce007c80c8fdb56e96900eb5240a3)

10 years agoosd_types: s/stashed/rollback_info_completed and set on create
Samuel Just [Fri, 1 Aug 2014 21:04:35 +0000 (14:04 -0700)]
osd_types: s/stashed/rollback_info_completed and set on create

Originally, this flag indicated that the object had already been stashed and
that therefore recording subsequent changes is unecessary.  We want to set it
on create() as well since operations like [create, writefull] should not need
to stash the object.

Fixes: #8625
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 4260767973d96978e808cb87ef6ae991104b4f8d)

10 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>
(cherry picked from commit 363496ad878c685008ccd87f26f121d62a48c24c)

10 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>
(cherry picked from commit 3f0ea9512be78d10ac0bc605a38e83cfbab7ffee)

10 years agorgw: need to pass need_to_wait for throttle_data()
Yehuda Sadeh [Sat, 2 Aug 2014 20:01:05 +0000 (13:01 -0700)]
rgw: need to pass need_to_wait for throttle_data()

need_to_wait wasn't passed into processor->throttle_data(). This was
broken in fix for #8937.

CID 1229541:    (PW.PARAM_SET_BUT_NOT_USED)

Backport: firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit e93818df33286a2a7f73b593dc20da412db4e0a6)
(cherry picked from commit 8519e9ab06caf6999e1243514a93eaffb155ab2e)

10 years agorgw: Don't send error body when it's a HEAD request
Sylvain Munaut [Thu, 5 Jun 2014 09:28:27 +0000 (11:28 +0200)]
rgw: Don't send error body when it's a HEAD request

The main 'operation' know not to send any body for HEAD requests.

However for errors, this was not the case, the formatter would be
flushed and would send the error 'message' in the body in all cases.

For the FastCGI case it doesn't seem to be an issue, it's possible
that the webserver (apache/lighttpd/...) cleans up the response
into shape.

But when using the new civetweb frontend this cause invalid HTTP.

Backport: firefly
Fixes #8539

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Signed-off-by: Sylvain Munaut <s.munaut@whatever-company.com>
(cherry picked from commit 0a2b4c25541bbd15776d3d35986518e37166910f)

10 years agoosd: prevent old clients from using tiered pools
Sage Weil [Wed, 30 Jul 2014 20:57:34 +0000 (13:57 -0700)]
osd: prevent old clients from using tiered pools

If the client is old and doesn't understand tiering, don't let them use a
tiered pool.  Reply with EOPNOTSUPP.

Fixes: #8714
Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0190df53056834f219e33ada2af3a79e8c4dfb77)

10 years agomon/OSDMonitor: warn when cache pools do not have hit_sets configured
Sage Weil [Thu, 31 Jul 2014 18:02:55 +0000 (11:02 -0700)]
mon/OSDMonitor: warn when cache pools do not have hit_sets configured

Give users a clue when cache pools are enabled but the hit_set is not
configured.  Note that technically this will work, but not well, so for
now let's just steer them away.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 383536a2ef2506c5591b25c0fd61dc8c181fdab9)

NOTE: removed readforward state for backport

10 years agoosd/ReplicatedPG: improve agent_choose_mode args
Sage Weil [Thu, 31 Jul 2014 16:28:12 +0000 (09:28 -0700)]
osd/ReplicatedPG: improve agent_choose_mode args

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit caf554bf2f752b50670d118c99843b7c4a2967b4)

10 years agoosd/ReplicatedPG: evict blindly if there is no hit_set
Sage Weil [Thu, 31 Jul 2014 16:26:03 +0000 (09:26 -0700)]
osd/ReplicatedPG: evict blindly if there is no hit_set

If there is no hit set for a PG, blindly evict objects.  This avoids an
assert(hit_set) in agent_estimate_atime_temp().

Fixes: #8982
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ea4996d3ef15c5d5a776d162b08d9fad6859c976)

10 years agoosd/ReplicatedPG: check agent_mode if agent is enabled but hit_sets aren't
Sage Weil [Thu, 31 Jul 2014 16:13:11 +0000 (09:13 -0700)]
osd/ReplicatedPG: check agent_mode if agent is enabled but hit_sets aren't

It is probably not a good idea to try to run the tiering agent without a
hit_set to inform its actions, but it is technically possible.  For
example, one could simply blindly evict when we reach the full point.
However, this doesn't work because the agent mode is guarded by a hit_set
check, even though agent_setup() is not.  Fix that.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5d1c76f641310f5f65600f70ae76945b2aa472d7)

10 years agocommon/LogClient: fix sending dup log items
Sage Weil [Tue, 12 Aug 2014 14:05:34 +0000 (07:05 -0700)]
common/LogClient: fix sending dup log items

We need to skip even the most recently sent item in order to get to the
ones we haven't sent yet.

Fixes: #9080
Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 057c6808be5bc61c3f1ac2b956c1522f18411245)

10 years agoRadosClient: Fixing potential lock leaks.
Pavan Rallabhandi [Wed, 6 Aug 2014 09:40:14 +0000 (15:10 +0530)]
RadosClient: Fixing potential lock leaks.

In lookup_pool and pool_delete, a lock is taken
before invoking wait_for_osdmap, but is not
released for the failure case of the call. Fixing the same.

Fixes: #9022
Signed-off-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
(cherry picked from commit f1aad8bcfc53f982130dbb3243660c3c546c3523)

10 years agolibrbd: fix error path cleanup for opening an image
Josh Durgin [Mon, 11 Aug 2014 23:41:26 +0000 (16:41 -0700)]
librbd: fix error path cleanup for opening an image

If the image doesn't exist and caching is enabled, the ObjectCacher
was not being shutdown, and the ImageCtx was leaked. The IoCtx could
later be closed while the ObjectCacher was still running, resulting in
a segfault. Simply use the usual cleanup path in open_image(), which
works fine here.

Fixes: #8912
Backport: dumpling, firefly
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit 3dfa72d5b9a1f54934dc8289592556d30430959d)

10 years agoMerge remote-tracking branch 'gh/firefly-next' into firefly
Sage Weil [Tue, 12 Aug 2014 21:38:33 +0000 (14:38 -0700)]
Merge remote-tracking branch 'gh/firefly-next' into firefly

10 years agoerasure-code: ErasureCodeJerasure::create_ruleset must return a ruleset 2244/head
Loic Dachary [Sun, 10 Aug 2014 15:10:04 +0000 (17:10 +0200)]
erasure-code: ErasureCodeJerasure::create_ruleset must return a ruleset

CrushWrapper::add_simple_ruleset does not return a ruleset, it returns
a ruleid that must be converted into a ruleset before being returned.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 0029a35872d3fc15f9a0d60d095b2e111d6e98a6)

10 years agoerasure-code: OSDMonitor::crush_ruleset_create_erasure needs ruleset
Loic Dachary [Sun, 10 Aug 2014 15:06:33 +0000 (17:06 +0200)]
erasure-code: OSDMonitor::crush_ruleset_create_erasure needs ruleset

When OSDMonitor::crush_ruleset_create_erasure checks the ruleset for
existence, it must convert the ruleid into a ruleset before assigning it
back to the *ruleset parameter.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 04a484a4d5800c9bcf9805d3e87ed0c8dee01c9a)

10 years agoAdd rbdcache max dirty object option
Haomai Wang [Mon, 14 Jul 2014 06:27:17 +0000 (14:27 +0800)]
Add rbdcache max dirty object option

Librbd will calculate max dirty object according to rbd_cache_max_size, it
doesn't suitable for every case. If user set image order 24, the calculating
result is too small for reality. It will increase the overhead of trim call
which is called each read/write op.

Now we make it as option for tunning, by default this value is calculated.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 3c7229a2fea98b30627878c86b1410c8eef2b5d7)

10 years agolibrbd/internal.cc: check earlier for null pointer
Danny Al-Gaaf [Wed, 4 Jun 2014 21:22:18 +0000 (23:22 +0200)]
librbd/internal.cc: check earlier for null pointer

Fix potential null ponter deref, move check for 'order != NULL'
to the beginning of the function to prevent a) deref in ldout() call
and b) to leave function as early as possible if check fails.

[src/librbd/internal.cc:843] -> [src/librbd/internal.cc:865]: (warning)
 Possible null pointer dereference: order - otherwise it is redundant
 to check it against null.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 3ee3e66a9520a5fcafa7d8c632586642f7bdbd29)