]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoosd/: maintain PeeringState::min_last_complete_ondisk on replica
Samuel Just [Fri, 13 Dec 2019 21:28:09 +0000 (13:28 -0800)]
osd/: maintain PeeringState::min_last_complete_ondisk on replica

Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoReplicatedBackend,MOSDRepOp: replace pg_roll_forward_to with mlcod
Samuel Just [Fri, 13 Dec 2019 20:54:28 +0000 (12:54 -0800)]
ReplicatedBackend,MOSDRepOp: replace pg_roll_forward_to with mlcod

New clients will ignore the field on header.version <= 2.  New
primaries will send the old variant if there are peers expecting
the old variant.

Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoReplicatedBackend: always rollforward on repop to version
Samuel Just [Fri, 13 Dec 2019 20:11:55 +0000 (12:11 -0800)]
ReplicatedBackend: always rollforward on repop to version

The primary always sets this field to be at_version, and we're
going to reuse this field to mean min_last_complete_ondisk.

Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoosd/PGBackend: rename submit_transaction field roll_forward_to
Samuel Just [Fri, 13 Dec 2019 20:06:31 +0000 (12:06 -0800)]
osd/PGBackend: rename submit_transaction field roll_forward_to

This field is actually just a lower bound on committed, client
visible log versions.

Signed-off-by: Samuel Just <sjust@redhat.com>
5 years agoceph_test_rados: use - not _ in args
Sage Weil [Fri, 23 Aug 2019 18:43:28 +0000 (13:43 -0500)]
ceph_test_rados: use - not _ in args

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/rados/thrash[-erasure-code]: add misc -{localized,balanced}.yaml jobs
Sage Weil [Thu, 22 Aug 2019 21:34:45 +0000 (16:34 -0500)]
qa/suites/rados/thrash[-erasure-code]: add misc -{localized,balanced}.yaml jobs

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/tasks/rados: add {localize,balance}_reads field
Sage Weil [Thu, 22 Aug 2019 21:33:42 +0000 (16:33 -0500)]
qa/tasks/rados: add {localize,balance}_reads field

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph_test_rados: add --localize_reads option
Sage Weil [Thu, 22 Aug 2019 21:29:39 +0000 (16:29 -0500)]
ceph_test_rados: add --localize_reads option

Same as balance_reads, but sets the LOCALIZE_READS op flag on read ops.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32300 into master
Sage Weil [Tue, 17 Dec 2019 19:32:38 +0000 (13:32 -0600)]
Merge PR #32300 into master

* refs/pull/32300/head:
cephadm: drop 'sha256:' prefix on container id

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #32302 into master
Sage Weil [Tue, 17 Dec 2019 19:32:24 +0000 (13:32 -0600)]
Merge PR #32302 into master

* refs/pull/32302/head:
cephadm: check for both ntp.service and ntpd.service

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #32280 from dillaman/wip-librbd-qos-test
Jason Dillaman [Tue, 17 Dec 2019 17:30:52 +0000 (12:30 -0500)]
Merge pull request #32280 from dillaman/wip-librbd-qos-test

qa/workunit/rbd: fixed QoS throughput unit parsing

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge PR #32279 into master
Sage Weil [Tue, 17 Dec 2019 16:59:26 +0000 (10:59 -0600)]
Merge PR #32279 into master

* refs/pull/32279/head:
mgr/orchestrator_cli: combine all host into one 'device ls' table
python-common: 'ssd/nvme' -> 'ssd'
mgr/orchestrator_cli: make 'device ls' table formatting consistent

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #32282 into master
Sage Weil [Tue, 17 Dec 2019 16:59:11 +0000 (10:59 -0600)]
Merge PR #32282 into master

* refs/pull/32282/head:
cephadm: clean up shell containers on exit
cephadm: do not force container removal on unit stop

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #32284 into master
Sage Weil [Tue, 17 Dec 2019 16:32:52 +0000 (10:32 -0600)]
Merge PR #32284 into master

* refs/pull/32284/head:
qa/suites/rbd/openstack: use 18.04, not 16.04

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agocephadm: drop 'sha256:' prefix on container id 32300/head
Sage Weil [Tue, 17 Dec 2019 14:05:04 +0000 (08:05 -0600)]
cephadm: drop 'sha256:' prefix on container id

