]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoceph-volume lvm.activate pass no_systemd args when detecting objectstore 24358/head
Alfredo Deza [Mon, 1 Oct 2018 15:54:19 +0000 (11:54 -0400)]
ceph-volume lvm.activate pass no_systemd args when detecting objectstore

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

6 years agoceph-volume tests.lvm verify activate works with --auto-detect-objectstore
Alfredo Deza [Mon, 1 Oct 2018 15:53:37 +0000 (11:53 -0400)]
ceph-volume tests.lvm verify activate works with --auto-detect-objectstore

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

6 years agoMerge pull request #24338 from alfredodeza/luminous-rm36251
Andrew Schoen [Fri, 28 Sep 2018 19:18:48 +0000 (14:18 -0500)]
Merge pull request #24338 from alfredodeza/luminous-rm36251

luminous ceph-volume add new ceph-handlers role from ceph-ansible

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume tests.functional add new ceph-handlers role from ceph-ansible 24338/head
Alfredo Deza [Fri, 28 Sep 2018 16:40:09 +0000 (12:40 -0400)]
ceph-volume tests.functional add new ceph-handlers role from ceph-ansible

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

6 years agoMerge pull request #24084 from batrick/i24862
Yuri Weinstein [Thu, 27 Sep 2018 23:19:49 +0000 (16:19 -0700)]
Merge pull request #24084 from batrick/i24862

luminous: ceph_volume_client: allow atomic update of RADOS objects

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #24282 from pdvian/wip-35933-luminous
Yuri Weinstein [Thu, 27 Sep 2018 23:19:01 +0000 (16:19 -0700)]
Merge pull request #24282 from pdvian/wip-35933-luminous

luminous:client:two ceph-fuse client, one can not list out files created by an…

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #24188 from pdvian/wip-35844-luminous
Yuri Weinstein [Thu, 27 Sep 2018 21:07:06 +0000 (14:07 -0700)]
Merge pull request #24188 from pdvian/wip-35844-luminous

luminous: osdc/Objecter: fix split vs reconnect race

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #24245 from dillaman/wip-36116-luminous
Yuri Weinstein [Thu, 27 Sep 2018 21:06:18 +0000 (14:06 -0700)]
Merge pull request #24245 from dillaman/wip-36116-luminous

luminous: test/librbd: not valid to have different parents between image snapshots

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #24257 from pdvian/wip-35929-luminous
Yuri Weinstein [Thu, 27 Sep 2018 21:05:38 +0000 (14:05 -0700)]
Merge pull request #24257 from pdvian/wip-35929-luminous

luminous: mon/OSDMonitor: invalidate max_failed_since on cancel_report

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #24259 from tchaikov/luminous-35969
Yuri Weinstein [Thu, 27 Sep 2018 21:04:40 +0000 (14:04 -0700)]
Merge pull request #24259 from tchaikov/luminous-35969

luminous: rpm: use updated gperftools

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #24307 from alfredodeza/luminous-batch-report-fix
Andrew Schoen [Thu, 27 Sep 2018 18:47:30 +0000 (13:47 -0500)]
Merge pull request #24307 from alfredodeza/luminous-batch-report-fix

luminous ceph-volume: fix journal and filestore data size in `lvm batch --report`

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoceph-volume: only run ceph-common once during tests 24307/head
Andrew Schoen [Tue, 25 Sep 2018 17:09:15 +0000 (12:09 -0500)]
ceph-volume: only run ceph-common once during tests

Using import_role we can have just one play and avoid rerunning
ceph-common over and over again in daemon specific plays.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit a81386123e66e2d61391371cec4485b3148ff5a7)

6 years agoceph-volume: fail fast during tests
Andrew Schoen [Mon, 24 Sep 2018 21:41:37 +0000 (16:41 -0500)]
ceph-volume: fail fast during tests

This also rsyncs the ceph-volume code to the testing vms before
a ceph.conf is generated because ceph-volume is needed now for this
to figure out the number of osds when you're using 'lvm batch'.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit eed244473d11a153cd7a37e0e9bfaf804a20db89)

