]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agolibrbd: implement mirror image resync request API 8138/head
Jason Dillaman [Tue, 15 Mar 2016 20:34:26 +0000 (16:34 -0400)]
librbd: implement mirror image resync request API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: track if a mirror image resync has been requested
Jason Dillaman [Tue, 15 Mar 2016 20:20:20 +0000 (16:20 -0400)]
librbd: track if a mirror image resync has been requested

A secondary image will store its resync request to the primary
image's journal. When the local rbd mirror process detects the
flag being set, it can initiate a resync from the remote.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: add placeholder for marking clients are disconnected
Jason Dillaman [Tue, 15 Mar 2016 19:50:31 +0000 (15:50 -0400)]
journal: add placeholder for marking clients are disconnected

When a client is disconnected from the journal, entries can be
pruned regardless of the affected client's commit position.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: initial implementation of mirror image promote/demote
Jason Dillaman [Tue, 15 Mar 2016 19:26:05 +0000 (15:26 -0400)]
librbd: initial implementation of mirror image promote/demote

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: helper methods for manipulating journal tags from API
Jason Dillaman [Tue, 15 Mar 2016 19:25:06 +0000 (15:25 -0400)]
librbd: helper methods for manipulating journal tags from API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: dump mirroring primary status on info command
Jason Dillaman [Tue, 15 Mar 2016 18:36:31 +0000 (14:36 -0400)]
rbd: dump mirroring primary status on info command

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: expose image mirroring primary/secondary status
Jason Dillaman [Tue, 15 Mar 2016 18:35:58 +0000 (14:35 -0400)]
librbd: expose image mirroring primary/secondary status

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: update rbd cli tests to incorporate new mirror image commands
Jason Dillaman [Tue, 15 Mar 2016 18:11:13 +0000 (14:11 -0400)]
test: update rbd cli tests to incorporate new mirror image commands

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: add mirror image promote/demote/resync commands
Jason Dillaman [Tue, 15 Mar 2016 18:10:46 +0000 (14:10 -0400)]
rbd: add mirror image promote/demote/resync commands

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: stub API methods for mirror image promotion/demotion/resync
Jason Dillaman [Tue, 15 Mar 2016 17:55:07 +0000 (13:55 -0400)]
librbd: stub API methods for mirror image promotion/demotion/resync

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8095 from yehudasa/wip-rgw-sync-fixes
Yehuda Sadeh [Tue, 15 Mar 2016 22:56:38 +0000 (15:56 -0700)]
Merge pull request #8095 from yehudasa/wip-rgw-sync-fixes

rgw sync fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: data shard sync doesn't exit on error 8095/head
Yehuda Sadeh [Tue, 15 Mar 2016 01:44:50 +0000 (18:44 -0700)]
rgw: data shard sync doesn't exit on error

We don't handle the error at the top level, so no
need to exit. Just continue with the backoff mechanism.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8108 from yehudasa/wip-rgw-highres-3
Matt Benjamin [Tue, 15 Mar 2016 22:37:19 +0000 (18:37 -0400)]
Merge pull request #8108 from yehudasa/wip-rgw-highres-3

Wip rgw highres 3

9 years agorgw: propagate low time precision for user operations 8108/head
Yehuda Sadeh [Tue, 15 Mar 2016 21:22:06 +0000 (14:22 -0700)]
rgw: propagate low time precision for user operations

When user set a conditional timestamp to compare (e.g. if-modified-since),
it uses a low precision time resolution. Need to adjust checks for that.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: use higher precision time when encoding / decoding external apis
Yehuda Sadeh [Tue, 15 Mar 2016 20:31:31 +0000 (13:31 -0700)]
rgw: use higher precision time when encoding / decoding external apis

When dealing with external entities (e.g., remote rgw), use higher precision time
format for object mtime.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoutime: add gmtime_nsec()
Yehuda Sadeh [Tue, 15 Mar 2016 20:30:29 +0000 (13:30 -0700)]
utime: add gmtime_nsec()

higher precision than gmtime()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: extend date/time parsing
Yehuda Sadeh [Tue, 15 Mar 2016 20:29:48 +0000 (13:29 -0700)]
rgw: extend date/time parsing

So that we can parse correctly time encoded using utime_t::gmtime()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7631 from liewegas/wip-agent-flush-low
Samuel Just [Tue, 15 Mar 2016 19:58:48 +0000 (12:58 -0700)]
Merge pull request #7631 from liewegas/wip-agent-flush-low

