]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoMerge pull request #30896 from smithfarm/wip-42037-luminous
Yuri Weinstein [Mon, 4 Nov 2019 20:28:41 +0000 (12:28 -0800)]
Merge pull request #30896 from smithfarm/wip-42037-luminous

luminous: osd/PeeringState: recover_got - add special handler for empty log

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agoMerge pull request #30917 from smithfarm/wip-41458-luminous
Yuri Weinstein [Mon, 4 Nov 2019 20:28:10 +0000 (12:28 -0800)]
Merge pull request #30917 from smithfarm/wip-41458-luminous

luminous: osd: merge replica log on primary need according to replica log's crt

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31030 from smithfarm/wip-42199-luminous
Yuri Weinstein [Mon, 4 Nov 2019 20:27:49 +0000 (12:27 -0800)]
Merge pull request #31030 from smithfarm/wip-42199-luminous

luminous: osd/PrimaryLogPG: skip obcs that don't exist during backfill scan_range

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31104 from k0ste/luminous_backports2
Yuri Weinstein [Mon, 4 Nov 2019 20:26:56 +0000 (12:26 -0800)]
Merge pull request #31104 from k0ste/luminous_backports2

luminous: mgr/balancer: python3 compatibility issue

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #31105 from k0ste/luminous_backports3
Yuri Weinstein [Mon, 4 Nov 2019 20:25:54 +0000 (12:25 -0800)]
Merge pull request #31105 from k0ste/luminous_backports3

luminous: mgr/prometheus: replace whitespaces in metrics' names

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31107 from k0ste/luminous_backports4
Yuri Weinstein [Mon, 4 Nov 2019 20:25:09 +0000 (12:25 -0800)]
Merge pull request #31107 from k0ste/luminous_backports4

luminous: mgr/prometheus: Cast collect_timeout (scrape_interval) to float

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31308 from dzafman/wip-smoke-21376-luminous
Yuri Weinstein [Mon, 4 Nov 2019 20:24:17 +0000 (12:24 -0800)]
Merge pull request #31308 from dzafman/wip-smoke-21376-luminous

luminous: Various whitelists for tests to pass

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #31294 from smithfarm/wip-qa-ceph-detect-init-luminous
Yuri Weinstein [Sat, 2 Nov 2019 16:17:45 +0000 (09:17 -0700)]
Merge pull request #31294 from smithfarm/wip-qa-ceph-detect-init-luminous

luminous: tests/ceph-disk: drop ceph-detect-init test

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agotests/ceph-disk: drop ceph-detect-init test 31294/head
Nathan Cutler [Thu, 31 Oct 2019 16:58:46 +0000 (17:58 +0100)]
tests/ceph-disk: drop ceph-detect-init test

This commit fixes an issue with a commit that was cherry-picked into luminous
from mimic.

17bc3dc73a14701f5f6541245955bdd343ffbee2 cherry-picked ceph-detect-init.yaml
from mimic. In mimic, this test works fine because all the supported distros use
systemd. But in luminous we support Ubuntu 14.04 which still uses Upstart
instead of systemd.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #31257 from jan--f/wip-41289-luminous
Nathan Cutler [Thu, 31 Oct 2019 10:20:12 +0000 (11:20 +0100)]
Merge pull request #31257 from jan--f/wip-41289-luminous

luminous: doc: update bluestore cache settings and clarify data fraction

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agodoc: update bluestore cache settings and clarify data fraction 31257/head
Jan Fajerski [Mon, 29 Apr 2019 12:52:27 +0000 (14:52 +0200)]
doc: update bluestore cache settings and clarify data fraction

Fixes: http://tracker.ceph.com/issues/39522
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 9d8336a7f418fe2bb11361dd74a214403b1e5be7)

5 years agoMerge pull request #30242 from smithfarm/wip-41489-luminous
Yuri Weinstein [Wed, 30 Oct 2019 15:24:41 +0000 (08:24 -0700)]
Merge pull request #30242 from smithfarm/wip-41489-luminous

luminous: cephfs: client: return -EIO when sync file which unsafe reqs have been dropped

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
5 years agoMerge pull request #31166 from alfredodeza/wip-rm42292
Yuri Weinstein [Tue, 29 Oct 2019 23:07:21 +0000 (16:07 -0700)]
Merge pull request #31166 from alfredodeza/wip-rm42292

luminous: qa/ceph-disk: use a Python2.7 compatible version of pytest

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #31172 from dzafman/wip-missed-backports
Yuri Weinstein [Tue, 29 Oct 2019 19:46:50 +0000 (12:46 -0700)]
Merge pull request #31172 from dzafman/wip-missed-backports

Luminous corrections for tests

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #28502 from smithfarm/wip-40166-luminous
Yuri Weinstein [Tue, 29 Oct 2019 15:35:06 +0000 (08:35 -0700)]
Merge pull request #28502 from smithfarm/wip-40166-luminous