6 years agoceph-volume: when using batch --report return journal/data size as ints
Andrew Schoen [Mon, 24 Sep 2018 21:37:35 +0000 (16:37 -0500)]
ceph-volume: when using batch --report return journal/data size as ints

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit a5e8bc97e70195cee54c4b66d10684d6cd3f5e38)

6 years agoMerge pull request #24280 from alfredodeza/luminous-rm27210
Andrew Schoen [Thu, 27 Sep 2018 16:11:06 +0000 (11:11 -0500)]
Merge pull request #24280 from alfredodeza/luminous-rm27210

luminous ceph-volume custom cluster names fail on filestore trigger

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #24211 from pdvian/wip-35854-luminous
Nathan Cutler [Thu, 27 Sep 2018 14:29:47 +0000 (16:29 +0200)]
Merge pull request #24211 from pdvian/wip-35854-luminous

luminous: doc: remove deprecated 'scrubq' from ceph(8)

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #24190 from joke-lee/luminous
Yuri Weinstein [Wed, 26 Sep 2018 16:30:16 +0000 (09:30 -0700)]
Merge pull request #24190 from joke-lee/luminous

luminous:rgw: return x-amz-version-id: null when delete obj in versio…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24231 from pdvian/wip-35856-luminous
Yuri Weinstein [Wed, 26 Sep 2018 16:29:46 +0000 (09:29 -0700)]
Merge pull request #24231 from pdvian/wip-35856-luminous

luminous: multisite: segfault on shutdown/realm reload

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24171 from ukernel/luminous-25046
Yuri Weinstein [Wed, 26 Sep 2018 16:29:03 +0000 (09:29 -0700)]
Merge pull request #24171 from ukernel/luminous-25046

luminous: mds: health warning for slow metadata IO

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoclient:two ceph-fuse client, one can not list out files created by another. 24282/head
Peng Xie [Sun, 26 Aug 2018 14:02:28 +0000 (22:02 +0800)]
client:two ceph-fuse client, one can not list out files created by another.

the problem happend after mds restored the stale client session,
right after one normal client created files under one specific
dir,while the restored client can not list out the just created
files.

Fixes: http://tracker.ceph.com/issues/27051
Signed-off-by: Peng Xie <peng.hse@xtaotech.com>
(cherry picked from commit fa1c2be4a93da46252a0b53776696baf80840700)

Conflicts:
src/client/Client.cc : Resolved for cap.issued

6 years agoceph-volume tests/functional update dmcrypt test playbooks to use --cluster 24280/head
Alfredo Deza [Mon, 24 Sep 2018 18:44:31 +0000 (14:44 -0400)]
ceph-volume tests/functional update dmcrypt test playbooks to use --cluster

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

6 years agoceph-volume tests/functional/batch update tests to use 'test' cluster name
Alfredo Deza [Mon, 24 Sep 2018 16:52:50 +0000 (12:52 -0400)]
ceph-volume tests/functional/batch update tests to use 'test' cluster name

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

6 years agoceph-volume tests/functional/lvm update tests to use 'test' cluster name
Alfredo Deza [Mon, 24 Sep 2018 16:52:33 +0000 (12:52 -0400)]
ceph-volume tests/functional/lvm update tests to use 'test' cluster name

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

6 years agoceph-volume tests/functional update playbooks to use --cluster
Alfredo Deza [Mon, 24 Sep 2018 16:51:47 +0000 (12:51 -0400)]
ceph-volume tests/functional update playbooks to use --cluster

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

6 years agoceph-volume main move out the load_ceph_conf_path to the configuration module
Alfredo Deza [Mon, 24 Sep 2018 16:27:04 +0000 (12:27 -0400)]
ceph-volume main move out the load_ceph_conf_path to the configuration module

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

6 years agoceph-volume tests.devices patch configuration.load to avoid raising non-existing...
Alfredo Deza [Mon, 24 Sep 2018 14:34:55 +0000 (10:34 -0400)]
ceph-volume tests.devices patch configuration.load to avoid raising non-existing ceph.conf

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

6 years agoceph-volume tests reset the cluster name after every unit test
Alfredo Deza [Mon, 24 Sep 2018 14:29:12 +0000 (10:29 -0400)]
ceph-volume tests reset the cluster name after every unit test

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