Podman doesn't include the prefix--only the (bionic) docker as far as I
can tell.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32273 from changchengx/doc_libvirt
Jason Dillaman [Tue, 17 Dec 2019 15:57:06 +0000 (10:57 -0500)]
Merge pull request #32273 from changchengx/doc_libvirt

doc/rbd: refine rbd/libvirt usage

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32296 from rzarzynski/wip-seastar-pickup-futureopt
Kefu Chai [Tue, 17 Dec 2019 15:30:28 +0000 (23:30 +0800)]
Merge pull request #32296 from rzarzynski/wip-seastar-pickup-futureopt

seastar: pickup the recent future optimizations.

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #32301 from tchaikov/wip-build-doc
Kefu Chai [Tue, 17 Dec 2019 15:27:21 +0000 (23:27 +0800)]
Merge pull request #32301 from tchaikov/wip-build-doc

admin/doc-requirements.txt: bump up Sphinx and breathe

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32285 from liewegas/wip-py3-docs
Kefu Chai [Tue, 17 Dec 2019 15:26:46 +0000 (23:26 +0800)]
Merge pull request #32285 from liewegas/wip-py3-docs

admin/build-doc: do not use system site-packages

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agocephadm: check for both ntp.service and ntpd.service 32302/head
Sage Weil [Tue, 17 Dec 2019 14:58:58 +0000 (08:58 -0600)]
cephadm: check for both ntp.service and ntpd.service

Sigh...

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32263 from rosinL/fix-vcluster-stop
Kefu Chai [Tue, 17 Dec 2019 14:50:24 +0000 (22:50 +0800)]
Merge pull request #32263 from rosinL/fix-vcluster-stop

stop.sh: use bash shell to solve syntax error

Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoadmin/build-doc: do not use system site-packages 32285/head
Sage Weil [Mon, 16 Dec 2019 23:21:30 +0000 (17:21 -0600)]
admin/build-doc: do not use system site-packages

Don't use site-packages, since the host might have the same version, and
it won't have the ditaa and breathe.

Require Cython to make the venv sufficient.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoadmin/doc-requirements.txt: bump Sphinx and breathe 32301/head
Kefu Chai [Tue, 17 Dec 2019 14:27:28 +0000 (22:27 +0800)]
admin/doc-requirements.txt: bump Sphinx and breathe

* use the latest Sphinx
* use the latest breathe. also, since there is no need to be compatible
  with python2. we can move to 4.14.0 which is python3 only.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/workunit/rbd: fixed QoS throughput unit parsing 32280/head
Jason Dillaman [Mon, 16 Dec 2019 18:10:36 +0000 (13:10 -0500)]
qa/workunit/rbd: fixed QoS throughput unit parsing

The 'rbd bench' command was recently modified to print IEC units
instead of bytes/sec. This broke the handling for QoS throughput
tests since it was incorrectly evaluating the available RBD
throughput. Additionally, the QoS tests should use a "<="
comparison operator since the QoS is the upper-bound limit.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #32293 into master
Sage Weil [Tue, 17 Dec 2019 14:10:01 +0000 (08:10 -0600)]
Merge PR #32293 into master

* refs/pull/32293/head:
script/build-integration-branch: Add usage

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32295 from tchaikov/wip-stop.sh
Kefu Chai [Tue, 17 Dec 2019 13:14:23 +0000 (21:14 +0800)]
Merge pull request #32295 from tchaikov/wip-stop.sh

stop.sh: do not try to contact mon unless cluster is up

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
5 years agocephadm: clean up shell containers on exit 32282/head
Sage Weil [Mon, 16 Dec 2019 22:05:26 +0000 (16:05 -0600)]
cephadm: clean up shell containers on exit

The run_cmd() was already passing --rm; do it for shell_cmd too so that
we don't leave behind a mess from shell commands, ceph-volume, etc.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: do not force container removal on unit stop
Sage Weil [Mon, 16 Dec 2019 21:55:51 +0000 (15:55 -0600)]
cephadm: do not force container removal on unit stop

The -f arg for 'podman rm' will remove the container without actually
stopping it, leaving the running containers and processes (conmon and
daemon) running and generally making a mess of things.

Doing 'podman rm' without the -f on a running container will complain
that the container is still running.

So, first stop, then remove.

Fixes: f1de7060762d31e567a277c02b0d8d533fbb4661
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agostop.sh: use ${CEPH_BIN} and -c ${conf_fn} 32295/head
Kefu Chai [Tue, 17 Dec 2019 11:57:34 +0000 (19:57 +0800)]
stop.sh: use ${CEPH_BIN} and -c ${conf_fn}

