]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agotests: comment out unstable tiering tests 4337/head 4378/head
Loic Dachary [Fri, 10 Apr 2015 18:00:13 +0000 (20:00 +0200)]
tests: comment out unstable tiering tests

So that make check does not randomly fails.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4339 from ceph/wip-da-SCA-20150317
Kefu Chai [Thu, 16 Apr 2015 06:46:26 +0000 (14:46 +0800)]
Merge pull request #4339 from ceph/wip-da-SCA-20150317

Various SCA and Coverity fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4367 from ceph/wip-ceph-disk-default-cluster
Loic Dachary [Thu, 16 Apr 2015 06:41:27 +0000 (08:41 +0200)]
Merge pull request #4367 from ceph/wip-ceph-disk-default-cluster

ceph-disk: set '--cluster=ceph' in 'prepare' subcommand

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4366 from BCLibCoop/bclibcoop/rgw-hostnames
Yehuda Sadeh [Wed, 15 Apr 2015 16:20:24 +0000 (09:20 -0700)]
Merge pull request #4366 from BCLibCoop/bclibcoop/rgw-hostnames

rgw: Document & improve region hostnames

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoTestPGLog.cc: fix -Wsign-compare 4339/head
Danny Al-Gaaf [Wed, 15 Apr 2015 10:22:29 +0000 (12:22 +0200)]
TestPGLog.cc: fix -Wsign-compare

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoTestErasureCodeShec.cc: fix -Wsign-compare
Danny Al-Gaaf [Wed, 15 Apr 2015 10:21:42 +0000 (12:21 +0200)]
TestErasureCodeShec.cc: fix -Wsign-compare

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agotest_async_driver.cc: fix UNINIT
Danny Al-Gaaf [Fri, 10 Apr 2015 09:25:12 +0000 (11:25 +0200)]
test_async_driver.cc: fix UNINIT

Fix for:

