Commit Graph

110766 Commits

Author SHA1 Message Date
Sebastian Wagner
bc164a07ee
Merge pull request #34676 from sebastian-philipp/cephadm-inventory-class
mgr/cephadm: add Inventory class
2020-04-24 18:26:55 +02:00
Sebastian Wagner
fb830a37af
Merge pull request #34695 from mgfritch/cephadm-iscsi-container-image
mgr/cephadm: allow config for an iscsi `container_image`

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-04-24 18:26:22 +02:00
Sebastian Wagner
5bb5a35581
Merge pull request #34718 from mgfritch/cephadm-mgr-is-available
cephadm: catch Exception during is_mgr_available

Reviewed-by: Joshua Schmid <jschmid@suse.de>
2020-04-24 18:25:11 +02:00
Sebastian Wagner
d240d23b09
Merge pull request #34619 from sebastian-philipp/qa-adopt-specific-commit
qa/cephadm: make test_adoption checkout a specific commit
2020-04-24 18:01:18 +02:00
Sebastian Wagner
9dcab04380
Merge pull request #34693 from sebastian-philipp/cephadm-warn-master-improvement
cephadm: improve warn message

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-04-24 18:00:42 +02:00
Sebastian Wagner
affb6018b1
Merge pull request #34675 from sebastian-philipp/cephadm-service-rm-feedback
mgr/cephadm: remove_service: Feedback, if spec not found

Reviewed-by: Joshua Schmid <jschmid@suse.de>
2020-04-24 18:00:18 +02:00
Kefu Chai
5c8e43c171 qa/tests: pass "-t 2" to teuthology-suite when testing mimic
it's an oversight in 21dacc823b

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-04-24 23:09:03 +08:00
Lenz Grimmer
88cb9f7adc
Merge pull request #34142 from rhcs-dashboard/wip-44667-fix-reload-issues
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-04-24 15:58:17 +02:00
Abhishek L
934d1010b8
Merge pull request #34730 from theanalyst/docs/release-updates-04-20
docs: release updates for nautilus,mimic,octopus 

Reviewed-By: Nathan Cutler <ncutler@suse.com>
2020-04-24 14:57:28 +02:00
Adam Kupczyk
aa1a116f9e os/bluestore: Enable sharding by default
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
2020-04-24 14:36:05 +02:00
Sebastian Wagner
5bef4cbf34
Merge pull request #34673 from sebastian-philipp/cephadm-man
doc/man: add cephadm

Reviewed-by: Alexandra Settle <asettle@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
2020-04-24 14:06:57 +02:00
Kefu Chai
7b38f01438
Merge pull request #34725 from lxbsz/_type_equality_funcs
qa/tasks/cephfs/test_scrub: fix self.assertEqual no attribute '_type_equality_funcs'

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-04-24 18:59:31 +08:00
Abhishek Lekshmanan
60c8254869 doc: update release.yml with octopus, nautilus & mimic
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2020-04-24 12:35:21 +02:00
Abhishek Lekshmanan
4238833653 doc: releases: add release notes for v14.2.9
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2020-04-24 12:34:59 +02:00
Kefu Chai
4e7bf15108
Merge pull request #34726 from lxbsz/dict_key_error
qa/tasks/cephfs/cephfs_test_case: switch 'dict_keys' object to list

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-04-24 18:33:33 +08:00
Abhishek Lekshmanan
a9d303118c doc: release notes for v13.2.10 mimic
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2020-04-24 12:28:44 +02:00
Abhishek Lekshmanan
d8d2d76c94 doc: releases: release notes for v13.2.9 mimic
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2020-04-24 12:28:22 +02:00
Abhishek Lekshmanan
3f4da44062 doc: releases: v15.2.1 release notes
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2020-04-24 12:20:32 +02:00
Xiubo Li
afe19f24ba qa/tasks/cephfs/test_volumes: to make sure the size is int type
Fix "Error EINVAL: invalid size option '4915200.0'".

In pytho2 int/2 will get a int type result, but in python3 it maybe
a float type.

