]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agolibrbd: convert AioImageRequest derived classes to templates
Jason Dillaman [Wed, 27 Jul 2016 03:26:08 +0000 (23:26 -0400)]
librbd: convert AioImageRequest derived classes to templates

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit a945c2c235d9259b1d4a8a579d7e6efc2ed35916)

8 years agolibrbd: removed namespace indentation from legacy classes
Jason Dillaman [Wed, 27 Jul 2016 12:49:44 +0000 (08:49 -0400)]
librbd: removed namespace indentation from legacy classes

Better follows the Ceph C++ style guide

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f1e391982b43ddfb363ff913260460368a6d5834)

8 years agolibrbd: do not record journal events if append is disabled by policy
Jason Dillaman [Wed, 27 Jul 2016 02:58:24 +0000 (22:58 -0400)]
librbd: do not record journal events if append is disabled by policy

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 405142c615352613e8bacee46e92484eb0c08f26)

8 years agolibrbd: remove unused journal replay canceled callback
Jason Dillaman [Wed, 27 Jul 2016 00:57:40 +0000 (20:57 -0400)]
librbd: remove unused journal replay canceled callback

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f453554edcb16ec72714b2456c08bab9e339b1eb)

8 years agolibrbd: optionally support disabling journal appends via policy
Jason Dillaman [Wed, 27 Jul 2016 00:48:13 +0000 (20:48 -0400)]
librbd: optionally support disabling journal appends via policy

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f7eeacd02f8f80c5d1d5d9cfed35bbd23f64b018)

8 years agolibrbd: optimize header file dependency & modify related file.
shawn [Fri, 17 Jun 2016 05:45:58 +0000 (01:45 -0400)]
librbd: optimize header file dependency & modify related file.

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit 2185a6275c89d9462611e965da407ea0d504987d)

8 years agolibrbd: optimize operation header file dependency
shawn [Tue, 7 Jun 2016 07:12:55 +0000 (03:12 -0400)]
librbd: optimize operation header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit 88afa408683238b803606f3d63de326ead8cefee)

8 years agolibrbd: optimize journal header file dependency
shawn [Tue, 7 Jun 2016 05:59:05 +0000 (01:59 -0400)]
librbd: optimize journal header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit 59397e27a04fb0f2b990a86dcaf3c418457d1b72)

8 years agolibrbd: optimize image_watcher header file dependency
shawn [Tue, 7 Jun 2016 03:36:06 +0000 (23:36 -0400)]
librbd: optimize image_watcher header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit aee1559f312e9493d6580e5ffcb606fe21ee3c59)

8 years agolibrbd: optimize image header file dependency
shawn [Tue, 7 Jun 2016 03:22:39 +0000 (23:22 -0400)]
librbd: optimize image header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit 461958ebc7e8ccef76b3f08a979482762267c10b)

8 years agolibrbd: optimize exclusive_lock header file dependency
shawn [Tue, 7 Jun 2016 02:56:49 +0000 (22:56 -0400)]
librbd: optimize exclusive_lock  header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit 01282eb5cdeda7bbbb77438c7d1953d023ea54b6)

8 years agolibrbd: optimize object-map header file dependency
shawn [Mon, 6 Jun 2016 07:37:22 +0000 (03:37 -0400)]
librbd: optimize object-map header file dependency

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit 1a2276927d5956918f7a4830b4a44048ac090328)

8 years agotest: fix librbd tests for rbd_skip_partial_discard
Mykola Golub [Thu, 30 Jun 2016 11:31:23 +0000 (14:31 +0300)]
test: fix librbd tests for rbd_skip_partial_discard

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 9717417b7b8aa1b24a82a0bfddbfc23748188641)

Conflicts:
src/rocksdb this was a mistake in the original commit

8 years agolibrbd: discard hangs when 'rbd_skip_partial_discard' is enabled
Mykola Golub [Thu, 30 Jun 2016 11:30:08 +0000 (14:30 +0300)]
librbd: discard hangs when 'rbd_skip_partial_discard' is enabled

Fixes: http://tracker.ceph.com/issues/16386
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit dc41731fbfd73d9fbb63d3ff360d4c5dd62deaf1)

