]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agorgw: data sync respects error_retry_time for backoff on error_repo
Casey Bodley [Tue, 14 Aug 2018 15:16:16 +0000 (11:16 -0400)]
rgw: data sync respects error_retry_time for backoff on error_repo

don't restart processing the error_repo until error_retry_time. when
data sync is otherwise idle, don't sleep past error_retry_time

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

Conflicts:
src/rgw/rgw_data_sync.cc

6 years agocommon: adding missing ceph::coarse_real_clock helpers
Casey Bodley [Tue, 14 Aug 2018 15:12:48 +0000 (11:12 -0400)]
common: adding missing ceph::coarse_real_clock helpers

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

6 years agorgw: data sync uses coarse clock for error_retry_time
Casey Bodley [Tue, 14 Aug 2018 15:11:22 +0000 (11:11 -0400)]
rgw: data sync uses coarse clock for error_retry_time

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

6 years agoMerge pull request #24242 from jonsger/luminous-backport-pr#23596
Yuri Weinstein [Tue, 2 Oct 2018 15:40:49 +0000 (08:40 -0700)]
Merge pull request #24242 from jonsger/luminous-backport-pr#23596

luminous: rgw: incremental data sync uses truncated flag to detect end of listing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24358 from alfredodeza/luminous-rm36249
Andrew Schoen [Tue, 2 Oct 2018 11:30:59 +0000 (06:30 -0500)]
Merge pull request #24358 from alfredodeza/luminous-rm36249

luminous ceph-volume:  activate option --auto-detect-objectstore respects --no-systemd

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #24089 from batrick/i26990
Yuri Weinstein [Mon, 1 Oct 2018 21:14:05 +0000 (14:14 -0700)]
Merge pull request #24089 from batrick/i26990

luminous: mds: curate priority of perf counters sent to mgr

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by:  Venky Shankar <vshankar@redhat.com>

6 years agoMerge pull request #24310 from batrick/i36210
Yuri Weinstein [Mon, 1 Oct 2018 21:09:56 +0000 (14:09 -0700)]
Merge pull request #24310 from batrick/i36210

luminous: mds: runs out of file descriptors after several respawns

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoceph-volume lvm.activate pass no_systemd args when detecting objectstore 24358/head
Alfredo Deza [Mon, 1 Oct 2018 15:54:19 +0000 (11:54 -0400)]
ceph-volume lvm.activate pass no_systemd args when detecting objectstore

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

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

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

6 years agoMerge pull request #24335 from alfredodeza/luminous-rm36098
Andrew Schoen [Mon, 1 Oct 2018 14:53:06 +0000 (09:53 -0500)]
Merge pull request #24335 from alfredodeza/luminous-rm36098

luminous ceph-volume:  lsblk can fail to find PARTLABEL, must fallback to blkid

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoMerge pull request #24070 from smithfarm/wip-25025-luminous
Yuri Weinstein [Mon, 1 Oct 2018 14:43:39 +0000 (07:43 -0700)]
Merge pull request #24070 from smithfarm/wip-25025-luminous

luminous: cls_rgw test is only run in rados suite: add it to rgw suite as well

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24299 from pdvian/wip-35962-luminous
Yuri Weinstein [Mon, 1 Oct 2018 14:43:05 +0000 (07:43 -0700)]
Merge pull request #24299 from pdvian/wip-35962-luminous

luminous: osd/PG: avoid choose_acting picking want with > pool size items

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #24308 from neha-ojha/wip-36239-luminous
Yuri Weinstein [Mon, 1 Oct 2018 14:42:18 +0000 (07:42 -0700)]
Merge pull request #24308 from neha-ojha/wip-36239-luminous

luminous: osd/PrimaryLogPG: fix potential pg-log overtrimming

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agomds: reorganize and curate perf log counters 24089/head
Venky Shankar [Fri, 22 Jun 2018 05:43:37 +0000 (01:43 -0400)]
mds: reorganize and curate perf log counters

Categorize perf counters into high (PRIO_{CRITICAL/INTERESTING}),
medium (PRIO_USEFUL) and low priority (PRIO_DEBUGONLY). High and
medium priority stats are transmitted to ceph mgr and included in
prometheus output.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
Fixes: http://tracker.ceph.com/issues/24004
(cherry picked from commit 48a33f6f06802fee998f60a2ec35d9041a7c51a6)

Conflicts:
src/mds/MDSRank.cc