luminous: cephfs: client: ceph.dir.rctime xattr value incorrectly prefixes 09 to the nanoseconds component

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
5 years agoMerge pull request #29097 from batrick/i40807
Yuri Weinstein [Tue, 29 Oct 2019 15:34:11 +0000 (08:34 -0700)]
Merge pull request #29097 from batrick/i40807

luminous: mds: msg weren't destroyed before handle_client_reconnect returned, if the reconnect msg was from non-existent session

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #29226 from smithfarm/wip-40163-luminous
Yuri Weinstein [Tue, 29 Oct 2019 15:33:40 +0000 (08:33 -0700)]
Merge pull request #29226 from smithfarm/wip-40163-luminous

luminous: cephfs: mount: key parsing fail when doing a remount

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29229 from smithfarm/wip-40218-luminous
Yuri Weinstein [Tue, 29 Oct 2019 15:33:08 +0000 (08:33 -0700)]
Merge pull request #29229 from smithfarm/wip-40218-luminous

luminous: tests: cephfs: TestMisc.test_evict_client fails

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29829 from batrick/i39691
Yuri Weinstein [Tue, 29 Oct 2019 15:32:46 +0000 (08:32 -0700)]
Merge pull request #29829 from batrick/i39691

luminous: mds: check dir fragment to split dir if mkdir makes it oversized.

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29830 from ukernel/luminous-41000
Yuri Weinstein [Tue, 29 Oct 2019 15:32:17 +0000 (08:32 -0700)]
Merge pull request #29830 from ukernel/luminous-41000

luminous: cephfs: client: unlink dentry for inode with llref=0

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #28701 from batrick/i40286
Yuri Weinstein [Tue, 29 Oct 2019 15:29:01 +0000 (08:29 -0700)]
Merge pull request #28701 from batrick/i40286

luminous: qa: remove ubuntu 14.04 testing

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #30934 from smithfarm/wip-42039-luminous
Yuri Weinstein [Tue, 29 Oct 2019 15:28:29 +0000 (08:28 -0700)]
Merge pull request #30934 from smithfarm/wip-42039-luminous

luminous: client: _readdir_cache_cb() may use the readdir_cache already clear

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoqa/ceph-disk: use a Python2.7 compatible version of pytest 31166/head
Alfredo Deza [Fri, 25 Oct 2019 15:49:54 +0000 (11:49 -0400)]
qa/ceph-disk: use a Python2.7 compatible version of pytest

Signed-off-by: Alfredo Deza <adeza@redhat.com>
5 years agoMerge pull request #30230 from dzafman/wip-network-luminous
Yuri Weinstein [Fri, 25 Oct 2019 19:05:01 +0000 (12:05 -0700)]
Merge pull request #30230 from dzafman/wip-network-luminous

luminous: core: Health warnings on long network ping times

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #30785 from smithfarm/wip-41919-luminous
Yuri Weinstein [Fri, 25 Oct 2019 19:04:29 +0000 (12:04 -0700)]
Merge pull request #30785 from smithfarm/wip-41919-luminous

luminous: core: osd: scrub error on big objects; make bluestore refuse to start on big objects

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #30902 from smithfarm/wip-42138-luminous
Yuri Weinstein [Fri, 25 Oct 2019 19:03:46 +0000 (12:03 -0700)]
Merge pull request #30902 from smithfarm/wip-42138-luminous

luminous: osd: Remove unused osdmap flags full, nearfull from output

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #31020 from smithfarm/wip-42393-luminous
Yuri Weinstein [Fri, 25 Oct 2019 01:36:12 +0000 (18:36 -0700)]
Merge pull request #31020 from smithfarm/wip-42393-luminous

luminous: common/ceph_context: avoid unnecessary wait during service thread shutdown

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31036 from smithfarm/wip-40502-luminous
Yuri Weinstein [Fri, 25 Oct 2019 01:35:38 +0000 (18:35 -0700)]
Merge pull request #31036 from smithfarm/wip-40502-luminous

luminous: core: osd: rollforward may need to mark pglog dirty

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #31049 from vshankar/wip-mds-session-ref
Yuri Weinstein [Thu, 24 Oct 2019 14:51:54 +0000 (07:51 -0700)]
Merge pull request #31049 from vshankar/wip-mds-session-ref

luminous: mds: add reference when setting Connection::priv to existing session

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agomgr/prometheus: Cast collect_timeout (scrape_interval) to float 31107/head
Benjeman Meekhof [Mon, 29 Jul 2019 14:28:40 +0000 (10:28 -0400)]
mgr/prometheus: Cast collect_timeout (scrape_interval) to float

If set by user scrape_interval option is returned as non-float by get_localized_module_option.
Metric cache timeout comparison always returns true and data is never refreshed.