8 years agolibrbd: object_may_exist always return true when you write an empty object
xinxin shu [Tue, 7 Jun 2016 04:07:55 +0000 (12:07 +0800)]
librbd: object_may_exist always return true when you write an empty object

if you write an empty object, object map is updated firstly

Signed-off-by: xinxin shu <shuxinxin@chinac.com>
(cherry picked from commit a54073808146d205d54d6a932a6e0fd750f1dc38)

8 years agolibrbd: ensure that AIO ops are started prior to request
Jason Dillaman [Mon, 25 Jul 2016 16:43:13 +0000 (12:43 -0400)]
librbd: ensure that AIO ops are started prior to request

Fixes: http://tracker.ceph.com/issues/16708
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 6064f2346de0a8bf2878bf5bfac9a992cda7c4ca)

8 years agolibrbd: helper method for creating and starting AioCompletions
Jason Dillaman [Mon, 25 Jul 2016 16:42:26 +0000 (12:42 -0400)]
librbd: helper method for creating and starting AioCompletions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3df7213c0a9f0186e3a37c9e4a10f1c8bc84446e)

8 years agoMerge pull request #10649 from dachary/wip-16867-jewel
Loic Dachary [Fri, 19 Aug 2016 18:35:19 +0000 (20:35 +0200)]
Merge pull request #10649 from dachary/wip-16867-jewel

jewel: mkfs.xfs slow performance with discards and object map

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #10684 from dillaman/wip-16904-jewel
Loic Dachary [Fri, 19 Aug 2016 05:12:40 +0000 (07:12 +0200)]
Merge pull request #10684 from dillaman/wip-16904-jewel

jewel: rbd-mirror: reduce memory footprint during journal replay

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agorbd-mirror: remove ceph_test_rbd_mirror_image_replay test case 10684/head
Mykola Golub [Thu, 30 Jun 2016 13:18:56 +0000 (16:18 +0300)]
rbd-mirror: remove ceph_test_rbd_mirror_image_replay test case

Fixes: http://tracker.ceph.com/issues/16539
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 06a333b116383de4d39c9e098e6e5fa195ceb370)

8 years agoqa/workunits/rbd: override rbd-mirror integration test poll frequency
Jason Dillaman [Wed, 20 Jul 2016 20:18:23 +0000 (16:18 -0400)]
qa/workunits/rbd: override rbd-mirror integration test poll frequency

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 574be7486ad737892422aed0322f80e5750a75a0)

8 years agorbd-mirror: do not cancel maintenance ops with missing finish events
Jason Dillaman [Thu, 21 Jul 2016 11:28:54 +0000 (07:28 -0400)]
rbd-mirror: do not cancel maintenance ops with missing finish events

librbd will replay these ops when opening an image, so rbd-mirror
should also ensure these ops are replayed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 862e581553fff510286b58135a1fd69705c06096)

8 years agorbd-mirror: potential memory leak when attempting to cancel image sync
Jason Dillaman [Tue, 19 Jul 2016 19:46:49 +0000 (15:46 -0400)]
rbd-mirror: potential memory leak when attempting to cancel image sync

The cancel request could race with the actual scheduling of the image
sync operation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e6cdf955bad500561ddada2791641eba5fb27762)

8 years agorbd-mirror: fix issues detected when attempting clean shut down
Jason Dillaman [Tue, 19 Jul 2016 19:42:27 +0000 (15:42 -0400)]
rbd-mirror: fix issues detected when attempting clean shut down

Fixed lockdep issue from status update callback and fixed the
potential for a stuck status state.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0275c7ca23b27dc5250cd33f317e2273470a9fe8)

8 years agorbd-mirror: shut down image replayers in parallel
Jason Dillaman [Tue, 19 Jul 2016 17:50:20 +0000 (13:50 -0400)]
rbd-mirror: shut down image replayers in parallel

When multiple pools are being replicated, start the shut down
process concurrently across all pool replayers.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 73cdd08007c27d2c3c41fe644601e7a144f21c82)

8 years agorbd-mirror: configuration options to control replay throttling
Jason Dillaman [Tue, 19 Jul 2016 04:50:14 +0000 (00:50 -0400)]
rbd-mirror: configuration options to control replay throttling

Fixes: http://tracker.ceph.com/issues/16223
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 24883e0605907d1f9bcd1206c8a95c3bde30d5dc)

