]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agotest: Add option to wait_for_clean() to execute at every sleep
David Zafman [Sat, 26 Jan 2019 00:03:30 +0000 (16:03 -0800)]
test: Add option to wait_for_clean() to execute at every sleep

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 70b51362084d2ae5f2a6e9e5856f17452c53e3f3)

6 years agoosd/PG: fix misused FORCE_RECOVERY[BACKFILL] flags
xie xingguo [Tue, 4 Sep 2018 07:34:24 +0000 (15:34 +0800)]
osd/PG: fix misused FORCE_RECOVERY[BACKFILL] flags

__set_force_backfill__ should set PG_STATE_FORCED_BACKFILL
instead of PG_STATE_FORCED_RECOVERY.

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

Conflicts:
src/osd/PG.cc (trivial)

6 years agoosd: print summary for forced backfill/recovery to debug
Sage Weil [Mon, 18 Sep 2017 21:53:31 +0000 (16:53 -0500)]
osd: print summary for forced backfill/recovery to debug

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

Conflicts:
src/osd/PG.h (pg_id public like master for OSDService::adjust_pg_priorities())

6 years agoosd/PG: clean up set_force_{recovery,backfill} interface
Sage Weil [Wed, 13 Sep 2017 22:09:35 +0000 (18:09 -0400)]
osd/PG: clean up set_force_{recovery,backfill} interface

- update state under pg lock
- clean up PG interface
- log only when we adjust the state

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

Conflicts:
src/osd/PG.h (trivial)

6 years agoMerge pull request #26686 from dzafman/wip-test-fix
Neha Ojha [Mon, 4 Mar 2019 22:28:22 +0000 (14:28 -0800)]
Merge pull request #26686 from dzafman/wip-test-fix

luminous: qa/workunits/cephtool/test.sh: Use :- to handle TMPDIR=""

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yuri Weinstein <yweinstei@redhat.com>
6 years agoMerge pull request #26546 from cbodley/wip-38410-luminous
Yuri Weinstein [Mon, 4 Mar 2019 17:06:17 +0000 (09:06 -0800)]
Merge pull request #26546 from cbodley/wip-38410-luminous

luminous: rgw: fix cls_bucket_head result order consistency

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #26548 from cbodley/wip-38414-luminous
Yuri Weinstein [Mon, 4 Mar 2019 17:05:50 +0000 (09:05 -0800)]
Merge pull request #26548 from cbodley/wip-38414-luminous

luminous: rgw: bug in versioning concurrent, list and get have consistency issue

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #25825 from pdvian/wip-36434-luminous
Yuri Weinstein [Thu, 28 Feb 2019 19:35:25 +0000 (11:35 -0800)]
Merge pull request #25825 from pdvian/wip-36434-luminous

luminous: mon: monstore tool rebuild does not generate creating_pgs

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #25855 from ashishkumsingh/wip-37825-luminous
Yuri Weinstein [Thu, 28 Feb 2019 19:30:16 +0000 (11:30 -0800)]
Merge pull request #25855 from ashishkumsingh/wip-37825-luminous

luminous: os/bluestore: KernelDevice::read() does the EIO mapping now.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agoMerge pull request #25956 from xiexingguo/wip-liminous-async-fixes
Yuri Weinstein [Thu, 28 Feb 2019 19:29:28 +0000 (11:29 -0800)]
Merge pull request #25956 from xiexingguo/wip-liminous-async-fixes

luminous: msg/async: backport recent messenger fixes

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26042 from trociny/wip-37972-luminous
Yuri Weinstein [Thu, 28 Feb 2019 19:24:46 +0000 (11:24 -0800)]
Merge pull request #26042 from trociny/wip-37972-luminous

luminous: msg/msg_types: fix the dencoder of entity_addr_t

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26284 from smithfarm/wip-38140-luminous
Yuri Weinstein [Thu, 28 Feb 2019 19:24:17 +0000 (11:24 -0800)]
Merge pull request #26284 from smithfarm/wip-38140-luminous

luminous: tests: Add hashinfo testing for dump command of ceph-objectstore-tool

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #26501 from k0ste/luminous_backports2
Yuri Weinstein [Thu, 28 Feb 2019 19:23:50 +0000 (11:23 -0800)]
Merge pull request #26501 from k0ste/luminous_backports2

luminous: mgr/balancer: restrict automatic balancing to specific weekdays

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #26656 from jan--f/c-v-simple-activate-all-luminous
Andrew Schoen [Wed, 27 Feb 2019 21:58:51 +0000 (15:58 -0600)]
Merge pull request #26656 from jan--f/c-v-simple-activate-all-luminous

luminous: ceph-volume: add --all flag to simple activate

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #26065 from pdvian/wip-37989-luminous
Yuri Weinstein [Tue, 26 Feb 2019 22:18:17 +0000 (14:18 -0800)]
Merge pull request #26065 from pdvian/wip-37989-luminous