osd: consider high/low mode when putting agent to sleep

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7713 from ukernel/wip-filelock-deadlock
Gregory Farnum [Tue, 15 Mar 2016 19:25:56 +0000 (12:25 -0700)]
Merge pull request #7713 from ukernel/wip-filelock-deadlock

Wip filelock deadlock

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8136 from athanatos/wip-split-lfn
Sage Weil [Tue, 15 Mar 2016 18:16:22 +0000 (14:16 -0400)]
Merge pull request #8136 from athanatos/wip-split-lfn

osd: filestore: fix race condition with split vs collection_move_rename and long object names

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8132 from dillaman/wip-librbd-memcheck
Josh Durgin [Tue, 15 Mar 2016 17:10:09 +0000 (10:10 -0700)]
Merge pull request #8132 from dillaman/wip-librbd-memcheck

librbd: correct issues discovered via valgrind memcheck

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agojournal: reschedule watch if no entries available during live replay 8132/head
Jason Dillaman [Tue, 15 Mar 2016 16:39:10 +0000 (12:39 -0400)]
journal: reschedule watch if no entries available during live replay

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: correct valgrind memcheck errors
Jason Dillaman [Tue, 15 Mar 2016 16:27:04 +0000 (12:27 -0400)]
librbd: correct valgrind memcheck errors

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8120 from SUSE/wip-15138
Ken Dreyer [Tue, 15 Mar 2016 15:24:19 +0000 (09:24 -0600)]
Merge pull request #8120 from SUSE/wip-15138

RPM: fix openldap and openssl build dependencies for SUSE

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Jun Huang <hjwsm1989@gmail.com>
9 years agoMerge pull request #8114 from liewegas/wip-tmap-migrate
Sage Weil [Tue, 15 Mar 2016 15:21:12 +0000 (11:21 -0400)]
Merge pull request #8114 from liewegas/wip-tmap-migrate

qa/workunits/rados/test.sh: test tmap_migrate

9 years agoMerge pull request #8119 from dillaman/wip-qa-rbd-copy
Josh Durgin [Tue, 15 Mar 2016 15:21:05 +0000 (08:21 -0700)]
Merge pull request #8119 from dillaman/wip-qa-rbd-copy

rbd: clone operation should default to image format 2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8090 from trociny/fixup-rbd-mirror-test
Josh Durgin [Tue, 15 Mar 2016 15:20:43 +0000 (08:20 -0700)]
Merge pull request #8090 from trociny/fixup-rbd-mirror-test

test: fixup and improvements for rbd-mirror test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8129 from dillaman/wip-qa-rbd-permissions
Josh Durgin [Tue, 15 Mar 2016 15:18:25 +0000 (08:18 -0700)]
Merge pull request #8129 from dillaman/wip-qa-rbd-permissions

test: fix issues discovered via the rbd permissions test case

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8124 from dillaman/wip-qa-rbd-lock-fence
Josh Durgin [Tue, 15 Mar 2016 15:17:21 +0000 (08:17 -0700)]
Merge pull request #8124 from dillaman/wip-qa-rbd-lock-fence

test: handle exception thrown from close during rbd lock test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/rbd: disable deep-flatten during permissions testing 8129/head
Jason Dillaman [Tue, 15 Mar 2016 14:58:08 +0000 (10:58 -0400)]
qa/workunits/rbd: disable deep-flatten during permissions testing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: snap list should open image as read-only
Jason Dillaman [Tue, 15 Mar 2016 14:57:48 +0000 (10:57 -0400)]
rbd: snap list should open image as read-only

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Tue, 15 Mar 2016 14:44:15 +0000 (10:44 -0400)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #7243 from tchaikov/wip-py3-jewel
Sage Weil [Tue, 15 Mar 2016 14:48:41 +0000 (10:48 -0400)]
Merge pull request #7243 from tchaikov/wip-py3-jewel

ceph-detect-init: fix py3 test

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7975 from JiYou/fix-config-opts
Kefu Chai [Tue, 15 Mar 2016 14:17:57 +0000 (22:17 +0800)]
Merge pull request #7975 from JiYou/fix-config-opts

config: fix osd_crush_initial_weight

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8125 from dillaman/wip-librbd-mock
Sage Weil [Tue, 15 Mar 2016 14:17:03 +0000 (10:17 -0400)]
Merge pull request #8125 from dillaman/wip-librbd-mock