8 years agolibrbd: new configuration option to restrict journal payload size
Jason Dillaman [Wed, 20 Jul 2016 12:11:53 +0000 (08:11 -0400)]
librbd: new configuration option to restrict journal payload size

Ensure that, by default, IO journal events are broken up into manageable
sizes when factoring in that an rbd-mirror daemon might be replaying
events from thousands of images.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 11d7500b9bcda7b7c1d8756ade3373f404257f32)

8 years agolibrbd: wait for journal commit op event to be safely recorded
Jason Dillaman [Tue, 19 Jul 2016 04:42:16 +0000 (00:42 -0400)]
librbd: wait for journal commit op event to be safely recorded

Operation request op finish events should not be fire and forget.
Instead, ensure the event is committed to the journal before
completing the op. This will avoid several possible split-brain
events during mirroring.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 47e0fbf231e52d00069c97b72c57c3158445bcf0)

Conflicts:
src/test/librbd/operation/test_mock_ResizeRequest.cc: no shrink restriction

8 years agojournal: optimize speed of live replay journal pruning
Jason Dillaman [Wed, 20 Jul 2016 20:17:41 +0000 (16:17 -0400)]
journal: optimize speed of live replay journal pruning

When streaming playback, avoid the unnecessary watch delay when
one or more entries have been pruned.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 08a8ee98c03b5dfb30341c8d209f0c231b2c5d27)

8 years agojournal: possible deadlock during flush of journal entries
Jason Dillaman [Wed, 20 Jul 2016 14:04:21 +0000 (10:04 -0400)]
journal: possible deadlock during flush of journal entries

If a future flush is requested at the exact same moment that an
overflow is detected, the two threads will deadlock since locks
are not taken in a consistent order.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2c65471de4b0f54b8ed722f5deaf51ba62632e37)

8 years agojournal: improve debug log messages
Jason Dillaman [Wed, 20 Jul 2016 13:15:26 +0000 (09:15 -0400)]
journal: improve debug log messages

rbd-mirror debugging involved potentially thousands of journals
concurrently running. The instance address will correlate log
messages between journals.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 11475f4fe740cccdfea459ebeabdca8cb94dc911)

8 years agojournal: support streaming entry playback
Jason Dillaman [Mon, 18 Jul 2016 19:34:53 +0000 (15:34 -0400)]
journal: support streaming entry playback

Now that it's possible for the ObjectPlayer to only read a
partial subset of available entries, the JournalPlayer needs
to detect that more entries might be available.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 28d5ca16cbcb445f985469413b2a8a3048ab66b7)

8 years agojournal: replay should only read from a single object set
Jason Dillaman [Mon, 18 Jul 2016 19:15:58 +0000 (15:15 -0400)]
journal: replay should only read from a single object set

Previously it was prefetching up to 2 object sets worth of journal
data objects which consumed too much memory.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2666d366645b22a5db2a2bcbfce466726bf0b3c0)

8 years agojournal: optionally restrict maximum entry payload size
Jason Dillaman [Wed, 20 Jul 2016 12:06:13 +0000 (08:06 -0400)]
journal: optionally restrict maximum entry payload size

Journal playback will need to read at least a full entry which was
currently limited to the maximum object size. In memory constrained
environment, this new optional limit will set a fix upper bound on
memory usage.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 8c1877b82fee0db1dba76252b32ff348226d41a7)

8 years agojournal: optionally fetch entries in small chunks during replay
Jason Dillaman [Mon, 18 Jul 2016 15:01:26 +0000 (11:01 -0400)]
journal: optionally fetch entries in small chunks during replay

Support fetching the full object or incremental chunks (with a
minimum of at least a single decoded entry if available).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f7362e9a57e484fffd840ca0eef01778dcacb65b)

8 years agojournal: helper class for organizing optional settings
Jason Dillaman [Mon, 18 Jul 2016 13:31:40 +0000 (09:31 -0400)]
journal: helper class for organizing optional settings

Additional runtime configuration settings will be needed. The
new class will avoid the need to expand the constructor.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit dad8328f2d502d18923c35f7b86a0cc2ccec133a)