luminous: MDSMonitor: missing osdmon writeable check

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #25858 from ashishkumsingh/wip-37823-luminous
Yuri Weinstein [Tue, 26 Feb 2019 22:14:18 +0000 (14:14 -0800)]
Merge pull request #25858 from ashishkumsingh/wip-37823-luminous

luminous: mds: log evicted clients to clog/dbg

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #25979 from pdvian/wip-37908-luminous
Yuri Weinstein [Tue, 26 Feb 2019 22:13:47 +0000 (14:13 -0800)]
Merge pull request #25979 from pdvian/wip-37908-luminous

luminous: mds: wait shorter intervals if beacon not sent

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26215 from pdvian/wip-38102-luminous
Yuri Weinstein [Tue, 26 Feb 2019 22:11:50 +0000 (14:11 -0800)]
Merge pull request #26215 from pdvian/wip-38102-luminous

luminous: mds: trim cache after journal flush

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26293 from pdvian/wip-38190-luminous
Yuri Weinstein [Tue, 26 Feb 2019 22:11:21 +0000 (14:11 -0800)]
Merge pull request #26293 from pdvian/wip-38190-luminous

luminous: mds: broadcast quota message to client when disable quota

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26473 from pdvian/wip-38336-luminous
Yuri Weinstein [Tue, 26 Feb 2019 22:10:51 +0000 (14:10 -0800)]
Merge pull request #26473 from pdvian/wip-38336-luminous

luminous: mds: fix potential re-evaluate stray dentry in _unlink_local_finish

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoceph-volume: add --all flag to simple activate 26656/head
Jan Fajerski [Thu, 31 Jan 2019 12:45:46 +0000 (13:45 +0100)]
ceph-volume: add --all flag to simple activate

This is intended to behave similarly to the lvm activate --all argument.
When passed, c-v will scan /etc/ceph/osd/ (or the location specified by
CEPH_VOLUME_SIMPLE_JSON_DIR) for json files (glob *.json) and call activate
for each file.  This should greatly ease the take-over of ceph-disk OSDs
with manual commands and deployment tools like DeepSea and ceph-ansible.
Also adds a simple unit test and modifies the
simple/centos7/filestore/activate functional test to use --all.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 05af94c6fca66083107e96e9aa1db87619e77e66)

 Conflicts:
src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
        resolved by deleting everything after conflict marker

6 years agoMerge pull request #25611 from pdvian/wip-37561-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:47:05 +0000 (12:47 -0800)]
Merge pull request #25611 from pdvian/wip-37561-luminous

luminous: rgw: rgwgc: process coredump in some special case

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25986 from ashishkumsingh/wip-37937-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:46:44 +0000 (12:46 -0800)]
Merge pull request #25986 from ashishkumsingh/wip-37937-luminous

luminous: librgw: export multitenancy support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #26310 from pdvian/wip-38193-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:46:20 +0000 (12:46 -0800)]
Merge pull request #26310 from pdvian/wip-38193-luminous

luminous: Object can still be deleted even if s3:DeleteObject policy is set

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25738 from pdvian/wip-37648-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:43:57 +0000 (12:43 -0800)]
Merge pull request #25738 from pdvian/wip-37648-luminous

luminous: rgw: feature -- log successful bucket resharding events

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #25901 from ashishkumsingh/wip-37559-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:43:20 +0000 (12:43 -0800)]
Merge pull request #25901 from ashishkumsingh/wip-37559-luminous

luminous: rgw: handle S3 version 2 pre-signed urls with meta-data

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
6 years agoMerge pull request #26131 from pdvian/wip-38038-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:42:40 +0000 (12:42 -0800)]
Merge pull request #26131 from pdvian/wip-38038-luminous

luminous: rgw: fails to start on Fedora 28 from default configuration

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #26192 from cbodley/wip-38079-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:42:08 +0000 (12:42 -0800)]
Merge pull request #26192 from cbodley/wip-38079-luminous

luminous: rgw: bucket full sync handles delete markers

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #26263 from pdvian/wip-38148-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:41:20 +0000 (12:41 -0800)]
Merge pull request #26263 from pdvian/wip-38148-luminous

luminous: rgw: "radosgw-admin bucket rm ... --purge-objects" can hang

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agoMerge pull request #26332 from smithfarm/wip-38232-luminous
Yuri Weinstein [Mon, 25 Feb 2019 20:40:36 +0000 (12:40 -0800)]
Merge pull request #26332 from smithfarm/wip-38232-luminous

luminous: rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
6 years agomgr/balancer: make weekday be compatible with C 26501/head
xie xingguo [Tue, 19 Feb 2019 10:36:25 +0000 (18:36 +0800)]
mgr/balancer: make weekday be compatible with C

