]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoceph-volume lvm.create rollback osd creation when prepare or activate fails 20237/head
Alfredo Deza [Tue, 5 Dec 2017 20:31:55 +0000 (15:31 -0500)]
ceph-volume lvm.create rollback osd creation when prepare or activate fails

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 07be6fe0ab7981ebdc34779a8ccd6220d640a549)

7 years agoceph-volume lvm.create fallback to bluestore when objectstore is not specified
Alfredo Deza [Tue, 5 Dec 2017 15:22:05 +0000 (10:22 -0500)]
ceph-volume lvm.create fallback to bluestore when objectstore is not specified

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 6781d6498e01bfc89189c235540e5c2a2e6bc8ca)

7 years agoceph-volume lvm.prepare fallback to bluestore when objectstore is not specified
Alfredo Deza [Tue, 5 Dec 2017 15:21:20 +0000 (10:21 -0500)]
ceph-volume lvm.prepare fallback to bluestore when objectstore is not specified

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 9b17ad2f8fe617d219fdb2f46dd2675669f32f08)

7 years agoceph-volume lvm.prepare rollback osd when prepare fails and an osd id was generated
Alfredo Deza [Tue, 5 Dec 2017 15:11:03 +0000 (10:11 -0500)]
ceph-volume lvm.prepare rollback osd when prepare fails and an osd id was generated

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 579d12806b2ffc693a4e70ba3eaf663fa281d35e)

7 years agoceph-volume lvm.common create a rollback_osd utility to cleanup failed osd prepare...
Alfredo Deza [Tue, 5 Dec 2017 15:08:35 +0000 (10:08 -0500)]
ceph-volume lvm.common create a rollback_osd utility to cleanup failed osd prepare/create calls

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e533792e0dbafc160238c0f5783f4430e2705571)

7 years agoMerge pull request #19483 from smithfarm/wip-22375-luminous
Jason Dillaman [Thu, 1 Feb 2018 17:30:26 +0000 (12:30 -0500)]
Merge pull request #19483 from smithfarm/wip-22375-luminous

luminous: build/ops: luminous build fails with --without-radosgw

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20211 from dillaman/wip-22198-luminous
Jason Dillaman [Thu, 1 Feb 2018 17:10:34 +0000 (12:10 -0500)]
Merge pull request #20211 from dillaman/wip-22198-luminous

luminous: librbd: compare and write against a clone can result in failure

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agotest/librbd: disable compare and write if skipping partial discard 20211/head
Jason Dillaman [Wed, 15 Nov 2017 13:24:50 +0000 (08:24 -0500)]
test/librbd: disable compare and write if skipping partial discard

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

7 years agolibrbd: refactor object write request state machines
Jason Dillaman [Thu, 9 Nov 2017 17:10:30 +0000 (12:10 -0500)]
librbd: refactor object write request state machines

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

7 years agolibrbd: consolidate all object discard-related logic into single state machine
Jason Dillaman [Thu, 9 Nov 2017 15:24:08 +0000 (10:24 -0500)]
librbd: consolidate all object discard-related logic into single state machine

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

7 years agolibrbd: simplify interface between object IO and copyup state machines
Jason Dillaman [Wed, 8 Nov 2017 17:31:28 +0000 (12:31 -0500)]
librbd: simplify interface between object IO and copyup state machines

The initial copyup was not receiving a write hint and the
code for hints was duplicated multiple times. Additionally,
the object map state should match the last executed write op.

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

Conflicts:
src/librbd/io/ObjectRequest.h: trivial resolution

7 years agolibrbd: copyup state machine needs to handle empty write ops
Jason Dillaman [Thu, 9 Nov 2017 20:15:58 +0000 (15:15 -0500)]
librbd: copyup state machine needs to handle empty write ops

The compare-and-write object operation cannot be executed
concurrently within a copyup operation since the object might not
exist yet (if not performing a deep-copy).

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

7 years agolibrbd: object cacher should re-use read state machine
Jason Dillaman [Tue, 7 Nov 2017 19:36:10 +0000 (14:36 -0500)]
librbd: object cacher should re-use read state machine