8 years agorbd-mirror: preprocess journal events prior to applying
Jason Dillaman [Mon, 11 Jul 2016 19:32:45 +0000 (15:32 -0400)]
rbd-mirror: preprocess journal events prior to applying

Fixes: http://tracker.ceph.com/issues/16622
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4df913d10b2dd0444db806fccb2812547efa1b56)

8 years agorbd-mirror: event preprocessor to handle snap rename operations
Jason Dillaman [Fri, 8 Jul 2016 20:19:52 +0000 (16:19 -0400)]
rbd-mirror: event preprocessor to handle snap rename operations

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit fdfca557370c9d86acb81d50edb6aafc42044747)

8 years agolibrbd: improve journaling debug log messages
Jason Dillaman [Fri, 8 Jul 2016 19:16:04 +0000 (15:16 -0400)]
librbd: improve journaling debug log messages

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 270cb74bc276bfb1f828a6a6933fa827f6cdce42)

Conflicts:
src/librbd/journal/Replay.cc: no snap limit restriction

8 years agolibrbd: separate journal event decoding and processing
Jason Dillaman [Fri, 8 Jul 2016 18:37:14 +0000 (14:37 -0400)]
librbd: separate journal event decoding and processing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 57cd75e8058b84b5dce38f3d8f4b7b4138ac6c9a)

8 years agolibrbd: record original snap name in snap rename journal event
Jason Dillaman [Fri, 8 Jul 2016 13:14:58 +0000 (09:14 -0400)]
librbd: record original snap name in snap rename journal event

Remote peers need a key to map snapshot ids between clusters.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f70b90c48d9520bbb4bb29058375e8205cf63771)

8 years agolibrbd: simple duplicate op checks for all maintenance operations
Jason Dillaman [Fri, 8 Jul 2016 13:13:07 +0000 (09:13 -0400)]
librbd: simple duplicate op checks for all maintenance operations

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 77699bfe749bc7a898024638fb8347c53fe12123)

Conflicts:
src/test/librbd/mock/MockOperations.h: no shrink restriction

8 years agoqa/workunits/rbd: exercise snapshot renames within rbd-mirror test
Jason Dillaman [Fri, 8 Jul 2016 02:16:51 +0000 (22:16 -0400)]
qa/workunits/rbd: exercise snapshot renames within rbd-mirror test

Snapshot rename operations utilize the (cluster) unique snapshot
sequence to prevent attempts at replays. When mirroring to a
different cluster, these sequences will not align.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2f4cb26d8bbd1457bc261547103b56ad40b3c464)

8 years agolibrbd: re-register watch on old format image rename
Mykola Golub [Wed, 15 Jun 2016 08:31:14 +0000 (11:31 +0300)]
librbd: re-register watch on old format image rename

The watching object name is changed when renaming an old format image,
so unregister the watcher before the rename, and register back after,
to avoid "Transport endpoint is not connected" error.

Fixes: http://tracker.ceph.com/issues/16321
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 1a3973c8814200dc449a557a4fc8212911633985)

8 years agorbd-mirror: gracefully restart pool replayer when blacklisted
Jason Dillaman [Fri, 24 Jun 2016 00:28:33 +0000 (20:28 -0400)]
rbd-mirror: gracefully restart pool replayer when blacklisted

Fixes: http://tracker.ceph.com/issues/16349
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2f55aa5e33b2fe242ebb9702ba9ff6f8d5cef96c)

8 years agorbd-mirror: do not clear image replayer error code after shut down
Jason Dillaman [Fri, 24 Jun 2016 00:28:02 +0000 (20:28 -0400)]
rbd-mirror: do not clear image replayer error code after shut down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1fc27545c2092c178293ed636b6aadb11bc8cbd3)

8 years agorbd-mirror: image deleter should use provided librados connection
Jason Dillaman [Thu, 23 Jun 2016 20:57:50 +0000 (16:57 -0400)]
rbd-mirror: image deleter should use provided librados connection

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 03c2aec4c613f11fcfed5bcd47855005f42abd79)

8 years agorbd-mirror: each pool replayer should use its own librados connection
Jason Dillaman [Thu, 23 Jun 2016 20:03:03 +0000 (16:03 -0400)]
rbd-mirror: each pool replayer should use its own librados connection

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 48f301decbf1f27937bb77a3b47e54933f272d7d)