test: add missing shut_down mock method

9 years agotest: add missing shut_down mock method 8125/head
Jason Dillaman [Tue, 15 Mar 2016 14:10:41 +0000 (10:10 -0400)]
test: add missing shut_down mock method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: handle exception thrown from close during lock test 8124/head
Jason Dillaman [Tue, 15 Mar 2016 13:57:37 +0000 (09:57 -0400)]
qa/workunits/rbd: handle exception thrown from close during lock test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoRPM: fix openldap and openssl build dependencies for SUSE 8120/head
Nathan Cutler [Tue, 15 Mar 2016 13:46:54 +0000 (14:46 +0100)]
RPM: fix openldap and openssl build dependencies for SUSE

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorbd: clone operation should default to image format 2 8119/head
Jason Dillaman [Tue, 15 Mar 2016 13:45:21 +0000 (09:45 -0400)]
rbd: clone operation should default to image format 2

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8116 from SUSE/wip-docdev-nuke
Loic Dachary [Tue, 15 Mar 2016 13:25:38 +0000 (14:25 +0100)]
Merge pull request #8116 from SUSE/wip-docdev-nuke

doc/dev: add section on interrupting a running suite

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc/dev: add section on interrupting a running suite 8116/head
Nathan Cutler [Tue, 15 Mar 2016 13:10:42 +0000 (14:10 +0100)]
doc/dev: add section on interrupting a running suite

This commit adds a new section, entitled "Interrupt a running suite", to
the "Testing in the cloud" chapter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #8105 from SUSE/wip-ceph-detect-init-tox
Sage Weil [Tue, 15 Mar 2016 13:12:24 +0000 (09:12 -0400)]
Merge pull request #8105 from SUSE/wip-ceph-detect-init-tox

ceph-detect-init: add missing test case

9 years agoMerge pull request #8088 from liewegas/wip-typo
Sage Weil [Tue, 15 Mar 2016 13:08:55 +0000 (09:08 -0400)]
Merge pull request #8088 from liewegas/wip-typo

osd/OSDMap: fix typo in summarize_mapping_stats

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8098 from liewegas/wip-fix-crush
Sage Weil [Tue, 15 Mar 2016 13:00:33 +0000 (09:00 -0400)]
Merge pull request #8098 from liewegas/wip-fix-crush

unittest_osdmap: default crush tunables now firefly

9 years agoMerge pull request #8089 from liewegas/wip-mark-pg-stale
Sage Weil [Tue, 15 Mar 2016 13:00:06 +0000 (09:00 -0400)]
Merge pull request #8089 from liewegas/wip-mark-pg-stale

mon/PGMonitor: reliably mark PGs state

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7943 from llua/init-ceph
Sage Weil [Tue, 15 Mar 2016 12:52:30 +0000 (08:52 -0400)]
Merge pull request #7943 from llua/init-ceph