Fixes: https://tracker.ceph.com/issues/45247
Signed-off-by: Xiubo Li <xiubli@redhat.com>
2020-04-24 05:05:54 -04:00
Xiubo Li
65f97690af qa/tasks/cephfs/mount: to make sure that the count/seek are int type
To fix "stderr:dd: invalid number: '5.0'".

Fixes: https://tracker.ceph.com/issues/45247
Signed-off-by: Xiubo Li <xiubli@redhat.com>
2020-04-24 05:05:54 -04:00
Xiubo Li
89d0649088 qa/tasks/cephfs/test_scrub: fix self.assertEqual no attribute '_type_equality_funcs'
Signed-off-by: Xiubo Li <xiubli@redhat.com>
2020-04-24 04:12:46 -04:00
Xiubo Li
666974e0a6 qa/tasks/cephfs/cephfs_test_case: switch 'dict_keys' object to list
Fix the "TypeError: 'dict_keys' object does not support indexing" under
py3.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
2020-04-24 04:04:18 -04:00
Kefu Chai
f80ce9ec07
Merge pull request #33769 from lxbsz/qa_vstart_runner_os
qa/vstart_runner.py: add os and arch properties support

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-04-24 15:41:54 +08:00
Xiubo Li
624944503e qa/tasks/vstart_runner: make remote.sh return str as default
To address the issue in https://github.com/ceph/teuthology/pull/1459.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
2020-04-24 03:05:34 -04:00
Xiubo Li
704ce2c969 qa/vstart_runner.py: add os and arch properties support
Fixes: https://tracker.ceph.com/issues/44456
Signed-off-by: Xiubo Li <xiubli@redhat.com>
2020-04-24 03:05:34 -04:00
Kefu Chai
036c40e943
Merge pull request #34685 from lxbsz/vstart_runner
qa/tasks/cephfs/mount: switch to StringIO to fix TypeErrors

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-04-24 09:09:49 +08:00
Xiubo Li
0631342d10 qa/tasks/cephfs/mount: switch to StringIO to fix TypeErrors
TypeError: cannot use a string pattern on a bytes-like object

Fixes: https://tracker.ceph.com/issues/45175
Signed-off-by: Xiubo Li <xiubli@redhat.com>
2020-04-23 20:55:35 -04:00
Xiubo Li
c541bae6b1 qa/vstart_runner: remove the debug info
Fixes: https://tracker.ceph.com/issues/45175
Signed-off-by: Xiubo Li <xiubli@redhat.com>
2020-04-23 20:55:35 -04:00
Matthew Oliver
d3de8697e6 cephadm: Check for pool existance for iscsi And NFS
Currently both iscsi and NFS require pools to be specified when they are
deployed. However, we don't actaully check these pools exist. Leading to
broken containers.

This patch uses the rados client that is part of the mgrmodule to check
that the specified pool exists. As we need to check in 2 different
daemons, a helper method:

   def _check_pool_exists(self, pool, service_name):

was added to `cephadm/module.py`.