6 years agoceph-volume tests.functional add custom cluster name to centos7-filestore-create
Alfredo Deza [Wed, 19 Sep 2018 17:23:19 +0000 (13:23 -0400)]
ceph-volume tests.functional add custom cluster name to centos7-filestore-create

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

6 years agoceph-volume lvm.activate load the config always by reading the cluster name from...
Alfredo Deza [Wed, 19 Sep 2018 16:04:41 +0000 (12:04 -0400)]
ceph-volume lvm.activate load the config always by reading the cluster name from the LV

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

6 years agoceph-volume configuration be able to set conf.ceph
Alfredo Deza [Wed, 19 Sep 2018 16:04:17 +0000 (12:04 -0400)]
ceph-volume configuration be able to set conf.ceph

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

6 years agoMerge pull request #24135 from linuxbox2/luminous-rgw-sync-loglevel
Yuri Weinstein [Tue, 25 Sep 2018 20:28:56 +0000 (13:28 -0700)]
Merge pull request #24135 from linuxbox2/luminous-rgw-sync-loglevel

luminous: rgw: raise debug level on redundant data sync error messages

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agorpm: use updated gperftools 24259/head
Kefu Chai [Mon, 17 Sep 2018 06:09:17 +0000 (14:09 +0800)]
rpm: use updated gperftools

make sure we only build with the higher version of gperftools on
distros where both 2.4 and 2.6.1 are packaged. see
https://git.centos.org/summary/rpms!gperftools.git . at the time of
writing, gperftools 2.6.1 is packaged for CentOS/RHEL 7, if gperftools
(>= 2.4) is required by Ceph, and user already has this version
installed, when new Ceph packages are installed, the updated gperftools
2.6.1 version won't be installed as a dependency. when launching
Ceph compiled with tcmalloc enabled, we will have

symbol lookup error: ceph-osd: undefined symbol: _ZdaPvm

so, by bumping up the required version of gperftools, the updated
gperftools will be installed.

see https://software.opensuse.org/package/gperftools, openSUSE/SLE offer
2.5. so they are safe at this moment.

Fixes: http://tracker.ceph.com/issues/35969
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e69e50a859acebe0bf854c12a71bfe745e0c1cf6)

6 years agomon/OSDMonitor: invalidate max_failed_since on cancel_report 24257/head
xie xingguo [Thu, 6 Sep 2018 02:44:26 +0000 (10:44 +0800)]
mon/OSDMonitor: invalidate max_failed_since on cancel_report

max_failed_since might reference the very failure-report which is to be
cancelled. We can simply invalidate it here to make **get_failed_since()**
recalculate if necessary.

Fixes: http://tracker.ceph.com/issues/35860
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 91a2d408a9349db08e916e2145040df8b1f17e14)

6 years agoMerge pull request #24065 from jdurgin/wip-luminous-cache-autotune
Yuri Weinstein [Mon, 24 Sep 2018 19:28:22 +0000 (12:28 -0700)]
Merge pull request #24065 from jdurgin/wip-luminous-cache-autotune

luminous: os/bluestore: cache autotuning and memory limit

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #24115 from dzafman/wip-35991
Yuri Weinstein [Mon, 24 Sep 2018 17:09:12 +0000 (10:09 -0700)]
Merge pull request #24115 from dzafman/wip-35991

luminous: tools: ceph-objectstore-tool: Allow target level as first positional …

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agotest/librbd: not valid to have different parents between image snapshots 24245/head
Jason Dillaman [Tue, 4 Sep 2018 12:31:07 +0000 (08:31 -0400)]
test/librbd: not valid to have different parents between image snapshots

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

Fixes: http://tracker.ceph.com/issues/36118
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agorgw: RGWAsyncPutSystemObjAttrs does not access coroutine memory 24231/head
Casey Bodley [Tue, 4 Sep 2018 20:50:22 +0000 (16:50 -0400)]
rgw: RGWAsyncPutSystemObjAttrs does not access coroutine memory

also exposes optional objv_tracker to RGWSimpleRadosWriteAttrsCR

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b01b3952db4c45feb98dbc7e224ca1982c224c72)