The __desc__ field of **begin[end]_weekend** suggests
sunday is the prevailing start of the week, whereas the
Python implementation says no.

See https://stackoverflow.com/questions/21045569/why-is-pythons-weekday-different-from-tm-wday-in-c

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit b9da0925490d4e9e964249c54e7775d9c76b1719)

6 years agomgr/balancer: restrict automatic balancing to specific weekdays
xie xingguo [Fri, 15 Feb 2019 05:35:53 +0000 (13:35 +0800)]
mgr/balancer: restrict automatic balancing to specific weekdays

We have implemented similar semantics for the scrub behaviour.
Let's try to keep pace with that.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 0412a51ac6dfecc1a72b654196ecb1a599dcc94d)

Conflicts:
- path: src/pybind/mgr/balancer/module.py
  comment: 'get_module_option()' -> 'get_config()' for mgr config-key
    'begin_weekday' and 'begin_weekday' should be int, but
    luminous/mimic config-key always return string.

6 years agoMerge pull request #26587 from smithfarm/wip-doc-fix-luminous
Nathan Cutler [Fri, 22 Feb 2019 13:00:37 +0000 (14:00 +0100)]
Merge pull request #26587 from smithfarm/wip-doc-fix-luminous

luminous: doc: Fix default value of 'mon_osd_max_split_count'

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agodoc: Fix default value of 'mon_osd_max_split_count' 26587/head
Kai Wagner [Fri, 22 Feb 2019 10:25:06 +0000 (11:25 +0100)]
doc: Fix default value of 'mon_osd_max_split_count'

This commit is not cherry-picked from master because the config
parameter mon_osd_max_split_count has been dropped in master

Signed-off-by: Kai Wagner <kwagner@suse.com>
(cherry picked from commit 17d503f5adfbfd96502877bcb55c42ba1eb34a5c)

6 years agoMerge pull request #24906 from tchaikov/wip-23673-luminous
Yuri Weinstein [Thu, 21 Feb 2019 23:29:07 +0000 (15:29 -0800)]
Merge pull request #24906 from tchaikov/wip-23673-luminous

luminous: auth: ceph auth add does not sanity-check caps

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #25711 from ashishkumsingh/wip-37756-luminous
Yuri Weinstein [Thu, 21 Feb 2019 23:27:41 +0000 (15:27 -0800)]
Merge pull request #25711 from ashishkumsingh/wip-37756-luminous

luminous: osd/PrimaryLogPG: fix the extent length error of the sync read

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #25722 from ashishkumsingh/wip-37690-luminous
Yuri Weinstein [Thu, 21 Feb 2019 23:26:41 +0000 (15:26 -0800)]
Merge pull request #25722 from ashishkumsingh/wip-37690-luminous

luminous: tools: ceph-objectstore-tool: Dump hashinfo

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #25851 from ashishkumsingh/wip-37815-luminous
Yuri Weinstein [Thu, 21 Feb 2019 23:25:38 +0000 (15:25 -0800)]
Merge pull request #25851 from ashishkumsingh/wip-37815-luminous

luminous: qa/workunits/rados/test_health_warnings: prevent out osds

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #25853 from ashishkumsingh/wip-37833-luminous
Yuri Weinstein [Thu, 21 Feb 2019 23:24:52 +0000 (15:24 -0800)]
Merge pull request #25853 from ashishkumsingh/wip-37833-luminous

luminous: objecter: avoid race when reset down osd's session

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #26305 from dzafman/wip-38207
Yuri Weinstein [Thu, 21 Feb 2019 23:23:42 +0000 (15:23 -0800)]
Merge pull request #26305 from dzafman/wip-38207

luminous: mon: A PG with PG_STATE_REPAIR doesn't mean damaged data, PG_STATE_IN…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #26078 from ashishkumsingh/wip-37993-luminous
Yuri Weinstein [Thu, 21 Feb 2019 21:54:12 +0000 (13:54 -0800)]
Merge pull request #26078 from ashishkumsingh/wip-37993-luminous

luminous: osd: keep using cache even if op will invalid cache

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26148 from ashishkumsingh/wip-38046-luminous
Yuri Weinstein [Thu, 21 Feb 2019 21:53:43 +0000 (13:53 -0800)]
Merge pull request #26148 from ashishkumsingh/wip-38046-luminous

luminous: tests: qa/overrides/short_pg_log.yaml: reduce osd_{min,max}_pg_log_entries

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #26236 from pdvian/wip-38105-luminous
Yuri Weinstein [Thu, 21 Feb 2019 21:53:16 +0000 (13:53 -0800)]
Merge pull request #26236 from pdvian/wip-38105-luminous

luminous: osd/PG.cc: account for missing set irrespective of last_complete

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #26261 from pdvian/wip-38142-luminous
Yuri Weinstein [Thu, 21 Feb 2019 21:52:38 +0000 (13:52 -0800)]
Merge pull request #26261 from pdvian/wip-38142-luminous