to make sure ${CEPH_BIN} and ${CEPH_CONF_PATH} are respected

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agostop.sh: do not try to contact mon unless cluster is up
Kefu Chai [Tue, 17 Dec 2019 11:48:45 +0000 (19:48 +0800)]
stop.sh: do not try to contact mon unless cluster is up

otherwise "ceph mon metadata" will hang, when we try to stop an
already-stopped cluster. and `vstart_runner.py` always calls `stop.sh`
before setting up a cluster.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoseastar: pickup the recent future optimizations. 32296/head
Radoslaw Zarzynski [Tue, 17 Dec 2019 11:24:19 +0000 (12:24 +0100)]
seastar: pickup the recent future optimizations.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoscript/build-integration-branch: Add usage 32293/head
Sebastian Wagner [Tue, 17 Dec 2019 11:25:43 +0000 (12:25 +0100)]
script/build-integration-branch: Add usage

Also add a --no-date to make it possible to re-use an existing branch name

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #32207 from bk201/wip-43136
Laura Paduano [Tue, 17 Dec 2019 09:57:43 +0000 (10:57 +0100)]
Merge pull request #32207 from bk201/wip-43136

mgr/dashboard: Fix OSD IDs are not displayed when using cephadm backend

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #32266 from xiexingguo/wip-balancer-efficiency-1
Xie Xingguo [Tue, 17 Dec 2019 09:15:04 +0000 (17:15 +0800)]
Merge pull request #32266 from xiexingguo/wip-balancer-efficiency-1

mgr/balancer: avoid pulling pg_dump twice

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32237 from tchaikov/wip-cmake-rdkafka
Kefu Chai [Tue, 17 Dec 2019 08:29:00 +0000 (16:29 +0800)]
Merge pull request #32237 from tchaikov/wip-cmake-rdkafka

cmake: check version of librdkafka

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agoMerge pull request #31144 from badone/wip-use-dnf-on-rhel-or-centos-8
Kefu Chai [Tue, 17 Dec 2019 04:03:54 +0000 (12:03 +0800)]
Merge pull request #31144 from badone/wip-use-dnf-on-rhel-or-centos-8

install-deps.sh: Use dnf for rhel/centos 8

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31884 into master
Patrick Donnelly [Tue, 17 Dec 2019 00:30:45 +0000 (16:30 -0800)]
Merge PR #31884 into master

* refs/pull/31884/head:
qa/tasks: Fix the volume ls in test_volume_rm
qa/tasks: tests for 'fs volume create' and 'fs volume ls'

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #29059 into master
Patrick Donnelly [Tue, 17 Dec 2019 00:07:55 +0000 (16:07 -0800)]
Merge PR #29059 into master

* refs/pull/29059/head:
mds: complete all the replay op when mds is restarted ,no matter the session is closed or not.

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31662 into master
Patrick Donnelly [Tue, 17 Dec 2019 00:06:30 +0000 (16:06 -0800)]
Merge PR #31662 into master

* refs/pull/31662/head:
mds: fix revoking caps after after stale->resume circle
client: fix incorrect debug message

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32162 into master
Patrick Donnelly [Tue, 17 Dec 2019 00:04:52 +0000 (16:04 -0800)]
Merge PR #32162 into master

* refs/pull/32162/head:
qa: note timeout in debug message

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31118 into master
Patrick Donnelly [Tue, 17 Dec 2019 00:04:04 +0000 (16:04 -0800)]
Merge PR #31118 into master

* refs/pull/31118/head:
mds: Reorganize class members in MDSMap header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31123 into master
Patrick Donnelly [Tue, 17 Dec 2019 00:02:53 +0000 (16:02 -0800)]
Merge PR #31123 into master

* refs/pull/31123/head:
mds : optimization functions,get_dirfrags_under, to speed up processing directories with tens of millions of files

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31595 into master
Patrick Donnelly [Tue, 17 Dec 2019 00:01:19 +0000 (16:01 -0800)]
Merge PR #31595 into master

* refs/pull/31595/head:
mds: optimize function, fragset_t::simplify, to improve the efficiency of  merging fragment

Reviewed-by: Zheng Yan <zyan@redhat.com>
5 years agoMerge PR #32020 into master
Patrick Donnelly [Tue, 17 Dec 2019 00:00:08 +0000 (16:00 -0800)]
Merge PR #32020 into master