8 years agorbd-mirror: clean up ImageReplayer before stopping state machine
Jason Dillaman [Mon, 27 Jun 2016 13:05:33 +0000 (09:05 -0400)]
rbd-mirror: clean up ImageReplayer before stopping state machine

Fixes: http://tracker.ceph.com/issues/16489
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c97f7245a015dbdda25584134840d023fd65cdd1)

8 years agoMerge pull request #10679 from dillaman/wip-16735-jewel
Loic Dachary [Wed, 17 Aug 2016 17:17:56 +0000 (19:17 +0200)]
Merge pull request #10679 from dillaman/wip-16735-jewel

jewel: rbd-nbd does not properly handle resize notifications

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #10148 from SUSE/wip-16599-jewel
Loic Dachary [Wed, 17 Aug 2016 17:10:04 +0000 (19:10 +0200)]
Merge pull request #10148 from SUSE/wip-16599-jewel

jewel: rgw: Swift API returns double space usage and objects of account metadata

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
8 years agoMerge pull request #10678 from dillaman/wip-16701-jewel
Loic Dachary [Wed, 17 Aug 2016 11:41:12 +0000 (13:41 +0200)]
Merge pull request #10678 from dillaman/wip-16701-jewel

jewel: rbd-mirror: include local pool id in resync throttle unique key

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #10614 from SUSE/wip-16959-jewel
Loic Dachary [Wed, 17 Aug 2016 11:39:02 +0000 (13:39 +0200)]
Merge pull request #10614 from SUSE/wip-16959-jewel

jewel: rpm: OBS needs ExclusiveArch

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10519 from Abhishekvrshny/wip-16312-jewel
Loic Dachary [Wed, 17 Aug 2016 11:38:27 +0000 (13:38 +0200)]
Merge pull request #10519 from Abhishekvrshny/wip-16312-jewel

jewel: selinux denials in RGW

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10364 from SUSE/wip-16750-jewel
Loic Dachary [Wed, 17 Aug 2016 11:37:51 +0000 (13:37 +0200)]
Merge pull request #10364 from SUSE/wip-16750-jewel

jewel: ceph-osd-prestart.sh contains Upstart-specific code

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10008 from dachary/wip-16099-jewel
Loic Dachary [Wed, 17 Aug 2016 11:36:47 +0000 (13:36 +0200)]
Merge pull request #10008 from dachary/wip-16099-jewel

jewel: ceph-base requires parted

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #9917 from SUSE/wip-16461-jewel
Loic Dachary [Wed, 17 Aug 2016 11:35:54 +0000 (13:35 +0200)]
Merge pull request #9917 from SUSE/wip-16461-jewel

jewel: ceph Resource Agent does not work with systemd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10303 from ukernel/jewel-16655
Loic Dachary [Tue, 16 Aug 2016 14:39:22 +0000 (16:39 +0200)]
Merge pull request #10303 from ukernel/jewel-16655

jewel: ceph-fuse: link to libtcmalloc or jemalloc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10420 from SUSE/wip-16798-jewel
Loic Dachary [Tue, 16 Aug 2016 14:21:01 +0000 (16:21 +0200)]
Merge pull request #10420 from SUSE/wip-16798-jewel

jewel: ceph command line tool chokes on ceph –w (the dash is unicode 'en dash' &ndash, copy-paste to reproduce)

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #10520 from Abhishekvrshny/wip-16319-jewel
Loic Dachary [Tue, 16 Aug 2016 08:40:05 +0000 (10:40 +0200)]
Merge pull request #10520 from Abhishekvrshny/wip-16319-jewel

jewel: radosgw-admin: inconsistency in uid/email handling

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #10073 from SUSE/wip-16565-jewel
Casey Bodley [Mon, 15 Aug 2016 21:18:36 +0000 (17:18 -0400)]
Merge pull request #10073 from SUSE/wip-16565-jewel

jewel: rgw: data sync stops after getting error in all data log sync shards

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #10524 from Abhishekvrshny/wip-16731-jewel
Casey Bodley [Mon, 15 Aug 2016 21:18:06 +0000 (17:18 -0400)]
Merge pull request #10524 from Abhishekvrshny/wip-16731-jewel

