Commit Graph

52642 Commits

Author SHA1 Message Date
Sage Weil
45feec92f4 Merge pull request #8648 from ffilz/master
libcephfs: add ceph_ll_mknod wrapper for ll_mknod

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-29 14:41:30 -04:00
Ali Maredia
324293f17a Merge pull request #8820 from ceph/wip-cmake-compression
cmake: fix linking of compressor and plugins

Reviewed-by: Ali Maredia
2016-04-29 13:47:00 -04:00
Ali Maredia
003c07a30b Merge pull request #8822 from cbodley/wip-cmake-tmp-virtualenv
cmake: put virtualenv directories under /tmp

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-04-29 13:44:22 -04:00
Casey Bodley
3d1801ebbb cmake: fix for unittest_async_compressor
this test wasn't creating the lib/compressor subdirectory, so it
depended on test_compressor_plugin_zlib or test_compressor_plugin_snappy
being run first

added the same dirty hack to copy libceph_snappy.so into lib/compressor,
and added a dependency on ceph_snappy to make sure it's built

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-04-29 13:42:12 -04:00
Casey Bodley
089e87fbe1 cmake: fix linking of compressor and plugins
libcommon now includes the compressor objects necessary to load
compressor plugins

also removed extra dependencies on the plugins and their unit tests

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-04-29 13:42:12 -04:00
Josh Durgin
9cdd61c198 Merge pull request #8817 from dillaman/wip-15572
librbd: reduce log level for errors encountered disabling object-map while flatten is in-progress

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-29 11:50:30 -05:00
Josh Durgin
a9c8eb1f99 Merge pull request #8819 from dillaman/wip-14540
rbd: disk usage now includes all snapshots by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-29 11:49:43 -05:00
Casey Bodley
1342ea80d5 cmake: put virtualenv directories under TMPDIR
this was required for cmake-check to find ceph-disk and ceph-detect-init
in the PATH

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-04-29 12:23:35 -04:00
Jason Dillaman
6cb1ff491e Merge pull request #8442 from trociny/wip-rbd-mirror-status
rbd-mirror: replay status now available via the rbd api and cli

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-29 12:11:21 -04:00
Jason Dillaman
66dbbda14f ObjectCacher: don't loop the extents of OSDWrite in map_writeReviewed-by
ObjectCacher: don't loop the extents of OSDWrite in map_write

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-29 09:59:18 -05:00
Jason Dillaman
f6f5515273 Merge pull request #7830 from yuyuyu101/wip-14907
IoCtxImpl: delete C_WatchCB2 when free LingerOp

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-29 08:39:34 -05:00
Jason Dillaman
9688f24e1a Merge pull request #8635 from runsisi/wip-fix-md-list
cls_rbd: fix loop condition when listing image metadata

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-29 08:38:46 -05:00
Jason Dillaman
dd459e701d Merge pull request #8661 from runsisi/wip-fix-snapc-validation
librbd: put the validation of image snap context earlier

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-29 08:38:34 -05:00
Sage Weil
a1b14e9a72 Merge pull request #7800 from renhwsky/renhw-wip-osdmonitor-have_pending_crush
mon/OSDMonitor: _have_pending_crush of return value should be bool

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-29 08:43:05 -04:00
Mykola Golub
f15cd51a1d qa/workunits/rbd: test mirror status in pool directory
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-04-29 11:47:49 +03:00
Mykola Golub
e4229d1d4b rbd-mirror: in replay status store number of entries behind master
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-04-29 11:47:49 +03:00
Jason Dillaman
4f3765c573 Merge pull request #8305 from tchaikov/wip-fix-vstart
vstart: make -k with optional mon_num (part 2)

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 23:01:07 -05:00
huanwen ren
023b45af5e osd/osdmonitor: _have_pending_crush of return value should be bool
have_pending_crush of return value should be bool, fix it

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-04-29 10:53:14 +08:00
Sage Weil
ac9b8b2d2d Merge pull request #8823 from aderumier/deb-default-tcmalloc-cache-size
etc/default/ceph: set 128MB tcmalloc cache size

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-28 21:47:07 -04:00
Alexandre Derumier
d1d144c03b set 128MB tcmalloc cache size by bytes 2016-04-29 03:30:05 +02:00
Alexandre Derumier
9decbd1026 etc/default/ceph: set 128MB tcmalloc cache size
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
2016-04-28 23:03:09 +02:00
Jason Dillaman
1ccdcb5b6c rbd: disk usage now includes all snapshots by default
Added a new "--from-snap" optional to restrict the calculation to
specific subsets of snapshots and the HEAD revision.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 15:58:05 -04:00
Josh Durgin
b3d766baac Merge pull request #8568 from ddiss/osd-librados-writesame
OSD and librados writesame support

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-04-28 14:57:02 -05:00
Josh Durgin
3684e7b45f Merge pull request #8791 from dillaman/wip-15574
librbd: parent image is closed twice if error encountered while opening

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-28 14:55:20 -05:00
Josh Durgin
2abe34cf81 Merge pull request #8790 from dillaman/wip-15630
rbd-mirror: interrupting image replay startup can cause crash

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-28 14:54:57 -05:00
Josh Durgin
dbe9b76443 Merge pull request #8785 from tchaikov/wip-librbd-bad-header
librbd: does not crash if image header is too short

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-28 14:54:30 -05:00
Jason Dillaman
7f903baec7 Merge pull request #8813 from trociny/fix-test-librbd-aio_write
test: librbd: aio write/discard completion should always return 0 on success

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:25:28 -05:00
Mykola Golub
da80029dd6 test: librbd: aio write/discard completion should always return 0 on success
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-04-28 20:33:19 +03:00
Jason Dillaman
db7aaff0f6 librbd: block RPC requests while updating features
Disabling the journal and object map require acquiring the exclusive
lock locally.  We don't want to start executing long-running ops
for this quick process.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
ed132a1eb1 librbd: return -ESHUTDOWN when a refresh is requested on a closed image
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
88e76cb3c9 librbd: synchronous block_writes should return possible error result
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
9cf6821bd9 librbd: refresh image before executing maint op
If a maint op is interrupted and restarted, it's possible that the
image will need to be refreshed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
5a4893b7a7 librbd: reduce log level when lock owner not detected
This can happen under normal operating conditions and the
lock request is automatically retried.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:04 -04:00
Jason Dillaman
1617328402 librbd: reduce log level for interrupted maint ops
Fixes: http://tracker.ceph.com/issues/15572
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 13:00:03 -04:00
Jason Dillaman
27c8608fc1 Merge pull request #8795 from runsisi/wip-fix-librbd-ut
cmake: add library cls_journal for target unittest_librbd

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 08:40:39 -05:00
Jason Dillaman
678a020026 Merge pull request #8796 from runsisi/wip-fix-invalidate
librbd: fix potential assertion during object map invalidation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-28 08:38:57 -05:00
Sage Weil
f00cc5a3c6 Merge pull request #8812 from liewegas/wip-dh-systemd
debian/control: dh_systemd_start is in the dh-systemd package

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-28 09:14:41 -04:00
Sage Weil
89154d1e01 debian/control: dh_systemd_start is in the dh-systemd package
Fixes: http://tracker.ceph.com/issues/15573
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-28 09:13:50 -04:00
Sage Weil
1eb435fcd6 Merge pull request #8700 from tchaikov/wip-systemd-deb
debian: package systemd targets