luminous: os/bluestore: fixup access a destroy cond cause deadlock or undefine

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agorgw: bug in versioning concurrent, list and get have consistency issue 26548/head
wanghao72 [Wed, 30 Jan 2019 07:18:06 +0000 (15:18 +0800)]
rgw: bug in versioning concurrent, list and get have consistency issue

Fixes: https://tracker.ceph.com/issues/38060
Signed-off-by: Wang Hao <wanghao72@baidu.com>
(cherry picked from commit cc2a96a47fd71dc8399e31f1a9e87d8a13ea3419)

6 years agorgw: fix cls_bucket_head result order consistency 26546/head
Tianshan Qu [Fri, 3 Nov 2017 07:53:41 +0000 (15:53 +0800)]
rgw: fix cls_bucket_head result order consistency

headers's key is string but bucket_instance_ids's key is int
looked around and found no one use header's key, so change
header from map to vector

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 46657a0f72530f50f1c94374a27edb57deb70de0)

Conflicts:
src/rgw/rgw_rados.h: unordered bucket listing

6 years agoMerge pull request #25720 from ashishkumsingh/wip-36692-luminous
Yuri Weinstein [Mon, 18 Feb 2019 17:06:25 +0000 (09:06 -0800)]
Merge pull request #25720 from ashishkumsingh/wip-36692-luminous

luminous: rbd-mirror: update mirror status when stopping

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #25768 from ashishkumsingh/wip-26913-luminous
Yuri Weinstein [Mon, 18 Feb 2019 17:05:42 +0000 (09:05 -0800)]
Merge pull request #25768 from ashishkumsingh/wip-26913-luminous

luminous: mgr: "balancer execute" only requires read permissions

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
6 years agoMerge pull request #25955 from pdvian/wip-37901-luminous
Yuri Weinstein [Mon, 18 Feb 2019 17:04:50 +0000 (09:04 -0800)]
Merge pull request #25955 from pdvian/wip-37901-luminous

luminous: [journal] max journal order is incorrectly set at 64

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #26000 from pdvian/wip-37926-luminous
Yuri Weinstein [Mon, 18 Feb 2019 17:04:19 +0000 (09:04 -0800)]
Merge pull request #26000 from pdvian/wip-37926-luminous

luminous: common: fix for broken rbdmap parameter parsing

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #26286 from smithfarm/wip-38186-luminous
Yuri Weinstein [Mon, 18 Feb 2019 17:03:49 +0000 (09:03 -0800)]
Merge pull request #26286 from smithfarm/wip-38186-luminous

luminous: tests: krbd discard no longer guarantees zeroing

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
6 years agomds: fix potential re-evaluate stray dentry in _unlink_local_finish 26473/head
Zhi Zhang [Tue, 12 Feb 2019 02:44:31 +0000 (10:44 +0800)]
mds: fix potential re-evaluate stray dentry in _unlink_local_finish

If MDS handles cap release before _unlink_local_finish, then when MDS
processes _unlink_local_finish, eval_stray might be re-entered twice,
so this will cause crashing.

Fixes: http://tracker.ceph.com/issues/38263
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit 72c93baac64211e9f02fa01e743451bf5d63d7a6)

Conflicts:
src/mds/MDCache.h : Resolved in notify_stray

6 years agotest: Add "slow request" to whitelist for Luminous 26686/head
David Zafman [Fri, 15 Feb 2019 10:00:52 +0000 (02:00 -0800)]
test: Add "slow request" to whitelist for Luminous
Redo backport 0e987665fe480530a0d1664392604713828bfa5c

Replaces: 77258ed181dbe04e56da249a71edd3220baf954a

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 0e987665fe480530a0d1664392604713828bfa5c)

Conflicts:
qa/suites/rados/singleton/all/osd-recovery.yaml (Use "slow request" for luminous)
qa/suites/rados/singleton/all/thrash-eio.yaml (Use "slow request" for luminous, keep OBJECT_MISPLACED)

6 years agoRevert "qa/suites/rados/singleton: more whitelist"
David Zafman [Fri, 15 Feb 2019 09:59:37 +0000 (01:59 -0800)]
Revert "qa/suites/rados/singleton: more whitelist"

This reverts commit 77258ed181dbe04e56da249a71edd3220baf954a.

Signed-off-by: David Zafman <dzafman@redhat.com>
Conflicts:
qa/suites/rados/singleton/all/osd-recovery.yaml (trivial)
qa/suites/rados/singleton/all/thrash-eio.yaml (trivial)

6 years agoqa/workunits/cephtool/test.sh: Use :- to handle TMPDIR=""
David Zafman [Fri, 15 Feb 2019 07:12:36 +0000 (23:12 -0800)]
qa/workunits/cephtool/test.sh: Use :- to handle TMPDIR=""

