]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomon/MDSMonitor: no_reply on MMDSLoadTargets 21684/head
Sage Weil [Wed, 2 May 2018 19:48:31 +0000 (14:48 -0500)]
mon/MDSMonitor: no_reply on MMDSLoadTargets

If we don't note that we don't reply then we don't close out the routed
mon request and the op will appear as slow on the forwarding mon.

Fixes: http://tracker.ceph.com/issues/23769
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon: log SLOW_OPS locally
Sage Weil [Tue, 1 May 2018 18:52:57 +0000 (13:52 -0500)]
mon: log SLOW_OPS locally

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/MgrStatMonitor: dump mgr health checks to debug log
Sage Weil [Mon, 30 Apr 2018 21:09:43 +0000 (16:09 -0500)]
mon/MgrStatMonitor: dump mgr health checks to debug log

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr: print daemon_health_metrics to debug log
Sage Weil [Mon, 30 Apr 2018 20:54:46 +0000 (15:54 -0500)]
mgr: print daemon_health_metrics to debug log

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: print desc for oldest slow op to osd log
Sage Weil [Fri, 27 Apr 2018 21:53:11 +0000 (16:53 -0500)]
osd: print desc for oldest slow op to osd log

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: log 'slow op' debug messages for individual slow ops
Sage Weil [Thu, 26 Apr 2018 18:20:40 +0000 (13:20 -0500)]
osd: log 'slow op' debug messages for individual slow ops

Otherwise it is very hard to identify which OSD ops are slow when we've
seen a SLOW_OPS health warning in a qa run.

Notably, without this, bugs like http://tracker.ceph.com/issues/23769
are very challenging to track down.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21742 from liewegas/wip-23940
Sage Weil [Tue, 1 May 2018 17:26:06 +0000 (12:26 -0500)]
Merge pull request #21742 from liewegas/wip-23940

osdc/Objecter: fix recursive locking in _finish_command

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21745 from liewegas/wip-pg-removal-race
Sage Weil [Tue, 1 May 2018 17:25:42 +0000 (12:25 -0500)]
Merge pull request #21745 from liewegas/wip-pg-removal-race

osd: fix _process handling for pg vs slot race

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #20678 from ceph/wip-s3a-fix
Yuri Weinstein [Tue, 1 May 2018 16:28:24 +0000 (09:28 -0700)]
Merge pull request #20678 from ceph/wip-s3a-fix

fix s3atests that are failing for sometime

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20894 from ZVampirEM77/wip-multisite-cleanup
Yuri Weinstein [Tue, 1 May 2018 16:27:52 +0000 (09:27 -0700)]
Merge pull request #20894 from ZVampirEM77/wip-multisite-cleanup

rgw: some cleanup for sync status

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21647 from yehudasa/wip-23859
Yuri Weinstein [Tue, 1 May 2018 16:27:32 +0000 (09:27 -0700)]
Merge pull request #21647 from yehudasa/wip-23859

rgw: fix for issue #21647

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21648 from yehudasa/wip-cloud-sync-7
Yuri Weinstein [Tue, 1 May 2018 16:27:10 +0000 (09:27 -0700)]
Merge pull request #21648 from yehudasa/wip-cloud-sync-7

rgw: cloud sync fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #21678 from idiv-biodiversity/wip-doc-scrub_load_threshold
Kefu Chai [Tue, 1 May 2018 12:22:09 +0000 (20:22 +0800)]
Merge pull request #21678 from idiv-biodiversity/wip-doc-scrub_load_threshold

doc: fix error in osd scrub load threshold

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21727 from trociny/wip-23929
Jason Dillaman [Tue, 1 May 2018 11:44:17 +0000 (07:44 -0400)]
Merge pull request #21727 from trociny/wip-23929

librbd: release lock executing deep copy progress callback

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge PR #21719 into master
Patrick Donnelly [Tue, 1 May 2018 00:25:58 +0000 (17:25 -0700)]
Merge PR #21719 into master

* refs/pull/21719/head:
mds: trim log during shutdown to clean metadata

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #21720 into master
Patrick Donnelly [Tue, 1 May 2018 00:24:59 +0000 (17:24 -0700)]
Merge PR #21720 into master