This adds support for sparse-reads and ensures all object reads
utilize a single, tested code path.

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

7 years agolibrbd: refactor io::ObjectReadRequest
Jason Dillaman [Tue, 7 Nov 2017 17:24:44 +0000 (12:24 -0500)]
librbd: refactor io::ObjectReadRequest

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

7 years agolibrbd: default template parameter for C_SparseReadRequest
Jason Dillaman [Tue, 7 Nov 2017 19:17:25 +0000 (14:17 -0500)]
librbd: default template parameter for C_SparseReadRequest

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

7 years agolibrbd: reduce lock scope when assembling read results
Jason Dillaman [Tue, 7 Nov 2017 18:42:19 +0000 (13:42 -0500)]
librbd: reduce lock scope when assembling read results

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

7 years agolibrbd: ObjectReadRequest does not require buffer extents
Jason Dillaman [Tue, 7 Nov 2017 18:33:12 +0000 (13:33 -0500)]
librbd: ObjectReadRequest does not require buffer extents

The ReadResult wrapper requires the buffer extents to know
how to properly reconstruct the out buffer.

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

7 years agolibrbd: templatize IO object request state machines
Jason Dillaman [Mon, 6 Nov 2017 23:35:42 +0000 (18:35 -0500)]
librbd: templatize IO object request state machines

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

7 years agotest/librados_test_stub: mocked remainder of IO ops used by librbd
Jason Dillaman [Sat, 11 Nov 2017 02:45:13 +0000 (21:45 -0500)]
test/librados_test_stub: mocked remainder of IO ops used by librbd

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

7 years agotest/librados_test_stub: simulate set_alloc_hint creating a non-existent file
Jason Dillaman [Fri, 10 Nov 2017 21:26:19 +0000 (16:26 -0500)]
test/librados_test_stub: simulate set_alloc_hint creating a non-existent file

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

7 years agotest/librados_test_stub: pass snap context to zero op
Mykola Golub [Wed, 23 Aug 2017 07:46:42 +0000 (09:46 +0200)]
test/librados_test_stub: pass snap context to zero op

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

7 years agoMerge pull request #20209 from dillaman/wip-22033-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:15:26 +0000 (11:15 -0500)]
Merge pull request #20209 from dillaman/wip-22033-luminous

luminous: mgr/dashboard: added iSCSI IOPS/throughput metrics

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20210 from dillaman/wip-22169-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:14:48 +0000 (11:14 -0500)]
Merge pull request #20210 from dillaman/wip-22169-luminous

luminous: librbd: set deleted parent pointer to null

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20208 from dillaman/wip-21920-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:13:36 +0000 (11:13 -0500)]
Merge pull request #20208 from dillaman/wip-21920-luminous

luminous: librbd: default to sparse-reads for any IO operation over 64K

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20207 from dillaman/wip-21793-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:12:42 +0000 (11:12 -0500)]
Merge pull request #20207 from dillaman/wip-21793-luminous

luminous: rbd-mirror: primary image should register in remote, non-primary image's journal

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20206 from dillaman/wip-21694-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:12:11 +0000 (11:12 -0500)]
Merge pull request #20206 from dillaman/wip-21694-luminous

luminous: librbd: journal should ignore -EILSEQ errors from compare-and-write

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20205 from dillaman/wip-22577-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:11:39 +0000 (11:11 -0500)]
Merge pull request #20205 from dillaman/wip-22577-luminous

luminous: qa/workunits/rbd: simplify split-brain test to avoid potential race

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20153 from pdvian/wip-22809-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:11:04 +0000 (11:11 -0500)]
Merge pull request #20153 from pdvian/wip-22809-luminous

luminous: librbd: fix snap create/rm may taking long time

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20135 from dillaman/wip-22806-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:09:15 +0000 (11:09 -0500)]
Merge pull request #20135 from dillaman/wip-22806-luminous