Fixes: https://tracker.ceph.com/issues/40997
Signed-off-by: Ben Meekhof <bmeekhof@umich.edu>
(cherry picked from commit 26a74a0d83e068b0bb762c4c7066b4b195187e94)

Conflicts:
- path: src/pybind/mgr/prometheus/module.py
  comment: get_localized_module_option() in master, get_localized_config() in luminous

5 years agomgr/prometheus: replace whitespaces in metrics' names 31105/head
alfonsomthd [Tue, 23 Apr 2019 14:20:47 +0000 (16:20 +0200)]
mgr/prometheus: replace whitespaces in metrics' names

Fixes: https://tracker.ceph.com/issues/39434
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 843802f43eaa8d0117dd2585b19ac71add3f1024)

Conflicts:
- path: src/pybind/mgr/prometheus/module.py
  comment: resolved new line conflict in promethize()

5 years agomgr/balancer: python3 compatibility issue 31104/head
Mykola Golub [Fri, 18 Oct 2019 09:19:30 +0000 (12:19 +0300)]
mgr/balancer: python3 compatibility issue

Fixes: https://tracker.ceph.com/issues/42370
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 97720eddd92f2fd31599ea0cecf2502f600d3bb9)

5 years agoMerge pull request #31091 from smithfarm/wip-42415-luminous
Nathan Cutler [Wed, 23 Oct 2019 15:10:48 +0000 (17:10 +0200)]
Merge pull request #31091 from smithfarm/wip-42415-luminous

luminous: doc/rbd: s/guess/xml/ for codeblock lexer

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agodoc/rbd: s/guess/xml/ for codeblock lexer 31091/head
Kefu Chai [Wed, 16 Oct 2019 04:34:19 +0000 (12:34 +0800)]
doc/rbd: s/guess/xml/ for codeblock lexer

this change silences the warning of

```
doc/rbd/qemu-rbd.rst:174: WARNING: Pygments lexer name 'guess' is not
known
```

see http://pygments.org/docs/lexers/, we should use "xml" for XML .

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

5 years agoMerge pull request #30425 from smithfarm/wip-41544-luminous
Yuri Weinstein [Tue, 22 Oct 2019 22:40:14 +0000 (15:40 -0700)]
Merge pull request #30425 from smithfarm/wip-41544-luminous

luminous: test/librbd: set nbd timeout due to newer kernels defaulting it on

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30147 from smithfarm/wip-41266-luminous
Yuri Weinstein [Tue, 22 Oct 2019 18:42:51 +0000 (11:42 -0700)]
Merge pull request #30147 from smithfarm/wip-41266-luminous

luminous: rgw: don't throw when accept errors are happening on frontend

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #30323 from smithfarm/wip-41713-luminous
Yuri Weinstein [Tue, 22 Oct 2019 15:07:57 +0000 (08:07 -0700)]
Merge pull request #30323 from smithfarm/wip-41713-luminous

luminous: rgw: fix refcount tags to match and update object's idtag

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agomds: fix MDSRank::send_message_client_counted() 31049/head
Yan, Zheng [Mon, 4 Jun 2018 05:56:44 +0000 (13:56 +0800)]
mds: fix MDSRank::send_message_client_counted()

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

5 years agomds: add reference when setting Connection::priv to existing session
Yan, Zheng [Mon, 4 Jun 2018 05:40:00 +0000 (13:40 +0800)]
mds: add reference when setting Connection::priv to existing session

the bug was introduced by commit 72883956c26 "use intrusive_ptr for
holding Connection::priv"

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

5 years agoosd: accident of rollforward may need to mark pglog dirty 31036/head
Zengran Zhang [Tue, 18 Jun 2019 03:32:33 +0000 (11:32 +0800)]
osd: accident of rollforward may need to mark pglog dirty

refers: https://github.com/ceph/ceph/pull/27015/files#r294114392

Fixes: http://tracker.ceph.com/issues/40403
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit 35cb184becd6562edd240553dfa50f47bb120b7f)

5 years agoOSD: rollforward may need to mark pglog dirty
Zengran Zhang [Sun, 17 Mar 2019 02:05:11 +0000 (10:05 +0800)]
OSD: rollforward may need to mark pglog dirty

if we rollforward at the end of PG::activate(), we may advance the *crt*,
but we did not mart the log dirty, this means we will not update the crt
within the transaction of rollforward, so it is inconsistent.

Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit 10d0990dc69310864b4845ee57b32610a642464f)

Conflicts:
src/osd/PGLog.h
dfbe5e070cc978253abcb30b86de5faa7e6a1efc is not being backported
- retain !touched_log as part of conditional in is_dirty()

5 years agoosd/PrimaryLogPG: skip obcs that don't exist during backfill scan_range 31030/head
Sage Weil [Thu, 3 Oct 2019 18:00:45 +0000 (13:00 -0500)]
osd/PrimaryLogPG: skip obcs that don't exist during backfill scan_range