6 years agorgw: RGWAsyncPutSystemObj does not access coroutine memory
Casey Bodley [Tue, 4 Sep 2018 20:33:48 +0000 (16:33 -0400)]
rgw: RGWAsyncPutSystemObj does not access coroutine memory

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 85396674811be8f7a25dc9d25fd2db68c93561c5)

6 years agorgw: RGWAsyncGetSystemObj does not access coroutine memory
Casey Bodley [Tue, 4 Sep 2018 20:14:18 +0000 (16:14 -0400)]
rgw: RGWAsyncGetSystemObj does not access coroutine memory

now reads the buffer/attrs into local memory, and calling coroutines
copy out the result during request_complete()

Fixes: http://tracker.ceph.com/issues/35543
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 089db9f74266073eb1d45900d982f1831c72fe59)

Conflicts:
src/rgw/rgw_cr_rados.h : Resolved in request_complete

6 years agoMerge pull request #24206 from alfredodeza/luminous-rm24794
Andrew Schoen [Fri, 21 Sep 2018 14:12:13 +0000 (09:12 -0500)]
Merge pull request #24206 from alfredodeza/luminous-rm24794

luminous ceph-volume: earlier detection for --journal and --filestore flag requirements

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #24209 from alfredodeza/luminous-rm36088
Andrew Schoen [Fri, 21 Sep 2018 14:02:18 +0000 (09:02 -0500)]
Merge pull request #24209 from alfredodeza/luminous-rm36088

luminous ceph-volume  batch: allow journal+block.db sizing on the CLI

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agomds: health warning for slow metadata IO 24171/head
Yan, Zheng [Fri, 13 Jul 2018 08:10:39 +0000 (16:10 +0800)]
mds: health warning for slow metadata IO

Fixes: http://tracker.ceph.com/issues/24879
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 0f735f40315448560fde049ed3ea019a7d30d868)

 Conflicts:
src/mds/Beacon.cc
src/mds/OpenFileTable.cc
        src/mds/MDSContext.h
        src/mds/MDSContext.cc

6 years agodoc: remove deprecated 'scrubq' from ceph(8) 24211/head
Ruben Kerkhof [Thu, 6 Sep 2018 12:17:23 +0000 (14:17 +0200)]
doc: remove deprecated 'scrubq' from ceph(8)

The option was removed in a30cbe9adea34782be8699c010d4281d245feb6b

Fixes: http://tracker.ceph.com/issues/35813
Signed-off-by: Ruben Kerkhof <ruben@rubenkerkhof.com>
(cherry picked from commit d05cd1a3e612f52eab9bde42c184022205f65384)

6 years agodoc/man/ceph-volume update batch command with new sizing flags 24209/head
Alfredo Deza [Thu, 20 Sep 2018 15:01:21 +0000 (11:01 -0400)]
doc/man/ceph-volume update batch command with new sizing flags

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

6 years agoceph-volume tests.devices update fixture to include new size flags for strategies
Alfredo Deza [Thu, 20 Sep 2018 14:54:12 +0000 (10:54 -0400)]
ceph-volume tests.devices update fixture to include new size flags for strategies

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

6 years agoceph-volume lvm.batch.filestore consume --journal-size
Alfredo Deza [Wed, 19 Sep 2018 21:40:24 +0000 (17:40 -0400)]
ceph-volume lvm.batch.filestore consume --journal-size

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

6 years agoceph-volume lvm.batch.bluestore consume --block-db-size
Alfredo Deza [Wed, 19 Sep 2018 21:39:59 +0000 (17:39 -0400)]
ceph-volume lvm.batch.bluestore consume --block-db-size

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

6 years agoceph-volume lvm.batch add sizing flags for journal and block.db LVs
Alfredo Deza [Wed, 19 Sep 2018 21:08:16 +0000 (17:08 -0400)]
ceph-volume lvm.batch add sizing flags for journal and block.db LVs

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

6 years agoMerge pull request #23773 from ifed01/wip-ifed-perf-reset-luminous
Yuri Weinstein [Thu, 20 Sep 2018 22:27:55 +0000 (15:27 -0700)]
Merge pull request #23773 from ifed01/wip-ifed-perf-reset-luminous