jewel: failed to create bucket after upgrade from hammer to jewel

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #10523 from Abhishekvrshny/wip-16700-jewel
Casey Bodley [Mon, 15 Aug 2016 21:16:41 +0000 (17:16 -0400)]
Merge pull request #10523 from Abhishekvrshny/wip-16700-jewel

jewel: rgw: segmentation fault on error_repo in data sync

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #10518 from Abhishekvrshny/wip-16272-jewel
Casey Bodley [Mon, 15 Aug 2016 21:16:06 +0000 (17:16 -0400)]
Merge pull request #10518 from Abhishekvrshny/wip-16272-jewel

jewel: rgw ldap: fix ldap bindpw parsing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #10144 from dillaman/wip-fix-missing-return-jewel
Loic Dachary [Mon, 15 Aug 2016 15:59:51 +0000 (17:59 +0200)]
Merge pull request #10144 from dillaman/wip-fix-missing-return-jewel

jewel: librbd: fix missing return statement if failed to get mirror image state

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10552 from ceph/wip-16507-jewel
Loic Dachary [Mon, 15 Aug 2016 15:55:42 +0000 (17:55 +0200)]
Merge pull request #10552 from ceph/wip-16507-jewel

jewel: expose buffer const_iterator symbols

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10497 from Abhishekvrshny/wip-16586-jewel
Loic Dachary [Mon, 15 Aug 2016 15:53:40 +0000 (17:53 +0200)]
Merge pull request #10497 from Abhishekvrshny/wip-16586-jewel

jewel: partprobe intermittent issues during ceph-disk prepare

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10716 from ceph/wip-16975
Josh Durgin [Mon, 15 Aug 2016 15:35:57 +0000 (08:35 -0700)]
Merge pull request #10716 from ceph/wip-16975

qa: add rados test script for upgrades

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10732 from dillaman/wip-rbd-default-format-jewel
Jason Dillaman [Mon, 15 Aug 2016 12:28:32 +0000 (08:28 -0400)]
Merge pull request #10732 from dillaman/wip-rbd-default-format-jewel

doc: format 2 now is the default image format

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agodoc: format 2 now is the default image format 10732/head
Chengwei Yang [Fri, 12 Aug 2016 09:44:16 +0000 (17:44 +0800)]
doc: format 2 now is the default image format

Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
(cherry picked from commit c8c92f8a2c2106d11b18c70c4c183c3724c2f3c2)

8 years agoMerge pull request #10217 from SUSE/wip-16636-jewel
Loic Dachary [Mon, 15 Aug 2016 09:14:58 +0000 (11:14 +0200)]
Merge pull request #10217 from SUSE/wip-16636-jewel

jewel: rgw: document multi tenancy

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #9453 from wido/jewel-issue-15348
Orit Wasserman [Mon, 15 Aug 2016 08:02:12 +0000 (10:02 +0200)]
Merge pull request #9453 from wido/jewel-issue-15348

jewel: rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a rule
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #10693 from dreamhost/wip-15975-jewel
Orit Wasserman [Fri, 12 Aug 2016 15:41:07 +0000 (17:41 +0200)]
Merge pull request #10693 from dreamhost/wip-15975-jewel

rgw: Fallback to Host header for bucket name.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoqa: remove tmap_migrate tests from upgrade testing 10716/head
Josh Durgin [Fri, 12 Aug 2016 03:39:20 +0000 (20:39 -0700)]
qa: remove tmap_migrate tests from upgrade testing

tmap_upgrade only exists in jewel

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoqa: add rados test script for upgrades
Josh Durgin [Thu, 11 Aug 2016 23:05:04 +0000 (16:05 -0700)]
qa: add rados test script for upgrades

Disable master tests that are not meant to work on jewel

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agorgw: Fallback to Host header for bucket name. 10693/head
Robin H. Johnson [Thu, 26 May 2016 22:41:20 +0000 (15:41 -0700)]
rgw: Fallback to Host header for bucket name.

RGW should fallback to using the Host header as the bucket name if valid &
possible even when it is NOT a suffix match against the DNS names, or a match
against the CNAME rule.

This mirrors AWS S3 behavior for these cases (The AWS S3 does not do any DNS
lookups regardless).