luminous: librbd: force removal of a snapshot cannot ignore dependent children

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #19123 from pdvian/wip-22174-luminous
Jason Dillaman [Thu, 1 Feb 2018 16:00:25 +0000 (11:00 -0500)]
Merge pull request #19123 from pdvian/wip-22174-luminous

luminous: possible deadlock in various maintenance operations

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17875 from smithfarm/wip-21359-luminous
Yuri Weinstein [Wed, 31 Jan 2018 22:10:45 +0000 (14:10 -0800)]
Merge pull request #17875 from smithfarm/wip-21359-luminous

luminous: cephfs: racy is_mounted() checks in libcephfs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #20121 from batrick/i21252p2
Yuri Weinstein [Wed, 31 Jan 2018 21:21:50 +0000 (13:21 -0800)]
Merge pull request #20121 from batrick/i21252p2

luminous: mds: fix return value of MDCache::dump_cache

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #20213 from dillaman/wip-21868-luminous
Jason Dillaman [Wed, 31 Jan 2018 18:27:40 +0000 (13:27 -0500)]
Merge pull request #20213 from dillaman/wip-21868-luminous

luminous: doc/rbd: tweaks for the LIO iSCSI gateway

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agodoc/rbd: tweaks to the Windows iSCSI initiator directions 20213/head
Jason Dillaman [Fri, 3 Nov 2017 14:09:38 +0000 (10:09 -0400)]
doc/rbd: tweaks to the Windows iSCSI initiator directions

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

7 years agodoc: Added CHAP cofiguration instructions for iSCSI
Ashish Singh [Fri, 20 Oct 2017 15:15:35 +0000 (20:45 +0530)]
doc: Added CHAP cofiguration instructions for iSCSI

Added details to specify the CHAP username and password while
discovering/login the iSCSI target.

Signed-off-by: Ashish Singh <assingh@redhat.com>
(cherry picked from commit 2a5755e0767108aefa6ccfb8a85e5d63e8c04fe8)

7 years agodoc: fix ceph-iscsi-config version number
Mike Christie [Mon, 22 Jan 2018 23:08:55 +0000 (17:08 -0600)]
doc: fix ceph-iscsi-config version number

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 3ab71020a5e420a333cb4a6b0be67ade185c1593)

7 years agodoc: add ceph iscsi test kernel info
Mike Christie [Sat, 20 Jan 2018 22:06:42 +0000 (16:06 -0600)]
doc: add ceph iscsi test kernel info

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 5c30318660eebc882326d87eec39b4fbe4cc85d7)

7 years agodoc: add rbd pool requirement for gwcli
Mike Christie [Tue, 16 Jan 2018 18:46:09 +0000 (12:46 -0600)]
doc: add rbd pool requirement for gwcli

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit b56d994f3addcd9c6a7848dec9be93568cdb2d0e)

7 years agodoc: add daemon-reload for rbd-target-api setup
Mike Christie [Mon, 15 Jan 2018 18:59:37 +0000 (12:59 -0600)]
doc: add daemon-reload for rbd-target-api setup

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 4ca0d508bb9b68c791abc5799d0195f4baace455)

7 years agodoc: add gwcli manual install instructions
Mike Christie [Tue, 16 Jan 2018 18:04:28 +0000 (12:04 -0600)]
doc: add gwcli manual install instructions

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit f45aafed1c7a5393e712f9fbfd7479fc444ad3d8)

7 years agodoc: separate gwcli install from post install setup steps
Mike Christie [Thu, 11 Jan 2018 20:54:06 +0000 (14:54 -0600)]
doc: separate gwcli install from post install setup steps

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit f80f083d0a982d7e89c77e3a6f8d71c2871a8f2c)

7 years agodoc: add note to clarify trusted_ip_list use
Mike Christie [Thu, 11 Jan 2018 20:53:16 +0000 (14:53 -0600)]
doc: add note to clarify trusted_ip_list use

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 3cc367dc6ebca18e884d7c75d2cd1fa7907b7139)

