Commit Graph

36943 Commits

Author SHA1 Message Date
Danny Al-Gaaf
109bcd44ba Revert "osd: detect (some) misordered ondisk tmaps"
This reverts commit 10b68b2e1a.

The check for 'nextkey < last_disk_key' makes not much sense since
last_disk_key is an empty string and not set before. Comparing a
decoded string to be less than an empty string will be never true.

Since this if() isn't part of a loop last_disk_key is only set
once and there is no other consumer: revert this dead code.

Conflicts:
	src/osd/ReplicatedPG.cc
2014-11-11 19:06:12 +01:00
Josh Durgin
2e2fc44f99 Merge pull request #2562 from ceph/wip-5595
Wip 5595

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2014-11-11 18:18:43 +01:00
Sage Weil
4d4b7d0bab doc/rados/configuration fix 'ods mkfs options' default
Signed-off-by: Sage Weil <sage@redhat.com>
2014-11-11 07:52:39 -08:00
Sage Weil
a8c8c934d8 Merge pull request #2466 from nereocystis/osd-filesystem-options
doc: Add file system osd config settings
2014-11-11 07:50:44 -08:00
Sage Weil
e3501f9307 Merge pull request #2883 from ceph/wip-da-SCA-20141028
Fixes for coverity and SCA issues

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-11 07:48:12 -08:00
Sage Weil
21bb2b066e Merge pull request #2889 from xuechendi/move_buffers_to_BufferTransaction
KeyValueStore: move buffers from strip_header to BufferTransaction

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2014-11-11 07:11:55 -08:00
Sage Weil
a6f6684df6 Merge pull request #2739 from majianpeng/fix2
buffer: Judge bufferlist whether need  rebuild

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-11 07:09:55 -08:00
Yan, Zheng
f4347bc091 Merge pull request #2894 from ceph/wip-scrub-coverity
Wip scrub coverity
2014-11-11 22:52:52 +08:00
Danny Al-Gaaf
41b5dd233b AuthSessionHandler.h: init protocol in constructor
Init protocol in AuthSessionHandler constructor with
with CEPH_AUTH_UNKNOWN.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-11-11 13:26:38 +01:00
Danny Al-Gaaf
dbfb63e8e8 src/librbd/librbd.cc: fix potential null pointer deref
Fix potential deref after null check. Move check for max_snaps in
rbd_snap_list up to fail early before call any functions.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-11-11 13:26:38 +01:00
Danny Al-Gaaf
4fc9428506 osd/ReplicatedPG.cc: remove redundant check
Fix for:

[src/osd/ReplicatedPG.cc:2171]: (style) Redundant checking of STL
 container element existence before removing it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-11-11 13:26:37 +01:00
Danny Al-Gaaf
a4cecda7cc test/librados/c_read_operations.cc: fix invalid checks
Wrong variable for return of rados_getxattrs_next() and
rados_omap_get_next() used (len vs. val_len).

Fix for:

CID 1219464 (#1 of 1): Logically dead code (DEADCODE)
 dead_error_line: Execution cannot reach this expression
 key == NULL inside statement if (len == 0UL && key == NU...

CID 1219465 (#1 of 1): Logically dead code (DEADCODE)
 dead_error_line: Execution cannot reach this expression
 key == NULL inside statement if (len == 0UL && key == NU...

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-11-11 13:26:37 +01:00
Danny Al-Gaaf
97ed2ae909 rgw_rados.cc: remove dead code
Fix for:

CID 1128391 (#1 of 1): Logically dead code (DEADCODE)
 dead_error_line: Execution cannot reach this statement goto done_err;

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-11-11 13:26:37 +01:00
Danny Al-Gaaf
e590d42c90 rados_sync.cc: fix xattr_diff() for the only_in_b checks
In the checks to build only_in_b up the wrong const_iterator x is
build up. it should compare rhs->xattrs with xattrs entries and
not twice rhs->xattrs.

Fix for:

CID 716957 (#1 of 1): Invalid iterator comparison (MISMATCHED_ITERATOR)
 mismatched_comparison: Comparing x from rhs->xattrs to this->xattrs.end()
 from this->xattrs.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-11-11 13:26:37 +01:00
Danny Al-Gaaf
04517f0dc2 bench_log.cc: catch ceph::FailedAssertion exception
Fix for:

CID 717177 (#2-1 of 3): Uncaught exception (UNCAUGHT_EXCEPT)
 root_function: In function main(int, char const **) an exception of
 type ceph::FailedAssertion is thrown and never caught.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-11-11 13:26:37 +01:00
Danny Al-Gaaf
60e7da9919 osd/PGLog.cc: prefer empty() over size() for emptiness check
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-11-11 13:26:37 +01:00
Josh Durgin
1cb3d6c52e Merge pull request #2873 from ceph/wip-rbd-test-fixtures
librbd: Refactor librbd unit tests to use test fixtures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2014-11-11 07:42:39 +01:00
Jianpeng Ma
c11cf2aebd bufferlist: Don't call rebuild(), c_strt() call it if bufferlist not contiguous.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2014-11-11 13:37:26 +08:00
Sage Weil
0edd7cf3f7 Merge pull request #2893 from ceph/wip-10045
common/Readahead: use correct lock when waiting on the pending ops

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-10 18:11:18 -08:00
Jason Dillaman
27049148c7 common/Readahead: use correct lock when waiting on the pending ops
Readahead was using the incorrect lock with the pending condition,
resulting in a failed assertion.  It now uses the lock associated
with pending ops.

Fixes: #10045
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2014-11-10 19:57:08 -05:00
Greg Farnum
42b0a35f98 mds: remove dead code from inode_t::compare()
CID 1251354

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2014-11-10 16:52:48 -08:00
Greg Farnum
f78cfa70da mds: CInode: catch exception by reference, not value
CID 1251353

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2014-11-10 16:52:30 -08:00
Sage Weil
e55f30ff48 Merge pull request #2380 from osynge/wip-suse-systemd-integration
systemd support in ceph-disk activate

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-10 16:44:26 -08:00
Yehuda Sadeh
dee0083163 Merge pull request #2446 from xylv/wip-9359
rgw: Export user stats in get-user-info Adminops API

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2014-11-10 16:35:02 -08:00
Yehuda Sadeh
f05cd2c907 Merge pull request #2725 from CzBiX/rgw-modified-since
rgw: correct "If-Modified-Since" handle.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2014-11-10 16:29:21 -08:00
Sage Weil
a7b93819c3 Merge pull request #2782 from boydc2014/master
rgw: fix can not disable max_size quota

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2014-11-10 16:21:08 -08:00
Sage Weil
1809f579b7 Merge pull request #2624 from ceph/wip-8911
rgw: swift GET / HEAD object returns X-Timestamp field

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-10 16:14:10 -08:00
Samuel Just
007e4c42a8 Merge pull request #2851 from ceph/wip-9986
objecter: fix map skipping

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-10 15:00:26 -08:00
Samuel Just
4705f5382b Merge pull request #2667 from yuandong1222/avoid-unused-pg_to_acting_osds-call
Avoid unused pg_to_acting_osds call in OSDMap::get_primary_shard

Reviewed-by: Samuel Just <sjust@redhat.com>
2014-11-10 14:58:56 -08:00
Samuel Just
1425482450 Merge pull request #2474 from dachary/wip-9420-erasure-code-non-regression
erasure-code: store and compare encoded contents

Reviewed-by: Samuel Just <sjust@redhat.com>
2014-11-10 14:57:42 -08:00
Samuel Just
0720e03ef3 Merge pull request #2456 from ceph/wip-9031-9262
Wip 9031 9262

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:30 -08:00
Samuel Just
ced51656da Merge pull request #2553 from ceph/wip-aio-journal
osd: clean up journal aio+dio header issue

Reviewed-by: Samuel Just <sjust@redhat.com>
2014-11-10 14:55:04 -08:00
Samuel Just
63cd066250 Merge pull request #2745 from ceph/wip-6756
JounralingObjectStore: journal->committed_thru after replay
2014-11-10 14:53:56 -08:00
Samuel Just
992a4a843f Merge pull request #2773 from ceph/wip-9852
mon: MDSMonitor: proper error output if pool DNE on 'add_data_pool'

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2014-11-10 14:52:10 -08:00
Samuel Just
07a441bdd2 Merge pull request #2822 from ceph/wip-9887
Wip 9887

Reviewed-by: Samuel Just <sjust@redhat.com>
2014-11-10 14:51:15 -08:00
Samuel Just
18a850933f Merge pull request #2850 from ceph/wip-9987
mon: fix min_last_epoch_started tracking

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2014-11-10 14:49:51 -08:00
Samuel Just
d392f44891 Merge pull request #2862 from ceph/wip-log-client
osd, mds: fix cluster log

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2014-11-10 14:47:15 -08:00
Sage Weil
17d517991c Merge pull request #2689 from zhurongze/fix-crush
crush: fix incorrect use of adjust_item_weight method

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-10 09:02:28 -08:00
Sage Weil
43f004de30 Merge pull request #2881 from ceph/wip-10030
librbd: don't close an already closed parent image upon failure

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-10 08:41:58 -08:00
Rongze Zhu
9850227d2f crush: fix incorrect use of adjust_item_weight method
adjust_item_weight method will adjust all buckets which the item
inside. If the osd.0 in host=fake01 and host=fake02, we execute
"ceph osd crush osd.0 10 host=fake01", it not only will adjust fake01's
weight, but also will adjust fake02's weight.

the patch add adjust_item_weightf_in_loc method and fix remove_item,
_remove_item_under, update_item, insert_item, detach_bucket methods.

Signed-off-by: Rongze Zhu <zrzhit@gmail.com>
2014-11-10 23:37:03 +08:00
Loic Dachary
2d7adb23bc erasure-code: erasure_code_benchmark exhaustive erasure exploration
Add the --erasure-generation exhaustive flag to try all combinations of
erasures, not just one at random.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
3ff2816b3e erasure-code: add erasure_code_benchmark --verbose
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
efe121d9f2 erasure_code: implement ceph_erasure_code to assert the existence of a plugin
This is handy when scripting in the context of teuthology and only
conditionally run tests for the isa plugin, for instance.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
49613cb2aa erasure-code: ceph_erasure_code does not need to avoid dlclose
The only reason for not dlclosing plugins at exit is for callgrind but
ceph_erasure_code has no workload that would require callgrind.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
6fdbdff2ad erasure-code: add corpus verification to make check
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
10c88c8f27 erasure-code: Makefile.am cosmetics
Cluster benchmark related lines together.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
2c84d0b1db erasure-code: s/alignement/alignment/ typos in jerasure
The jerasure-per-chunk-alignment prameter was mispelled and while
useable that would lead to confusion.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
7638b15f23 erasure-code: workunit to check for encoding regression
Clone the archive of encoded objects and decode all archived objects, up
to and including the current ceph version.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
f5901303db erasure-code: store and compare encoded contents
Introduce ceph_erasure_code_non_regression to check and compare how an
erasure code plugin encodes and decodes content with a given set of
parameters. For instance:

./ceph_erasure_code_non_regression \
      --plugin jerasure \
      --parameter technique=reed_sol_van \
      --parameter k=2 \
      --parameter m=2 \
      --stripe-width 3181 \
      --create \
      --check

Will create an encoded object (--create) and store it into a directory
along with the chunks, one chunk per file. The directory name is derived
from the parameters. The content of the object is a random pattern of 31
bytes repeated to fill the object size specified with --stripe-width.

The check function (--check) reads the object back from the file,
encodes it and compares the result with the content of the chunks read
from the files. It also attempts recover from one or two erasures.

Chunks encoded by a given version of Ceph are expected to be encoded
exactly in the same way by all Ceph versions going forward.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-10 14:56:43 +01:00
Loic Dachary
4b07381daf Merge pull request #2888 from dachary/wip-9970-erasure-code-documentation
erasure-code: document pool operations

Reviewed-by: Laurent Guerby <laurent@guerby.net>
2014-11-10 14:51:15 +01:00