6 years agomds: show session load average in dump session
Venky Shankar [Wed, 4 Jul 2018 09:44:57 +0000 (05:44 -0400)]
mds: show session load average in dump session

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 682dc08cbd521342b4abc45fd85edb2dd7bc5682)

Conflicts:
    src/mds/SessionMap.h

6 years agomds: allow request load average decay rate configurable via admin socket
Venky Shankar [Tue, 3 Jul 2018 12:06:39 +0000 (08:06 -0400)]
mds: allow request load average decay rate configurable via admin socket

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 3809d96a5b53721b88602d662c4c1cd00dd727a0)

Conflicts:
src/mds/MDSRank.h
src/mds/SessionMap.h
src/mds/SessionMap.cc

6 years agomds: decay counter for tracking request load average
Venky Shankar [Tue, 3 Jul 2018 12:04:56 +0000 (08:04 -0400)]
mds: decay counter for tracking request load average

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 816d8aaea01aef81467e3df7a4b3ab3eff86d27a)

Conflicts:
src/common/options.cc
src/mds/SessionMap.cc
src/mds/SessionMap.h

6 years agomds: add perf counters to track current open/stale sessions
Venky Shankar [Wed, 27 Jun 2018 08:05:49 +0000 (04:05 -0400)]
mds: add perf counters to track current open/stale sessions

Signed-off-by: Venky Shankar <vshankar@redhat.com>
6 years agomds:improve mds perf counters can statistics filesystem operations number and latency
YunfeiGuan [Wed, 29 Nov 2017 07:15:36 +0000 (15:15 +0800)]
mds:improve mds perf counters can statistics filesystem operations number and latency

Dumping the latency of all operations which will help we analysis of
what kind of operation is the most waste of time which can do a simple
performence analysis.

Fixes: http://tracker.ceph.com/issues/22097
Signed-off-by: Guan yunfei <yunfei.guan@xtaotech.com>
(cherry picked from commit 20760f26bae7d9c599019a0295d66386e4281af2)

6 years agoMerge PR #23553 into luminous
Patrick Donnelly [Fri, 28 Sep 2018 21:28:51 +0000 (14:28 -0700)]
Merge PR #23553 into luminous

* refs/pull/23553/head:
mds: report lagginess at lower debug
MDSMonitor: note beacons and cluster changes at low dbg level

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Conflicts:
    src/mds/Beacon.cc

6 years agoceph-volume simple.scan better detection for ceph-disk data devices 24335/head
Alfredo Deza [Thu, 27 Sep 2018 20:17:29 +0000 (16:17 -0400)]
ceph-volume simple.scan better detection for ceph-disk data devices

Uses the new ``CephDiskDevice`` to look into PARTLABEL from both lsblk
(the default) falling back to blkid, which in some cases has the right
value when lsblk fails.

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

6 years agoceph-volume tests.util verify CephDiskDevice behavior
Alfredo Deza [Thu, 27 Sep 2018 20:15:26 +0000 (16:15 -0400)]
ceph-volume tests.util verify CephDiskDevice behavior

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

6 years agoceph-volume tests.conftest add blkid patching to device_info fixture
Alfredo Deza [Thu, 27 Sep 2018 20:15:00 +0000 (16:15 -0400)]
ceph-volume tests.conftest add blkid patching to device_info fixture

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

6 years agoceph-volume util.device add a ceph-disk device object to detect types
Alfredo Deza [Thu, 27 Sep 2018 20:14:28 +0000 (16:14 -0400)]
ceph-volume util.device add a ceph-disk device object to detect types

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

6 years agoceph-volume tests.util verify new blkid API calls
Alfredo Deza [Tue, 25 Sep 2018 19:27:47 +0000 (15:27 -0400)]
ceph-volume tests.util verify new blkid API calls

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

6 years agoceph-volume util.disk expand blkid's API calls
Alfredo Deza [Tue, 25 Sep 2018 19:25:13 +0000 (15:25 -0400)]
ceph-volume util.disk expand blkid's API calls

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

6 years agoMerge pull request #24083 from batrick/i26851
Yuri Weinstein [Fri, 28 Sep 2018 20:06:52 +0000 (13:06 -0700)]
Merge pull request #24083 from batrick/i26851

luminous: ceph_volume_client: py3 compatible

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #24313 from batrick/i36198
Yuri Weinstein [Fri, 28 Sep 2018 20:05:53 +0000 (13:05 -0700)]
Merge pull request #24313 from batrick/i36198