luminous: os/bluestore: bluestore_buffer_hit_bytes perf counter doesn't reset

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #23817 from pdvian/wip-26992-luminous
Yuri Weinstein [Thu, 20 Sep 2018 22:10:26 +0000 (15:10 -0700)]
Merge pull request #23817 from pdvian/wip-26992-luminous

luminous: discover_all_missing() not always called during activating

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #23832 from pdvian/wip-27058-luminous
Yuri Weinstein [Thu, 20 Sep 2018 22:09:49 +0000 (15:09 -0700)]
Merge pull request #23832 from pdvian/wip-27058-luminous

luminous: debian/rules: fix ceph-mgr .pyc files left behind

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #23915 from liewegas/wip-pod-hostname-luminous
Yuri Weinstein [Thu, 20 Sep 2018 22:09:26 +0000 (15:09 -0700)]
Merge pull request #23915 from liewegas/wip-pod-hostname-luminous

luminous: common: get real hostname from container/pod environment

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoceph-volume tests.lvm verify that it is reported when --journal is not used with... 24206/head
Alfredo Deza [Tue, 18 Sep 2018 18:07:06 +0000 (14:07 -0400)]
ceph-volume tests.lvm verify that it is reported when --journal is not used with --filestore

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

6 years agoceph-volume lvm.prepare report back when --journal is not used when --filestore is set
Alfredo Deza [Tue, 18 Sep 2018 18:06:19 +0000 (14:06 -0400)]
ceph-volume lvm.prepare report back when --journal is not used when --filestore is set

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

6 years agoluminous:rgw: return x-amz-version-id: null when delete obj in versioning 24190/head
yuliyang [Wed, 5 Sep 2018 06:18:44 +0000 (14:18 +0800)]
luminous:rgw: return x-amz-version-id: null when delete obj in versioning
suspended bucket

fix http://tracker.ceph.com/issues/35814

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit 9c39147)

6 years agoosdc/Objecter: fix split vs reconnect race 24188/head
Sage Weil [Sat, 1 Sep 2018 20:48:37 +0000 (15:48 -0500)]
osdc/Objecter: fix split vs reconnect race

If we are reconnecting to an OSD, we may not have a connection established
so this feature check is completely unreliable.  If there happens to be a
split, that could mean we don't resend an op that should have been resent.

Instead, we can infer the OSD has the new behavior if require_osd_release
is luminous or later.  If not, we can look at the per-osd features in the
OSDMap.

Fixes: http://tracker.ceph.com/issues/22544
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 917fdbe5422d099902aaa08b3406efc0247ef155)

6 years agoMerge pull request #24054 from smithfarm/wip-24983-luminous
Yuri Weinstein [Wed, 19 Sep 2018 16:06:51 +0000 (09:06 -0700)]
Merge pull request #24054 from smithfarm/wip-24983-luminous

luminous: 'radosgw-admin sync error trim' only trims partially

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24056 from smithfarm/wip-24985-luminous
Yuri Weinstein [Wed, 19 Sep 2018 16:05:14 +0000 (09:05 -0700)]
Merge pull request #24056 from smithfarm/wip-24985-luminous

luminous: multisite: object metadata operations are skipped by sync

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24069 from pdvian/wip-35709-luminous
Yuri Weinstein [Wed, 19 Sep 2018 16:04:39 +0000 (09:04 -0700)]
Merge pull request #24069 from pdvian/wip-35709-luminous

luminous: rgw: fix deadlock on RGWIndexCompletionManager::stop

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #23884 from smithfarm/wip-32084-luminous
Yan, Zheng [Wed, 19 Sep 2018 01:42:41 +0000 (09:42 +0800)]
Merge pull request #23884 from smithfarm/wip-32084-luminous

luminous: mds: MDBalancer::try_rebalance() may stop prematurely

6 years agomds: fix premature stop of MDBalancer::try_rebalance() 23884/head
Yan, Zheng [Fri, 3 Aug 2018 10:43:41 +0000 (18:43 +0800)]
mds: fix premature stop of MDBalancer::try_rebalance()