We already skip objects we encounter that we do getattr() on and get
ENOENT, but sometimes the object is in our obc cache with exists=false.
Skip those too.

Fixes: https://tracker.ceph.com/issues/42177
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b700c17ec053c8ffb178d6bd44edb2d643fe8fb6)

5 years agoMerge pull request #30981 from tchaikov/wip-luminous-42361
Yuri Weinstein [Mon, 21 Oct 2019 18:17:53 +0000 (11:17 -0700)]
Merge pull request #30981 from tchaikov/wip-luminous-42361

luminous: build/ops: python3-cephfs should provide python36-cephfs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #30118 from smithfarm/wip-41439-luminous
Yuri Weinstein [Mon, 21 Oct 2019 18:03:41 +0000 (11:03 -0700)]
Merge pull request #30118 from smithfarm/wip-41439-luminous

luminous: rbd-mirror: ignore errors relating to parsing the cluster config file

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agocommon/ceph_context: avoid unnecessary wait during service thread shutdown 31020/head
Jason Dillaman [Tue, 15 Oct 2019 22:19:15 +0000 (18:19 -0400)]
common/ceph_context: avoid unnecessary wait during service thread shutdown

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

Conflicts:
src/common/ceph_context.cc
- luminous uses Mutex::Locker instead of std::unique_lock

5 years agoMerge pull request #29875 from trociny/wip-41421-luminous
Jason Dillaman [Mon, 21 Oct 2019 12:40:12 +0000 (08:40 -0400)]
Merge pull request #29875 from trociny/wip-41421-luminous

luminous: qa/workunits/rbd: stress test `rbd mirror pool status --verbose`

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoqa/workunits/rbd: stress test `rbd mirror pool status --verbose` 29875/head
Mykola Golub [Wed, 14 Aug 2019 07:40:02 +0000 (08:40 +0100)]
qa/workunits/rbd: stress test `rbd mirror pool status --verbose`

Fixes: https://tracker.ceph.com/issues/40923
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 0866a2456b773843537681c768d93d1c9e7718a4)

Conflicts:
qa/workunits/rbd/rbd_mirror_helpers.sh:
          - trivial resolution in test_status_in_pool_dir
          - adding missing XMLSTARLET definition (added in master by 917f8a0)

5 years agoMerge pull request #30298 from smithfarm/wip-40082-luminous
Yuri Weinstein [Fri, 18 Oct 2019 14:47:43 +0000 (07:47 -0700)]
Merge pull request #30298 from smithfarm/wip-40082-luminous

luminous: osd: Better error message when OSD count is less than osd_pool_default_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30132 from smithfarm/wip-40735-luminous
Nathan Cutler [Fri, 18 Oct 2019 13:05:45 +0000 (15:05 +0200)]
Merge pull request #30132 from smithfarm/wip-40735-luminous

luminous: doc/rgw: document use of 'realm pull' instead of 'period pull'

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #30071 from smithfarm/wip-40138-luminous
Nathan Cutler [Fri, 18 Oct 2019 12:47:13 +0000 (14:47 +0200)]
Merge pull request #30071 from smithfarm/wip-40138-luminous

luminous: doc: describe metadata_heap cleanup

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #30690 from smithfarm/wip-42106-luminous-follow-on
Nathan Cutler [Fri, 18 Oct 2019 12:39:08 +0000 (14:39 +0200)]
Merge pull request #30690 from smithfarm/wip-42106-luminous-follow-on

luminous: build/ops: admin/build-doc: use python3 (follow-on fix)

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoceph.spec.in: provide python2-<modname> 30981/head
Kefu Chai [Thu, 10 Oct 2019 02:11:27 +0000 (10:11 +0800)]
ceph.spec.in: provide python2-<modname>

to be consistent with other python2 packages, and their python3
counterparts

the `python_provide` macro is offered by `python-rpm-macros` package,
which is in turn required by python*-devel

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

5 years agoceph.spec.in: use python_provide macro
Kefu Chai [Thu, 10 Oct 2019 01:54:50 +0000 (09:54 +0800)]
ceph.spec.in: use python_provide macro

our python3 bindings are now named `python3-<modname>` after python3 is
now maintained by RHEL/CentOS instead EPEL. to help the users using
`python36-<modname>`, we should "Provide" `python36-<modname>`.

the `python_provide` macro is offered by `python-rpm-macros` package,
which is in turn required by python*-devel. and we do install
`python36-devel` in install-deps.sh, and install `python3-devel` in
ceph-*build/build/setup_rpm

see also
https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_provides

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

5 years agoMerge pull request #30608 from vumrao/wip-vumrao-luminous-rados-tools-list-objects...
Yuri Weinstein [Thu, 17 Oct 2019 23:01:51 +0000 (16:01 -0700)]
Merge pull request #30608 from vumrao/wip-vumrao-luminous-rados-tools-list-objects-in-a-pg