7 years agodoc: update esx instructions
Mike Christie [Thu, 11 Jan 2018 04:14:18 +0000 (22:14 -0600)]
doc: update esx instructions

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 3806f9750d29c6d930a7c8a003902e79b99766f6)

Conflicts:
doc/rbd/iscsi-initiator-esx.rst: trivial resolution

7 years agodoc: add warning about SCSI PGRs/reservations
Mike Christie [Thu, 11 Jan 2018 02:33:03 +0000 (20:33 -0600)]
doc: add warning about SCSI PGRs/reservations

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 62661a2e23ce98432f3c037fa9a8155a633ee182)

7 years agodoc: add esx web based client images
Mike Christie [Thu, 11 Jan 2018 00:51:51 +0000 (18:51 -0600)]
doc: add esx web based client images

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 78e12135eeb5829cad65cebd3c2be9df4d582b1f)

7 years agodoc: remove windows based vsphere client images
Mike Christie [Fri, 12 Jan 2018 01:36:06 +0000 (19:36 -0600)]
doc: remove windows based vsphere client images

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 426b562fdc1b373b72de2d69c4851be22ec12008)

7 years agodoc: fix gwcli examples
Mike Christie [Fri, 12 Jan 2018 01:35:22 +0000 (19:35 -0600)]
doc: fix gwcli examples

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit 480f6a82a2b9dcd0179951ea16432d8d32f2c96d)

7 years agodoc: Update ceph iscsi kernel/distro requirements.
Mike Christie [Wed, 10 Jan 2018 22:38:13 +0000 (16:38 -0600)]
doc: Update ceph iscsi kernel/distro requirements.

Signed-off-by: Mike Christie <mchristi@redhat.com>
(cherry picked from commit f436e993d359dfdad26b7d569d555a3b3a5b798d)

7 years agodoc/rbd: tweaks for the LIO iSCSI gateway
Jason Dillaman [Wed, 11 Oct 2017 16:02:55 +0000 (12:02 -0400)]
doc/rbd: tweaks for the LIO iSCSI gateway

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

7 years agomgr/dashboard: added iSCSI IOPS/throughput metrics 20209/head
Jason Dillaman [Tue, 31 Oct 2017 15:05:47 +0000 (11:05 -0400)]
mgr/dashboard: added iSCSI IOPS/throughput metrics

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

7 years agomgr/dashboard: include A/O start relative timestamp for iSCSI
Jason Dillaman [Tue, 31 Oct 2017 14:41:36 +0000 (10:41 -0400)]
mgr/dashboard: include A/O start relative timestamp for iSCSI

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

7 years agolibrbd: track image open and lock acquire time via perf counter
Jason Dillaman [Tue, 17 Oct 2017 19:40:55 +0000 (15:40 -0400)]
librbd: track image open and lock acquire time via perf counter

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

7 years agolibrbd: export read and writes performance counters for daemons
Jason Dillaman [Tue, 17 Oct 2017 19:21:42 +0000 (15:21 -0400)]
librbd: export read and writes performance counters for daemons

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

7 years agolibrbd: moved performance counter enums to common location
Jason Dillaman [Tue, 17 Oct 2017 19:49:22 +0000 (15:49 -0400)]
librbd: moved performance counter enums to common location

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

Conflicts:
src/librbd/internal.h: trivial resolution

7 years agolibrbd: set deleted parent pointer to null 20210/head
Jason Dillaman [Sat, 18 Nov 2017 13:30:27 +0000 (08:30 -0500)]
librbd: set deleted parent pointer to null

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

7 years agolibrbd: track the child of an image in-memory
Jason Dillaman [Tue, 17 Oct 2017 18:57:08 +0000 (14:57 -0400)]
librbd: track the child of an image in-memory

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

7 years agorbd-mirror: journal debug message should not be logged as error 20207/head
Jason Dillaman [Fri, 27 Oct 2017 20:02:47 +0000 (16:02 -0400)]
rbd-mirror: journal debug message should not be logged as error

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

7 years agorbd-mirror: avoid attempting to decode an empty client data buffer
Jason Dillaman [Fri, 27 Oct 2017 20:02:20 +0000 (16:02 -0400)]
rbd-mirror: avoid attempting to decode an empty client data buffer

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

