Commit Graph

36991 Commits

Author SHA1 Message Date
Sage Weil
292be9799e Merge pull request #2902 from dachary/wip-10083-noisy-osd
qa: handle CEPH_CLI_TEST_DUP_COMMAND on ceph osd create

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-12 11:27:08 -08:00
Josh Durgin
94a10196b5 Merge remote-tracking branch 'origin/next' 2014-11-12 11:18:52 -08:00
Loic Dachary
6c80525551 qa: handle CEPH_CLI_TEST_DUP_COMMAND on ceph osd create
If CEPH_CLI_TEST_DUP_COMMAND is set when ceph osd create is called, it
will create two osd. They must be cleaned up afterwards instead of
assuming only one is going to be created.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-11-12 19:33:46 +01:00
Sage Weil
22b6c1a531 Merge pull request #2124 from ceph/wip-objectstore
simplify ObjectStore interface

sage-2014-11-11_08:26:01-rados-wip-sage-testing-distro-basic-multi

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2014-11-12 10:02:52 -08:00
Sage Weil
1eed56bf5d Merge pull request #2722 from ceph/wip-9598
msgr: make mark_down not block on fast dispatch

sage-2014-11-11_08:26:01-rados-wip-sage-testing-distro-basic-multi

Reviewed-by: Greg Farnum <greg@inktank.com>
2014-11-12 10:01:50 -08:00
John Wilkins
636316a15a Merge pull request #2901 from ktdreyer/doc-spelling-grammar
doc: spelling & grammar fixes

Reviewed-by: John Wilkins <jowilkin@redhat.com>
2014-11-12 09:18:42 -08:00
Ken Dreyer
0cff9148ff doc: correct grammar in RGW SSL cert installation
The SSL certificate generation instruction was missing a preposition.
Add it.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2014-11-12 09:55:55 -07:00
Ken Dreyer
731ea68bfb doc: correct spelling of "fqdn"
The "fqdn" (fully-qualified domain name) was misspelled in a couple
places as fgdn". Use the correct spelling.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2014-11-12 09:53:43 -07:00
Jason Dillaman
d76bfc2e8e Merge pull request #2899 from jdurgin/wip-import-export-next
qa: allow small allocation diffs for exported rbds

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2014-11-12 09:26:45 -05:00
Josh Durgin
e94d3c11ed qa: allow small allocation diffs for exported rbds
The local filesytem may behave slightly differently. This isn't
foolproof, but seems to be reliable enough on rhel7 rootfs, where
exact comparison was failing.

Fixes: #10002
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2014-11-11 18:16:04 -08:00
Josh Durgin
e5e92c7cb1 Merge pull request #2898 from ceph/wip-rbd-python-tests
librbd: Python unit tests now use unique pools and images

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2014-11-12 03:13:04 +01:00
Josh Durgin
c224014ac0 Merge pull request #2820 from ceph/wip-9854
osdc: Constrain max number of in-flight read requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2014-11-12 03:05:28 +01:00
Loic Dachary
b0eb532796 Merge pull request #2890 from zhouyuan/fix_mailmap
Fix Yuan's mailmap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-12 01:52:44 +01:00
Sage Weil
80865fea71 Merge remote-tracking branch 'gh/next' 2014-11-11 16:22:40 -08:00
Yuan Zhou
09eefac760 Fix Yuan's mailmap
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2014-11-12 08:16:45 +08:00
Sage Weil
05a1c3f128 doc/release-notes: v0.88
Signed-off-by: Sage Weil <sage@redhat.com>
2014-11-11 16:15:08 -08:00
Sage Weil
8e6fe680e6 Merge pull request #2897 from ceph/wip-da-revert-10b68b
Revert "osd: detect (some) misordered ondisk tmaps"

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2014-11-11 15:28:20 -08:00
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
Jenkins
4be687bf44 0.88 2014-11-11 09:33:12 -08: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
Jason Dillaman
fea7097524 librbd: Python unit tests now use unique pools and images
RBD python unit tests no longer utilize the 'rbd' pool for
test cases.  Instead, a new temporary pool is created and
deleted. Additionally, each unit test now uses a unique
image name to reduce the possibility of test case failures
affecting subsequent tests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2014-11-11 02:17:28 -05: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
Jason Dillaman
cd784eab22 osdc: Constrain max number of in-flight read requests
Constrain the number of in-flight RADOS read requests to the
cache size.  This reduces the chance of the cache memory
ballooning during certain scenarios like copy-up which can
invoke many concurrent read requests.

Fixes: #9854
Backport: giant, firefly, dumpling
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2014-11-10 22:20:58 -05: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
Gregory Farnum
69be8e9b30 Merge pull request #2878 from ceph/wip-10025
#10025 Fix 'journal import' (aka undump)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2014-11-10 17:20:48 -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