Backport: jewel
Fixes: http://tracker.ceph.com/issues/15975
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit 46aae19eeb91bf3ac78a94c9d4812a788d9042a8)

8 years agorbd-mirror: include local pool id in resync throttle unique key 10678/head
Jason Dillaman [Tue, 12 Jul 2016 01:58:45 +0000 (21:58 -0400)]
rbd-mirror: include local pool id in resync throttle unique key

Fixes: http://tracker.ceph.com/issues/16536
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 8ad36cab7cbf3492bfa972b43e4a5f75a110bfe6)

8 years agotest: ensure unique template specializations per test case
Jason Dillaman [Tue, 28 Jun 2016 19:18:51 +0000 (15:18 -0400)]
test: ensure unique template specializations per test case

With optimizations disabled, there can be cross translation unit
symbol leaking that is not present when inlining is enabled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 995a16ebcbe79fd14e6de3b25087373744238294)

8 years agotest: missing template specialization for unittest_rbd_mirror
Jason Dillaman [Tue, 28 Jun 2016 18:59:17 +0000 (14:59 -0400)]
test: missing template specialization for unittest_rbd_mirror

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 187e2c87b50d64e93736a42fcf449c55e8550125)

8 years agoqa/workunits/rbd: increase writes in large image count test
Jason Dillaman [Wed, 15 Jun 2016 21:49:54 +0000 (17:49 -0400)]
qa/workunits/rbd: increase writes in large image count test

This will help to test edge cases where the remote image does
or does not own the exclusive lock when the sync starts.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d16698f96c65b9627cc1f64ef80b7f1e39d69d45)

8 years agorbd-mirror: prune sync points referencing missing snapshots
Jason Dillaman [Wed, 15 Jun 2016 21:42:59 +0000 (17:42 -0400)]
rbd-mirror: prune sync points referencing missing snapshots

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 378914f6b8a8a8c5517fee8fa186268078fbcbfb)

8 years agorbd-mirror: ignore empty snapshot sequence mapping
Jason Dillaman [Wed, 15 Jun 2016 20:34:44 +0000 (16:34 -0400)]
rbd-mirror: ignore empty snapshot sequence mapping

This invalid condition will be gracefully detected and handled
when the snapshot mappings are computed.

Fixes: http://tracker.ceph.com/issues/16329
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 58ed8a18e91401333bc3f3f957ce5d715b6687b6)

8 years agoqa/workunits/rbd: remove temporary image exports
Jason Dillaman [Mon, 27 Jun 2016 17:01:13 +0000 (13:01 -0400)]
qa/workunits/rbd: remove temporary image exports

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 45498d04990861a034e2aad69a93658e018c991a)

8 years agorbd-mirror: fix potential image replayer state transition race
Jason Dillaman [Mon, 27 Jun 2016 15:13:29 +0000 (11:13 -0400)]
rbd-mirror: fix potential image replayer state transition race

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3e224c6c03a6a5de0e179bd788387cfa3ff49e9d)

8 years agorbd-mirror: cancel image deletion callback on shut down
Jason Dillaman [Mon, 27 Jun 2016 15:06:57 +0000 (11:06 -0400)]
rbd-mirror: cancel image deletion callback on shut down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c3f1cb3a34e1b4d258877d519e683e25bf65c65a)

8 years agorbd-mirror: fixed potential leaking image deletion context callback
Jason Dillaman [Mon, 27 Jun 2016 14:58:09 +0000 (10:58 -0400)]
rbd-mirror: fixed potential leaking image deletion context callback

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9d1cd90c220f95d23d2694b4f1fb6b2fed073ced)

8 years agorbd-mirror: ImageReplayer doesn't need image deleted callback
Jason Dillaman [Mon, 27 Jun 2016 13:45:25 +0000 (09:45 -0400)]
rbd-mirror: ImageReplayer doesn't need image deleted callback

The Replayer will detect that the ImageReplayer is stopped and will
schedule the "wait for deleted" callback before attempting to
restart the ImageReplayer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 7e5afc71dfd3ec3e7b0ddaca96f92ac6e0414006)

8 years agorbd-mirror: use async callback when deletion not in-progress
Jason Dillaman [Mon, 27 Jun 2016 13:21:05 +0000 (09:21 -0400)]
rbd-mirror: use async callback when deletion not in-progress