* refs/pull/32020/head:
mds: fix assert(omap_num_objs <= MAX_OBJECTS) of OpenFileTable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoqa: note timeout in debug message 32162/head
Patrick Donnelly [Tue, 10 Dec 2019 21:14:42 +0000 (13:14 -0800)]
qa: note timeout in debug message

Some tests set this to a dynamic value, it'd be helpful to know how long
a test is planning to wait.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32042 into master
Patrick Donnelly [Mon, 16 Dec 2019 23:57:38 +0000 (15:57 -0800)]
Merge PR #32042 into master

* refs/pull/32042/head:
mds: update default MDS cache size memory limit
common/options: note runtime effect for some MDS configs

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoqa/suites/rbd/openstack: use 18.04, not 16.04 32284/head
Sage Weil [Mon, 16 Dec 2019 23:11:47 +0000 (17:11 -0600)]
qa/suites/rbd/openstack: use 18.04, not 16.04

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32275 into master
Sage Weil [Mon, 16 Dec 2019 19:57:08 +0000 (13:57 -0600)]
Merge PR #32275 into master

* refs/pull/32275/head:
qa/suites/upgrade: all upgrades to octopus on ubuntu only

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #32274 from dillaman/wip-rbd-mirror-test
Jason Dillaman [Mon, 16 Dec 2019 19:44:28 +0000 (14:44 -0500)]
Merge pull request #32274 from dillaman/wip-rbd-mirror-test

rbd-mirror: ensure deterministic ordering of method calls

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agoMerge PR #32212 into master
Sage Weil [Mon, 16 Dec 2019 19:26:14 +0000 (13:26 -0600)]
Merge PR #32212 into master

* refs/pull/32212/head:
rpm/cephadm: start description and summary with capital letter
rpm/cephadm: move HOMEDIR to /var/lib and make scriptlets idempotent on SUSE

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoMerge PR #32277 into master
Sage Weil [Mon, 16 Dec 2019 19:26:00 +0000 (13:26 -0600)]
Merge PR #32277 into master

* refs/pull/32277/head:
lvm/deactivate: add unit tests, remove --all

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator_cli: combine all host into one 'device ls' table 32279/head
Sage Weil [Mon, 16 Dec 2019 18:56:24 +0000 (12:56 -0600)]
mgr/orchestrator_cli: combine all host into one 'device ls' table

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agopython-common: 'ssd/nvme' -> 'ssd'
Sage Weil [Mon, 16 Dec 2019 18:54:37 +0000 (12:54 -0600)]
python-common: 'ssd/nvme' -> 'ssd'

NVMe's are generally 'solid state disks'.  More importantly, NVMe is an
interface, not a device type, and there is talk of HDDs with NVMe
interfaces.

But mostly this is just makes for a more compact table.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator_cli: make 'device ls' table formatting consistent
Sage Weil [Mon, 16 Dec 2019 18:53:44 +0000 (12:53 -0600)]
mgr/orchestrator_cli: make 'device ls' table formatting consistent

- all caps headers
- align left by default
- reorder columns

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoqa/suites/upgrade: all upgrades to octopus on ubuntu only 32275/head
Sage Weil [Mon, 16 Dec 2019 15:29:30 +0000 (09:29 -0600)]
qa/suites/upgrade: all upgrades to octopus on ubuntu only

We cannot do a traditional upgrade (install old package, start cluster,
install new package, ...) because nautilus is el7-only and octopus is
el8-only.

So, do these tests on ubuntu.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #32217 from trociny/wip-41557-2
Jason Dillaman [Mon, 16 Dec 2019 18:14:28 +0000 (13:14 -0500)]
Merge pull request #32217 from trociny/wip-41557-2

librbd: explicitly specify mode on mirror image enable

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agolvm/deactivate: add unit tests, remove --all 32277/head
Jan Fajerski [Mon, 16 Dec 2019 15:57:58 +0000 (16:57 +0100)]
lvm/deactivate: add unit tests, remove --all

Remove the --all flag until its actually implemented.

Fixes: https://tracker.ceph.com/issues/43330
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge PR #32198 into master
Sage Weil [Mon, 16 Dec 2019 16:04:13 +0000 (10:04 -0600)]
Merge PR #32198 into master