7 years agolibrbd: default to sparse-reads for any IO operation over 64K 20208/head
Jason Dillaman [Thu, 19 Oct 2017 17:52:56 +0000 (13:52 -0400)]
librbd: default to sparse-reads for any IO operation over 64K

Testing BlueStore against both HDDs and OSDs with fully allocated
and sparse-allocated objects shows a performance improvement with
sparse-read between 32K and 64K.

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

7 years agolibrbd: templatize io::CopyupRequest and io::ObjectRequest
Jason Dillaman [Thu, 19 Oct 2017 18:32:05 +0000 (14:32 -0400)]
librbd: templatize io::CopyupRequest and io::ObjectRequest

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

7 years agorbd-mirror: removed duplicate client registration logic
Jason Dillaman [Thu, 5 Oct 2017 20:38:32 +0000 (16:38 -0400)]
rbd-mirror: removed duplicate client registration logic

The client will now be registered before the bootstrap state machine
is invoked.

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

7 years agorbd-mirror: local primary images should still register to remote images
Jason Dillaman [Thu, 5 Oct 2017 19:56:19 +0000 (15:56 -0400)]
rbd-mirror: local primary images should still register to remote images

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

7 years agolibrbd: journal should ignore -EILSEQ errors from compare-and-write 20206/head
Jason Dillaman [Tue, 3 Oct 2017 19:42:50 +0000 (15:42 -0400)]
librbd: journal should ignore -EILSEQ errors from compare-and-write

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

7 years agoqa/workunits/rbd: simplify split-brain test to avoid potential race 20205/head
Jason Dillaman [Tue, 19 Dec 2017 21:29:18 +0000 (16:29 -0500)]
qa/workunits/rbd: simplify split-brain test to avoid potential race

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

Conflicts:
qa/workunits/rbd/rbd_mirror.sh: trivial resolution

7 years agoMerge pull request #19555 from shinobu-x/wip-22455-luminous
John Spray [Wed, 31 Jan 2018 12:09:08 +0000 (12:09 +0000)]
Merge pull request #19555 from shinobu-x/wip-22455-luminous

 luminous: balancer crush-compat sends "foo" command

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20156 from pdvian/wip-22811-luminous
John Spray [Wed, 31 Jan 2018 12:06:59 +0000 (12:06 +0000)]
Merge pull request #20156 from pdvian/wip-22811-luminous

luminous: mon: fix mgr using auth_client_required policy

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19481 from jan--f/wip-22421-luminous
John Spray [Wed, 31 Jan 2018 12:01:45 +0000 (12:01 +0000)]
Merge pull request #19481 from jan--f/wip-22421-luminous

luminous: mon: reenable timer to send digest when paxos is temporarily inactive

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19553 from shinobu-x/wip-22453-luminous
John Spray [Wed, 31 Jan 2018 11:59:04 +0000 (11:59 +0000)]
Merge pull request #19553 from shinobu-x/wip-22453-luminous

 luminous: mgr/balancer/upmap_max_iterations must be cast to integer

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19624 from shinobu-x/wip-22496-luminous
John Spray [Wed, 31 Jan 2018 11:49:41 +0000 (11:49 +0000)]
Merge pull request #19624 from shinobu-x/wip-22496-luminous

 luminous: KeyError: ('name',) in balancer rm

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19834 from pdvian/wip-22585-luminous
John Spray [Wed, 31 Jan 2018 11:48:50 +0000 (11:48 +0000)]
Merge pull request #19834 from pdvian/wip-22585-luminous

luminous: pybind/mgr/prometheus: fix metric type undef -> untyped

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20084 from pdvian/wip-22760-luminous
John Spray [Wed, 31 Jan 2018 11:47:05 +0000 (11:47 +0000)]
Merge pull request #20084 from pdvian/wip-22760-luminous