luminous: ceph-fuse: add SELinux policy

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #24119 from ukernel/luminous-22504
Yuri Weinstein [Fri, 28 Sep 2018 20:04:28 +0000 (13:04 -0700)]
Merge pull request #24119 from ukernel/luminous-22504

luminous: client: drop null child dentries before try pruning inode's alias

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #24138 from pdvian/wip-35718-luminous
Yuri Weinstein [Fri, 28 Sep 2018 20:04:01 +0000 (13:04 -0700)]
Merge pull request #24138 from pdvian/wip-35718-luminous

luminous: mds: print is_laggy message once

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #24268 from smithfarm/wip-36101-luminous
Yuri Weinstein [Fri, 28 Sep 2018 20:03:28 +0000 (13:03 -0700)]
Merge pull request #24268 from smithfarm/wip-36101-luminous

luminous: qa: remove knfs site from future releases

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
6 years agoMerge pull request #24285 from iridescent-rsy/luminous-35958
Yuri Weinstein [Fri, 28 Sep 2018 20:02:45 +0000 (13:02 -0700)]
Merge pull request #24285 from iridescent-rsy/luminous-35958

luminous: librbd: fixed assert when flattening clone with zero overlap

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24303 from vshankar/wip-35931
Yuri Weinstein [Fri, 28 Sep 2018 20:02:06 +0000 (13:02 -0700)]
Merge pull request #24303 from vshankar/wip-35931

luminous: client: retry remount on dcache invalidation failure

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years ago*: set missing CLOEXEC on opened fds 24310/head
Patrick Donnelly [Fri, 7 Sep 2018 21:19:38 +0000 (14:19 -0700)]
*: set missing CLOEXEC on opened fds

Otherwise these descriptors may leak across execve() during e.g. MDS respawn.

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

Conflicts:
CMakeLists.txt
src/auth/Crypto.cc
src/ceph_osd.cc
src/common/CMakeLists.txt
src/common/Preforker.h
src/common/SubProcess.cc
src/common/admin_socket.cc
src/common/admin_socket_client.cc
src/common/blkdev.cc
src/crimson/CMakeLists.txt
src/global/signal_handler.cc
src/include/random.h
src/include/uuid.h
src/log/Log.cc
src/mon/MonitorDBStore.h
src/msg/simple/Accepter.cc
src/os/bluestore/BlueStore.cc
src/os/bluestore/bluestore_tool.cc
src/os/filestore/FileStore.cc
src/os/kstore/KStore.cc
src/test/objectstore/test_bluefs.cc

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

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

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

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

6 years agoceph-fuse: add to selinux profile 24313/head
Patrick Donnelly [Thu, 20 Sep 2018 17:27:43 +0000 (10:27 -0700)]
ceph-fuse: add to selinux profile

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

6 years agomds: report lagginess at lower debug 23553/head
Patrick Donnelly [Sat, 11 Aug 2018 18:21:43 +0000 (11:21 -0700)]
mds: report lagginess at lower debug

To help diagnose laggy daemons with performance tuned debug settings.

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

Conflicts:
src/mds/Beacon.cc

6 years agoMDSMonitor: note beacons and cluster changes at low dbg level
Patrick Donnelly [Sat, 11 Aug 2018 17:40:03 +0000 (10:40 -0700)]
MDSMonitor: note beacons and cluster changes at low dbg level

These messages are essential for diagnosing the reason why the MDSMonitor is
kicking MDSs out of the MDSMap. They should also be rare enough that the extra
verbosity is not noticable.

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

Conflicts:
src/mon/MDSMonitor.cc

6 years agoceph_volume_client: use integer division for pg_num 24083/head
Patrick Donnelly [Fri, 27 Jul 2018 21:05:42 +0000 (14:05 -0700)]
ceph_volume_client: use integer division for pg_num

Otherwise a float is sent to the manager which is not the invalid format.

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

6 years agopackages.yaml: install py3 compatible cephfs and rados bindings...
Rishabh Dave [Mon, 23 Jul 2018 10:31:42 +0000 (10:31 +0000)]
packages.yaml: install py3 compatible cephfs and rados bindings...

on Ubuntu and CentOS for upstream testing.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit c1efd59f618e24cf060d564ac0f21d5b0b57fd4a)