* refs/pull/32198/head:
cephadm: Fix Python2.7 isssue
cephadm: fix how uid/gid is determined
cephadm: add sample configuration for prometheus
cephadm: support deployment of prometheus

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agorpm/cephadm: start description and summary with capital letter 32212/head
Nathan Cutler [Mon, 16 Dec 2019 09:45:22 +0000 (10:45 +0100)]
rpm/cephadm: start description and summary with capital letter

This commit fixes RPMLINT issue:

cephadm.x86_64: E: summary-not-capitalized (Badness: 20) C cephadm utility to bootstrap Ceph clusters
Summary doesn't begin with a capital letter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agorpm/cephadm: move HOMEDIR to /var/lib and make scriptlets idempotent on SUSE
Nathan Cutler [Thu, 12 Dec 2019 13:31:24 +0000 (14:31 +0100)]
rpm/cephadm: move HOMEDIR to /var/lib and make scriptlets idempotent on SUSE

Also introduce a cephadm group. Since the cephadm package does not
require ceph-common, the ceph group is not available to be used.

Drop the -r option to useradd, because cephadm does not qualify as a system
user.

Finally, fix the SUSE RPM build. SUSE RPM builds using "osc" implement a check
that compares the cephadm package's "before" and "after" file lists, to enforce
idempotency of the scriptlets. The "userdel cephadm" in the %postun breaks this
check, so omit it from the SUSE RPM builds.

Fixes: https://tracker.ceph.com/issues/43285
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agorbd-mirror: ensure deterministic ordering of method calls 32274/head
Jason Dillaman [Mon, 16 Dec 2019 14:46:15 +0000 (09:46 -0500)]
rbd-mirror: ensure deterministic ordering of method calls

The mock tests will require method calls in a known order. Previously
different environments could evaluate the parameters in different
orders resulting in out-of-order method calls.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32211 from rhcs-dashboard/43284-fix-frontend-e2e-script
Laura Paduano [Mon, 16 Dec 2019 14:28:33 +0000 (15:28 +0100)]
Merge pull request #32211 from rhcs-dashboard/43284-fix-frontend-e2e-script

mgr/dashboard: run-frontend-e2e-tests.sh: allow user defined BASE_URL…

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #31819 from ricardoasmarques/wip-42687
Laura Paduano [Mon, 16 Dec 2019 14:27:46 +0000 (15:27 +0100)]
Merge pull request #31819 from ricardoasmarques/wip-42687

mgr/dashboard: iSCSI targets not available if any gateway is down

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge PR #32246 into master
Sage Weil [Mon, 16 Dec 2019 13:15:28 +0000 (07:15 -0600)]
Merge PR #32246 into master

* refs/pull/32246/head:
mgr/cephadm: remove redundant /dev when blinking device light

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #32257 from dillaman/wip-41556
Mykola Golub [Mon, 16 Dec 2019 11:53:34 +0000 (13:53 +0200)]
Merge pull request #32257 from dillaman/wip-41556

rbd-mirror: extract journal replaying logic from image replayer

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agodoc/rbd: remind Selinux/AppArmor effect on libvirtd 32273/head
Changcheng Liu [Mon, 16 Dec 2019 11:41:26 +0000 (19:41 +0800)]
doc/rbd: remind Selinux/AppArmor effect on libvirtd