Fixes: http://tracker.ceph.com/issues/16491
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c136f443366fe804057a9c1f8c01c3f0a33a4d63)

8 years agorbd-mirror: tests: ImageSyncThrottler unit tests
Ricardo Dias [Thu, 9 Jun 2016 09:40:23 +0000 (10:40 +0100)]
rbd-mirror: tests: ImageSyncThrottler unit tests

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 8ca9a84f36efa73ad17fd27f545dff3716cd798c)

8 years agorbd-mirror: Usage of image-sync throttler in BootstrapRequest
Ricardo Dias [Wed, 8 Jun 2016 15:38:01 +0000 (16:38 +0100)]
rbd-mirror: Usage of image-sync throttler in BootstrapRequest

Fixes: http://tracker.ceph.com/issues/15239
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 6a91146255d84229688bd8b378732be5975a778b)

8 years agorbd-mirror: Implementation of image-sync throttler
Ricardo Dias [Wed, 8 Jun 2016 15:37:20 +0000 (16:37 +0100)]
rbd-mirror: Implementation of image-sync throttler

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit c4f926d6980d1efd95771885a11d8cc4ebd2e4c3)

8 years agorbd-mirror: tests: Support for inflight image sync point update
Ricardo Dias [Tue, 14 Jun 2016 15:43:19 +0000 (16:43 +0100)]
rbd-mirror: tests: Support for inflight image sync point update

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit cee543bd96bc99f219024aedbfafc5dcd99abb5a)

8 years agorbd-mirror: image-sync: Periodically update sync point object number
Ricardo Dias [Thu, 2 Jun 2016 09:04:41 +0000 (10:04 +0100)]
rbd-mirror: image-sync: Periodically update sync point object number

Fixes: http://tracker.ceph.com/issues/15108
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit c2eedf4d27b73d7eaf3fda54f9b0ee74e455bc1d)

8 years agorbd-mirror: image-replayer: Fix bug in resync listener remotion
Ricardo Dias [Mon, 27 Jun 2016 10:07:41 +0000 (11:07 +0100)]
rbd-mirror: image-replayer: Fix bug in resync listener remotion

Fixes: http://tracker.ceph.com/issues/16488
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 11a5851e90bca2c1813156bf12dda0192965db37)

8 years agorbd-mirror: resync: Added unit tests
Ricardo Dias [Thu, 19 May 2016 11:06:08 +0000 (12:06 +0100)]
rbd-mirror: resync: Added unit tests

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 8953825956f2a560d17c7b651d1724a95f2f7d1d)

8 years agorbd-mirror: image-replayer: Implementation of resync operation
Ricardo Dias [Thu, 12 May 2016 17:12:33 +0000 (18:12 +0100)]
rbd-mirror: image-replayer: Implementation of resync operation

Fixes: http://tracker.ceph.com/issues/15670
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit f2b114238103315197a9eefc8490786c484c8520)

8 years agorbd: journal: Support for listening updates on client metadata
Ricardo Dias [Thu, 12 May 2016 17:10:38 +0000 (18:10 +0100)]
rbd: journal: Support for listening updates on client metadata

Currently we only support listening for image resync requests.

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 0dd85739e9034912b86250ced2834dd7fb3d92fd)

8 years agojournal: Support for registering metadata listeners in the Journaler
Ricardo Dias [Thu, 12 May 2016 17:09:09 +0000 (18:09 +0100)]
journal: Support for registering metadata listeners in the Journaler

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit c535eb0399cd649371db233ee1ed01cf5441a4b3)

8 years agotest: fsx: fix rbd-nbd daemon logging 10679/head
Mykola Golub [Mon, 27 Jun 2016 07:53:09 +0000 (10:53 +0300)]
test: fsx: fix rbd-nbd daemon logging

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 09710c46d3811e602250f858fe7292925c1e3c06)

8 years agoqa/workunits/rbd: image resize test for rbd-nbd
Mykola Golub [Fri, 3 Jun 2016 18:11:21 +0000 (21:11 +0300)]
qa/workunits/rbd: image resize test for rbd-nbd

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit fa58acbb6fcc79e5a9bfd4b86250a0e2b9c8efa1)