6 years agoqa: test py2 and py3 for volume client
Patrick Donnelly [Wed, 6 Jun 2018 23:51:05 +0000 (16:51 -0700)]
qa: test py2 and py3 for volume client

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

6 years agoqa: make test_volume_client.py py3 compatible
Rishabh Dave [Tue, 15 May 2018 06:06:39 +0000 (06:06 +0000)]
qa: make test_volume_client.py py3 compatible

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit f28274dc70aa102e3c4523059a65e5da8c8a0426)

6 years agoqa/ceph-volume: allow executing python pyloads using python3
Rishabh Dave [Tue, 24 Jul 2018 07:59:55 +0000 (07:59 +0000)]
qa/ceph-volume: allow executing python pyloads using python3

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 2f35ade05f9910ef9bdaaa24de9593bd584073fa)

Conflicts:
qa/tasks/vstart_runner.py

6 years agocephfs.pyx: add py3 compatibility
Rishabh Dave [Wed, 16 May 2018 19:06:42 +0000 (19:06 +0000)]
cephfs.pyx: add py3 compatibility

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 5106582fc7edae7f39161cf89e566c020fcfa0ce)

6 years agoceph-volume-client: add py3 compatibility
Rishabh Dave [Tue, 15 May 2018 05:58:25 +0000 (05:58 +0000)]
ceph-volume-client: add py3 compatibility

Fixes: http://tracker.ceph.com/issues/17230
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit efdf1af41d198565c2993598b8e345683396b169)

Conflicts:
src/pybind/ceph_volume_client.py

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

luminous: ceph_volume_client: allow atomic update of RADOS objects

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

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

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

luminous: osdc/Objecter: fix split vs reconnect race

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

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

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

luminous: mon/OSDMonitor: invalidate max_failed_since on cancel_report

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

luminous: rpm: use updated gperftools

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agomsg: set O_NONBLOCK on file status flags
Patrick Donnelly [Fri, 7 Sep 2018 21:25:43 +0000 (14:25 -0700)]
msg: set O_NONBLOCK on file status flags

There is no NONBLOCK file **descriptor** flag.

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

Conflicts:
src/msg/simple/Accepter.cc

6 years agoMerge pull request #24307 from alfredodeza/luminous-batch-report-fix
Andrew Schoen [Thu, 27 Sep 2018 18:47:30 +0000 (13:47 -0500)]
Merge pull request #24307 from alfredodeza/luminous-batch-report-fix

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

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agoosd/PrimaryLogPG: fix potential pg-log overtrimming 24308/head
xie xingguo [Mon, 30 Jul 2018 10:56:56 +0000 (18:56 +0800)]
osd/PrimaryLogPG: fix potential pg-log overtrimming

In https://github.com/ceph/ceph/pull/21580 I set a trap to catch some wired
and random segmentfaults and in a recent QA run I was able to observe it was
successfully triggered by one of the test case, see:

```
http://qa-proxy.ceph.com/teuthology/xxg-2018-07-30_05:25:06-rados-wip-hb-peers-distro-basic-smithi/2837916/teuthology.log
```

The root cause is that there might be holes on log versions, thus the
approx_size() method should (almost) always overestimate the actual number of log entries.
As a result, we might be at the risk of overtrimming log entries.

https://github.com/ceph/ceph/pull/18338 reveals a probably easier way
to fix the above problem but unfortunately it also can cause big performance regression
and hence comes this pr..

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

Conflicts:
src/osd/PrimaryLogPG.cc: trivial resolution

6 years agoceph-volume: only run ceph-common once during tests 24307/head
Andrew Schoen [Tue, 25 Sep 2018 17:09:15 +0000 (12:09 -0500)]
ceph-volume: only run ceph-common once during tests

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

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

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

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

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

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

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

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

luminous ceph-volume custom cluster names fail on filestore trigger

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

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

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoqa/suites/rgw/verify: drop ragweed.yaml 24070/head
Nathan Cutler [Thu, 27 Sep 2018 14:13:27 +0000 (16:13 +0200)]
qa/suites/rgw/verify: drop ragweed.yaml

There is no ragweed task in luminous.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
6 years agoclient: retry remount on dcache invalidation failure 24303/head
Venky Shankar [Tue, 28 Aug 2018 10:35:18 +0000 (06:35 -0400)]
client: retry remount on dcache invalidation failure