If libvird is under Selinux/Apparmor enforced mode, libvirtd
may not be enable to do some operatoins on the rbd image. It
need remind this in document.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agodoc/rbd: correct software stack of VM with Ceph
Changcheng Liu [Mon, 16 Dec 2019 04:50:50 +0000 (12:50 +0800)]
doc/rbd: correct software stack of VM with Ceph

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agocephadm: Fix Python2.7 isssue 32198/head
Sebastian Wagner [Mon, 16 Dec 2019 11:19:03 +0000 (12:19 +0100)]
cephadm: Fix Python2.7 isssue

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/dashboard: CephFS quota management (#31811)
Lenz Grimmer [Mon, 16 Dec 2019 09:55:36 +0000 (09:55 +0000)]
mgr/dashboard: CephFS quota management (#31811)

mgr/dashboard: CephFS quota management

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: add password expiration date (#30939)
Lenz Grimmer [Mon, 16 Dec 2019 09:49:16 +0000 (09:49 +0000)]
mgr/dashboard: add password expiration date (#30939)

mgr/dashboard: add password expiration date

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Display OSD device class in OSD list (#32092)
Lenz Grimmer [Mon, 16 Dec 2019 09:42:56 +0000 (09:42 +0000)]
mgr/dashboard: Display OSD device class in OSD list (#32092)

mgr/dashboard: Display OSD device class in OSD list

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31815 from tchaikov/wip-mgr-dashboard-gevent
Kefu Chai [Mon, 16 Dec 2019 09:30:08 +0000 (17:30 +0800)]
Merge pull request #31815 from tchaikov/wip-mgr-dashboard-gevent

mgr/dashboard: install teuthology using pip

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
5 years agorbd: show mirror mode in image info 32217/head
Mykola Golub [Fri, 13 Dec 2019 10:56:30 +0000 (10:56 +0000)]
rbd: show mirror mode in image info

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agorbd: improve mirror snapshot list formatting for status command
Mykola Golub [Fri, 13 Dec 2019 10:55:00 +0000 (10:55 +0000)]
rbd: improve mirror snapshot list formatting for status command

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agorbd: allow to specify mode on mirror image enable
Mykola Golub [Thu, 12 Dec 2019 14:38:26 +0000 (14:38 +0000)]
rbd: allow to specify mode on mirror image enable

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agolibrbd: explicitly specify mode on mirror image enable
Mykola Golub [Thu, 12 Dec 2019 14:38:08 +0000 (14:38 +0000)]
librbd: explicitly specify mode on mirror image enable

- don't use journaling feature to chose the mode;
- provide new API function mirror_image_enable2;
- return back the old behavior to automatically enable/disable
  journaling feature on enabling/disabling image mirroring.

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agomgr/balancer: avoid pulling pg_dump twice 32266/head
xie xingguo [Mon, 16 Dec 2019 05:54:50 +0000 (13:54 +0800)]
mgr/balancer: avoid pulling pg_dump twice

For large cluster with thousands of osds/pgs, it may take
seconds even mitutes to refresh the relevant stats.
Since we already have pulling them down at initialization,
make a direct use of them whenever possible.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agostop.sh: use bash shell to solve syntax error 32263/head
luo rixin [Mon, 16 Dec 2019 02:32:01 +0000 (10:32 +0800)]
stop.sh: use bash shell to solve syntax error

When running on ubuntu 18.04 for aarch64, there is syntax error in
line 52, caused by the /bin/sh is defalut to dash, which is not
support array type.

Signed-off-by: luo rixin <luorixin@huawei.com>
5 years agorbd-mirror: switch image replayer to new standalone journal replayer 32257/head
Jason Dillaman [Fri, 13 Dec 2019 15:54:58 +0000 (10:54 -0500)]
rbd-mirror: switch image replayer to new standalone journal replayer

Remove all the original journal replaying code embedded in the image
replayer and instead rely on the new journal replayer class.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: extract journal replay logic to its own class
Jason Dillaman [Sat, 7 Dec 2019 21:52:51 +0000 (16:52 -0500)]
rbd-mirror: extract journal replay logic to its own class

This will help to greatly reduce the journal-specific code in the
current image replayer.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: moved image asok/perf counter name helper to utils
Jason Dillaman [Fri, 13 Dec 2019 01:46:14 +0000 (20:46 -0500)]
rbd-mirror: moved image asok/perf counter name helper to utils

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: moved event pre-processor to sub-namespace
Jason Dillaman [Sat, 7 Dec 2019 03:38:33 +0000 (22:38 -0500)]
rbd-mirror: moved event pre-processor to sub-namespace

The current implementation is tied to journal-based replaying so
move it down into the journal sub-namespace.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: moved replay status formatter to sub-namespace
Jason Dillaman [Sat, 7 Dec 2019 03:03:02 +0000 (22:03 -0500)]
rbd-mirror: moved replay status formatter to sub-namespace

The current implementation is tied to journal-based replaying so
move it down into a new journal sub-namespace.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd-mirror: drop 'using namespace' in image replayer state machine
Jason Dillaman [Sat, 7 Dec 2019 02:50:15 +0000 (21:50 -0500)]
rbd-mirror: drop 'using namespace' in image replayer state machine

This is going to cause conflicts w/ the '::journal' namespace and
future 'rbd::mirror::image_replayer::journal' namespace.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32142 from changchengx/doc_libvirt
Jason Dillaman [Sun, 15 Dec 2019 23:46:40 +0000 (18:46 -0500)]
Merge pull request #32142 from changchengx/doc_libvirt

doc/rbd: simplify libvirt usage

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32243 from trociny/wip-43289
Jason Dillaman [Sun, 15 Dec 2019 23:29:17 +0000 (18:29 -0500)]
Merge pull request #32243 from trociny/wip-43289

rbd-mirror: fix race on namespace replayer initialization failure

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32184 from trociny/wip-43004
Jason Dillaman [Sun, 15 Dec 2019 23:28:52 +0000 (18:28 -0500)]
Merge pull request #32184 from trociny/wip-43004

rbd-mirror: rename per-image replication perf counters

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32113 from lixiaoy1/master
Jason Dillaman [Sun, 15 Dec 2019 23:27:23 +0000 (18:27 -0500)]
Merge pull request #32113 from lixiaoy1/master

librbd: finish write request early

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #32251 into master
Sage Weil [Sun, 15 Dec 2019 22:40:45 +0000 (16:40 -0600)]
Merge PR #32251 into master

* refs/pull/32251/head:
mds/MDSDaemon: fix asok 'exit' and 'respawn' commands

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32260 into master
Sage Weil [Sun, 15 Dec 2019 19:08:35 +0000 (13:08 -0600)]
Merge PR #32260 into master

* refs/pull/32260/head:
.organizationmap: Wido 42on -> 42on

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agocephadm: fix how uid/gid is determined
Paul Cuzner [Thu, 12 Dec 2019 21:52:19 +0000 (10:52 +1300)]
cephadm: fix how uid/gid is determined

The uid/gid is determined by looking at file ownership. It
was looking at /etc/ceph, but on current builds this is owned by root so switched to using /var/lib/ceph which
is the homedir of the ceph account.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
5 years agocephadm: add sample configuration for prometheus
Paul Cuzner [Thu, 12 Dec 2019 20:30:33 +0000 (09:30 +1300)]
cephadm: add sample configuration for prometheus

Provides an example definition that sets up an
initial prometheus server with a scrape of itself.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
5 years agocephadm: support deployment of prometheus
Paul Cuzner [Thu, 12 Dec 2019 04:29:19 +0000 (17:29 +1300)]
cephadm: support deployment of prometheus

Initial support to enable cephadm to deploy
monitoring containers like prometheus. This
patch adds support for prometheus. It is the callers
responsibility to provide a valid prometheus.yml
file passed within the --config-json parameter.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
5 years ago.organizationmap: Wido 42on -> 42on 32260/head
Sage Weil [Sun, 15 Dec 2019 16:21:07 +0000 (10:21 -0600)]
.organizationmap: Wido 42on -> 42on

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocmake: check version of librdkafka 32237/head
Kefu Chai [Fri, 13 Dec 2019 11:02:22 +0000 (19:02 +0800)]
cmake: check version of librdkafka

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #32158 into master
Sage Weil [Sun, 15 Dec 2019 01:43:08 +0000 (19:43 -0600)]
Merge PR #32158 into master

* refs/pull/32158/head:
cephadm: fix exception when no time sync is running
cephadm: properly extract osd fsid during adoption
cephadm: do ceph-volume activate+deactivate as part of systemd unit
ceph-daemon: behave with no /etc/ceph/ceph.conf

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agocephadm: fix exception when no time sync is running 32158/head
Sage Weil [Sat, 14 Dec 2019 14:22:12 +0000 (08:22 -0600)]
cephadm: fix exception when no time sync is running

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: properly extract osd fsid during adoption
Sage Weil [Fri, 13 Dec 2019 23:14:12 +0000 (17:14 -0600)]
cephadm: properly extract osd fsid during adoption

This needs to be passed to the deploy_daemon_units method so that we can
set up the pre and post c-v calls properly.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocephadm: do ceph-volume activate+deactivate as part of systemd unit
Sage Weil [Fri, 13 Dec 2019 14:37:29 +0000 (08:37 -0600)]
cephadm: do ceph-volume activate+deactivate as part of systemd unit

1- Do the activate as part of the unit on start, since it may include
setup that disappears on a reboot, like starting up the dmcrypted volume.

2- Do the matching deactivate step when the container stops, like shutting
down the dmcrypt volume.

Right now the OSD is the only thing that needs this special behavior.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: behave with no /etc/ceph/ceph.conf
Sage Weil [Tue, 10 Dec 2019 16:20:52 +0000 (10:20 -0600)]
ceph-daemon: behave with no /etc/ceph/ceph.conf

Signed-off-by: Sage Weil <sage@redhat.com>