CID 1254380 (#1 of 1): Uninitialized scalar variable (UNINIT)
 uninit_use_in_call: Using uninitialized value sa. Field
 sa.sin_zero is uninitialized when calling connect

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agopsim.cc: change initialzation of VLAs
Danny Al-Gaaf [Fri, 10 Apr 2015 08:19:25 +0000 (10:19 +0200)]
psim.cc: change initialzation of VLAs

Use memset to fill integer VLAs.

Fix for:

CID 1219649 (#1 of 1): Uninitialized scalar variable (UNINIT)
 uninit_use: Using uninitialized value primary_count[primary]

CID 1219648 (#1 of 1): Uninitialized scalar variable (UNINIT)
 uninit_use: Using uninitialized value first_count[osds[0UL]]

CID 1219647 (#1 of 1): Uninitialized scalar variable (UNINIT)
 uninit_use: Using uninitialized value count[osds[i]]

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agosystest_runnable.h: mark copy ctor as explicit
Danny Al-Gaaf [Wed, 1 Apr 2015 16:25:57 +0000 (18:25 +0200)]
systest_runnable.h: mark copy ctor as explicit

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agocommon/Thread.h: mark copy/move ctor as explicit
Danny Al-Gaaf [Wed, 1 Apr 2015 16:25:27 +0000 (18:25 +0200)]
common/Thread.h: mark copy/move ctor as explicit

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agocls_rbd.cc: reduce scope of local variable
Danny Al-Gaaf [Wed, 1 Apr 2015 16:25:00 +0000 (18:25 +0200)]
cls_rbd.cc: reduce scope of local variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoReplicatedBackend.cc: init 'Message *commit' to NULL
Danny Al-Gaaf [Tue, 24 Mar 2015 08:50:47 +0000 (09:50 +0100)]
ReplicatedBackend.cc: init 'Message *commit' to NULL

Init variable with NULL to make sure it crashes in error
case (would be a bug) if NDEBUG disable the assert() call.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoosd/PG.h: mark copy ctor explicit
Danny Al-Gaaf [Tue, 24 Mar 2015 09:06:42 +0000 (10:06 +0100)]
osd/PG.h: mark copy ctor explicit

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agomsg/Dispatcher.h: make copy/move ctor explicit
Danny Al-Gaaf [Thu, 19 Mar 2015 21:11:17 +0000 (22:11 +0100)]
msg/Dispatcher.h: make copy/move ctor explicit

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agotest_shared_cache.cc: reduce scope of variable
Danny Al-Gaaf [Wed, 18 Mar 2015 15:29:58 +0000 (16:29 +0100)]
test_shared_cache.cc: reduce scope of variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agorgw_rest_user.cc: UserQuotas init vars in ctor init list
Danny Al-Gaaf [Wed, 18 Mar 2015 14:03:28 +0000 (15:03 +0100)]
rgw_rest_user.cc: UserQuotas init vars in ctor init list

Fix for:

[src/rgw/rgw_rest_user.cc:631]: (performance) Variable 'bucket_quota' is
 assigned in constructor body. Consider performing initialization in
 initialization list.
[src/rgw/rgw_rest_user.cc:632]: (performance) Variable 'user_quota' is
 assigned in constructor body. Consider performing initialization in
 initialization list.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoclient/Client.cc: fix uninit variables
Danny Al-Gaaf [Wed, 18 Mar 2015 10:12:51 +0000 (11:12 +0100)]
client/Client.cc: fix uninit variables

This is caused by assert(). If assert is disabled we run into use
of uninitialized variables. Return -EINVAL in case assert() is
disabled.

Fix for:

[src/client/Client.cc:7791]: (error) Uninitialized variable: lock_state
[src/client/Client.cc:7829]: (error) Uninitialized variable: lock_type

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agolibcephfs.h: fix unnecessary forward declarations
Danny Al-Gaaf [Tue, 17 Mar 2015 21:58:19 +0000 (22:58 +0100)]
libcephfs.h: fix unnecessary forward declarations

This is an issue in case non-cpp code. Move the declaration of
inodeno_t and vinodeno_t structs into __cplusplus block where
they are needed.

Fix for cppcheck issue:

[src/include/cephfs/libcephfs.h:89] -> [src/include/cephfs/libcephfs.h:74]:
 The struct 'inodeno_t' forward declaration is unnecessary. Type struct is
 already declared earlier.
[src/include/cephfs/libcephfs.h:93] -> [src/include/cephfs/libcephfs.h:83]:
 The struct 'vinodeno_t' forward declaration is unnecessary. Type struct is
 already declared earlier.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoos/FileStore.cc: fix format qualifier in COMMIT_SNAP_ITEM
Danny Al-Gaaf [Tue, 17 Mar 2015 19:23:53 +0000 (20:23 +0100)]
os/FileStore.cc: fix format qualifier in COMMIT_SNAP_ITEM

All places COMMIT_SNAP_ITEM is used the variables are
'unsigned long long'. Change the format qualifier to reflect
this and to fix:

[src/os/FileStore.cc:1341]: (warning) %lld in format string (no. 1)
 requires 'long long *' but the argument type is 'unsigned long long *'.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agomds/MDCache.cc: fix potential null pointer dereference
Danny Al-Gaaf [Tue, 17 Mar 2015 17:18:34 +0000 (18:18 +0100)]
mds/MDCache.cc: fix potential null pointer dereference

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agotest/../chain_xattr.cc: fix suspicious usage of 'sizeof'
Danny Al-Gaaf [Tue, 17 Mar 2015 16:55:06 +0000 (17:55 +0100)]
test/../chain_xattr.cc: fix suspicious usage of 'sizeof'

Use sizeof(char) instead of sizeof('\0').

Fix for:

[src/test/objectstore/chain_xattr.cc:164]: (warning) Suspicious
 usage of 'sizeof' with a numeric constant as parameter.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoTestErasureCodeShec: fix some -Wsign-compare
Danny Al-Gaaf [Tue, 17 Mar 2015 16:16:42 +0000 (17:16 +0100)]
TestErasureCodeShec: fix some -Wsign-compare

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agorgw_rest_log.h: remove http_ret from some RGWOp_*_list classes
Danny Al-Gaaf [Tue, 17 Mar 2015 16:12:04 +0000 (17:12 +0100)]
rgw_rest_log.h: remove http_ret from some RGWOp_*_list classes

Remove http_ret from child class since there is already an integer
with the same name in the parent/base class.

Fix for:

[src/rgw/rgw_rest_log.h:79] -> [src/rgw/rgw_rest.h:275]: (warning) The
 class 'RGWOp_MDLog_List' defines member variable with name 'http_ret'
 also defined in its parent class 'RGWRESTOp'.
[src/rgw/rgw_rest_log.h:99] -> [src/rgw/rgw_rest.h:275]: (warning) The
 class 'RGWOp_MDLog_Info' defines member variable with name 'http_ret'
 also defined in its parent class 'RGWRESTOp'.
[src/rgw/rgw_rest_log.h:182] -> [src/rgw/rgw_rest.h:275]: (warning) The
 class 'RGWOp_DATALog_List' defines member variable with name 'http_ret'
 also defined in its parent class 'RGWRESTOp'.
[src/rgw/rgw_rest_log.h:202] -> [src/rgw/rgw_rest.h:275]: (warning) The
 class 'RGWOp_DATALog_Info' defines member variable with name 'http_ret'
 also defined in its parent class 'RGWRESTOp'.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoceph-disk: set '--cluster=ceph' in 'prepare' subcommand 4367/head
Kefu Chai [Wed, 15 Apr 2015 07:55:42 +0000 (15:55 +0800)]
ceph-disk: set '--cluster=ceph' in 'prepare' subcommand

otherwise the 'ceph' default value won't be catched by "main_prepare()",
this breaks TEST_corrupt_and_repair_replicated. seems the behaviour
was changed in python 2.7.9, so we move the default value to where
the '--cluster' argument is added instead of setting it in the
main argument parser.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: Changes in region hostname do not seem to take effect until radosgw is restarted. 4366/head
Robin H. Johnson [Wed, 15 Apr 2015 07:14:43 +0000 (00:14 -0700)]
doc: Changes in region hostname do not seem to take effect until radosgw is restarted.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
10 years agoMerge pull request #4335 from liewegas/wip-osd-df
Kefu Chai [Wed, 15 Apr 2015 06:18:48 +0000 (14:18 +0800)]
Merge pull request #4335 from liewegas/wip-osd-df

mon: fix min/max variance for 'cpeh osd df' when osds are marked out

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agorgw: Document a lurking problem I see with subdomain/domain splitting
Robin H. Johnson [Wed, 15 Apr 2015 01:31:18 +0000 (18:31 -0700)]
rgw: Document a lurking problem I see with subdomain/domain splitting

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
10 years agorgw: Speed up the building of valid de-duplicated hostnames for regions.
Robin H. Johnson [Wed, 15 Apr 2015 01:30:16 +0000 (18:30 -0700)]
rgw: Speed up the building of valid de-duplicated hostnames for regions.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
10 years agodoc: Document region hostnames settings.
Robin H. Johnson [Wed, 15 Apr 2015 01:12:18 +0000 (18:12 -0700)]
doc: Document region hostnames settings.

The hostnames key in region settings was undocumented. Also includes how
the setting interacts with the ``rgw dns name`` configuration setting.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
10 years agoMerge pull request #3481 from ktdreyer/wip-rpm-rm-old-fedoras
Sage Weil [Tue, 14 Apr 2015 20:49:05 +0000 (13:49 -0700)]
Merge pull request #3481 from ktdreyer/wip-rpm-rm-old-fedoras

ceph.spec.in: remove reference to EOL Fedoras

10 years agoMerge pull request #4316 from Ved-vampir/librdb
Josh Durgin [Tue, 14 Apr 2015 20:40:56 +0000 (13:40 -0700)]
Merge pull request #4316 from Ved-vampir/librdb

librdb: add perf counters descriptions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4361 from oritwas/wip-11091
Yehuda Sadeh [Tue, 14 Apr 2015 18:53:49 +0000 (11:53 -0700)]
Merge pull request #4361 from oritwas/wip-11091

rgw: shouldn't return content-type: application/xml if content length is 0

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4351 from ceph/wip-11256
Josh Durgin [Tue, 14 Apr 2015 17:45:34 +0000 (10:45 -0700)]
Merge pull request #4351 from ceph/wip-11256

Wip 11256

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4363 from nilamdyuti/wip-doc-ceph-object-gateway
Ken Dreyer [Tue, 14 Apr 2015 16:59:19 +0000 (10:59 -0600)]
Merge pull request #4363 from nilamdyuti/wip-doc-ceph-object-gateway

doc: Corrected the steps of Apache configuration for Debian-based
distros in object gateway installation guide.

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodoc: Corrected the steps of Apache configuration for Debian-based distros 4363/head
Nilamdyuti Goswami [Tue, 14 Apr 2015 16:49:32 +0000 (22:19 +0530)]
doc: Corrected the steps of Apache configuration for Debian-based distros
in object gateway installation guide.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agomon: make note about osd df calc bug 4335/head
Sage Weil [Tue, 14 Apr 2015 16:35:04 +0000 (09:35 -0700)]
mon: make note about osd df calc bug

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomon: fix min variance calc in 'osd df'
Sage Weil [Tue, 14 Apr 2015 16:32:22 +0000 (09:32 -0700)]
mon: fix min variance calc in 'osd df'

If the reweight is 0, ignore the osd for the purposes of calculating the
min.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4354 from zhouyuan/fix_ct_doc
Sage Weil [Tue, 14 Apr 2015 16:26:13 +0000 (09:26 -0700)]
Merge pull request #4354 from zhouyuan/fix_ct_doc

doc: Fix misleading overlay settting in Cache Tier

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4359 from ceph/wip-fix-ceph-dencoder-build-master
Ken Dreyer [Tue, 14 Apr 2015 16:22:37 +0000 (10:22 -0600)]
Merge pull request #4359 from ceph/wip-fix-ceph-dencoder-build-master

Move ceph-dencoder build to client
Rework mds/Makefile.am to support a dencoder client build
rgw/Makefile.am: Populate DENCODER_SOURCES properly
Dencoder should never be built with tcmalloc

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agorgw: shouldn't return content-type: application/xml if content length is 0 4361/head
Orit Wasserman [Thu, 9 Apr 2015 18:04:59 +0000 (20:04 +0200)]
rgw: shouldn't return content-type: application/xml if content length is 0

Fixed: #11091

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
10 years agoMove ceph-dencoder build to client 4359/head
Boris Ranto [Mon, 13 Apr 2015 10:38:58 +0000 (12:38 +0200)]
Move ceph-dencoder build to client

The patch simply moves the ceph-dencoder build from server part of the
Makefiles to client part of the Makefiles.

Refs: #10691

Signed-off-by: Boris Ranto <branto@redhat.com>
10 years agoRework mds/Makefile.am to support a dencoder client build
Boris Ranto [Mon, 13 Apr 2015 13:07:03 +0000 (15:07 +0200)]
Rework mds/Makefile.am to support a dencoder client build

The patch adds all the mds sources to DENCODER_SOURCES to allow a
dencoder client build. The patch also splits the Makefile.am file to
better accomodate the change.

Refs: #10691

Signed-off-by: Boris Ranto <branto@redhat.com>
10 years agorgw/Makefile.am: Populate DENCODER_SOURCES properly
Boris Ranto [Mon, 13 Apr 2015 10:33:00 +0000 (12:33 +0200)]
rgw/Makefile.am: Populate DENCODER_SOURCES properly

Dencoder is built if ENABLE_CLIENT is set. However, the rgw/Makefile.am
populated DENCODER_SOURCES only if WITH_RADOSGW was set. The patch fixes
this and populates DENCODER_SOURES if ENABLE_CLIENT is set.

Signed-off-by: Boris Ranto <branto@redhat.com>
10 years agoDencoder should never be built with tcmalloc
Boris Ranto [Mon, 13 Apr 2015 10:32:30 +0000 (12:32 +0200)]
Dencoder should never be built with tcmalloc

The patch adds disabled perfglue stubs to DENCODER sources in order to
avoid tcmalloc-enabled ceph-dencoder builds.

Refs: #10691

Signed-off-by: Boris Ranto <branto@redhat.com>
10 years agoMerge pull request #4348 from ceph/wip-mon-clean
Joao Eduardo Luis [Tue, 14 Apr 2015 10:02:49 +0000 (11:02 +0100)]
Merge pull request #4348 from ceph/wip-mon-clean

mon: remove dead MonitorStore code

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
10 years agolibrdb: add perf counters descriptions 4316/head
Ved-vampir [Thu, 9 Apr 2015 14:03:45 +0000 (17:03 +0300)]
librdb: add perf counters descriptions

Sign-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
10 years agodoc: Fix misleading overlay settting in Cache Tier 4354/head
Yuan Zhou [Tue, 14 Apr 2015 06:46:14 +0000 (14:46 +0800)]
doc: Fix misleading overlay settting in Cache Tier

set-overlay is needed in either writeback or readonly mode of Cache
Tier setup.

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agoceph_json: add decode / encoder for multimap 4351/head
Yehuda Sadeh [Mon, 13 Apr 2015 23:33:17 +0000 (16:33 -0700)]
ceph_json: add decode / encoder for multimap

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocls_rgw: use multimap to keep pending operations in bucket index
Yehuda Sadeh [Tue, 31 Mar 2015 00:34:57 +0000 (17:34 -0700)]
cls_rgw: use multimap to keep pending operations in bucket index

Fixes: #11256
Multiple concurrent requests might be sent using the same tag, need the
entry map to be able to hold multiple entries.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: generate new tag for object when setting object attrs
Yehuda Sadeh [Fri, 27 Mar 2015 23:32:48 +0000 (16:32 -0700)]
rgw: generate new tag for object when setting object attrs

Fixes: #11256
Backport: firefly, hammer

Beforehand we were reusing the object's tag, which is problematic as
this tag is used for bucket index updates, and we might be clobbering a
racing update (like object removal).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4350 from almightybeeij/master
Sage Weil [Mon, 13 Apr 2015 21:36:11 +0000 (14:36 -0700)]
Merge pull request #4350 from almightybeeij/master

Check that delta_sum.stats.sum.num_object_copies and delta_sum.stats.sum...

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4349 from ceph/wip-dist-systemd-tmpfiles-d
Sage Weil [Mon, 13 Apr 2015 17:43:09 +0000 (10:43 -0700)]
Merge pull request #4349 from ceph/wip-dist-systemd-tmpfiles-d

#11383: packaging: ship systemd/ceph.tmpfiles.d in tarballs

10 years agopackaging: ship systemd/ceph.tmpfiles.d in tarballs 4349/head
Ken Dreyer [Mon, 13 Apr 2015 15:43:11 +0000 (09:43 -0600)]
packaging: ship systemd/ceph.tmpfiles.d in tarballs

Prior to this commit, the tarballs did not contain
any files under the top-level "systemd" directory. This caused problems
with RPM builds on Fedora and RHEL 7, because as of commit
aa88364f30e2d2f254ade185a83ba263b48e2a73, those RPMs depend on the
systemd/ceph.tmpfiles.d file.

(Longer-term we might want to improve the tarball generation code to be
less complex/manual.)

http://tracker.ceph.com/issues/11383 Refe: #11383

Reported-by: Greg Farnum <gfarnum@redhat.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoCheck that delta_sum.stats.sum.num_object_copies and delta_sum.stats.sum.num_object... 4350/head
BJ Lougee [Mon, 13 Apr 2015 16:24:38 +0000 (11:24 -0500)]
Check that delta_sum.stats.sum.num_object_copies and delta_sum.stats.sum.num_object are greater than zero

This fixes division by zero.

Signed-off-by BJ Lougee <almightybeeij@gmail.com>

10 years agomon: remove dead MonitorStore code 4348/head
Sage Weil [Mon, 13 Apr 2015 15:42:47 +0000 (08:42 -0700)]
mon: remove dead MonitorStore code

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agodoc/release-notes: v0.94.1
Sage Weil [Mon, 13 Apr 2015 15:31:40 +0000 (08:31 -0700)]
doc/release-notes: v0.94.1

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4317 from ceph/wip-rpm-with-systemd-comparison
branto1 [Mon, 13 Apr 2015 12:11:45 +0000 (14:11 +0200)]
Merge pull request #4317 from ceph/wip-rpm-with-systemd-comparison

ceph.spec.in: set _with_systemd on RHEL 7 and Fedora

10 years agoMerge pull request #4327 from dachary/wip-wheezy
Kefu Chai [Mon, 13 Apr 2015 10:06:28 +0000 (18:06 +0800)]
Merge pull request #4327 from dachary/wip-wheezy

install-deps.sh: Debian GNU/Linux wheezy needs backports

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4341 from dachary/wip-test-timeout
Loic Dachary [Mon, 13 Apr 2015 09:30:29 +0000 (11:30 +0200)]
Merge pull request #4341 from dachary/wip-test-timeout

tests: display ceph report when stuck

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoMerge pull request #4334 from smithfarm/master
Loic Dachary [Mon, 13 Apr 2015 09:20:34 +0000 (11:20 +0200)]
Merge pull request #4334 from smithfarm/master

do_autogen: add missing '--without-lttng' option to usage()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: display ceph report when stuck 4341/head
Loic Dachary [Sat, 11 Apr 2015 12:14:53 +0000 (14:14 +0200)]
tests: display ceph report when stuck

When the cluster is stuck (wait_for_clean times out), display ceph
report to stderr for debugging purposes.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4239 from yuyuyu101/wip-librbd-conf
Josh Durgin [Sat, 11 Apr 2015 06:10:34 +0000 (23:10 -0700)]
Merge pull request #4239 from yuyuyu101/wip-librbd-conf

Wip librbd conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4323 from ceph/wip-11363
Josh Durgin [Sat, 11 Apr 2015 01:04:30 +0000 (18:04 -0700)]
Merge pull request #4323 from ceph/wip-11363

librbd: ImageWatcher should cancel in-flight ops on watch error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4140 from ceph/wip-rbd-rebuild-object-map
Josh Durgin [Sat, 11 Apr 2015 00:56:48 +0000 (17:56 -0700)]
Merge pull request #4140 from ceph/wip-rbd-rebuild-object-map

rbd: add ability to rebuild corrupt/missing object maps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4325 from wonzhq/async-resize-2
Josh Durgin [Sat, 11 Apr 2015 00:32:58 +0000 (17:32 -0700)]
Merge pull request #4325 from wonzhq/async-resize-2

librbd/AsyncResize: avoid dup incrementing refresh seq

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4336 from ceph/wip-11369
Josh Durgin [Sat, 11 Apr 2015 00:26:14 +0000 (17:26 -0700)]
Merge pull request #4336 from ceph/wip-11369

librbd: failure to update the object map should always return success

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoinstall-deps.sh: Debian GNU/Linux wheezy needs backports 4327/head
Loic Dachary [Fri, 10 Apr 2015 07:26:14 +0000 (09:26 +0200)]
install-deps.sh: Debian GNU/Linux wheezy needs backports

It is not enough for the backports to be available, they also need to be
explicitly allowed to take precedence whenever a package is installed
indirectly. This is causing problems with libp11-kit-dev pulled by
libcurl4-gnutls-dev.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4319 from ceph/wip-11348
Josh Durgin [Fri, 10 Apr 2015 21:07:43 +0000 (14:07 -0700)]
Merge pull request #4319 from ceph/wip-11348

librbd: update default image format to version 2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agodo_autogen.sh: add missing '--without-lttng' option to usage 4334/head
Nathan Cutler [Fri, 10 Apr 2015 14:05:20 +0000 (16:05 +0200)]
do_autogen.sh: add missing '--without-lttng' option to usage

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
10 years agolibrbd: notify of header update after rebuilding object map 4140/head
Jason Dillaman [Fri, 10 Apr 2015 19:43:45 +0000 (15:43 -0400)]
librbd: notify of header update after rebuilding object map

This will allow clients to detect that the object map is no longer
invalid and to reload the object map from disk.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: rebuilding object map shouldn't update piecemeal
Jason Dillaman [Fri, 10 Apr 2015 19:42:58 +0000 (15:42 -0400)]
librbd: rebuilding object map shouldn't update piecemeal

The object map is now rebuilt in-memory and written back to the
OSDs as a single operation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: add test case for cls_rbd object_map_save
Jason Dillaman [Fri, 10 Apr 2015 18:05:01 +0000 (14:05 -0400)]
tests: add test case for cls_rbd object_map_save

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd_client: add object_map_save helper method
Jason Dillaman [Fri, 10 Apr 2015 17:59:28 +0000 (13:59 -0400)]
cls_rbd_client: add object_map_save helper method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: add object_map_save method
Jason Dillaman [Fri, 10 Apr 2015 17:56:39 +0000 (13:56 -0400)]
cls_rbd: add object_map_save method

Allow the object map rebuild process to build the full object map
in memory and save it to disk with one operation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: add ImageWatcher test for new rebuild object map request
Jason Dillaman [Fri, 20 Mar 2015 17:12:49 +0000 (13:12 -0400)]
tests: add ImageWatcher test for new rebuild object map request

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: added rebuild_object_map test to test_librbd
Jason Dillaman [Fri, 20 Mar 2015 15:47:36 +0000 (11:47 -0400)]
tests: added rebuild_object_map test to test_librbd

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: librados_test_stub reads should deep-copy
Jason Dillaman [Fri, 6 Mar 2015 20:40:48 +0000 (15:40 -0500)]
tests: librados_test_stub reads should deep-copy

If a client of librados_test_stub modified a bufferlist
retrieved via a read call, the client will actually be
changing the contents of the file.  Therefore, read calls
should deep-copy the contents of the buffer::ptrs.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: allow snapshot object maps to be updated
Jason Dillaman [Sat, 21 Mar 2015 18:40:26 +0000 (14:40 -0400)]
librbd: allow snapshot object maps to be updated

Rebuild will need to be able to update/resize the object maps
for image snapshots.  This was previously not permitted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: update in-memory object map before on-disk update completes
Jason Dillaman [Fri, 20 Mar 2015 14:40:22 +0000 (10:40 -0400)]
librbd: update in-memory object map before on-disk update completes

When multiple IO updates are occurring within the same object, this
will allow only a single object map update request to be sent to the
OSD.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: treat zero-byte object maps as missing
Jason Dillaman [Fri, 20 Mar 2015 03:29:44 +0000 (23:29 -0400)]
cls_rbd: treat zero-byte object maps as missing

Acquiring the lock on a missing object map will create an
empty object. Treat the empty object as a non-existant
object map to support rebuilding corrupt object maps while
holding the exclusive lock.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agorbd: add object map rebuild command
Jason Dillaman [Thu, 12 Mar 2015 16:10:32 +0000 (12:10 -0400)]
rbd: add object map rebuild command

An invalid object map can now be rebuilt via the rbd CLI.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add rebuild_object_map to public API
Jason Dillaman [Fri, 20 Mar 2015 01:19:22 +0000 (21:19 -0400)]
librbd: add rebuild_object_map to public API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: add another overload of aio_operate
Jason Dillaman [Thu, 19 Mar 2015 20:28:34 +0000 (16:28 -0400)]
librados_test_stub: add another overload of aio_operate

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: connect async rebuild object map to state machine
Jason Dillaman [Thu, 19 Mar 2015 20:26:40 +0000 (16:26 -0400)]
librbd: connect async rebuild object map to state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: require callers to ObjectMap::aio_update to acquire lock
Jason Dillaman [Thu, 19 Mar 2015 19:35:59 +0000 (15:35 -0400)]
librbd: require callers to ObjectMap::aio_update to acquire lock

This is needed to allow an atomic compare and update operation
from the rebuild object map utility.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: added RebuildObjectMapRequest state machine
Jason Dillaman [Thu, 19 Mar 2015 19:33:07 +0000 (15:33 -0400)]
librbd: added RebuildObjectMapRequest state machine

It will verify the object map is properly sized, verify
the existence of each object within the image (snapshot),
and clear the invalid object map flag once complete.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: correct basic object map errors during refresh
Jason Dillaman [Fri, 20 Mar 2015 16:16:14 +0000 (12:16 -0400)]
librbd: correct basic object map errors during refresh

If the object map is corrupt on-disk or too small for the image,
correct these basic issues as soon as possible.  The object map
is still flagged as invalid, but there will be less required repair
work if future IO is able to properly update the object map.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: use generic helper for issuing async requests
Jason Dillaman [Wed, 18 Mar 2015 15:51:47 +0000 (11:51 -0400)]
librbd: use generic helper for issuing async requests

resize, flatten, and rebuild object map now use the same
bootstrap code for sending the request to the remote lock owner
or executing the request locally.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: connect ImageWatch rebuild request to async rebuild method
Jason Dillaman [Wed, 18 Mar 2015 15:08:23 +0000 (11:08 -0400)]
librbd: connect ImageWatch rebuild request to async rebuild method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add preliminary methods for rebuilding object map
Jason Dillaman [Wed, 18 Mar 2015 15:07:35 +0000 (11:07 -0400)]
librbd: add preliminary methods for rebuilding object map

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add hooks for rebuild object map to ImageWatcher
Jason Dillaman [Wed, 18 Mar 2015 14:38:09 +0000 (10:38 -0400)]
librbd: add hooks for rebuild object map to ImageWatcher

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add new notify payload for rebuild object map
Jason Dillaman [Wed, 18 Mar 2015 14:21:17 +0000 (10:21 -0400)]
librbd: add new notify payload for rebuild object map

The request will be sent to the client which owns the exclusive
lock to rebuild the object map for the current image HEAD.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: failure to update the object map should always return success 4336/head
Jason Dillaman [Fri, 10 Apr 2015 16:37:05 +0000 (12:37 -0400)]
librbd: failure to update the object map should always return success

If an object map update fails, the object map will be flagged as
invalid.  However, if a subsequent update failure occurs, the error
code will propagate back to the caller.

Fixes: #11369
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: librados_test_stub reads should deep-copy
Jason Dillaman [Fri, 6 Mar 2015 20:40:48 +0000 (15:40 -0500)]
tests: librados_test_stub reads should deep-copy

If a client of librados_test_stub modified a bufferlist
retrieved via a read call, the client will actually be
changing the contents of the file.  Therefore, read calls
should deep-copy the contents of the buffer::ptrs.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4330 from dachary/wip-hammer-release-notes
Loic Dachary [Fri, 10 Apr 2015 15:59:07 +0000 (17:59 +0200)]
Merge pull request #4330 from dachary/wip-hammer-release-notes

release-notes: draft v0.94.1 release notes

10 years agolibrbd: ImageWatcher should cancel in-flight ops on watch error 4323/head
Jason Dillaman [Fri, 20 Mar 2015 15:56:55 +0000 (11:56 -0400)]
librbd: ImageWatcher should cancel in-flight ops on watch error

Upon an watch error notification from librados, pending requests
should be canceled and in-flight IO should be flushed prior to
unlocking the image.

Fixes: #11363
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4333 from dachary/wip-fedora
Kefu Chai [Fri, 10 Apr 2015 13:33:13 +0000 (21:33 +0800)]
Merge pull request #4333 from dachary/wip-fedora

tests: add Dockerfile for fedora 21

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agotests: add Dockerfile for fedora 21 4333/head
Loic Dachary [Fri, 10 Apr 2015 13:09:00 +0000 (15:09 +0200)]
tests: add Dockerfile for fedora 21

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agorelease-notes: draft v0.94.1 release notes 4330/head
Loic Dachary [Fri, 10 Apr 2015 09:43:11 +0000 (11:43 +0200)]
release-notes: draft v0.94.1 release notes

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agolibrbd: Fix image_watcher test 4239/head
Haomai Wang [Fri, 10 Apr 2015 08:51:31 +0000 (16:51 +0800)]
librbd: Fix image_watcher test

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