luminous: rados tools list objects in a pg

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30905 from smithfarm/wip-42153-luminous
Yuri Weinstein [Thu, 17 Oct 2019 23:01:16 +0000 (16:01 -0700)]
Merge pull request #30905 from smithfarm/wip-42153-luminous

luminous: mon/OSDMonitor: trim not-longer-exist failure reporters

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30922 from vumrao/wip-vumrao-42241
Yuri Weinstein [Thu, 17 Oct 2019 23:00:31 +0000 (16:00 -0700)]
Merge pull request #30922 from vumrao/wip-vumrao-42241

luminous: osd/PG: Add PG to large omap log message

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoMerge pull request #30926 from smithfarm/wip-42127-luminous
Yuri Weinstein [Thu, 17 Oct 2019 22:59:59 +0000 (15:59 -0700)]
Merge pull request #30926 from smithfarm/wip-42127-luminous

luminous: osd/OSDMap: do not trust partially simplified pg_upmap_item

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agoMerge pull request #30855 from dillaman/wip-39673-luminous
Yuri Weinstein [Thu, 17 Oct 2019 15:55:01 +0000 (08:55 -0700)]
Merge pull request #30855 from dillaman/wip-39673-luminous

luminous: qa/workunits/rbd: wait for rbd-nbd unmap to complete

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #30856 from dillaman/wip-40499-luminous
Yuri Weinstein [Thu, 17 Oct 2019 15:54:19 +0000 (08:54 -0700)]
Merge pull request #30856 from dillaman/wip-40499-luminous

luminous: rbd: use the ordered throttle for the export action

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #30857 from dillaman/wip-40880-luminous
Yuri Weinstein [Thu, 17 Oct 2019 15:53:14 +0000 (08:53 -0700)]
Merge pull request #30857 from dillaman/wip-40880-luminous

luminous: rbd: Reduce log level for cls/journal and cls/rbd expected errors

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #30858 from dillaman/wip-41621-luminous
Yuri Weinstein [Thu, 17 Oct 2019 15:52:42 +0000 (08:52 -0700)]
Merge pull request #30858 from dillaman/wip-41621-luminous

luminous: tools/rbd-ggate: close log before running postfork

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #29202 from smithfarm/wip-40266-luminous
Yuri Weinstein [Wed, 16 Oct 2019 23:37:18 +0000 (16:37 -0700)]
Merge pull request #29202 from smithfarm/wip-40266-luminous

luminous: common: data race in OutputDataSocket

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #28989 from smithfarm/wip-39537-luminous
Yuri Weinstein [Wed, 16 Oct 2019 23:07:50 +0000 (16:07 -0700)]
Merge pull request #28989 from smithfarm/wip-39537-luminous

luminous: osd/ReplicatedBackend.cc: 1321: FAILED assert(get_parent()->get_log().get_log().objects.count(soid) && (get_parent()->get_log().get_log().objects.find(soid)->second->op == pg_log_entry_t::LOST_REVERT) && (get_parent()->get_log().get_log().object

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #29564 from k0ste/luminous_backports4
Yuri Weinstein [Wed, 16 Oct 2019 23:07:12 +0000 (16:07 -0700)]
Merge pull request #29564 from k0ste/luminous_backports4

luminous: osd/bluestore: Actually wait until completion in write_sync

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge pull request #30271 from smithfarm/wip-41733-luminous
Yuri Weinstein [Wed, 16 Oct 2019 23:06:39 +0000 (16:06 -0700)]
Merge pull request #30271 from smithfarm/wip-41733-luminous

luminous: osd: clear PG_STATE_CLEAN when repair object

Reviewed-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #30722 from smithfarm/wip-epel-release-snafu-luminous
Yuri Weinstein [Wed, 16 Oct 2019 23:05:20 +0000 (16:05 -0700)]
Merge pull request #30722 from smithfarm/wip-epel-release-snafu-luminous

luminous: build/ops: backport miscellaneous install-deps.sh and ceph.spec.in fixes from master

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoqa/standalone/ceph-helpers: fix test_wait_for_clean 30298/head
Sage Weil [Sat, 9 Mar 2019 00:07:10 +0000 (18:07 -0600)]
qa/standalone/ceph-helpers: fix test_wait_for_clean

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 30fc7f5e972bd41537c92eb135c9763b46dd09d2)

Conflicts:
qa/standalone/ceph-helpers.sh
- mimic does not have separate WAIT_FOR_CLEAN_TIMEOUT

5 years agoqa/standalone: make sure an osd is running before create_rbd_pool
Sage Weil [Tue, 5 Mar 2019 15:19:38 +0000 (09:19 -0600)]
qa/standalone: make sure an osd is running before create_rbd_pool

'rbd pool init' now does IO.  Drop the pool, or change the pool size to 1.

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

5 years agoqa: specify filestore for misc tests
Vikhyat Umrao [Tue, 23 Oct 2018 22:51:00 +0000 (15:51 -0700)]
qa: specify filestore for misc tests

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8a694fc2f9e75864e064fe591feda9fab943c15e)