Reviewed-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-04-27 23:15:52 -04:00
runsisi
7efb29416b cmake: add library cls_journal for target unittest_librbd
otherwise if we want to generate target unittest_librbd we need to
(re)generate cls_journal manually

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-04-28 10:22:07 +08:00
Kefu Chai
f950a0a7f5 debian: install systemd target files
* enable it using dh_systemd_enable
* start the target using dh_systemd_start
* move the dh_installinit, dh_systemd_enable, dh_systemd_start calls
  down, so they can identify the service files if they care about them.

Fixes: http://tracker.ceph.com/issues/15573
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-28 10:02:08 +08:00
runsisi
dd0eb719a5 librbd: fix potential assertion for object map invalidation
if update_flags fails we should not go any further, or the async request
will be removed from m_image_ctx.async_requests twice

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-04-28 09:05:33 +08:00
Sage Weil
4cdf0aa7ed Merge pull request #8792 from cbodley/wip-defer-drop-privileges
common: fix value of CINIT_FLAG_DEFER_DROP_PRIVILEGES

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-27 17:13:03 -04:00
Casey Bodley
dfb897ad57 common: fix value of CINIT_FLAG_DEFER_DROP_PRIVILEGES
0x16 (binary 10110) was overlapping two other flags

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-04-27 16:56:29 -04:00
Jason Dillaman
105ef8a24a librbd: propagate any image refresh errors back to caller
Previously, the saved error code was only propagated when an image
flush was required.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-27 15:56:11 -04:00
Jason Dillaman
e91e7f8d9c librbd: avoid second close attempt of invalid parent image
Fixes: http://tracker.ceph.com/issues/15574
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-27 15:46:04 -04:00
Jason Dillaman
3a71052a5b rbd-mirror: interrupting image replay startup can cause crash
Properly shut down the journaler if a shut down has been requested
while start up is in-progress.

Fixes: http://tracker.ceph.com/issues/15630
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-27 15:22:59 -04:00
Boris Ranto
27b467bad5 Merge pull request #8714 from ceph/wip-14941
rpm: implement scriptlets for the post-split daemon packages

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-04-27 20:13:38 +02:00
Kefu Chai
7b52183add librbd: does not crash if image header is too short
if something goes wrong with the object, and returns a chunk shorter
than expected, don't panic

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-28 00:59:44 +08:00
Boris Ranto
14652f3216 rpm: Add rpm scripts for ceph-rbd-mirror
We are currently missing the systemd scripts for the new ceph-rbd-mirror
daemons. This patch introduces them.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 18:14:51 +02:00