Only Luminous has seen TMPDIR="" coming into this script.

Signed-off-by: David Zafman <dzafman@redhat.com>
6 years agomsg/async: do not force updating rotating keys inline 25956/head
xie xingguo [Tue, 15 Jan 2019 05:49:40 +0000 (13:49 +0800)]
msg/async: do not force updating rotating keys inline

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agomsg/async: fix mark_down vs accept race
xie xingguo [Tue, 15 Jan 2019 05:47:09 +0000 (13:47 +0800)]
msg/async: fix mark_down vs accept race

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #25990 from ukernel/luminous-37760
Yuri Weinstein [Tue, 12 Feb 2019 21:52:53 +0000 (13:52 -0800)]
Merge pull request #25990 from ukernel/luminous-37760

luminous: mds: handle fragment notify race

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #26005 from ukernel/luminous-37481
Yuri Weinstein [Tue, 12 Feb 2019 21:52:21 +0000 (13:52 -0800)]
Merge pull request #26005 from ukernel/luminous-37481

luminous: mds: handle state change race

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #26257 from batrick/i38084
Yuri Weinstein [Tue, 12 Feb 2019 21:51:56 +0000 (13:51 -0800)]
Merge pull request #26257 from batrick/i38084

luminous: mds: log new client sessions with various metadata

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #26271 from batrick/i38104
Yuri Weinstein [Tue, 12 Feb 2019 21:51:24 +0000 (13:51 -0800)]
Merge pull request #26271 from batrick/i38104

luminous: client: session flush does not cause cap release message flush

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #26278 from ukernel/luminous-stale-caps
Yuri Weinstein [Tue, 12 Feb 2019 21:50:52 +0000 (13:50 -0800)]
Merge pull request #26278 from ukernel/luminous-stale-caps

luminous: mds: optimize revoking stale caps

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #26326 from alfredodeza/luminous-rm38229
Andrew Schoen [Fri, 8 Feb 2019 15:58:07 +0000 (09:58 -0600)]
Merge pull request #26326 from alfredodeza/luminous-rm38229

luminous: doc: pin the version for "breathe" to 4.1.11

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agorgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF 26332/head
Nathan Cutler [Fri, 8 Feb 2019 11:34:19 +0000 (12:34 +0100)]
rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF

The master commit 5c040d991510cb4ff0d74305889130e2d84fedc1 fixing issue
http://tracker.ceph.com/issues/23680 was backported to luminous for v12.2.11 by
a47e714e7f5ce803ba7d8986c5d954123b85fc8e which was included in
https://github.com/ceph/ceph/pull/24621, where it came as the first of a series
of five cherry-picks.

This, it turns out, was the wrong order - it should have come last since it
was a follow-up fix.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(partial manual backport of 5c040d991510cb4ff0d74305889130e2d84fedc1)

6 years agodoc: pin the version for `breathe` to 4.1.11 26326/head
Alfredo Deza [Thu, 7 Feb 2019 22:04:47 +0000 (17:04 -0500)]
doc: pin the version for `breathe` to 4.1.11

It has the compatibility needed for Sphinx version 1.6.3

Signed-off-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #26295 from jan--f/25390-luminous
Andrew Schoen [Thu, 7 Feb 2019 21:29:43 +0000 (15:29 -0600)]
Merge pull request #26295 from jan--f/25390-luminous

[luminous] ceph-volume: revert partition as disk

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agorgw: cleanup for RGWDeleteObj::verify_permission() 26310/head
Enming.Zhang [Tue, 27 Nov 2018 11:41:56 +0000 (06:41 -0500)]
rgw: cleanup for RGWDeleteObj::verify_permission()

- if the 'Effect' field of user policy and bucket policy
  is set to 'Allow', RGWDeleteObj::verify_permission()
  should return 0 instead of true;

- as the same with bucket policy, if the 'Effect' field
  of user policy is set to 'Deny', RGWDeleteObj::verify_permission()
  should return -EACCES instead of false;

Signed-off-by: Enming.Zhang <zvampirem77@gmail.com>
(cherry picked from commit 86334645cf96c03515d30804e2df0bdf22916fb5)

Conflicts:
src/rgw/rgw_op.cc : Resolved in verify_permission

6 years agorgw: fix obj can still be deleted even if deleteobject policy is set
Enming.Zhang [Tue, 27 Nov 2018 10:05:32 +0000 (05:05 -0500)]
rgw: fix obj can still be deleted even if deleteobject policy is set

Fixes: http://tracker.ceph.com/issues/37403
Signed-off-by: Enming.Zhang <zvampirem77@gmail.com>
(cherry picked from commit 84879e915eb3f01b453aa2138cd44c09925e7cd1)

Conflicts:
src/rgw/rgw_op.cc : Resolved in verify_permission