* refs/pull/21720/head:
mds: kick rdlock if waiting for dirfragtreelock

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoosd: fix _process handling for pg vs slot race 21745/head
Sage Weil [Mon, 30 Apr 2018 15:41:35 +0000 (10:41 -0500)]
osd: fix _process handling for pg vs slot race

We could see the slot with a different PG than we expected if the old
PG was removed and a new one was instantiated in its place.  We can't
just pick up the new PG pointer, however, since it isn't locked.

Fix by retrying with the slot's new pg (possibly null!).  Move this check
below the other cases so that we know we are otherwise consistent with
the slot, since the next pass around we might get pg==null and skip the
to_process.empty() and requeue_seq checks entirely.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agolibrbd: release lock executing deep copy progress callback 21727/head
Mykola Golub [Sun, 29 Apr 2018 08:24:42 +0000 (11:24 +0300)]
librbd: release lock executing deep copy progress callback

Fixes: http://tracker.ceph.com/issues/23929
Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #21706 from liewegas/wip-23860
Josh Durgin [Mon, 30 Apr 2018 18:32:31 +0000 (11:32 -0700)]
Merge pull request #21706 from liewegas/wip-23860

osd/PG: fix DeferRecovery vs AllReplicasRecovered race

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agomds: kick rdlock if waiting for dirfragtreelock 21720/head
Patrick Donnelly [Sun, 29 Apr 2018 01:42:03 +0000 (18:42 -0700)]
mds: kick rdlock if waiting for dirfragtreelock

Fixes: https://tracker.ceph.com/issues/23919
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomds: trim log during shutdown to clean metadata 21719/head
Patrick Donnelly [Sun, 29 Apr 2018 00:17:53 +0000 (17:17 -0700)]
mds: trim log during shutdown to clean metadata

Otherwise the trimming won't advance so that the remaining inodes are marked
clean.

Fixes: http://tracker.ceph.com/issues/23923
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21702 from theanalyst/wip-std-mutex
Sage Weil [Mon, 30 Apr 2018 16:18:11 +0000 (11:18 -0500)]
Merge pull request #21702 from theanalyst/wip-std-mutex

osdc/Objector: use std::shared_mutex instead of boost::shared_mutex

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge PR #21731 into master
Patrick Donnelly [Mon, 30 Apr 2018 16:16:48 +0000 (09:16 -0700)]
Merge PR #21731 into master

* refs/pull/21731/head:
client: drop function _get_inodeno

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21743 from yuriw/wip-yuriw-crontab
Sage Weil [Mon, 30 Apr 2018 15:33:36 +0000 (10:33 -0500)]
Merge pull request #21743 from yuriw/wip-yuriw-crontab

qa/tests: removed rest suite from the mix

7 years agoMerge pull request #21697 from dillaman/wip-18753-1
Mykola Golub [Mon, 30 Apr 2018 15:25:35 +0000 (18:25 +0300)]
Merge pull request #21697 from dillaman/wip-18753-1

rbd-mirror: additional thrasher testing

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoqa/tests: removed rest suite from the mix 21743/head
Yuri Weinstein [Mon, 30 Apr 2018 15:20:06 +0000 (08:20 -0700)]
qa/tests: removed rest suite from the mix

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoMerge pull request #21716 from smithfarm/wip-drop-obs-kludge
Ken Dreyer [Mon, 30 Apr 2018 15:15:21 +0000 (09:15 -0600)]
Merge pull request #21716 from smithfarm/wip-drop-obs-kludge

build/ops: rpm: Revert "ceph.spec: work around build.opensuse.org"

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
7 years agoMerge pull request #21739 from tchaikov/wip-23922
Sage Weil [Mon, 30 Apr 2018 14:55:10 +0000 (09:55 -0500)]
Merge pull request #21739 from tchaikov/wip-23922

qa/suites/rados/thrash-old-clients: ms_type=simple

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21685 from alfredodeza/wip-rm23874
Andrew Schoen [Mon, 30 Apr 2018 14:52:50 +0000 (14:52 +0000)]
Merge pull request #21685 from alfredodeza/wip-rm23874