When mds wants to export loads to multiple targets. The amount of single
export can easily be less than (0.2 * target_loads). For example:

6 active mds, mds.0's load is 11, other ranks' loads are 5. target_load
is 6. Export amount for each target is 1.

Fixes: http://tracker.ceph.com/issues/26973
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit e68cbec6a647f0252d848620ce6e51b4f3eea1e3)

6 years agomds: don't queue straydir for split
Yan, Zheng [Wed, 1 Aug 2018 05:16:10 +0000 (13:16 +0800)]
mds: don't queue straydir for split

straydir can not get splitted (for now at least)

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 959e63c1f88b6ce6b2492cfb98e5875d928558e4)

Conflicts:
src/mds/MDBalancer.cc
- finesse split/merge conditional expression

6 years agoMerge pull request #23789 from ukernel/luminous-mds-export-size
Yan, Zheng [Wed, 19 Sep 2018 01:13:02 +0000 (09:13 +0800)]
Merge pull request #23789 from ukernel/luminous-mds-export-size

luminous: mds: optimize the way how max export size is enforced

6 years agoMerge branch 'luminous' into luminous-mds-export-size 23789/head
Yan, Zheng [Wed, 19 Sep 2018 01:12:45 +0000 (09:12 +0800)]
Merge branch 'luminous' into luminous-mds-export-size

6 years agoMerge pull request #23594 from dillaman/wip-23604-luminous
Yuri Weinstein [Tue, 18 Sep 2018 20:00:57 +0000 (13:00 -0700)]
Merge pull request #23594 from dillaman/wip-23604-luminous

luminous: librbd: discard should wait for in-flight cache writeback to complete

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #24100 from pdvian/wip-35711-luminous
Yuri Weinstein [Tue, 18 Sep 2018 20:00:24 +0000 (13:00 -0700)]
Merge pull request #24100 from pdvian/wip-35711-luminous

luminous: librbd: journaling unable request can not be sent to remote lock owner

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #23793 from pdvian/wip-26983-luminous
Yuri Weinstein [Tue, 18 Sep 2018 19:58:32 +0000 (12:58 -0700)]
Merge pull request #23793 from pdvian/wip-26983-luminous

luminous : client: fix choose_target_mds for requests that do name lookup

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23881 from smithfarm/wip-26977-luminous
Yuri Weinstein [Tue, 18 Sep 2018 19:57:51 +0000 (12:57 -0700)]
Merge pull request #23881 from smithfarm/wip-26977-luminous

luminous: cephfs-data-scan: print the max used ino

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #23946 from ukernel/luminous-35721
Yuri Weinstein [Tue, 18 Sep 2018 19:56:31 +0000 (12:56 -0700)]
Merge pull request #23946 from ukernel/luminous-35721

luminous: mds: prevent MDSRank::evict_client from blocking finisher thread

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23990 from batrick/i35852
Yuri Weinstein [Tue, 18 Sep 2018 19:56:01 +0000 (12:56 -0700)]
Merge pull request #23990 from batrick/i35852

luminous: MDSMonitor: lookup of gid in prepare_beacon that has been removed will cause exception

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge pull request #24033 from smithfarm/wip-24934-luminous
Yuri Weinstein [Tue, 18 Sep 2018 19:55:23 +0000 (12:55 -0700)]
Merge pull request #24033 from smithfarm/wip-24934-luminous

luminous: cephfs-journal-tool: wrong layout info used

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #24134 from batrick/qa-.qa-symlink
Yuri Weinstein [Tue, 18 Sep 2018 19:55:04 +0000 (12:55 -0700)]
Merge pull request #24134 from batrick/qa-.qa-symlink

luminous: qa: add .qa helper link

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agorgw: raise debug level on redundant data sync error messages 24135/head
Casey Bodley [Fri, 7 Sep 2018 13:51:56 +0000 (09:51 -0400)]
rgw: raise debug level on redundant data sync error messages

each of these errors have already been logged at a lower level with a
more detailed error message. by logging them as ERRORs at level 0 here,
the messages could be easily confused as separate failures