For some (unknown) reason, there have been reports of
ceph-fuse crash due to failure is remounting at the
time of invalidating kernel dentry cache. This issue
is not also reproducible yet.

Therefore, as suggested by Patrick and Zheng, for a
temporary workaround, client would ignore the failure
as the invalidation would be retried again. There is
a max cap on the number of consecutive remount failures
after which client would abort.

Fixes: http://tracker.ceph.com/issues/35931
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit d1471f070cd1ad9c0f773e00d2552161d1ad5955)

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

6 years agorgw: fix up indentation in incremental data sync 24242/head
Casey Bodley [Wed, 15 Aug 2018 20:13:17 +0000 (16:13 -0400)]
rgw: fix up indentation in incremental data sync

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 666bfe3a909ec83a3067398e7896527f99283e0a)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Conflicts:
src/rgw/rgw_data_sync.cc: ident regarding current state

6 years agorgw: remove unused query for remote datalog info
Casey Bodley [Wed, 15 Aug 2018 20:09:43 +0000 (16:09 -0400)]
rgw: remove unused query for remote datalog info

Fixes: http://tracker.ceph.com/issues/26952
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a543df729a6ca415648678e2ae2ed46eceaba086)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Conflicts:
src/rgw/rgw_data_sync.cc: adapt to ldout, as there is no tn->log

6 years agorgw: remove unused datalog trim detection logic
Casey Bodley [Wed, 15 Aug 2018 20:07:32 +0000 (16:07 -0400)]
rgw: remove unused datalog trim detection logic

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 0d47743e0f6b9f51848056885831910d0ea5b282)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Conflicts:
src/rgw/rgw_data_sync.cc: trivial

6 years agorgw: incremental data sync uses truncated flag to detect end of listing
Casey Bodley [Wed, 15 Aug 2018 20:04:37 +0000 (16:04 -0400)]
rgw: incremental data sync uses truncated flag to detect end of listing

we call wait() after incremental sync if we've reached the end of the
datalog listing. the existing logic compares our local marker with the
remote's high marker, with some extra code to handle the case where the
remote log was trimmed

all of this can be simplified by using the 'truncated' flag returned
with the RGWReadRemoteDataLogShardCR used to list the remote datalog

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit fb2b618658d8ff9c311838f59e396ab24c21e9e8)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Conflicts:
src/rgw/rgw_data_sync.cc: write log with ldout

6 years agoosd/PG: avoid choose_acting picking want with > pool size items 24299/head
Sage Weil [Tue, 11 Sep 2018 16:12:22 +0000 (11:12 -0500)]
osd/PG: avoid choose_acting picking want with > pool size items

If the pool size recently changed, we might see an up that is larger than
the pool size.  Or, we might already have selected a primary that is not
part of up, and then add all up osds and end up with a want that is too
big.

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

6 years agoMerge pull request #24190 from joke-lee/luminous
Yuri Weinstein [Wed, 26 Sep 2018 16:30:16 +0000 (09:30 -0700)]
Merge pull request #24190 from joke-lee/luminous

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

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

luminous: multisite: segfault on shutdown/realm reload

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

luminous: mds: health warning for slow metadata IO

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoluminous: librbd: fixed assert when flattening clone with zero overlap 24285/head
Jason Dillaman [Wed, 12 Sep 2018 01:52:05 +0000 (21:52 -0400)]
luminous: librbd: fixed assert when flattening clone with zero overlap

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

 Conflicts:
src/librbd/Operations.cc
src/test/librbd/test_librbd.cc

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoqa/tests: removed knfs suite 24268/head
Yuri Weinstein [Tue, 18 Sep 2018 21:55:27 +0000 (14:55 -0700)]
qa/tests: removed knfs suite

Fixes: http://tracker.ceph.com/issues/36075
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit eaca18873350bbef45a695f29569fab269d238da)

Conflicts:
qa/suites/knfs/basic/clusters/extra-client.yaml

6 years agorpm: use updated gperftools 24259/head
Kefu Chai [Mon, 17 Sep 2018 06:09:17 +0000 (14:09 +0800)]
rpm: use updated gperftools

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

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

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

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

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

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

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

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

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

luminous: os/bluestore: cache autotuning and memory limit

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

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

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

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

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

also exposes optional objv_tracker to RGWSimpleRadosWriteAttrsCR

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

The option was removed in a30cbe9adea34782be8699c010d4281d245feb6b

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

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

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

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

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

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

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

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

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