6 years agoceph-volume: add inventory call to functional tests 26295/head
Jan Fajerski [Fri, 7 Dec 2018 08:59:34 +0000 (09:59 +0100)]
ceph-volume: add inventory call to functional tests

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit a183a28c5e423c5658a37f7a1d3add9d64c6d683)

6 years agoceph-volume: add partition support to Device
Jan Fajerski [Tue, 4 Dec 2018 16:00:59 +0000 (17:00 +0100)]
ceph-volume: add partition support to Device

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 05ac680cb37fd15fdeadaea86780bf1b4f2d566a)

6 years agoRevert "ceph-volume tests.util ensure partitions are listed as top-level keys"
Jan Fajerski [Tue, 4 Dec 2018 07:33:53 +0000 (08:33 +0100)]
Revert "ceph-volume tests.util ensure partitions are listed as top-level keys"

This reverts commit 6dc01772245e557b73551111f7c48cc60aec0893.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 3c1c32cbc2736d72295f1bd7921c4a3cd2f4727e)

6 years agoRevert "ceph-volume util.disk include partitions as top level devices in get_devices"
Jan Fajerski [Tue, 4 Dec 2018 07:29:39 +0000 (08:29 +0100)]
Revert "ceph-volume util.disk include partitions as top level devices in get_devices"

This reverts commit 7f3c3598491e556ec1b93ea0a54f52144202fab6.
Fixes: http://tracker.ceph.com/issues/37506
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 50bc44f1c2327ad38504950fe62820a44ead9b14)

6 years agomds: broadcast quota message to client when disable quota 26293/head
Junhui Tang [Thu, 24 Jan 2019 08:33:58 +0000 (16:33 +0800)]
mds: broadcast quota message to client when disable quota

When disable quota by setting quota.max_files or quota.max_bytes
to zero, client does not receive the quota broadcast message.

Signed-off-by: Junhui Tang <tangjunhui@sangfor.com.cn>
Fixes: https://tracker.ceph.com/issues/38054
(cherry picked from commit 061ace2eb7c08d271db4d5d08ffa91ae832715f5)

Conflicts:
src/mds/MDCache.cc : Resolved in broadcast_quota_to_client

6 years agoqa: update krbd tests for zeroout 26286/head
Ilya Dryomov [Fri, 1 Feb 2019 09:35:33 +0000 (10:35 +0100)]
qa: update krbd tests for zeroout

Discard no longer guarantees zeroing, use BLKZEROOUT and "fallocate -z"
instead (blkdiscard(8) in xenial doesn't support -z).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 04f5b343f9987f0cf67509c2a76ddf7ef46288e5)

Conflicts:
qa/rbd/krbd_whole_object_zeroout.t
qa/suites/krbd/basic/tasks/krbd_whole_object_zeroout.yaml
- the modifications to these files are not relevant for luminous

6 years agotest: ceph-objectstore-tool cut down on large run 26284/head
David Zafman [Sun, 27 Jan 2019 03:22:43 +0000 (19:22 -0800)]
test: ceph-objectstore-tool cut down on large run

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 388e54d906512106c38088d4ce18842985dd000c)

6 years agotest: ceph-objectstore-tool: Add test for EC object dump to check hinfo section
David Zafman [Sat, 26 Jan 2019 19:25:16 +0000 (11:25 -0800)]
test: ceph-objectstore-tool: Add test for EC object dump to check hinfo section

Fixes: http://tracker.ceph.com/issues/38053
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 07e4273c6a0d48adf0dd2f3370e07b99f43bd013)

6 years agotest: ceph-objectstore-tool: Fix EC code handling so it doesn't skip EC objects
David Zafman [Sat, 26 Jan 2019 19:24:38 +0000 (11:24 -0800)]
test: ceph-objectstore-tool: Fix EC code handling so it doesn't skip EC objects

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 786b39f18f6df21991582c178595ce87d28633d1)

6 years agomds: optimize resuming stale caps 26278/head
Yan, Zheng [Mon, 10 Dec 2018 03:37:32 +0000 (11:37 +0800)]
mds: optimize resuming stale caps

If client doesn't want any cap, there is no need to re-issue stale
caps.

A special case is that client wants some caps, but skipped updating
'wanted'. For this case, client needs to update 'wanted' when stale
session get renewed.

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

 Conflicts:
src/client/Client.cc
src/mds/cephfs_features.h

6 years agoclient: avoid unnecessary wakeup when handling RENEWCAPS
Yan, Zheng [Thu, 6 Dec 2018 09:22:25 +0000 (17:22 +0800)]
client: avoid unnecessary wakeup when handling RENEWCAPS

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

6 years agoclient: set cap->wanted when adding new cap
Yan, Zheng [Thu, 6 Dec 2018 07:30:44 +0000 (15:30 +0800)]
client: set cap->wanted when adding new cap