Fixes: https://tracker.ceph.com/issues/45161
Signed-off-by: Matthew Oliver <moliver@suse.com>
2020-04-24 00:44:54 +00:00
Michael Fritch
b454b995cb
cephadm: catch Exception during is_mgr_available
Traceback (most recent call last):
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 4578, in <module>
    r = args.func()
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 1121, in _default_image
    return func()
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 2489, in command_bootstrap
    is_available('mgr', is_mgr_available)
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 895, in is_available
    if func():
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 2486, in is_mgr_available
    out = cli(['status', '-f', 'json-pretty'], timeout=timeout)
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 2403, in cli
    return CephContainer(
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 2140, in run
    out, _, _ = call_throws(
  File "test_tmp/tmp.ykMmPiFqIT/cephadm", line 838, in call_throws
    raise RuntimeError('Failed command: %s' % ' '.join(command))

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-04-23 15:12:56 -06:00
Neha Ojha
7c8b627eaa qa/*/osd-scrub-repair.sh: don't fail if PG is in active+clean+wait
a0b453ad33 added the wait state, which can
make PGs stay in active+clean+wait for a while instead of going into
active+clean directly. As far as TEST_auto_repair_bluestore_failed is
concerned, we only care about the repair state being cleared.

Fixes: https://tracker.ceph.com/issues/45075
Signed-off-by: Neha Ojha <nojha@redhat.com>
2020-04-23 20:24:28 +00:00
Jason Dillaman
fbede28d1a rbd-mirror: skip snapshot image sync if mirror snapshot is marked clean
This is currently only utilized for the case where a newly created image
has mirroring enabled at time of creation, but it could be expanded in the
future if we track writes.

Fixes: https://tracker.ceph.com/issues/44596
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
ea64ba5a6f librbd: EnableRequest now accepts a boolean to indicate a clean image
If the image is clean, it's treated as if it was newly created and
therefore clean since snapshot id 0. The CreateRequest and
CloneRequest state machines pass true for this bool if mirroring
is being enabled during creation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
959d5e60d8 librbd: pass clean_since_snap_id to CreatePrimaryRequest
This will be stored in the primary MirrorSnapshotNamespace for use by
the rbd-mirror snapshot replayer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
50702eece0 cls/rbd: added clean_since_snap_id to MirrorSnapshotNamespace
It is only valid for primary snapshots so we can re-use the space
previously used by the primary_snap_id without the need to bump the
version id.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
6da56d7982 rbd: add '--mirror-image-mode' optional to image creation actions
This allows the user to enable mirroring while creating, cloning,
copying, importing, or migrating an image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
25c034f0a0 librbd: save requested mirror image mode during migration prepare
Once the migration is committed, the requested mode will be applied.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
407f2e5c17 librbd: permit mirroring to be enabled upon image cloning
The librbd clone API's ImageOptions parameter now supports passing
the mirror image mode.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
a90042b254 librbd: add non-primary global image id to mirror enable
The constructor that took an ImageCtx did not support passing the
non-primary global image id and instead defaulted to an empty string.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
37f6fa8fe9 librbd: permit mirroring to be enabled upon image creation
The librbd create API's ImageOptions parameter now supports passing
the mirror image mode.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:49 -04:00
Jason Dillaman
931c9f0fd9 librbd: mirror enable state machine might need to open image
If attempting to create a snapshot-based mirroring primary snapshot,
the image needs to first be opened. If we weren't supplied an image,
open the image, create the snapshot, and close the image again.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 13:19:48 -04:00
Casey Bodley
ce5f3e3047
Merge pull request #34570 from cbodley/wip-bucket-layout-json
rgw: bucket layout fixes

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2020-04-23 11:16:55 -04:00
Casey Bodley
f43e58071e
Merge pull request #34645 from cbodley/wip-rgw-reshard-target-layout
rgw: use target bucket layout for reshard

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
2020-04-23 11:16:44 -04:00
Jason Dillaman
92b3122a06
Merge pull request #33937 from changchengx/unsigned_compare
librbd: fix unsigned value compared with zero

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2020-04-23 10:48:33 -04:00
Boris Ranto
05573aa57d
Merge pull request #34694 from mikechristie/ceph-iscsi-selinux-fixes
ceph-iscsi:  selinux fixes

Reviewed-by: Boris Ranto <branto@redhat.com>
2020-04-23 13:52:36 +02:00
Sebastian Wagner
9f13c126f6 doc/man: add cephadm
Fixes: https://tracker.ceph.com/issues/44971

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-04-23 13:01:02 +02:00
Sebastian Wagner
bf395f253e mgr/cephadm: unify apply tests
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-04-23 12:39:32 +02:00
Sebastian Wagner
8eaadfe612 mgr/cephadm: unified add_daemon tests
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-04-23 12:39:32 +02:00
Sebastian Wagner
61393da911 mgr/cephadm: add cleanup to test_cephadm
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-04-23 12:39:32 +02:00
Sebastian Wagner
33b6c501f1 mgr/cephadm: remove_service: Feedback, if spec not found
`ceph orch rm my-unknown-service` still returned
`Removed service my-unknown-service`.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-04-23 12:26:04 +02:00