5 years agoqa/standalone/ceph-helpers: resurrect all OSD before waiting for health
Kefu Chai [Thu, 30 May 2019 15:44:37 +0000 (23:44 +0800)]
qa/standalone/ceph-helpers: resurrect all OSD before waiting for health

address the regression introduced by e62cfceb
in e62cfceb, we wanted to test the newly introduced TOO_FEW_OSDS
warning, so we increased the number of OSD to the size of pool, so if
the number of OSD is less than pool size, monitor will send a warning
message.

but we need to bring all OSDs back if we are expecting a healthy
cluster. in this change, all OSDs are resurrect before
`wait_for_health_ok`.

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

5 years agoqa/standalone/ceph-helpers: fix health_ok test
Sage Weil [Tue, 5 Feb 2019 11:41:28 +0000 (05:41 -0600)]
qa/standalone/ceph-helpers: fix health_ok test

Stopping the osd daemon won't reliably get you HEALTH_WARN or ERR; you have
to make sure it is also marked down.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit dcdca44aa45e7dc5aab56da26caec644e32024a6)

5 years agomon/PGMap: enable/disable TOO_FEW_OSDS warning with an option
Sage Weil [Fri, 10 May 2019 19:45:12 +0000 (14:45 -0500)]
mon/PGMap: enable/disable TOO_FEW_OSDS warning with an option

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3b74fbc93d32d6cc367049d3bcbe83d3837abba5)

Conflicts
        src/mon/PGMap.cc
- cct->_conf->get_val in luminous
src/common/options.cc
- no mon_max_snap_prune_per_epoch in luminous
- in luminous, osd_pool_default_size is INT_T (int64_t). In master, it is UINT_T
  (uint64_t). So I changed the type to int64_t.

5 years agoqa/standalone: remove osd_pool_default_size in test_wait_for_health_ok
zjh [Mon, 6 May 2019 06:35:54 +0000 (14:35 +0800)]
qa/standalone: remove osd_pool_default_size in test_wait_for_health_ok

Signed-off-by: zjh <jhzeng93@foxmail.com>
(cherry picked from commit e62cfceb9549e806f774ef3da549efd9f4d90171)

5 years agoosd: Better error message when OSD count is less than osd_pool_default_size
zjh [Fri, 26 Apr 2019 07:15:11 +0000 (15:15 +0800)]
osd: Better error message when OSD count is less than osd_pool_default_size

Fixes: http://tracker.ceph.com/issues/38617
Signed-off-by: zjh <jhzeng93@foxmail.com>
(cherry picked from commit 94237d36932b27961afffbe65d433af26c3fe513)

Conflicts:
doc/rados/operations/health-checks.rst
- trivial
        src/mon/PGMap.cc
- cct->_conf->get_val in luminous

5 years agoclient: _readdir_cache_cb() may use the readdir_cache already clear 30934/head
huanwen ren [Wed, 7 Aug 2019 16:49:23 +0000 (00:49 +0800)]
client: _readdir_cache_cb() may use the readdir_cache already clear

Calling function _readdir_cache_cb() means to get dir information from the cache, but in the while loop,
the contents of readdir_cache are not static.

For example, _getattr() will trigger insert_trace to update readdir_cache, such as:
1. insert_trace()->clear_dir_complete_and_ordered() or
2. insert_trace()->add_update_inode()->add_update_cap()-> check_cap_issue()->clear_dir_complete_and_ordered()
So, there is a possibility that dn is empty after the _getattr() call.

Fixes: http://tracker.ceph.com/issues/41148
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
(cherry picked from commit 404c06784e46016703104db59ea73f36d09b578b)

5 years agoosd/OSDMap: do not trust partially simplified pg_upmap_item 30926/head
xie xingguo [Wed, 25 Sep 2019 11:36:10 +0000 (19:36 +0800)]
osd/OSDMap: do not trust partially simplified pg_upmap_item

If we simplified a partially no-op pg_upmap_item, we shall still
continue to verify that the remaining part is valid.
The bug is introduced by 02e5499b350bcd7d9eac98b2072052a9a4a1f535,
before which we always validate the correctness of a pg_upmap_item
before trying to cancel or simplify it.

Fixes: https://tracker.ceph.com/issues/42052
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 4196b13283144de966eeba40e6765f10b254dac6)

Conflicts:
src/osd/OSDMap.cc

5 years agomon/OSDMonitor: trim no-longer-exist failure reporters 30905/head
su_nan@inspur.com [Fri, 6 Sep 2019 02:20:42 +0000 (10:20 +0800)]
mon/OSDMonitor: trim no-longer-exist failure reporters