This avoids unnecessary cap message if cap is added by open/create
request reply.

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

 Conflicts:
src/client/Client.cc
src/client/Client.h

6 years agoclient: don't wakeup cap waiters twice when mds recovered
Yan, Zheng [Thu, 6 Dec 2018 09:16:49 +0000 (17:16 +0800)]
client: don't wakeup cap waiters twice when mds recovered

Both kick_maxsize_requests() and wake_inode_waiters() wake up cap
waiters

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

 Conflicts:
src/client/Client.cc
src/client/Client.h

6 years agomds: optimize revoking stale caps
Yan, Zheng [Tue, 5 Feb 2019 09:06:48 +0000 (17:06 +0800)]
mds: optimize revoking stale caps

For caps that are not being revoked and don't have writeable range
and don't want exclusive caps or file read/write. there is no need
to call Locker::revoke_stale_caps(Capability*). Because these caps
don't need recover and don't affect eval_gather()/try_eval().

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

 Conflicts:
src/mds/CInode.cc
src/mds/Capability.h
src/mds/Locker.cc
src/mds/Migrator.cc

6 years agomds: put notable caps at the front of session's caps list
Yan, Zheng [Thu, 22 Nov 2018 09:28:15 +0000 (17:28 +0800)]
mds: put notable caps at the front of session's caps list

Notable Capabilities are ones that are being revoked, ones that
have writeable ranges and ones that want exclusive caps or want
file read/write.

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

 Conflicts:
src/mds/Capability.cc

6 years agomds: track if client has writeable range in Capability
Yan, Zheng [Wed, 21 Nov 2018 12:22:25 +0000 (20:22 +0800)]
mds: track if client has writeable range in Capability

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

 Conflicts:
src/mds/Capability.h
src/mds/Locker.cc
src/mds/MDCache.h
src/mds/Server.cc

6 years agomds: add session pointer to Capability
Yan, Zheng [Mon, 26 Nov 2018 01:44:56 +0000 (09:44 +0800)]
mds: add session pointer to Capability

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

 Conflicts:
src/mds/CInode.cc
src/mds/Capability.cc
src/mds/Capability.h
src/mds/Locker.cc

6 years agoclient: skip updating 'wanted' caps if caps are already issued
Yan, Zheng [Thu, 22 Nov 2018 07:02:36 +0000 (15:02 +0800)]
client: skip updating 'wanted' caps if caps are already issued

When reading cached inode that already has Fscr caps, this can avoid
two cap messages (one updats 'wanted' caps, one clears 'wanted' caps).

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

 Conflicts:
src/client/Client.cc

6 years agoclient: sync 'retain caps' logical from kernel client
Yan, Zheng [Thu, 22 Nov 2018 07:55:12 +0000 (15:55 +0800)]
client: sync 'retain caps' logical from kernel client

The main change is keeping CEPH_CAP_ANY_RD for unused file inodes

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

6 years agoMerge pull request #26207 from vumrao/wip-vumrao-38108
Neha Ojha [Mon, 4 Feb 2019 16:43:53 +0000 (08:43 -0800)]
Merge pull request #26207 from vumrao/wip-vumrao-38108

luminous: mgr/DaemonServer: log pgmap usage to cluster log

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #26186 from tchaikov/luminous-36737
Kefu Chai [Mon, 4 Feb 2019 16:20:53 +0000 (00:20 +0800)]
Merge pull request #26186 from tchaikov/luminous-36737

luminous: build/ops: Allow multi instances of "make tests" on the same machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
6 years agoclient: flush cap release on session flush 26271/head
Patrick Donnelly [Tue, 22 Jan 2019 18:44:26 +0000 (10:44 -0800)]
client: flush cap release on session flush

MDS expects the completed cap release prior to responding to the session flush
for cache drop.

Fixes: http://tracker.ceph.com/issues/38009
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 59eca7a17816317d5064840745ea5e28d3349d1a)

Conflicts:
src/client/Client.cc

6 years agorgw: `radosgw-admin bucket rm ... --purge-objects` can hang... 26263/head
J. Eric Ivancich [Thu, 31 Jan 2019 19:21:07 +0000 (14:21 -0500)]
rgw: `radosgw-admin bucket rm ... --purge-objects` can hang...

This command can hang (i.e., enter an infinite loop) due to
problematic bucket index entries left as a result of bug
https://tracker.ceph.com/issues/38007 .

The fix is to ignore the false bucket index entries -- since they do
not represent actual objects -- and remove all actual objects in the
bucket, so that bucket itself can be removed.

This fixes the both code paths whether `--bypass-gc` is specified or
not.

Furthermore, to made these operations more efficient, the internal
listing of the bucket is done unordered. This would improve behavior
when removing buckets with a large number of objects.

Fixes: http://tracker.ceph.com/issues/38134
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 5b3dc38c628728651b26415ab3d2190cf06b9e39)