luminous: mgr: prometheus: added osd commit/apply latency metrics (#22718).

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20089 from pdvian/wip-22768-luminous
John Spray [Wed, 31 Jan 2018 11:46:03 +0000 (11:46 +0000)]
Merge pull request #20089 from pdvian/wip-22768-luminous

luminous: mgr: disconnect unregistered service daemon when report received

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20182 from jcsp/wip-22831
John Spray [Wed, 31 Jan 2018 11:42:58 +0000 (11:42 +0000)]
Merge pull request #20182 from jcsp/wip-22831

luminous: pybind/mgr/dashboard: fix reverse proxy support

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17869 from smithfarm/wip-21479-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:47:21 +0000 (16:47 -0800)]
Merge pull request #17869 from smithfarm/wip-21479-luminous

luminous: mgr: Services reported with blank hostname

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #18832 from shinobu-x/wip-22075-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:46:34 +0000 (16:46 -0800)]
Merge pull request #18832 from shinobu-x/wip-22075-luminous

luminous: mgr tests don't indicate failure if exception thrown from serve()

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18842 from shinobu-x/wip-21863-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:46:04 +0000 (16:46 -0800)]
Merge pull request #18842 from shinobu-x/wip-21863-luminous

luminous: ceph-conf: dump parsed config in plain text or as json

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19002 from tchaikov/wip-pr-18976-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:45:40 +0000 (16:45 -0800)]
Merge pull request #19002 from tchaikov/wip-pr-18976-luminous

luminous: udev: Fix typo in udev OSD rules file

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #19023 from pdvian/wip-22164-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:44:46 +0000 (16:44 -0800)]
Merge pull request #19023 from pdvian/wip-22164-luminous

luminous: cluster [ERR] Unhandled exception from module 'balancer' while running on mgr.x: 'NoneType' object has no attribute 'iteritems'" in cluster log

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19031 from pdvian/wip-22167-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:44:16 +0000 (16:44 -0800)]
Merge pull request #19031 from pdvian/wip-22167-luminous

luminous: Various odd clog messages for mons

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19039 from jan--f/wip-22199-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:42:52 +0000 (16:42 -0800)]
Merge pull request #19039 from jan--f/wip-22199-luminous

luminous: tools/crushtool: skip device id if no name exists

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #19046 from shinobu-x/wip-22189-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:41:50 +0000 (16:41 -0800)]
Merge pull request #19046 from shinobu-x/wip-22189-luminous

luminous: osdc/Objecter: objecter op_send_bytes perf counter always 0

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19059 from pdvian/wip-22176-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:41:25 +0000 (16:41 -0800)]
Merge pull request #19059 from pdvian/wip-22176-luminous

luminous: osd: subscribe osdmaps if any pending pgs

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19083 from smithfarm/wip-22213-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:40:44 +0000 (16:40 -0800)]
Merge pull request #19083 from smithfarm/wip-22213-luminous

luminous: On pg repair the primary is not favored as was intended

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #19084 from shinobu-x/wip-22216-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:40:04 +0000 (16:40 -0800)]
Merge pull request #19084 from shinobu-x/wip-22216-luminous

 luminous: "osd status" command exception if OSD not in pgmap stats

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #19118 from tangwenjun3/wip-backport-19030
Yuri Weinstein [Wed, 31 Jan 2018 00:39:36 +0000 (16:39 -0800)]
Merge pull request #19118 from tangwenjun3/wip-backport-19030

luminous: os/bluestore: fix the allocate in bluefs

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Shinobu Kinjo <skinjo@redhat.com>
7 years agoMerge pull request #19133 from smithfarm/wip-22194-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:33:43 +0000 (16:33 -0800)]
Merge pull request #19133 from smithfarm/wip-22194-luminous

luminous: Default kernel.pid_max is easily exceeded during recovery on high OSD-count system

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #19631 from shinobu-x/wip-22509-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:30:53 +0000 (16:30 -0800)]
Merge pull request #19631 from shinobu-x/wip-22509-luminous

 luminous: osd: "sudo cp /var/lib/ceph/osd/ceph-0/fsid ..." fails

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19839 from tchaikov/wip-22558-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:30:11 +0000 (16:30 -0800)]
Merge pull request #19839 from tchaikov/wip-22558-luminous