remove the report from failure_info in OSDMonitor::check_failure(), if
the reporter does not exist in the osdmap any longer. otherwise, we will
run into assert() failure when trying to lookup the osd in osdmap using
`osdmap.get_xinfo()`.

Fixes: https://tracker.ceph.com/issues/41680
Signed-off-by: NancySu05 <su_nan@inspur.com>
(cherry picked from commit 99ccc166ede5f296b86abfe9db0a3d597100edde)

Conflicts:
src/mon/OSDMonitor.cc
- ceph_assert, g_conf()
- account for C++17ism by moving iter initialization out of if statement

5 years agoosd/PG: Add PG to large omap log message 30922/head
Brad Hubbard [Sun, 29 Sep 2019 23:31:10 +0000 (09:31 +1000)]
osd/PG: Add PG to large omap log message

Fixes: https://tracker.ceph.com/issues/41359
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit a71d51bfa154a278a350e6dbeb842fb3585b74f5)

5 years agoosd: merge replica log on primary need according to replica log's crt 30917/head
Zengran Zhang [Mon, 12 Aug 2019 03:23:26 +0000 (11:23 +0800)]
osd: merge replica log on primary need according to replica log's crt

Fixes: https://tracker.ceph.com/issues/41194
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit ac387844e12edc9a1f481bdd1ba307ac4dc60e82)

Conflicts:
src/osd/PGLog.h
- ceph_assert

5 years agoosd: Remove unused osdmap flags full, nearfull from output 30902/head
David Zafman [Mon, 23 Sep 2019 21:31:05 +0000 (14:31 -0700)]
osd: Remove unused osdmap flags full, nearfull from output

Fixes: https://tracker.ceph.com/issues/42015
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d9c645d7d8c7355c8aaf3ff9121f2b8fc3b1290a)

5 years agoosd/OSDMap: misleading message in print_oneline_summary()
Gu Zhongyan [Mon, 5 Feb 2018 10:45:54 +0000 (18:45 +0800)]
osd/OSDMap: misleading message in print_oneline_summary()
The output scared people as showing so many osds were full/nearfull

Improve the output to make the message clearer

Fixes: http://tracker.ceph.com/issues/22350
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
(cherry picked from commit 7004b35f71a657a0d9479b7cc46acc210de303d4)

5 years agoosd/PeeringState: recover_got - add special handler for empty log 30896/head
xie xingguo [Fri, 20 Sep 2019 07:33:40 +0000 (15:33 +0800)]
osd/PeeringState: recover_got - add special handler for empty log

If we use a small osd_min[max]_pg_log_entries setting, say, 10, and
do splitting, a child pg may only be able to keep some divergent log
entries in the list. Any follow-up peering cycle on that child pg
would then rewind all the divergent log entries and lead to an empty
log list, which as a result could reliably fire the

  ceph_assert(info.last_complete == info.last_update)

assert if we start to recover any of the missing divergent objects
later.

Fixes: https://tracker.ceph.com/issues/41816
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit a5e9e9099865be7a3d90c58cf3f3fc50ed6eed6d)

Conflicts:
src/osd/PeeringState.cc
- file does not exist in the stable branch: made the changes manually to
  src/osd/PrimaryLogPG.cc

5 years agoMerge pull request #29713 from cbodley/wip-41322
Yuri Weinstein [Fri, 11 Oct 2019 13:02:20 +0000 (06:02 -0700)]
Merge pull request #29713 from cbodley/wip-41322

luminous: rgw: datalog/mdlog trim commands loop until done

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
5 years agotools/rbd-ggate: close log before running postfork 30858/head
Willem Jan Withagen [Thu, 29 Aug 2019 13:54:30 +0000 (15:54 +0200)]
tools/rbd-ggate: close log before running postfork

Otherwise the assert in Log:open() will trigger since
all data is kept during the fork and also the `is_started` flag

Fixes: https://tracker.ceph.com/issues/41592
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
(cherry picked from commit 21bdd4c6ecd24b2a7dbf8691705f228ac11481ad)

Conflicts:
src/tools/rbd_ggate/main.cc : Resolved in do_map

5 years agocls/journal: reduce verbosity of debug logs for non-errors 30857/head
Jason Dillaman [Mon, 22 Jul 2019 12:55:53 +0000 (08:55 -0400)]
cls/journal: reduce verbosity of debug logs for non-errors

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

5 years agocls/rbd: reduce verbosity of debug logs for non-errors
Jason Dillaman [Mon, 22 Jul 2019 12:55:25 +0000 (08:55 -0400)]
cls/rbd: reduce verbosity of debug logs for non-errors

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

5 years agorbd: use the ordered throttle for the export action 30856/head
Jason Dillaman [Wed, 19 Jun 2019 15:09:54 +0000 (11:09 -0400)]
rbd: use the ordered throttle for the export action