6 years agomon: A PG with PG_STATE_REPAIR doesn't mean damaged data, PG_STATE_INCONSISTENT does 26303/head 26305/head
David Zafman [Mon, 28 Jan 2019 22:30:29 +0000 (14:30 -0800)]
mon: A PG with PG_STATE_REPAIR doesn't mean damaged data, PG_STATE_INCONSISTENT does

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

6 years agoos/bluestore: fixup access a destroy cond cause deadlock or undefine 26261/head
linbing [Fri, 21 Dec 2018 00:22:30 +0000 (08:22 +0800)]
os/bluestore: fixup access a destroy cond cause deadlock or undefine
              behavior.

Fixes: https://tracker.ceph.com/issues/37733
Signed-off-by: linbing <linbing@t2cloud.net>
(cherry picked from commit dbbde306484276251cbd7a7b7a6fde0093f98ba2)

Conflicts:
src/os/bluestore/BlockDevice.h : Resolved in try_aio_wake

6 years agomds: do not log internal journal error 26257/head
Patrick Donnelly [Thu, 3 Jan 2019 22:02:52 +0000 (14:02 -0800)]
mds: do not log internal journal error

MDS can't reach this code due to assert in C_MDS_session_finish.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0992ac1fa62edb6143efc80a6fea7b4704107705)

Conflicts:
src/mds/Server.cc

6 years agomds: clean up log level 2 messages
Patrick Donnelly [Mon, 17 Dec 2018 23:05:24 +0000 (15:05 -0800)]
mds: clean up log level 2 messages

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit a225c266052d09ffcb066aead83a18dec918aa35)

Conflicts:
src/mds/MDSRank.cc

6 years agomds: log session open stats
Patrick Donnelly [Sat, 15 Dec 2018 02:16:09 +0000 (18:16 -0800)]
mds: log session open stats

This is to assist with tracking what clients are connecting and how long it
takes for them to open a session (a rough estimate of how long it takes to
mount).

Example line:

    2018-12-17 17:21:31.682 7f822703c700  2 mds.0.server New client session: addr="127.0.0.1:60552/2307908923",elapsed=0.013384,throttled=0.000071,status="ACCEPTED",root="/"

Fixes: http://tracker.ceph.com/issues/37678
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit c89cd8cac16789ed98dc1487ec17f45adf03dd26)

Conflicts:
src/mds/Server.cc
src/mds/SessionMap.cc
src/mds/SessionMap.h
src/mds/events/ESession.h

6 years agoosd/PG.cc: account for missing set irrespective of last_complete 26236/head
Neha Ojha [Thu, 24 Jan 2019 20:46:49 +0000 (12:46 -0800)]
osd/PG.cc: account for missing set irrespective of last_complete

When adding source info from another OSD, check if an object that needs
recovery is present in its missing set. If yes, do not include the OSD
as a missing loc.

Fixes: http://tracker.ceph.com/issues/37919
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit e6b1637e00a3e98e588e4b83a13db5703fb96fce)

6 years agocmake: use $CMAKE_BINARY_DIR for default $CEPH_BUILD_VIRTUALENV 26186/head
Kefu Chai [Wed, 23 Jan 2019 11:41:18 +0000 (19:41 +0800)]
cmake: use $CMAKE_BINARY_DIR for default $CEPH_BUILD_VIRTUALENV

to avoid conflict with other `make check` runs in the same host

See-also: http://tracker.ceph.com/issues/36737
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit a8d6b2170dfa0838dad0d1b7b03fc8cf19e4eeff)

Conflicts:
- drop the change to mgr/*/run-tox.sh, as they don't exist in
luminous.
        - apply the change to ceph-disk/run-tox.sh
- apply the change to ceph-helpers.sh: as it set $PATH using
          $TMPDIR, which is set to /tmp if $TMPDIR is empty.

6 years agomds: trim cache after journal flush 26215/head
Patrick Donnelly [Tue, 22 Jan 2019 20:12:55 +0000 (12:12 -0800)]
mds: trim cache after journal flush

Dropping cache should trim the cache only after journal flush otherwise dirty
inodes will remain pinned in cache.

Fixes: http://tracker.ceph.com/issues/38010
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d7f6c1583b4162fade434e376176f3068472f53f)

6 years agomgr/DaemonServer: log pgmap usage to cluster log 26207/head
Neha Ojha [Thu, 24 Jan 2019 03:25:12 +0000 (19:25 -0800)]
mgr/DaemonServer: log pgmap usage to cluster log

- change default of mon_cluster_log_file_level to debug
- log to clog->debug()

Fixes: https://tracker.ceph.com/issues/37886
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit f64a69e5054fb319e9f717bbcb7ddd8541e01c6f)

 Conflicts:
src/common/options.cc
        dropped master .add_service, .add_see_also