init-ceph.in: allow case-insensitive true in `osd crush update on start'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #8055 from liewegas/wip-hobject
Sage Weil [Tue, 15 Mar 2016 12:40:14 +0000 (08:40 -0400)]
Merge pull request #8055 from liewegas/wip-hobject

ghobject_t: use # instead of ! as a separator

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #8056 from rjfd/wip-13296
Jason Dillaman [Tue, 15 Mar 2016 12:39:44 +0000 (08:39 -0400)]
Merge pull request #8056 from rjfd/wip-13296

rbd: support for enabling/disabling mirroring on specific images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rados/test.sh: test tmap_migrate 8114/head
Sage Weil [Mon, 14 Mar 2016 17:11:59 +0000 (13:11 -0400)]
qa/workunits/rados/test.sh: test tmap_migrate

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7971 from ceph/wip-selinux-update
Sage Weil [Tue, 15 Mar 2016 12:38:01 +0000 (08:38 -0400)]
Merge pull request #7971 from ceph/wip-selinux-update

selinux: Update policy to grant additional access

9 years agoMerge pull request #8033 from liewegas/wip-pg-create
Sage Weil [Tue, 15 Mar 2016 12:35:36 +0000 (08:35 -0400)]
Merge pull request #8033 from liewegas/wip-pg-create

osd: handle dup pg_create that races with pg deletion

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8054 from ErwanAliasr1/evelu-check
Sage Weil [Tue, 15 Mar 2016 12:35:06 +0000 (08:35 -0400)]
Merge pull request #8054 from ErwanAliasr1/evelu-check

common: SubProcess: Avoid buffer corruption when calling err()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8057 from liewegas/wip-pglog-warning
Sage Weil [Tue, 15 Mar 2016 12:34:29 +0000 (08:34 -0400)]
Merge pull request #8057 from liewegas/wip-pglog-warning

osd/PGLog: fix warning

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8059 from ceph/wip-include-scope
Sage Weil [Tue, 15 Mar 2016 12:34:09 +0000 (08:34 -0400)]
Merge pull request #8059 from ceph/wip-include-scope

rados: add ceph:: namespace to bufferlist type

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8071 from xiexingguo/xxg-wip-fixptr
Sage Weil [Tue, 15 Mar 2016 12:33:42 +0000 (08:33 -0400)]
Merge pull request #8071 from xiexingguo/xxg-wip-fixptr

osd: initialize last_recalibrate field at construction

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8081 from renhwsky/renhw-wip-osdmonitor-poolset
Sage Weil [Tue, 15 Mar 2016 12:33:13 +0000 (08:33 -0400)]
Merge pull request #8081 from renhwsky/renhw-wip-osdmonitor-poolset

osd: min_write_recency_for_promote & min_read_recency_for_promote are tiering only

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotest: fixup and improvements for rbd-mirror test 8090/head
Mykola Golub [Mon, 14 Mar 2016 14:47:04 +0000 (16:47 +0200)]
test: fixup and improvements for rbd-mirror test

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #7879 from xiexingguo/xxg-wip-doc-rados-api
Kefu Chai [Tue, 15 Mar 2016 06:44:24 +0000 (14:44 +0800)]
Merge pull request #7879 from xiexingguo/xxg-wip-doc-rados-api

doc/rados/api/librados-intro.rst: fix typo

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
9 years agodoc: fix typo 7879/head
xie xingguo [Wed, 2 Mar 2016 18:40:04 +0000 (02:40 +0800)]
doc: fix typo

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorgw: metadata notifications go to all zones
Yehuda Sadeh [Tue, 15 Mar 2016 03:00:35 +0000 (20:00 -0700)]
rgw: metadata notifications go to all zones

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fetch remote obj uses high def clock for if-[un]modified-since
Yehuda Sadeh [Tue, 15 Mar 2016 01:42:39 +0000 (18:42 -0700)]
rgw: fetch remote obj uses high def clock for if-[un]modified-since

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: timespan fix
Yehuda Sadeh [Sun, 13 Mar 2016 03:21:20 +0000 (19:21 -0800)]
rgw: timespan fix

use make_timespan() to generate a correct timespan struct

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotime: For tests, subtract in the right order
Adam C. Emerson [Fri, 11 Mar 2016 23:33:59 +0000 (18:33 -0500)]
time: For tests, subtract in the right order

This was a bug in the test rather than a bug in the code the test was testing.

Use the ternary operator to replace labs.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agorgw: adapt to narrow stat2() and mtime2()
Matt Benjamin [Fri, 11 Mar 2016 20:35:16 +0000 (15:35 -0500)]
rgw: adapt to narrow stat2() and mtime2()

The librados stat2() and mtime2() ops no longer provide an override
for the internal ceph_realtime type.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw: high resolution time
Yehuda Sadeh [Thu, 3 Mar 2016 06:23:41 +0000 (22:23 -0800)]
rgw: high resolution time

replace time_t, and some utime_t with ceph::real_clock. Use new
librados interfaces to stat() and set mtime.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoutime: add conversion methods to/from real_time
Yehuda Sadeh [Thu, 3 Mar 2016 06:26:21 +0000 (22:26 -0800)]
utime: add conversion methods to/from real_time

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agocommon/ceph_time: add real_clock::is_zero()
Yehuda Sadeh [Thu, 3 Mar 2016 06:25:15 +0000 (22:25 -0800)]
common/ceph_time: add real_clock::is_zero()

to check whether time is not zero

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #8079 from dillaman/wip-14413
Josh Durgin [Tue, 15 Mar 2016 00:27:30 +0000 (17:27 -0700)]
Merge pull request #8079 from dillaman/wip-14413

rbd-mirror: integrate with image sync state machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotest: remove broken negative test cases
Jason Dillaman [Mon, 14 Mar 2016 02:14:28 +0000 (22:14 -0400)]
test: remove broken negative test cases

These should be reimplemented using google mock instead of
virtual functions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: integrate new bootstrap state machine
Jason Dillaman [Mon, 14 Mar 2016 02:12:15 +0000 (22:12 -0400)]
rbd-mirror: integrate new bootstrap state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: simple image bootstrap state machine
Jason Dillaman [Mon, 14 Mar 2016 02:10:13 +0000 (22:10 -0400)]
rbd-mirror: simple image bootstrap state machine

This state machine will handle the simple cases of creating
a local image from a remote image, registering to the remote
journal, and sync'ing the image contents.

There are several TODOs for future remaining work.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: helper state machine for opening local image
Jason Dillaman [Mon, 14 Mar 2016 02:09:19 +0000 (22:09 -0400)]
rbd-mirror: helper state machine for opening local image

This state machine will open a local image and request the
exclusive lock.  If the open or lock fails, it will automatically
close the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: helper state machine for closing librbd images
Jason Dillaman [Mon, 14 Mar 2016 02:08:16 +0000 (22:08 -0400)]
rbd-mirror: helper state machine for closing librbd images

librbd ImageCtx's cannot be deleted from within the librbd thread.  This
state machine will perform the deletion from the rbd-mirror work queue
thread.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7979 from dillaman/wip-14413
Josh Durgin [Tue, 15 Mar 2016 00:14:01 +0000 (17:14 -0700)]
Merge pull request #7979 from dillaman/wip-14413

rbd-mirror: remote to local cluster image sync

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8102 from dillaman/wip-librados-aio-notify-redux
Josh Durgin [Mon, 14 Mar 2016 23:23:25 +0000 (16:23 -0700)]
Merge pull request #8102 from dillaman/wip-librados-aio-notify-redux

librados: cancel aio notification linger op upon completion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8099 from dillaman/wip-15121
Josh Durgin [Mon, 14 Mar 2016 22:44:35 +0000 (15:44 -0700)]
Merge pull request #8099 from dillaman/wip-15121

cls_rbd: protect against excessively large object maps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoceph-detect-init: add test for squeeze 8105/head
Nathan Cutler [Mon, 14 Mar 2016 21:56:32 +0000 (22:56 +0100)]
ceph-detect-init: add test for squeeze

Since we return 'sysvinit' for wheezy and squeeze only, make sure we are
testing both of these.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #8100 from linuxbox2/ldap-cmake
Orit Wasserman [Mon, 14 Mar 2016 21:16:09 +0000 (22:16 +0100)]
Merge pull request #8100 from linuxbox2/ldap-cmake

cmake: avoid false-positive LDAP header detect

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8104 from dillaman/wip-rbd-read-flags
Josh Durgin [Mon, 14 Mar 2016 21:11:49 +0000 (14:11 -0700)]
Merge pull request #8104 from dillaman/wip-rbd-read-flags

qa/workunits/rbd: do not use object map during read flag testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa/workunits/rbd: do not use object map during read flag testing 8104/head
Jason Dillaman [Mon, 14 Mar 2016 21:06:15 +0000 (17:06 -0400)]
qa/workunits/rbd: do not use object map during read flag testing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados: cancel aio notification linger op upon completion 8102/head
Jason Dillaman [Mon, 14 Mar 2016 19:21:01 +0000 (15:21 -0400)]
librados: cancel aio notification linger op upon completion

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: cmake: Fix make check compilation error 8056/head
Ricardo Dias [Fri, 11 Mar 2016 17:50:39 +0000 (17:50 +0000)]
test: cmake: Fix make check compilation error

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd-mirroring: test: Added mirror image enable/disable to RBD CLI syntax tests
Ricardo Dias [Fri, 11 Mar 2016 17:48:36 +0000 (17:48 +0000)]
rbd-mirroring: test: Added mirror image enable/disable to RBD CLI syntax tests

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agocmake: avoid false-positive LDAP header detect 8100/head
Matt Benjamin [Mon, 14 Mar 2016 18:08:53 +0000 (14:08 -0400)]
cmake: avoid false-positive LDAP header detect

Pre-setting a value in OPENLDAP_INCLUDE_DIR broke the subsequent
test.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agocls_rbd: protect against excessively large object maps 8099/head
Jason Dillaman [Mon, 14 Mar 2016 17:57:28 +0000 (13:57 -0400)]
cls_rbd: protect against excessively large object maps

Fixes: #15121
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: rbd-mirroring: Added mirroing info to image info command in RBD CLI
Ricardo Dias [Thu, 10 Mar 2016 13:43:18 +0000 (13:43 +0000)]
rbd: rbd-mirroring: Added mirroing info to image info command in RBD CLI

Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #13296
9 years agorbd: rbd-mirroring: Support image mirroring state retrieval in librbd
Ricardo Dias [Thu, 10 Mar 2016 13:39:12 +0000 (13:39 +0000)]
rbd: rbd-mirroring: Support image mirroring state retrieval in librbd

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd: rbd-mirroring: Added mirror image enable/disable commands to RBD CLI
Ricardo Dias [Thu, 10 Mar 2016 13:36:06 +0000 (13:36 +0000)]
rbd: rbd-mirroring: Added mirror image enable/disable commands to RBD CLI

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd: rbd-mirroring: Support mirroring image disable in librbd
Ricardo Dias [Thu, 10 Mar 2016 13:02:59 +0000 (13:02 +0000)]
rbd: rbd-mirroring: Support mirroring image disable in librbd

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorbd: rbd-mirroring: Support mirroring image enable in librbd
Ricardo Dias [Thu, 10 Mar 2016 12:19:24 +0000 (12:19 +0000)]
rbd: rbd-mirroring: Support mirroring image enable in librbd

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoMerge pull request #8094 from dillaman/wip-librbd-image-watch-unregister
Josh Durgin [Mon, 14 Mar 2016 17:28:17 +0000 (10:28 -0700)]
Merge pull request #8094 from dillaman/wip-librbd-image-watch-unregister

librbd: handle unregistering the image watcher when disconnected

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agostore_test: improve synthetic coverage of the ec stash case 8136/head
Samuel Just [Sat, 12 Mar 2016 01:02:15 +0000 (17:02 -0800)]
store_test: improve synthetic coverage of the ec stash case

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agostore_test: improve synthetic test coverage of long object names
Samuel Just [Fri, 11 Mar 2016 22:05:37 +0000 (14:05 -0800)]
store_test: improve synthetic test coverage of long object names

1/2 of objects will now have long names, and we'll shift the region
of the hash space where new objects are created every 1024 objects
created.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoTestRados: make half the objects have long names
Samuel Just [Thu, 10 Mar 2016 23:38:26 +0000 (15:38 -0800)]
TestRados: make half the objects have long names

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex::lfn_translate: consider alt attr as well
Samuel Just [Thu, 10 Mar 2016 23:19:15 +0000 (15:19 -0800)]
LFNIndex::lfn_translate: consider alt attr as well

If the file has an alt attr, there are two possible matching
ghobjects.  We want to make sure we choose the right one for
the short name we have.  If we don't, a split while there are
two objects linking to the same inode will result in one of
the links being orphaned in the source directory, resulting
in #14766.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex::created: fix return value with failure injection
Samuel Just [Thu, 10 Mar 2016 19:06:06 +0000 (11:06 -0800)]
LFNIndex::created: fix return value with failure injection

See comment for explanation.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agostore_test: add reproducer for #14766
Samuel Just [Thu, 10 Mar 2016 19:03:13 +0000 (11:03 -0800)]
store_test: add reproducer for #14766

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoceph_test_rados_api_tmap_migrate: fix warning 8088/head
Sage Weil [Mon, 14 Mar 2016 17:11:49 +0000 (13:11 -0400)]
ceph_test_rados_api_tmap_migrate: fix warning

In file included from ./test/librados/TestCase.h:9:0,
                 from test/librados/tmap_migrate.cc:4:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::Asserti$
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from ‘static testi$
test/librados/tmap_migrate.cc:56:3:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between s$
   if (expected == actual) {
                ^

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph_test_rados_api_list: fix warning
Sage Weil [Mon, 14 Mar 2016 17:10:36 +0000 (13:10 -0400)]
ceph_test_rados_api_list: fix warning

In file included from ./test/librados/TestCase.h:9:0,
                 from test/librados/list.cc:7:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::Asserti$
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from ‘static testi$
test/librados/list.cc:944:5:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between s$
   if (expected == actual) {
                ^

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agounittest_osdmap: default crush tunables now firefly 8098/head
Sage Weil [Mon, 14 Mar 2016 17:01:50 +0000 (13:01 -0400)]
unittest_osdmap: default crush tunables now firefly

This should have been changed in
000344ef0ca639d515e3f89401bafc9b0b13deda.

Signed-off-by: Sage Weil <sage@redhat.com>