ceph-volume  failed ceph-osd --mkfs command doesn't halt the OSD creation process

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoosdc/Objecter: fix recursive locking in _finish_command 21742/head
Sage Weil [Mon, 30 Apr 2018 14:52:38 +0000 (09:52 -0500)]
osdc/Objecter: fix recursive locking in _finish_command

The path

#9  Objecter::_finish_command (this=this@entry=0x7f76c00aeb30, c=c@entry=0x7f76b0000b10, r=<optimized out>, rs="osd down") at /build/ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:4950
#10 0x00007f76d26de106 in Objecter::_check_command_map_dne (this=this@entry=0x7f76c00aeb30, c=c@entry=0x7f76b0000b10) at /build/ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1726
#11 0x00007f76d26e52e4 in Objecter::_scan_requests (this=this@entry=0x7f76c00aeb30, s=0x7f76c00af8a0, skipped_map=skipped_map@entry=false, cluster_full=cluster_full@entry=false, pool_full_map=0x7f76be7fb330, need_resend=..., need_resend_linger=..., need_resend_command=std::map with 0 elements, sul=...,
    gap_removed_snaps=0x7f76ac0016f8) at /build/ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1120
#12 0x00007f76d26eded5 in Objecter::handle_osd_map (this=this@entry=0x7f76c00aeb30, m=m@entry=0x7f76ac0014a0) at /build/ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1228

led to recursive lock of the session mutex (locked in _scan_requests,
and again in _finish_command).

Fix by making the callers for _finish_command (and
_check_command_map_dne) take the session lock.

Fixes: http://tracker.ceph.com/issues/23940
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21708 from dalgaaf/wip-da-SCA-20180425
Kefu Chai [Mon, 30 Apr 2018 13:57:19 +0000 (21:57 +0800)]
Merge pull request #21708 from dalgaaf/wip-da-SCA-20180425

Various fixes for SCA issues

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21690 from xiexingguo/wip-pr-20304
Kefu Chai [Mon, 30 Apr 2018 13:53:34 +0000 (21:53 +0800)]
Merge pull request #21690 from xiexingguo/wip-pr-20304

mon, osd: add create-time for pool

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21659 from yangDL/master
Kefu Chai [Mon, 30 Apr 2018 13:48:37 +0000 (21:48 +0800)]
Merge pull request #21659 from yangDL/master

pybind/ceph_argparse.py:'timeout' must in kwargs when call run_in_thread

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/suites/rados/thrash-old-clients: ms_type=simple 21739/head
Kefu Chai [Mon, 30 Apr 2018 13:01:02 +0000 (21:01 +0800)]
qa/suites/rados/thrash-old-clients: ms_type=simple

hammer does not support async messenger, so set ms_type to "simple" for
hammer client.

Fixes: http://tracker.ceph.com/issues/23922
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21733 from trociny/wip-23938
Jason Dillaman [Mon, 30 Apr 2018 12:55:12 +0000 (08:55 -0400)]
Merge pull request #21733 from trociny/wip-23938

qa/workunits/rbd: potential race in mirror disconnect test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #21671 from jan--f/mgr-module-config-doc
John Spray [Mon, 30 Apr 2018 11:42:18 +0000 (12:42 +0100)]
Merge pull request #21671 from jan--f/mgr-module-config-doc

doc/mgr/plugins: add note about distinction between config and kv store

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoqa/workunits/rbd: potential race in mirror disconnect test 21733/head
Mykola Golub [Sun, 29 Apr 2018 17:07:38 +0000 (20:07 +0300)]
qa/workunits/rbd: potential race in mirror disconnect test

(due to a typo in get_image_id command arg)

Fixes: http://tracker.ceph.com/issues/23938
Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoclient: drop function _get_inodeno 21731/head
Jos Collin [Mon, 30 Apr 2018 04:33:55 +0000 (10:03 +0530)]
client: drop function _get_inodeno