Fixes: http://tracker.ceph.com/issues/36037
See-also: http://tracker.ceph.com/issues/35830

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a6e392f2b8cb885f6fede5dfa9b584659740e161)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoMerge pull request #23408 from ukernel/luminous-24820
Yuri Weinstein [Mon, 17 Sep 2018 19:48:11 +0000 (12:48 -0700)]
Merge pull request #23408 from ukernel/luminous-24820

luminous: mds: avoid using g_conf->get_val<...>(...) in hot path

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23505 from ukernel/luminous-26834
Yuri Weinstein [Mon, 17 Sep 2018 19:47:39 +0000 (12:47 -0700)]
Merge pull request #23505 from ukernel/luminous-26834

luminous: mds: calculate load by checking self CPU usage

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23507 from ukernel/luminous-26858
Yuri Weinstein [Mon, 17 Sep 2018 19:47:10 +0000 (12:47 -0700)]
Merge pull request #23507 from ukernel/luminous-26858

luminous: mds: reset heartbeat map at potential time-consuming places

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23554 from batrick/i26906
Yuri Weinstein [Mon, 17 Sep 2018 19:46:44 +0000 (12:46 -0700)]
Merge pull request #23554 from batrick/i26906

luminous: MDSMonitor: consider raising priority of MMDSBeacons from MDS so they are processed before other client messages

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #23556 from batrick/i26924
Yuri Weinstein [Mon, 17 Sep 2018 19:46:09 +0000 (12:46 -0700)]
Merge pull request #23556 from batrick/i26924

luminous: mds: mds got laggy because of MDSBeacon stuck in mqueue

Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #23617 from pdvian/wip-26915-luminous
Yuri Weinstein [Mon, 17 Sep 2018 19:45:37 +0000 (12:45 -0700)]
Merge pull request #23617 from pdvian/wip-26915-luminous

luminous: client: check for unmounted condition before printing debug output

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23677 from ukernel/luminous-26894
Yuri Weinstein [Mon, 17 Sep 2018 19:44:48 +0000 (12:44 -0700)]
Merge pull request #23677 from ukernel/luminous-26894

luminous: mds: crash when dumping ops in flight

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23678 from ukernel/luminous-24840
Yuri Weinstein [Mon, 17 Sep 2018 19:44:23 +0000 (12:44 -0700)]
Merge pull request #23678 from ukernel/luminous-24840

luminous: mds: explain delayed client_request due to subtree migration

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23693 from tserlin/tserlin-require-fuse-luminous
Yuri Weinstein [Mon, 17 Sep 2018 19:44:00 +0000 (12:44 -0700)]
Merge pull request #23693 from tserlin/tserlin-require-fuse-luminous

luminous: debian/control: require fuse for ceph-fuse

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #23726 from joscollin/wip-25205-luminous
Yuri Weinstein [Mon, 17 Sep 2018 19:43:06 +0000 (12:43 -0700)]
Merge pull request #23726 from joscollin/wip-25205-luminous

luminous: CephVolumeClient: delay required after adding data pool to MDSMap

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23758 from dillaman/wip-27987
Yuri Weinstein [Mon, 17 Sep 2018 19:29:13 +0000 (12:29 -0700)]
Merge pull request #23758 from dillaman/wip-27987

luminous: librbd: fix refuse to release lock when cookie is the same at rewatch

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #23892 from pdvian/wip-27061-luminous
Yuri Weinstein [Mon, 17 Sep 2018 19:28:26 +0000 (12:28 -0700)]
Merge pull request #23892 from pdvian/wip-27061-luminous

luminous: librbd: potential race on image create request complete

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24003 from pdvian/wip-35704-luminous
Yuri Weinstein [Mon, 17 Sep 2018 19:27:51 +0000 (12:27 -0700)]
Merge pull request #24003 from pdvian/wip-35704-luminous

luminous: rbd: fix error import when the input is a pipe

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agolibrbd: discard should wait for in-flight cache writeback to complete 23594/head
Jason Dillaman [Wed, 4 Apr 2018 15:48:56 +0000 (11:48 -0400)]
librbd: discard should wait for in-flight cache writeback to complete

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(derived from commit 0e04de4bb9c08755bd0915776bd538ce8f7c2b5b)