This allows exports to STDOUT to use multiple concurrent operations
and also fixes a potential race condition with concurrent callbacks
and file seeking.

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

Conflicts:
src/tools/rbd/action/Export.cc
- mimic has g_conf->get_val and int64_t "rbd_concurrent_management_ops"

5 years agoqa/workunits/rbd: wait for rbd-nbd unmap to complete 30855/head
Jason Dillaman [Mon, 6 May 2019 19:16:03 +0000 (15:16 -0400)]
qa/workunits/rbd: wait for rbd-nbd unmap to complete

The "unmap" request is asynchronous, so wait for a short amount
of time for the "rbd-nbd" daemon process to exit.

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

Conflicts:
qa/workunits/rbd/rbd-nbd.sh : Resolved for map/unmap namespace test
(cherry picked from commit b9e4644140ce9538a5162e466615d7e6b53efa7a)

5 years agorbd-nbd: output format support for list-mapped command
Mykola Golub [Wed, 27 Dec 2017 18:50:40 +0000 (20:50 +0200)]
rbd-nbd: output format support for list-mapped command

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

5 years agorbd-nbd: support optionally setting device timeout
Mykola Golub [Mon, 11 Dec 2017 17:29:00 +0000 (19:29 +0200)]
rbd-nbd: support optionally setting device timeout

Fixes: http://tracker.ceph.com/issues/22333
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
(cherry picked from commit bad51ffe7fbfe8c2e33eb0db2ef7acb89a03bd1d)

5 years agorbd-nbd: allow to unmap by image or snap spec
Mykola Golub [Sun, 24 Dec 2017 12:31:36 +0000 (14:31 +0200)]
rbd-nbd: allow to unmap by image or snap spec

(to match the behaviour of krbd unmap)

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 02e211c2822db7d3fb3792ce18cdb217c5de24ee)

5 years agoqa/workunits/rbd: bench-write is part of exclusive option test
Mykola Golub [Mon, 25 Dec 2017 11:22:59 +0000 (13:22 +0200)]
qa/workunits/rbd: bench-write is part of exclusive option test

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 47e38ca1b9f748e2f2ce1c035cd3f982d68eb492)

5 years agoMerge pull request #29269 from smithfarm/wip-40135-luminous
Yuri Weinstein [Thu, 10 Oct 2019 21:33:22 +0000 (14:33 -0700)]
Merge pull request #29269 from smithfarm/wip-40135-luminous

luminous: rgw: the Multi-Object Delete operation of S3 API wrongly handles the Code response element

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #30345 from dillaman/wip-41772-luminous
Yuri Weinstein [Thu, 10 Oct 2019 20:53:53 +0000 (13:53 -0700)]
Merge pull request #30345 from dillaman/wip-41772-luminous

luminous: common/config: hold lock while accessing mutable container

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #27974 from iain-buclaw-sociomantic/luminous-rgw-cls-bi-list-log...
Yuri Weinstein [Thu, 10 Oct 2019 20:10:39 +0000 (13:10 -0700)]
Merge pull request #27974 from iain-buclaw-sociomantic/luminous-rgw-cls-bi-list-log-level

luminous: rgw: cls/rgw: raise debug level of bi_log_iterate_entries output

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #27992 from smithfarm/wip-39016-luminous
Yuri Weinstein [Thu, 10 Oct 2019 20:10:17 +0000 (13:10 -0700)]
Merge pull request #27992 from smithfarm/wip-39016-luminous

luminous: rgw: unable to cancel reshard operations for buckets with tenants

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29153 from davebiffuk/s3_policy_tracker_39272
Yuri Weinstein [Thu, 10 Oct 2019 20:09:50 +0000 (13:09 -0700)]
Merge pull request #29153 from davebiffuk/s3_policy_tracker_39272

luminous: rgw: policy fix for nonexistent objects

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29170 from cbodley/wip-qa-rgw-tempest-luminous
Yuri Weinstein [Thu, 10 Oct 2019 20:09:17 +0000 (13:09 -0700)]
Merge pull request #29170 from cbodley/wip-qa-rgw-tempest-luminous

luminous: qa/rgw: remove incomplete rgw/tempest suite from luminous

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #29271 from smithfarm/wip-40143-luminous
Yuri Weinstein [Thu, 10 Oct 2019 20:08:30 +0000 (13:08 -0700)]
Merge pull request #29271 from smithfarm/wip-40143-luminous

luminous: rgw: multisite: 'radosgw-admin bucket sync status' should call syncs_from(source.name) instead of id

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29295 from dillaman/wip-40233-luminous
Yuri Weinstein [Thu, 10 Oct 2019 20:07:59 +0000 (13:07 -0700)]
Merge pull request #29295 from dillaman/wip-40233-luminous

luminous: rbd/action: fix error getting positional argument

Reviewed-by: Mykola Golub <mgolub@mirantis.com>