Drop _get_inodeno() as per the comment in https://github.com/ceph/ceph/pull/21554.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoosd/PG: fix DeferRecovery vs AllReplicasRecovered race 21706/head
Sage Weil [Fri, 27 Apr 2018 20:00:58 +0000 (15:00 -0500)]
osd/PG: fix DeferRecovery vs AllReplicasRecovered race

- DeferRecovery event queued by AsyncReserver due to preemption
  event.  We are in Recovering state with RECOVERING bit set.
- We finish recovery, clear RECOVERING state bit, and queue
  AllReplicasRecovered from PrimaryLogPG::start_recovery_ops()
- DeferRecovery event arrives, moving us from Recovering -> NotRecovering
- AllReplciasRecovered event arrives, crashing us.

This is all hard to deal with because the events are queued and may
arrive later.  Solve the problem here by tolerating a delayed
DeferRecovery event: if the RECOVERING pg state bit isn't set, ignore
it (it's old).  The async reserver cancel events are unpredictable.

Fixes: http://tracker.ceph.com/issues/23860
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge PR #21554 into master
Patrick Donnelly [Sun, 29 Apr 2018 18:05:33 +0000 (11:05 -0700)]
Merge PR #21554 into master

* refs/pull/21554/head:
client: avoid second lock on client_lock

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
7 years agoMerge PR #21592 into master
Patrick Donnelly [Sun, 29 Apr 2018 18:05:27 +0000 (11:05 -0700)]
Merge PR #21592 into master

* refs/pull/21592/head:
mds: filter out blacklisted clients when importing caps
mds: don't add blacklisted clients to reconnect gather set
mds: combine MDCache::{cap_exports,cap_export_targets}

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #21593 into master
Patrick Donnelly [Sun, 29 Apr 2018 18:05:22 +0000 (11:05 -0700)]
Merge PR #21593 into master

* refs/pull/21593/head:
mds: properly check auth subtree count in MDCache::shutdown_pass()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #21601 into master
Patrick Donnelly [Sun, 29 Apr 2018 18:05:16 +0000 (11:05 -0700)]
Merge PR #21601 into master

* refs/pull/21601/head:
mds: don't discover inode/dirfrag when mds is in 'starting' state

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #21610 into master
Patrick Donnelly [Sun, 29 Apr 2018 18:05:11 +0000 (11:05 -0700)]
Merge PR #21610 into master

* refs/pull/21610/head:
cephfs-journal-tool: wait prezero ops before destroying journal

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #21625 into master
Patrick Donnelly [Sun, 29 Apr 2018 18:05:06 +0000 (11:05 -0700)]
Merge PR #21625 into master

* refs/pull/21625/head:
qa: remove racy/buggy test_purge_queue_op_rate

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #21664 into master
Patrick Donnelly [Sun, 29 Apr 2018 18:04:55 +0000 (11:04 -0700)]
Merge PR #21664 into master

* refs/pull/21664/head:
mds: properly trim log segments after scrub repairs something

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21728 from yuriw/wip-yuriw-crontab
Sage Weil [Sun, 29 Apr 2018 15:10:31 +0000 (10:10 -0500)]
Merge pull request #21728 from yuriw/wip-yuriw-crontab

qa/tests: fixed typo

7 years agoqa/tests: fixed typo 21728/head
Yuri Weinstein [Sun, 29 Apr 2018 14:57:27 +0000 (07:57 -0700)]
qa/tests: fixed typo

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
7 years agoRevert "ceph.spec: work around build.opensuse.org" 21716/head
Nathan Cutler [Sat, 28 Apr 2018 19:23:01 +0000 (21:23 +0200)]
Revert "ceph.spec: work around build.opensuse.org"

This reverts commit 21d941e83b168fa297aed58e27b4c11193468293 which introduced a
"kludge" to make 32-bit x86 builds work in the openSUSE Build Service (OBS).

The OBS no longer uses i386 in RPM_OPT_FLAGS when the i586 build target is
specified. The current value of RPM_OPT_FLAGS for i586 is:

-fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches -O2 -Wall
-D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables
-fasynchronous-unwind-tables -fstack-clash-protection -g

(Side note: we are not currently building Ceph for any 32-bit architectures
in the OBS, and there are no plans to start doing so. That doesn't mean it
won't ever happen, but even if it does, this "kludge" will not be needed.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Conflicts:
ceph.spec.in

7 years agoMerge pull request #21583 from yanghonggang/disable-cache
Sage Weil [Sat, 28 Apr 2018 18:19:12 +0000 (13:19 -0500)]
Merge pull request #21583 from yanghonggang/disable-cache

kv/RocksDBStore: fix rocksdb error when block cache is disabled

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #21670 from xiexingguo/wip-23878
Sage Weil [Sat, 28 Apr 2018 18:17:36 +0000 (13:17 -0500)]
Merge pull request #21670 from xiexingguo/wip-23878

osd/OSDMap: more pg upmap fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21709 from liewegas/wip-23917
Sage Weil [Sat, 28 Apr 2018 18:17:04 +0000 (13:17 -0500)]
Merge pull request #21709 from liewegas/wip-23917

ceph_test_rados_api_aio: fix race with full pool and osdmap

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21641 from zy751713126/total_size_format
Kefu Chai [Sat, 28 Apr 2018 14:49:40 +0000 (22:49 +0800)]
Merge pull request #21641 from zy751713126/total_size_format

tools: correct total size formatting

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agopybind/ceph_argparse.py: argument 'target' change to func 21659/head
yangdeliu [Sat, 28 Apr 2018 09:56:06 +0000 (17:56 +0800)]
pybind/ceph_argparse.py: argument 'target' change to func

'run_in_thread' first argument named 'target'.
It is confusing with cluster.mon_command last argument 'target=None'.
So change 'run_in_thread' and RadosThread 'target' to 'func'

Signed-off-by: yangdeliu <yangdeliu@szsandstone.com>
7 years agoMerge pull request #21710 from neha-ojha/wip-cosbench-workloads
Josh Durgin [Sat, 28 Apr 2018 01:30:11 +0000 (18:30 -0700)]
Merge pull request #21710 from neha-ojha/wip-cosbench-workloads

qa: add cosbench workloads and override teuthology default settings

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agomon, osd: add create-time for pool 21690/head
xie xingguo [Mon, 5 Feb 2018 02:55:21 +0000 (10:55 +0800)]
mon, osd: add create-time for pool

We want to know how old the pools currently are, on which mgr/balancer
can make some time-related smart decisions based.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoqa/suites/perf-basic: add cosbench write workload 21710/head
Neha Ojha [Fri, 27 Apr 2018 23:10:13 +0000 (16:10 -0700)]
qa/suites/perf-basic: add cosbench write workload

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoqa/suites/perf-basic: override default teuthology settings
Neha Ojha [Fri, 27 Apr 2018 23:07:11 +0000 (16:07 -0700)]
qa/suites/perf-basic: override default teuthology settings

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoqa/suites/rados/perf: add cosbench workloads
Neha Ojha [Fri, 27 Apr 2018 21:49:41 +0000 (14:49 -0700)]
qa/suites/rados/perf: add cosbench workloads

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoceph_test_rados_api_aio: fix race with full pool and osdmap 21709/head
Sage Weil [Fri, 27 Apr 2018 22:32:38 +0000 (17:32 -0500)]
ceph_test_rados_api_aio: fix race with full pool and osdmap

We send ops until we get a EDQUOT, and then assert our next op to
a different object also gets EDQUOT.  However, if the second osd
doesn't have as new a map it may succeed.  Make sure the client has
the latest (mon) map, and thus the one marking the pool full, before
we send the second op.  That ensures the second OSD also has that
newer map and also returns EDQUOT.

Fixes: http://tracker.ceph.com/issues/23917
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest/perf_local.cc: reduce scope of some variables 21708/head
Danny Al-Gaaf [Fri, 27 Apr 2018 21:52:37 +0000 (23:52 +0200)]
test/perf_local.cc: reduce scope of some variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
7 years agoclient/Client.cc: reduce scope of variable 'r'
Danny Al-Gaaf [Fri, 27 Apr 2018 21:51:56 +0000 (23:51 +0200)]
client/Client.cc: reduce scope of variable 'r'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
7 years agoMerge pull request #21704 from liewegas/wip-rados-old-clients
Jason Dillaman [Fri, 27 Apr 2018 21:35:58 +0000 (17:35 -0400)]
Merge pull request #21704 from liewegas/wip-rados-old-clients

qa/suites/rados/thrash-old-clients: add rbd tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #21339 from guzhongyan/tp-cleanup
Yuri Weinstein [Fri, 27 Apr 2018 21:22:35 +0000 (14:22 -0700)]
Merge pull request #21339 from guzhongyan/tp-cleanup

osd: drop unused osd_disk_tp related options

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21630 from neha-ojha/wip-rgw-pools
Yuri Weinstein [Fri, 27 Apr 2018 21:21:52 +0000 (14:21 -0700)]
Merge pull request #21630 from neha-ojha/wip-rgw-pools

qa: modify rgw default pool names

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agocommon/TrackedOp: fix 'warned' handling
Danny Al-Gaaf [Fri, 27 Apr 2018 21:07:12 +0000 (23:07 +0200)]
common/TrackedOp: fix 'warned' handling

Fix for this cppcheck issue:

[src/common/TrackedOp.cc:385]: (style) The scope of the variable
 'warned' can be reduced.

Actually it seems that warned was not set correctly anymore
after rewrite of the code. Set 'warned' in with_slow_ops_in_flight()
as already done with number of slow iops.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
7 years agoqa/suites/rados/thrash-old-clients: add cls_rbd, rbd api tests 21704/head
Sage Weil [Thu, 26 Apr 2018 19:25:56 +0000 (14:25 -0500)]
qa/suites/rados/thrash-old-clients: add cls_rbd, rbd api tests

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados/perf: override default teuthology settings
Neha Ojha [Fri, 27 Apr 2018 19:04:00 +0000 (12:04 -0700)]
qa/suites/rados/perf: override default teuthology settings

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agokv/RocksDBStore: fix rocksdb error when block cache is disabled 21583/head
Yang Honggang [Sat, 21 Apr 2018 15:39:21 +0000 (15:39 +0000)]
kv/RocksDBStore: fix rocksdb error when block cache is disabled

Fixes: http://tracker.ceph.com/issues/23816
Signed-off-by: Yang Honggang <yanghonggang@umcloud.com>
7 years agoMerge pull request #21703 from liewegas/wip-rados-old-clients
Sage Weil [Fri, 27 Apr 2018 17:25:48 +0000 (12:25 -0500)]
Merge pull request #21703 from liewegas/wip-rados-old-clients

qa/suites/rados/thrash-old-clients: add hammer clients

7 years agoqa/suites/rados/thrash-old-clients: add hammer 21703/head
Sage Weil [Fri, 27 Apr 2018 16:11:42 +0000 (11:11 -0500)]
qa/suites/rados/thrash-old-clients: add hammer

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21679 from liewegas/wip-rados-old-clients
Sage Weil [Fri, 27 Apr 2018 16:30:39 +0000 (11:30 -0500)]
Merge pull request #21679 from liewegas/wip-rados-old-clients

qa/suites/rados/thrash-old-clients: do some thrashing with jewel and luminous clients

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21605 from liewegas/wip-osdmap-encode
Sage Weil [Fri, 27 Apr 2018 16:13:56 +0000 (11:13 -0500)]
Merge pull request #21605 from liewegas/wip-osdmap-encode

mon: cache reencoded osdmaps

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Xiaoxi CHEN <xiaoxchen@ebay.com>
7 years agomessages/MOSDMap: fix compat_version for MOSDMap 21605/head
Sage Weil [Thu, 26 Apr 2018 15:31:34 +0000 (10:31 -0500)]
messages/MOSDMap: fix compat_version for MOSDMap

Jewel clients see
 will not decode message of type 41 version 4 because compat_version 4 > supported version 3

The problem is when compat_version == 0 and head_version != 0, we
interpret compat_version == head_version.  From Message::encode,

    // if the encoder didn't specify past compatibility, we assume it
    // is incompatible.
    if (header.compat_version == 0)
      header.compat_version = header.version;

Broken by 49833c3bb264949b8126796997a95a95b50af411 for the
head_version=4 case (compat_version needs to be 3).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocrush/CrushWrapper: clean up member init
Sage Weil [Tue, 24 Apr 2018 14:16:52 +0000 (09:16 -0500)]
crush/CrushWrapper: clean up member init

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomessages/MOSDMap: significant feature bits.
Xiaoxi CHEN [Mon, 23 Apr 2018 17:58:11 +0000 (12:58 -0500)]
messages/MOSDMap: significant feature bits.

1. MOSDMap go with features indicating the features
this map encoded for.

2. Only reencode if significant bits mismatch between
target features and my features.

also update mon/OSDMonitor and osd/OSDService to adopt this change.

Signed-off-by: Xiaoxi CHEN <xiaoxchen@ebay.com>
7 years agomon/OSDMonitor: add feature into osdmap cache key.
Xiaoxi CHEN [Mon, 23 Apr 2018 17:57:52 +0000 (12:57 -0500)]
mon/OSDMonitor: add feature into osdmap cache key.

Change the cache from
SimpleLRU<version_t, bufferlist> inc_osd_cache;
to
SimpleLRU<pair<version_t, uint64_t>, bufferlist> inc_osd_cache;

By doing this , we can cache several encoded osdmap for different
features, not necessary to re-encoding for each client.

Signed-off-by: Xiaoxi CHEN <xiaoxchen@ebay.com>
7 years agoosdc/Objector: use std::shared_mutex instead of boost::shared_mutex 21702/head
Abhishek Lekshmanan [Fri, 27 Apr 2018 08:40:59 +0000 (10:40 +0200)]
osdc/Objector: use std::shared_mutex instead of boost::shared_mutex

Since boost::threads support interruption by default locking over
boost::shared_mutexes may throw if the thread is interrupted. Replacing this by
std:: variant

Fixes: http://tracker.ceph.com/issues/23910
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agoMerge pull request #21693 from LenzGr/mgr-dashboard-documentation
Ricardo Dias [Fri, 27 Apr 2018 13:28:02 +0000 (14:28 +0100)]
Merge pull request #21693 from LenzGr/mgr-dashboard-documentation

doc: Updated dashboard feature list.

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #21586 from trociny/wip-deep-copy-fixes
Jason Dillaman [Fri, 27 Apr 2018 12:37:24 +0000 (08:37 -0400)]
Merge pull request #21586 from trociny/wip-deep-copy-fixes

 librbd: skip head object map update when deep copying object beyond image size

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/suites/rbd: rbd-mirror fsx stress test 21697/head
Jason Dillaman [Tue, 24 Apr 2018 13:00:18 +0000 (09:00 -0400)]
qa/suites/rbd: rbd-mirror fsx stress test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: clean up ENOENT error message
Jason Dillaman [Wed, 25 Apr 2018 23:45:01 +0000 (19:45 -0400)]
rbd-mirror: clean up ENOENT error message

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: move state machine transition debug messages to higher priority
Jason Dillaman [Wed, 25 Apr 2018 01:09:23 +0000 (21:09 -0400)]
rbd-mirror: move state machine transition debug messages to higher priority

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd/fsx: add support for cluster and client id optionals
Jason Dillaman [Tue, 24 Apr 2018 16:05:21 +0000 (12:05 -0400)]
test/librbd/fsx: add support for cluster and client id optionals

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agodoc: Updated dashboard feature list. 21693/head
Lenz Grimmer [Fri, 27 Apr 2018 12:17:58 +0000 (14:17 +0200)]
doc: Updated dashboard feature list.

Updated the dashboard documentation and added recently merged
RBD management features (flatten, clone, copy)

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
7 years agoMerge pull request #21681 from Devp00l/wip-rbd-form-type-error-fix
Lenz Grimmer [Fri, 27 Apr 2018 09:35:27 +0000 (11:35 +0200)]
Merge pull request #21681 from Devp00l/wip-rbd-form-type-error-fix

mgr/dashboard: Fixes type error in RBD form

Reviewed-by: Volker Theile <vtheile@suse.com>
7 years agoMerge pull request #21682 from dillaman/wip-23888
Mykola Golub [Fri, 27 Apr 2018 08:52:26 +0000 (11:52 +0300)]
Merge pull request #21682 from dillaman/wip-23888

rbd-mirror: rename asok hook to match image name when not replaying

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #21657 from dillaman/wip-23876
Mykola Golub [Fri, 27 Apr 2018 08:51:27 +0000 (11:51 +0300)]
Merge pull request #21657 from dillaman/wip-23876

rbd-mirror: properly translate remote tag mirror uuid for local mirror

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #21662 from tchaikov/wip-cmake
Kefu Chai [Fri, 27 Apr 2018 06:20:17 +0000 (14:20 +0800)]
Merge pull request #21662 from tchaikov/wip-cmake

cmake: enable new policies to silence cmake warnings

Review-by: Casey Bodley <cbodley@redhat.com>
7 years agoosd/OSDMap: check pending pg upmap changes too 21670/head
xiexingguo [Thu, 26 Apr 2018 13:08:15 +0000 (21:08 +0800)]
osd/OSDMap: check pending pg upmap changes too

Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
7 years agoosd/OSDMap: check against crush-tree changing
xiexingguo [Thu, 26 Apr 2018 11:47:35 +0000 (19:47 +0800)]
osd/OSDMap: check against crush-tree changing

pg_upmap/pg_upmap_items should not bring osds which
no longer belong to a specific crush-tree in.

Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
7 years agoosd/OSDMap: more sanity checks before applying pg_upmap[_items]
xiexingguo [Thu, 26 Apr 2018 11:41:47 +0000 (19:41 +0800)]
osd/OSDMap: more sanity checks before applying pg_upmap[_items]

Fixes: http://tracker.ceph.com/issues/23878
Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
7 years agoosd/OSDMap: refactor maybe_remove_pg_upmaps()
xiexingguo [Thu, 26 Apr 2018 10:48:21 +0000 (18:48 +0800)]
osd/OSDMap: refactor maybe_remove_pg_upmaps()

There is too much code redundancy..

Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
7 years agoMerge pull request #21649 from dillaman/wip-23872
Kefu Chai [Fri, 27 Apr 2018 00:55:42 +0000 (08:55 +0800)]
Merge pull request #21649 from dillaman/wip-23872

osdc/Objecter: prevent double-invocation of linger op callback

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21656 from neha-ojha/wip-integrate-cosbench
Josh Durgin [Fri, 27 Apr 2018 00:38:27 +0000 (17:38 -0700)]
Merge pull request #21656 from neha-ojha/wip-integrate-cosbench

qa/tasks: run cosbench using the CBT task

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoqa/tasks: run cosbench using the CBT task 21656/head
Neha Ojha [Wed, 25 Apr 2018 23:00:11 +0000 (16:00 -0700)]
qa/tasks: run cosbench using the CBT task

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge pull request #21676 from liewegas/wip-23871
Sage Weil [Thu, 26 Apr 2018 22:22:40 +0000 (17:22 -0500)]
Merge pull request #21676 from liewegas/wip-23871

osd/PrimaryLogPG: clear data digest on WRITEFULL if skip_data_digest

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21686 from jdurgin/wip-ec-backend-comment
Josh Durgin [Thu, 26 Apr 2018 21:52:59 +0000 (14:52 -0700)]
Merge pull request #21686 from jdurgin/wip-ec-backend-comment

osd/ECBackend: update misleading comment about EIO handling

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #21653 from liewegas/wip-23364
Josh Durgin [Thu, 26 Apr 2018 21:51:59 +0000 (14:51 -0700)]
Merge pull request #21653 from liewegas/wip-23364

osd/PrimaryLogPG: avoid infinite loop when flush collides with write lock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21222 from bmflynn/pybind-alignment
Josh Durgin [Thu, 26 Apr 2018 21:48:08 +0000 (14:48 -0700)]
Merge pull request #21222 from bmflynn/pybind-alignment

pybind/rados: add alignment getter to IoCtx

Reviewed-by: Josh Durgin <jdurgin@redhat.com>