6 years agoqa: add .qa helper link 24134/head
Patrick Donnelly [Mon, 17 Sep 2018 17:57:32 +0000 (10:57 -0700)]
qa: add .qa helper link

Barebones backport of #22719.

Command used:

    $ find qa/suites -type d -execdir ln -sfn ../.qa/ {}/.qa \;
    $ ln -sf ../ qa/suites/.qa

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #23680 from k0ste/luminous_backports
Yuri Weinstein [Fri, 14 Sep 2018 16:47:36 +0000 (09:47 -0700)]
Merge pull request #23680 from k0ste/luminous_backports

luminous: osd: backport 'bench' and stdout changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #23740 from k0ste/luminous_backports2
Yuri Weinstein [Fri, 14 Sep 2018 16:46:50 +0000 (09:46 -0700)]
Merge pull request #23740 from k0ste/luminous_backports2

luminous: mgr/balancer: deepcopy best plan - otherwise we get latest

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #23791 from tchaikov/wip-23370-luminous
Yuri Weinstein [Fri, 14 Sep 2018 16:46:18 +0000 (09:46 -0700)]
Merge pull request #23791 from tchaikov/wip-23370-luminous

luminous: mgr/MgrClient: guard send_pgstats() with lock

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #23862 from smithfarm/wip-25177-luminous
Yuri Weinstein [Fri, 14 Sep 2018 16:45:41 +0000 (09:45 -0700)]
Merge pull request #23862 from smithfarm/wip-25177-luminous

luminous: osd,mon: increase mon_max_pg_per_osd to 250

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #23864 from smithfarm/wip-25203-luminous
Yuri Weinstein [Fri, 14 Sep 2018 16:45:09 +0000 (09:45 -0700)]
Merge pull request #23864 from smithfarm/wip-25203-luminous

luminous: rados python bindings use prval from stack

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #23871 from smithfarm/wip-32106-luminous
Yuri Weinstein [Fri, 14 Sep 2018 16:44:25 +0000 (09:44 -0700)]
Merge pull request #23871 from smithfarm/wip-32106-luminous

luminous: object errors found in be_select_auth_object() aren't logged the same

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #23901 from pdvian/wip-32078-luminous
Yuri Weinstein [Fri, 14 Sep 2018 16:43:52 +0000 (09:43 -0700)]
Merge pull request #23901 from pdvian/wip-32078-luminous

luminous: test: Use pids instead of jobspecs which were wrong

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #23943 from batrick/i35716
Yuri Weinstein [Fri, 14 Sep 2018 16:43:12 +0000 (09:43 -0700)]
Merge pull request #23943 from batrick/i35716

luminous: msg: "challenging authorizer" messages appear at debug_ms=0

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #23969 from zmedico/backport-lumious-17121-17239-17410-17820
Yuri Weinstein [Fri, 14 Sep 2018 16:42:50 +0000 (09:42 -0700)]
Merge pull request #23969 from zmedico/backport-lumious-17121-17239-17410-17820

luminous: PGPool::update optimizations

Reviewed-by: Robin H. Johnson <robbat2@gentoo.org>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #23499 from pdvian/wip-26844-luminous
Yuri Weinstein [Fri, 14 Sep 2018 16:40:50 +0000 (09:40 -0700)]
Merge pull request #23499 from pdvian/wip-26844-luminous

luminous: rgw_file: deep stat handling

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
6 years agoMerge pull request #23522 from pdvian/wip-26846-luminous
Yuri Weinstein [Fri, 14 Sep 2018 15:41:51 +0000 (08:41 -0700)]
Merge pull request #23522 from pdvian/wip-26846-luminous

luminous: rgw: Limit the number of lifecycle rules on one bucket.

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
6 years agoMerge pull request #23545 from pdvian/wip-26848-luminous
Yuri Weinstein [Fri, 14 Sep 2018 15:41:18 +0000 (08:41 -0700)]
Merge pull request #23545 from pdvian/wip-26848-luminous

luminous: rgw: The delete markers generated by object expiration should have owner

Reviewed-by: Orit Wasserman <owasserm@redhat.com>