luminous: rpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #18838 from shinobu-x/wip-21973-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:28:05 +0000 (16:28 -0800)]
Merge pull request #18838 from shinobu-x/wip-21973-luminous

luminous: [test] UpdateFeatures RPC message should be included in test_notify.py

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18840 from shinobu-x/wip-21970-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:27:34 +0000 (16:27 -0800)]
Merge pull request #18840 from shinobu-x/wip-21970-luminous

luminous: [journal] tags are not being expired if no other clients are registered

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18949 from jcsp/wip-luminous-rgw-config-desc
Yuri Weinstein [Wed, 31 Jan 2018 00:26:21 +0000 (16:26 -0800)]
Merge pull request #18949 from jcsp/wip-luminous-rgw-config-desc

luminous: options.cc: document rgw config options

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19051 from shinobu-x/wip-22185-luminous
Yuri Weinstein [Wed, 31 Jan 2018 00:25:18 +0000 (16:25 -0800)]
Merge pull request #19051 from shinobu-x/wip-22185-luminous

luminous: rbd: abort in listing mapped nbd devices when running in a container

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agopybind/mgr/dashboard: fix reverse proxy support 20182/head
Nick Erdmann [Mon, 22 Jan 2018 12:33:32 +0000 (12:33 +0000)]
pybind/mgr/dashboard: fix reverse proxy support

This fixes http redirection for reverse http proxies

Fixes: http://tracker.ceph.com/issues/22557
Signed-off-by: Nick Erdmann <n@nirf.de>
(cherry picked from commit 95e1963cb5327f0699081c4c4b0b355d109ff0e3)

7 years agopybind/mgr: fix typo
Nick Erdmann [Fri, 26 Jan 2018 13:40:27 +0000 (13:40 +0000)]
pybind/mgr: fix typo

Signed-off-by: Nick Erdmann <n@nirf.de>
(cherry picked from commit fdd64bb2dac33085b47c737032a525d89319c866)

7 years agopybind/mgr/mgr_module: add default param for MgrStandbyModule.get_config()
Kefu Chai [Mon, 15 Jan 2018 03:49:08 +0000 (11:49 +0800)]
pybind/mgr/mgr_module: add default param for MgrStandbyModule.get_config()

this matches its counterpart of MgrModule.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit bc7de8b124c32a2ee6910a3bac6a06f1c566a2ac)

7 years agoMerge pull request #20062 from cbodley/wip-luminous-rgw-bilog-trim
Casey Bodley [Tue, 30 Jan 2018 14:29:15 +0000 (09:29 -0500)]
Merge pull request #20062 from cbodley/wip-luminous-rgw-bilog-trim

luminous: rgw multisite: automated trimming for bucket index logs

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agolibrbd: added missing locks for snap rollback and rename 19123/head
Jason Dillaman [Tue, 14 Nov 2017 17:07:36 +0000 (12:07 -0500)]
librbd: added missing locks for snap rollback and rename

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

7 years agolibrbd: possible deadlock with synchronous maintenance operations
Jason Dillaman [Mon, 13 Nov 2017 18:28:06 +0000 (13:28 -0500)]
librbd: possible deadlock with synchronous maintenance operations

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

7 years agoMerge pull request #19848 from cbodley/wip-luminous-boost-166
Sage Weil [Mon, 29 Jan 2018 16:22:14 +0000 (10:22 -0600)]
Merge pull request #19848 from cbodley/wip-luminous-boost-166

luminous: backport beast frontend and boost 1.66 update

7 years agoMerge pull request #19500 from shinobu-x/wip-22401-luminous
Sage Weil [Mon, 29 Jan 2018 16:21:07 +0000 (10:21 -0600)]
Merge pull request #19500 from shinobu-x/wip-22401-luminous

luminous: rgw: make HTTP dechunking compatible with Amazon S3

Reviewed-by: Casey Bodley <cbodley@redhat.com>