]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Jason Dillaman [Thu, 7 Nov 2019 15:58:35 +0000 (10:58 -0500)]
Revert "nautilus: librbd: behave more gracefully when data pool removed"
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Thu, 7 Nov 2019 15:30:59 +0000 (09:30 -0600)]
Merge pull request #30844 from liewegas/wip-crash-nautilus
nautilus: ceph-crash: try client.crash[.host] before client.admin; add mon profile
Jason Dillaman [Thu, 7 Nov 2019 12:55:47 +0000 (07:55 -0500)]
Merge pull request #30823 from dillaman/wip-42204-nautilus
nautilus: librbd: v1 clones are restricted to the same namespace
Reviewed-by: Mykola Golub <mgolub@suse.com>
Jason Dillaman [Thu, 7 Nov 2019 12:54:31 +0000 (07:54 -0500)]
Merge pull request #30824 from dillaman/wip-41629-nautilus
nautilus: librbd: behave more gracefully when data pool removed
Reviewed-by: Mykola Golub <mgolub@suse.com>
Jason Dillaman [Thu, 7 Nov 2019 12:53:06 +0000 (07:53 -0500)]
Merge pull request #30825 from dillaman/wip-41883-nautilus
nautilus: rbd-mirror: cannot restore deferred deletion mirrored images
Reviewed-by: Mykola Golub <mgolub@suse.com>
Jason Dillaman [Thu, 7 Nov 2019 12:51:50 +0000 (07:51 -0500)]
Merge pull request #30948 from dillaman/wip-42333-nautilus
nautilus: test/cls_rbd: removed mirror peer pool test cases
Reviewed-by: Mykola Golub <mgolub@suse.com>
Lenz Grimmer [Thu, 7 Nov 2019 11:43:56 +0000 (11:43 +0000)]
nautilus: mgr/dashboard: Unify button/URL actions naming for i… (#29510)
nautilus: mgr/dashboard: Unify button/URL actions naming for iSCSI and NFS
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Lenz Grimmer [Thu, 7 Nov 2019 11:43:19 +0000 (11:43 +0000)]
nautilus: mgr/dashboard: change bucket owner between owners fr… (#29485)
nautilus: mgr/dashboard: change bucket owner between owners from same tenant
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Yuri Weinstein [Wed, 6 Nov 2019 20:21:27 +0000 (12:21 -0800)]
Merge pull request #31012 from smithfarm/wip-42392-nautilus
nautilus: mgr/balancer: python3 compatibility issue
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Wed, 6 Nov 2019 20:20:52 +0000 (12:20 -0800)]
Merge pull request #31031 from smithfarm/wip-42200-nautilus
nautilus: core: kv/RocksDBStore: tell rocksdb to set mode to 0600, not 0644
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 6 Nov 2019 20:20:26 +0000 (12:20 -0800)]
Merge pull request #31034 from smithfarm/wip-40504-nautilus
nautilus: core: osd: rollforward may need to mark pglog dirty
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Yuri Weinstein [Wed, 6 Nov 2019 20:19:51 +0000 (12:19 -0800)]
Merge pull request #31037 from smithfarm/wip-41548-nautilus
nautilus: core: mon/MonClient: ENXIO when sending command to down mon
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Yuri Weinstein [Wed, 6 Nov 2019 20:19:29 +0000 (12:19 -0800)]
Merge pull request #31038 from smithfarm/wip-41705-nautilus
nautilus: core: mon/Monitor.cc: fix condition that checks for unrecognized auth mode
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Yuri Weinstein [Wed, 6 Nov 2019 20:18:32 +0000 (12:18 -0800)]
Merge pull request #31039 from smithfarm/wip-42125-nautilus
nautilus: mgr: fix weird health-alert daemon key
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 6 Nov 2019 20:17:49 +0000 (12:17 -0800)]
Merge pull request #31111 from tchaikov/nautilus/42455
nautilus: core: mon/MonCommands: "smart" only needs read permission
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Lenz Grimmer [Wed, 6 Nov 2019 14:34:45 +0000 (14:34 +0000)]
nautilus: mgr/dashboard: qa: whitelist client eviction warning (#31114)
nautilus: mgr/dashboard: qa: whitelist client eviction warning
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Nathan Cutler [Tue, 5 Nov 2019 18:25:38 +0000 (19:25 +0100)]
Merge pull request #30889 from yuvalif/nautilus-backport-42042
nautilus: rgw/amqp: fix race condition in AMQP unit test
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Lenz Grimmer [Tue, 5 Nov 2019 11:46:40 +0000 (11:46 +0000)]
Merge pull request #30259 from LenzGr/wip-41604-nautilus
nautilus: mgr/dashboard: access_control: add grafana scope read access to *-manager roles
Reviewed-by: Ricardo Dias <rdias@suse.com>
Lenz Grimmer [Tue, 5 Nov 2019 11:44:33 +0000 (11:44 +0000)]
nautilus: mgr/dashboard: Allow the decrease of pg's of an exis… (#30376)
nautilus: mgr/dashboard: Allow the decrease of pg's of an existing pool
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Lenz Grimmer [Tue, 5 Nov 2019 11:40:18 +0000 (11:40 +0000)]
nautilus: mgr/dashboard: Allow disabling redirection on standb… (#30382)
nautilus: mgr/dashboard: Allow disabling redirection on standby Dashboards
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Tue, 5 Nov 2019 10:00:37 +0000 (10:00 +0000)]
nautilus: mgr/dashboard: Automatically use correct chromedrive… (#31371)
nautilus: mgr/dashboard: Automatically use correct chromedriver version
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Yuri Weinstein [Mon, 4 Nov 2019 21:04:37 +0000 (13:04 -0800)]
Merge pull request #30532 from mikechristie/nautilus-rbd-nbd-netlink
nautilus: rbd-nbd: add netlink support and nl resize
Yuri Weinstein [Mon, 4 Nov 2019 21:04:01 +0000 (13:04 -0800)]
Merge pull request #30661 from smithfarm/wip-41771-nautilus
nautilus: common/config_proxy: hold lock while accessing mutable container
Yuri Weinstein [Mon, 4 Nov 2019 21:03:00 +0000 (13:03 -0800)]
Merge pull request #30464 from smithfarm/wip-41915-nautilus
nautilus: qa: avoid page cache for krbd discard round off tests
Yuri Weinstein [Mon, 4 Nov 2019 21:02:19 +0000 (13:02 -0800)]
Merge pull request #30423 from smithfarm/wip-41545-nautilus
nautilus: test/librbd: set nbd timeout due to newer kernels defaulting it on
Yuri Weinstein [Mon, 4 Nov 2019 21:01:35 +0000 (13:01 -0800)]
Merge pull request #30354 from pdvian/wip-41764-nautilus
nautilus: test/cls_rbd/test_cls_rbd: update TestClsRbd.sparsify
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 4 Nov 2019 21:01:17 +0000 (13:01 -0800)]
Merge pull request #30120 from pdvian/wip-41620-nautilus
nautilus: tools/rbd-ggate: close log before running postfork
Yuri Weinstein [Mon, 4 Nov 2019 21:00:27 +0000 (13:00 -0800)]
Merge pull request #30697 from uweigand/nautilus-endian-fixes
nautilus: backport endian fixes
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Mon, 4 Nov 2019 20:53:19 +0000 (12:53 -0800)]
Merge pull request #30048 from smithfarm/wip-41258-nautilus
nautilus: bluestore: Don't forget sub kv_submitted_waiters
Yuri Weinstein [Mon, 4 Nov 2019 20:52:27 +0000 (12:52 -0800)]
Merge pull request #30007 from smithfarm/wip-41279-nautilus
nautilus: mgr/prometheus: Cast collect_timeout (scrape_interval) to float
Yuri Weinstein [Mon, 4 Nov 2019 20:51:36 +0000 (12:51 -0800)]
Merge pull request #30000 from smithfarm/wip-41503-nautilus
nautilus: osd/PeeringState: do not complain about past_intervals constrained by oldest epoch
Yuri Weinstein [Mon, 4 Nov 2019 20:50:25 +0000 (12:50 -0800)]
Merge pull request #29999 from smithfarm/wip-41501-nautilus
nautilus: core: Improve health status for backfill_toofull and recovery_toofull and fix backfill_toofull seen on cluster where the most full OSD is at 1%
Yuri Weinstein [Mon, 4 Nov 2019 20:49:36 +0000 (12:49 -0800)]
Merge pull request #30050 from smithfarm/wip-41443-nautilus
nautilus: core: osd: clear PG_STATE_CLEAN when repair object
Yuri Weinstein [Mon, 4 Nov 2019 20:48:46 +0000 (12:48 -0800)]
Merge pull request #30051 from smithfarm/wip-41456-nautilus
nautilus: core: osd: merge replica log on primary need according to replica log's crt
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 4 Nov 2019 20:48:15 +0000 (12:48 -0800)]
Merge pull request #30080 from pdvian/wip-41596-nautilus
nautilus: tools: ceph-objectstore-tool can't remove head with bad snapset
Reviewed-by: David Zafman <dzafman@redhat.com>
Tiago Melo [Mon, 4 Nov 2019 11:27:46 +0000 (10:27 -0100)]
mgr/dashboard: Automatically use correct chromedriver version
Every Chrome version requires a corresponding chromedriver version for the e2e
test to work.
Since we were using a fixed chromedriver version, each time chrome was updated
the e2e scripts stopped working.
With this new script we will check which version of Chrome is installed and
update chromedriver to the correct version.
Fixes: https://tracker.ceph.com/issues/42607
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit
242e76e8840b5d9085239a6fa55a29a093792ee3 )
Conflicts:
src/pybind/mgr/dashboard/frontend/package.json
- use "e2e:dev" in nautilus, instead of "e2e:ci"
Jan Fajerski [Sat, 2 Nov 2019 14:20:46 +0000 (15:20 +0100)]
Merge pull request #31228 from jan--f/wip-42540-nautilus
nautilus: ceph-volume: api/lvm: check if list of LVs is empty
Yuri Weinstein [Fri, 1 Nov 2019 19:12:14 +0000 (12:12 -0700)]
Merge pull request #29994 from smithfarm/wip-41448-nautilus
nautilus: osd/PrimaryLogPG: Avoid accessing destroyed references in finish_degr…
Yuri Weinstein [Fri, 1 Nov 2019 19:11:20 +0000 (12:11 -0700)]
Merge pull request #29992 from smithfarm/wip-40084-nautilus
nautilus: osd: Better error message when OSD count is less than osd_pool_default_size
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 1 Nov 2019 19:09:04 +0000 (12:09 -0700)]
Merge pull request #29991 from smithfarm/wip-39700-nautilus
nautilus: core: If the nodeep-scrub/noscrub flags are set in pools instead of global cluster. List the pool names in the ceph status
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 1 Nov 2019 19:05:18 +0000 (12:05 -0700)]
Merge pull request #29988 from smithfarm/wip-39682-nautilus
nautilus: core: filestore pre-split may not split enough directories
Yuri Weinstein [Fri, 1 Nov 2019 19:04:24 +0000 (12:04 -0700)]
Merge pull request #29979 from smithfarm/wip-41341-nautilus
nautilus: tests: "CMake Error" in test_envlibrados_for_rocksdb.sh
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 1 Nov 2019 19:03:42 +0000 (12:03 -0700)]
Merge pull request #29997 from smithfarm/wip-41453-nautilus
nautilus: core: mon: C_AckMarkedDown has not handled the Callback Arguments
Yuri Weinstein [Fri, 1 Nov 2019 19:03:02 +0000 (12:03 -0700)]
Merge pull request #29998 from smithfarm/wip-41491-nautilus
nautilus: core: osd/OSDCap: Check for empty namespace
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Jan Fajerski [Fri, 1 Nov 2019 13:38:35 +0000 (14:38 +0100)]
Merge pull request #30805 from jan--f/wip-42236-nautilus
nautilus: ceph-volume: PVolumes.filter shouldn't purge itself
Jan Fajerski [Fri, 1 Nov 2019 13:38:21 +0000 (14:38 +0100)]
Merge pull request #30807 from jan--f/wip-42234-nautilus
nautilus: ceph-volume: VolumeGroups.filter shouldn't purge itself
Nathan Cutler [Fri, 1 Nov 2019 07:42:54 +0000 (08:42 +0100)]
Merge pull request #31290 from idryomov/wip-krbd-unmap-msgr1-nautilus
nautilus: qa/suites/krbd: run unmap subsuite with msgr1 only
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Ilya Dryomov [Tue, 29 Oct 2019 15:19:14 +0000 (16:19 +0100)]
qa/suites/krbd: run unmap subsuite with msgr1 only
pre-single-major.yaml kernel doesn't have any of the monitor client
fixes that came in 4.6. If the connection is closed, it closes the
session and retries only after 10 seconds. On top of that, there is
nothing to prevent it from picking the same monitor when reconnecting.
This means that when given both v1 and v2 ports (which look like two
different monitors), it is susceptible to mount_timeout (60 seconds):
$ sudo rbd map img
rbd: sysfs write failed
In some cases useful info is found in syslog - try "dmesg | tail".
rbd: map failed: (5) Input/output error
[ 822.242313] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
[ 832.265494] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
[ 842.296175] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
[ 852.326924] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
[ 862.357611] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
[ 872.388373] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
[ 882.676136] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
Unlike newer kernels that return ETIMEDOUT, it returns EIO.
Newer kernels are much more aggressive about retries and will pick
a different monitor when reconnecting, hence they are always able to
establish the session in time.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
5011cc926cd434a6c095bab57e4b0658f98f5657 )
Jan Fajerski [Thu, 31 Oct 2019 10:48:15 +0000 (11:48 +0100)]
Merge pull request #31210 from sebastian-philipp/nautilus-ceph-volume-device_id
nautilus: ceph-volume: add Ceph's device id to inventory
Nathan Cutler [Thu, 31 Oct 2019 10:20:56 +0000 (11:20 +0100)]
Merge pull request #31259 from jan--f/wip-41290-nautilus
nautilus: doc: update bluestore cache settings and clarify data fraction
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Jan Fajerski [Mon, 29 Apr 2019 12:52:27 +0000 (14:52 +0200)]
doc: update bluestore cache settings and clarify data fraction
Fixes: http://tracker.ceph.com/issues/39522
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
9d8336a7f418fe2bb11361dd74a214403b1e5be7 )
Rishabh Dave [Tue, 3 Sep 2019 13:06:23 +0000 (18:36 +0530)]
api/lvm: rewrite a condition
Create the list of logical volumes if the list passed in arguments is
empty and rewrite the condition to make it more readable.
Fixes: https://tracker.ceph.com/issues/41649
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
d1f1bfd3635501090f4069be59e0bcde94dd64ec )
Sebastian Wagner [Fri, 18 Oct 2019 11:59:44 +0000 (13:59 +0200)]
ceph-volume: add Ceph's device id to inventory
This will benefit the orchestrator and dashboard to show a unified view of devices with SMART data
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
e70d6041c1a093ed5c2b77abe17e1ede533d9659 )
Ricardo Dias [Thu, 18 Jul 2019 14:44:04 +0000 (15:44 +0100)]
mgr/dashboard: qa: whitelist client eviction warning
This warning is caused by the recent changes to the volumes
module that cache the CephFS handles.
Commit
5c41e949af9acabd612b0644de0603e374b4b42a
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit
658bd35b96f276bf50461ff87d7bafb99d7eb585 )
Kefu Chai [Mon, 14 Oct 2019 13:32:04 +0000 (21:32 +0800)]
mon/MonCommands: "smart" only needs read permission
Fixes: https://tracker.ceph.com/issues/42455
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts: this change is not cherry-picked from master, because in
master, we had a massive refactor in asok. see
https://github.com/ceph/ceph/pull/30859. and #30859 is not backported
to nautilus.
Nathan Cutler [Wed, 23 Oct 2019 14:01:24 +0000 (16:01 +0200)]
Merge pull request #31074 from smithfarm/wip-42417-nautilus
nautilus: doc/rbd: s/guess/xml/ for codeblock lexer
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Wed, 16 Oct 2019 04:34:19 +0000 (12:34 +0800)]
doc/rbd: s/guess/xml/ for codeblock lexer
this change silences the warning of
```
doc/rbd/qemu-rbd.rst:174: WARNING: Pygments lexer name 'guess' is not
known
```
see http://pygments.org/docs/lexers/, we should use "xml" for XML .
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
df226da996e468d2707b08eb012d54b4e37ffdc6 )
Zengran Zhang [Tue, 18 Jun 2019 03:32:33 +0000 (11:32 +0800)]
osd: accident of rollforward may need to mark pglog dirty
refers: https://github.com/ceph/ceph/pull/27015/files#r294114392
Fixes: http://tracker.ceph.com/issues/40403
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit
35cb184becd6562edd240553dfa50f47bb120b7f )
Zengran Zhang [Sun, 17 Mar 2019 02:05:11 +0000 (10:05 +0800)]
OSD: rollforward may need to mark pglog dirty
if we rollforward at the end of PG::activate(), we may advance the *crt*,
but we did not mart the log dirty, this means we will not update the crt
within the transaction of rollforward, so it is inconsistent.
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit
10d0990dc69310864b4845ee57b32610a642464f )
Conflicts:
src/osd/PGLog.h
-
dfbe5e070cc978253abcb30b86de5faa7e6a1efc is not being backported
- retain !touched_log as part of conditional in is_dirty()
xie xingguo [Sun, 29 Sep 2019 06:15:07 +0000 (14:15 +0800)]
mgr: fix weird health-alert daemon key
Was:
19 slow ops, oldest one blocked for 34 sec, daemons [osd,2,osd,4] have slow ops.
Now:
153 slow ops, oldest one blocked for 38 sec, daemons [osd.3,osd.4,osd.5] have slow ops.
Fixes: https://tracker.ceph.com/issues/42079
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
25963f24e59568871e8231432bfc31d60624e911 )
Neha Ojha [Thu, 29 Aug 2019 17:37:24 +0000 (10:37 -0700)]
mon/Monitor.cc: fix condition that checks for unrecognized auth mode
Introduced by
771682aad09
Fixes:https://tracker.ceph.com/issues/41429
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
2758ba1fb9645d2e552545b232de3d36a1f3fae5 )
Sage Weil [Wed, 17 Jul 2019 21:47:14 +0000 (16:47 -0500)]
qa/tasks/ceph: retry several times to tell mons ot stop logging health
If we have any sort of failure injection, one attempt is not enough.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
662dbf9c6c6567a5eaad8d5c9fe7f936b939b423 )
Sage Weil [Wed, 17 Jul 2019 21:46:52 +0000 (16:46 -0500)]
mon/MonClient: allow retries to be adjusted
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit
2c8e538e8352d17f8f64c77b80e18a764540c8d0 )
Sage Weil [Wed, 17 Jul 2019 15:20:25 +0000 (10:20 -0500)]
mon/MonClient: give up targetted mon_commands after one attempt
If one of the monitors is down, we need to give up trying to reconnect to
that mon and send it a MonCommand.
Fixes: https://tracker.ceph.com/issues/40792
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit
134f6a843ce6a9c9aeea59cd43c8c60103e635a7 )
Conflicts:
src/mon/MonClient.cc
-
5475f67bf66d1d7faf20b91dd6e629051996a0e9 is not being backported
Sage Weil [Tue, 16 Jul 2019 22:42:15 +0000 (17:42 -0500)]
mon/MonClient: debug show start_mon_command variant
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
1c92ab7c91c5e3ee9d706cefda9ec4317e48eec0 )
Sage Weil [Tue, 16 Jul 2019 22:39:46 +0000 (17:39 -0500)]
mon/MonClient: tolerate null onfinish during shutdown
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
0fb123a2f6d60b4fdaf22ddcbd54d1b6b8ea96e9 )
Sage Weil [Tue, 1 Oct 2019 22:48:11 +0000 (17:48 -0500)]
common/safe_io: pass mode to safe_io; use 0600, not 0644
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f6e00b96c8802f2205c89cf54fb689bc07436415 )
Sage Weil [Tue, 1 Oct 2019 22:45:01 +0000 (17:45 -0500)]
kv/RocksDBStore: tell rocksdb to set mode to 0600, not 0644
We don't want other users on the system to be able to read the rocksdb
database.
Fixes: https://tracker.ceph.com/issues/42114
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
d9a46f9f1e0b14e63ac0b8def7f7ae8a716a833a )
Nathan Cutler [Mon, 21 Oct 2019 20:22:21 +0000 (22:22 +0200)]
Merge pull request #31009 from SUSE/wip-doc-telemetry-default-interval-nautilus
nautilus: doc/mgr/telemetry: update default interval
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Mykola Golub [Fri, 18 Oct 2019 09:19:30 +0000 (12:19 +0300)]
mgr/balancer: python3 compatibility issue
Fixes: https://tracker.ceph.com/issues/42370
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
97720eddd92f2fd31599ea0cecf2502f600d3bb9 )
Tim Serong [Mon, 21 Oct 2019 07:11:35 +0000 (18:11 +1100)]
doc/mgr/telemetry: update default interval
Commit
712987d533 changed the default interval to 24h;
updating the docs to match (this also should go to
the Nautilus branch as that commit landed there too
in https://github.com/ceph/ceph/pull/27709)
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit
3c8793c4bd077db2796b512a3b59cd6a01cb3a8c )
Jason Dillaman [Wed, 16 Oct 2019 00:42:29 +0000 (20:42 -0400)]
test/cls_rbd: removed mirror peer pool test cases
The mirror peer pool id has never been used and has been dropped
from the Octopus release. This will fix the breakage in the test
cases where the pool id was tested.
Fixes: https://tracker.ceph.com/issues/42333
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Yuval Lifshitz [Sun, 6 Oct 2019 08:31:35 +0000 (11:31 +0300)]
rgw/amqp: fix race condition in AMQP unit test
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
(cherry picked from commit
5934ef5071a71c7ae8604d5f2a5e83ac4d01d263 )
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
David Zafman [Fri, 23 Aug 2019 15:54:28 +0000 (08:54 -0700)]
osd: Rename backfill reservation reject names to reflect too full use
The only reason for a reject is in a too full condition. Now that we
have two types of revoke, let's make this clearer.
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
0115595c1d1366cb3633e9dc6730496b9e5cf5c4 )
Conflicts:
src/osd/PeeringEvent.h
- file does not exist in nautilus due to refactoring: made the changes manually to src/osd/PGPeeringEvent.h
src/osd/PeeringState.cc
src/osd/PeeringState.h
- files do not exist in nautilus due to refactoring: made the changes manually to src/osd/PG.{cc,h}
by doing:
s/RejectRemoteReservation/RejectTooFullRemoteReservation/g
s/RemoteReservationRejected/RemoteReservationRejectedTooFull/g
David Zafman [Thu, 22 Aug 2019 17:30:01 +0000 (10:30 -0700)]
osd: Rename MBackfillReserve::TOOFULL to what it does in particular (revoke)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
7810ee584cc0fe9ca1b819d2a807dfc7cd13d292 )
Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus due to refactoring: made the changes manually
to src/osd/PG.cc
David Zafman [Fri, 23 Aug 2019 15:52:39 +0000 (08:52 -0700)]
osd: Don't set backfill_toofull in RemoteReservationRevoked path
We shouldn't set backfill_toofull when a revoke occurs in the non-toofull
case.
Fixes: https://tracker.ceph.com/issues/41255
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
fa569ecfecc43ce685b29e0456f62cb085788f25 )
Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus due to refactoring: made the changes manually
to src/osd/PG.cc
- no "DECLARE_LOCALS" in nautilus
Sage Weil [Sat, 5 Oct 2019 18:30:21 +0000 (13:30 -0500)]
ceph-crash: try to post as either client.crash[.$hostname] or client.admin
Often/usually a client.admin isn't installed on hosts with ceph daemons
where we need to scrape crashes. Try both client.crash (which can be
relatively unprivileged, but isn't historically present) and client.admin.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
885031296f36bda59baca168149432ba009cab7b )
Dan Mick [Mon, 15 Jul 2019 21:39:52 +0000 (14:39 -0700)]
ceph-crash: use open(..,'rb') to read bytes for Python3
Fixes: http://tracker.ceph.com/issues/40781
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit
6fd63a6abbad4054744ba980600ee3fca20768bf )
Sage Weil [Sat, 5 Oct 2019 15:50:01 +0000 (10:50 -0500)]
mon/MonCap: add 'crash' profile
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
530f1190f6b7d8fe320f83e7134d2aaf9ac41c30 )
Jason Dillaman [Wed, 11 Sep 2019 20:30:16 +0000 (16:30 -0400)]
rbd-mirror: prevent restored trash images from being deleted after delay
The image deleter wasn't verifying whether or not an image was still in the trash
prior to deleting the image. This not only would incorrectly remove any restored
images but it will also leave the image id object and entry within the directory.
Fixes: https://tracker.ceph.com/issues/41780
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
f091a31d5252bba76598fffdc997275ca531621d )
Jason Dillaman [Wed, 11 Sep 2019 19:28:28 +0000 (15:28 -0400)]
rbd-mirror: renamed RemoveRequest state machine to TrashRemoveRequest
This better matches the current behavior where the images are only
removed from the trash.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
55daa8e1e28f457a897070adfabf1583093aadd3 )
Conflicts:
src/test/rbd_mirror/CMakeLists.txt: trivial resolution
src/tools/rbd_mirror/ImageDeleter.cc: trivial resolution
Jason Dillaman [Wed, 11 Sep 2019 18:50:24 +0000 (14:50 -0400)]
rbd-mirror: set image as primary when moving to trash
This will allow the the image to be restored and re-mirrored if
desired.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
73d4577d1b9a9bff087b555c9de5005d1120a0ea )
Jason Dillaman [Wed, 11 Sep 2019 18:07:23 +0000 (14:07 -0400)]
librbd: allow mirroring trash images to be restored
This functionality was accidentally broken when image live-migration
was introduced.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
0ef0f43da9d112c54e3f17ed786d7197f920b8a2 )
Conflicts:
src/librbd/api/Trash.cc: TRASH_IMAGE_SOURCE_USER_PARENT not valid enum
Mykola Golub [Mon, 15 Apr 2019 10:34:07 +0000 (11:34 +0100)]
librbd: reuse async trash remove state machine
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
bf8a67f3b8bde4c8759c6b7251358148a85f63d4 )
Conflicts:
src/librbd/api/Trash.cc: TRASH_IMAGE_SOURCE_USER_PARENT not valid enum
Mykola Golub [Mon, 15 Apr 2019 10:32:15 +0000 (11:32 +0100)]
librbd: async trash remove state machine
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
8455d6611c48ae8a721d307d157b64d8a7041abe )
Mykola Golub [Tue, 27 Aug 2019 05:07:32 +0000 (06:07 +0100)]
qa/workunits/rbd: add 'remove mirroring pool' test
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
de66e0b89c3b80390d03205699cb9fd985dc5629 )
Mykola Golub [Mon, 12 Aug 2019 13:42:51 +0000 (14:42 +0100)]
librbd: behave more gracefully when data pool removed
allowing to open the image and do some maintenance operations,
and returning -ENODEV for ops that require data pool.
Fixes: https://tracker.ceph.com/issues/41206
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
00b2c86f7c486fbd82e6ce27edbd90f866de88af )
Conflicts:
src/librbd/cache/ObjectCacherObjectDispatch.cc: trivial resolution
src/librbd/cache/ParentCacheObjectDispatch.cc: DNE
src/librbd/image/RefreshRequest.cc: trivial resolution
src/librbd/image/OpenRequest.cc: don't init cache on invalid data_ctx
src/librbd/io/ImageRequestWQ.cc: get reference to AioCompletion before failing
Mykola Golub [Thu, 22 Aug 2019 13:29:52 +0000 (14:29 +0100)]
librados: add IoCtx::is_valid method to test if IoCtx was initialized
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
10ae725d3bd19899e1ae935e3197e5a0d1ff9df3 )
Jason Dillaman [Thu, 3 Oct 2019 14:03:44 +0000 (10:03 -0400)]
librbd: v1 clones are restricted to the same namespace
Therefore the v1 parent spec should not attempt to populate the
namespace.
Fixes: https://tracker.ceph.com/issues/41938
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
547ebccaf9cbc27aeee68877cd46da7d132c078f )
Rishabh Dave [Thu, 3 Oct 2019 12:14:37 +0000 (17:44 +0530)]
ceph-volume: update tests since VolumeGroups.filter returns a list
VolumeGroups.filter returns VolumeGroups object that contains VGs
matching the filter. Update the tests to hold the list returned by the
Volumes.filter() call.
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
da58d239a0e067cd3ea5fd26aac24a2551b871c1 )
Rishabh Dave [Thu, 3 Oct 2019 12:09:37 +0000 (17:39 +0530)]
ceph-volume: VolumeGroups.filter shouldn't purge itself
VolumeGroups.filter remove VGs from the list that do no match filter.
Instead of doing that, return a new list that contains VGs that match
the fiter so that VolumeGroups object held by code calling it is not
modified.
Fixes: https://tracker.ceph.com/issues/42171
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
028757813282f764ebcce05572f9e4b76ea4e552 )
Rishabh Dave [Thu, 3 Oct 2019 12:10:37 +0000 (17:40 +0530)]
ceph-volume: allow creating empty VolumeGroup objects
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
2dc4f7de96e51c8117b719640ec4c09388a1412e )
Rishabh Dave [Thu, 3 Oct 2019 11:30:38 +0000 (17:00 +0530)]
ceph-volume: update tests since PVolumes.filter returns a list
...returns a list of filtered PVs instead of removing the items that do
not match the filters from itself.
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
38ccfe089a86f86b6e48b9a60286f26bb2444596 )
Rishabh Dave [Thu, 3 Oct 2019 11:18:46 +0000 (16:48 +0530)]
ceph-volume: PVolumes.filter shouldn't purge itself
PVolumes.filter removes the PVs that do not match the filters from its
list. This approach is problematic since the code calling this method
has to create a copy beforehand. Therefore, it's better to return a new
object that contains PVs that matches the filters.
Fixes: https://tracker.ceph.com/issues/42170
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
fcec33ee50457d43add844aef3b81bbf9dd2ad58 )
Rishabh Dave [Thu, 3 Oct 2019 11:14:35 +0000 (16:44 +0530)]
ceph-volume: allow creating empty PVolumes objects
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
384aaee8fd2b0de7120e58efc3ebbd2a520d709f )
Jan Fajerski [Wed, 9 Oct 2019 11:15:12 +0000 (13:15 +0200)]
Merge pull request #30676 from sobelek/wip-42050-nautilus
nautilus: ceph-volume: fix warnings raised by pytest
Yuri Weinstein [Tue, 8 Oct 2019 19:51:20 +0000 (12:51 -0700)]
Merge pull request #29965 from smithfarm/wip-41272-nautilus
nautilus: rgw: rgw-log issues the wrong message when decompression fails
Yuri Weinstein [Tue, 8 Oct 2019 19:50:35 +0000 (12:50 -0700)]
Merge pull request #29969 from smithfarm/wip-41446-nautilus
nautilus: rgw_file: readdir: do not construct markers w/leading '/'
Yuri Weinstein [Tue, 8 Oct 2019 19:50:09 +0000 (12:50 -0700)]
Merge pull request #29970 from smithfarm/wip-41459-nautilus
nautilus: rgw: Put User Policy is sensitive to whitespace
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:49:41 +0000 (12:49 -0700)]
Merge pull request #29972 from smithfarm/wip-41482-nautilus
nautilus: rgw: potential realm watch lost
Reviewed-by: Casey Bodley <cbodley@redhat.com>