Commit Graph

104870 Commits

Author SHA1 Message Date
Sage Weil
ede1d36773 qa/standalone/ceph-helpers.sh: destroy_osd: mark osd down
Stopping the OSD doesn't guarantee that it will be marked down.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-19 20:05:16 -06:00
xie xingguo
22c8cdad8e osd/PeeringState: do not exclude up from acting_recovery_backfill
If we choose a primary that does not belong to the current up set,
and all up peers are still recoverable, then we might end up excluding
some up peer from the acting_recovery_backfill set too due to the
"want size <= pool size" constraint (since https://github.com/ceph/ceph/pull/24035),
as a result of which all up peers might not get recovered in one go.

Fix by falling through any oversized want set to async recovery, which
should be able to handle it nicely.

Fixes: https://tracker.ceph.com/issues/42577
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-11-20 08:32:19 +08:00
xie xingguo
82bb83f0ba Revert "osd/PG: avoid choose_acting picking want with > pool size items"
This reverts commit c3e2990c39.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-11-20 08:30:27 +08:00
Sage Weil
bc62adc4f5 Merge PR #31721 into master
* refs/pull/31721/head:
	mgr/ssh: set UserKnownHostsFile

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-19 16:05:16 -06:00
Ali Maredia
c1b142ef71
Merge pull request #31660 from ivancich/wip-add-some-const
rgw: add const correctness to some rest functions
2019-11-19 14:23:33 -05:00
Casey Bodley
669453138d
Merge pull request #16715 from adamemerson/wip-I-Object!
osdc/Objecter: Boost.Asio (I object!)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-11-19 12:48:26 -05:00
Sage Weil
36f5fcbb97 Merge PR #31672 into master
* refs/pull/31672/head:
	mgr/orch: adapt update_mgr/mon funcs to new parsing
	mgr/orch: improve commandline parsing

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-19 10:37:49 -06:00
Sage Weil
9ae8a737dd Merge PR #31679 into master
* refs/pull/31679/head:
	ceph-daemon: add osd create test(s)

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-19 10:37:33 -06:00
Ricardo Marques
3e2922148a mgr/dashboard: unable to set bool values to false when default is true
Fixes: https://tracker.ceph.com/issues/41776

Signed-off-by: Ricardo Marques <rimarques@suse.com>
2019-11-19 16:18:53 +00:00
Sage Weil
9b61479da4
Merge pull request #31731 from varshar16/wip-doc-update-orchestrator_cli-url
mgr/orchestrator_cli: Update doc link in README
2019-11-19 09:09:43 -06:00
Sage Weil
977657a4a5 mgr/ssh: set UserKnownHostsFile
Set this to /dev/null, since we have StrictHostKeyChecking
off anyway.  This gets rid of messages to stderr every time we connect
to a new host.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-19 09:08:15 -06:00
Jan Fajerski
4749f4c59d ceph-volume: refactor tests for refactored get_devices
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-11-19 15:24:21 +01:00
Jan Fajerski
b35e8c485f ceph-volume: refactor get_devices, don't use os.path.realpath
Fixes: https://tracker.ceph.com/issues/42777

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-11-19 15:24:14 +01:00
Jason Dillaman
2773e68f43 journal: properly handle immediate overflow upon advancing object set
While the old set is being closed, additional IO can be queued up within
the old, closed objects while the in-flight IO settles. It's therefore
possible that the queued IO that is transferred from the old set to the
new set causes an immediate overflow of the new set.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-11-19 08:45:46 -05:00
Jason Dillaman
e536b5c8e1 journal: fix flush by age and in-flight byte tracking
The flush by age was always causing an immediate flush due to a
backwards comparison. Additionally, the in-flight byte tracker was
never decremented which caused premature closure of the journal
object.

Finally, there was a potential race condition between closing the
object and in-flight notification callbacks executing. Now we keep
the lock held for both closed and overflow callbacks to prevent
the small chance of a race.

Fixes: https://tracker.ceph.com/issues/42598
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-11-19 08:45:46 -05:00
Jason Dillaman
5a5b5c5801 journal: simplify object recorder locker aggregation
Use move semantics and RAII to control the locking of the
per-object recorder lock.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-11-19 08:45:46 -05:00
Matt Benjamin
b35926ea8a
Merge pull request #29399 from ofriedma/master
rgw: Fix expiration header does not return the earliest rule
2019-11-19 08:42:19 -05:00
Matt Benjamin
6068e3ace1
Merge pull request #29937 from ofriedma/wip-ofriedma-days0
Add days0 to rgw lc
2019-11-19 08:41:10 -05:00
Jason Dillaman
eb3fb7479a
Merge pull request #31642 from trociny/wip-rbd-mirror-service-daemon-ns-support
rbd-mirror: add namespace support to service daemon

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-11-19 08:16:44 -05:00
Jason Dillaman
8617416990
Merge pull request #31627 from trociny/wip-pybind-rbd-snap_remove
pybind/rbd: provide snap remove flags

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-11-19 08:16:29 -05:00
Jason Dillaman
2dc02761cb
Merge pull request #31608 from trociny/wip-mock-warnings
test/rbd_mirror: fix mock warnings

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-11-19 08:15:26 -05:00
Jason Dillaman
f0f62cc5dd
Merge pull request #31606 from trociny/wip-test_rbd.py-tabs
test/pybind: inconsistent use of tabs and spaces in indentation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-11-19 08:14:44 -05:00
Nathan Cutler
fb60d2ffce ceph-backport.sh: restore "set -x" when in debug mode
Recently, "set -x"/"set +x" code was added to show the user which git commands
the script is running. This code was inadvertently deactivating "set -x" when
running in debug mode.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-19 13:53:21 +01:00
Nathan Cutler
0cb63573d8 ceph-backport.sh: mention --force in usage message
The --force option was missing in "usage()".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-19 13:47:34 +01:00
Nathan Cutler
3697e0fc00 ceph-backport.sh: allow user to specify --fork explicitly
Some users prefer to use a Ceph fork on GitHub other than their personal one.

Support this by implementing a "--fork EXPLICIT_FORK" option. Users without
a personal fork of ceph/ceph.git would need to provide this option always --
even when setting up the script.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-19 13:47:31 +01:00
Stephan Müller
bde9aa61ec mgr/dashboard: CephFS snapshot management UI
CephFS snapshots can now be created on a directory basis. Multiple
snapshots can be deleted at once.

Fixes: https://tracker.ceph.com/issues/41791

Signed-off-by: Volker Theile <vtheile@suse.com>
Signed-off-by: Stephan Müller <smueller@suse.com>
2019-11-19 12:27:39 +01:00
Varsha Rao
f7f5d1b723 mgr/orchestrator_cli: Update doc link in README
Update the orchestrator cli doc link to fix page not found error. Also remove
some unnecessary blank lines.

Signed-off-by: Varsha Rao <varao@redhat.com>
2019-11-19 16:50:41 +05:30
Ernesto Puerta
93bf7ddde1
mgr/dashboard: remove traceback/version assertions
Debug mode (https://github.com/ceph/ceph/pull/30522) by default hides
Cherrypy version and Python traceback on Error responses. Both can be
displayed optionally.

Some QA tests expect these two fields to be present in the error
responses and fail otherwise.

Fixes: https://tracker.ceph.com/issues/42708
Fixes: https://github.com/ceph/ceph/pull/30522
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2019-11-19 11:37:58 +01:00
Nathan Cutler
71633b2527
Merge pull request #31594 from smithfarm/wip-bri-regex-fix
backport-resolve-issue: narrow regular expression and read key/token from files

Reviewed-by: Tiago Melo <tmelo@suse.com>
2019-11-19 10:00:07 +01:00
Ramana Raja
caba9474a3
Merge pull request #30336 from joscollin/wip-F40959-subvolume-uid-gid
mgr/volumes: uid, gid for subvolume create and subvolumegroup create commands
2019-11-19 14:16:46 +05:30
Alfonso Martínez
fa478ce4ae mgr/dashboard: show Rename in modal header & button when renaming RBD snapshot
Fixes: https://tracker.ceph.com/issues/42762
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2019-11-19 09:22:35 +01:00
Yuval Lifshitz
12927eda4a rgw/pubsub: disable kafka when building on ubuntu xenial via
"run-make-check.sh"

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
2019-11-19 10:11:19 +02:00
Kefu Chai
310a2d37be
Merge pull request #31546 from zjcmszh/execute
pybind/rados: add WriteOp::execute()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-19 14:36:07 +08:00
Kefu Chai
1772803b16
Merge pull request #30968 from majianpeng/osd-optimze-send_message_osd_cluster
osd: optimize send_message to peers

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-19 14:35:14 +08:00
Kefu Chai
396b717e5d
Merge pull request #31550 from wido/issue-42761
systemd: Wait 5 seconds before attempting a restart of an OSD

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2019-11-19 14:28:25 +08:00
Kefu Chai
c9af7ba6e1
Merge pull request #31623 from badone/wip-tracker-42387-extend-admin-socket-timeout
common/admin_socket: Increase socket timeouts

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-19 14:25:37 +08:00
Kefu Chai
69ab2c26a3
Merge pull request #31241 from zjcmszh/add_rados_create_pool2
pybind/rados/rados.pyx: improve Rados.create_pool()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-19 14:24:49 +08:00
Kefu Chai
169be571e2
Merge pull request #31617 from Devp00l/wip-42776
mgr/dashboard: Fix pool renaming functionality

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-11-19 14:23:35 +08:00
Michael Fritch
5cb5e77f50
ceph-daemon: add osd create test(s)
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-18 22:30:22 -07:00
Dai zhiwei
637fdea62b osd/OSD: enhance osd numa affinity compatibility
add bond network numa affinity compatibility support
add subnet compatibility support
add public and cluster network numa nodes not matching log

Fixes: https://tracker.ceph.com/issues/42411

Signed-off-by: Dai zhiwei <daizhiwei3@huawei.com>
2019-11-19 11:14:47 +08:00
Kefu Chai
e4daf56bbd
Merge pull request #31515 from drunkard/master
doc: typo fix in doc/dev/dev_cluster_deployement.rst: s/hostanme/hostname/

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-19 09:25:23 +08:00
Kefu Chai
1d0579566e
Merge pull request #31541 from BlackLotus/master
added a remark to always use powers of two for pg_num

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-19 09:24:08 +08:00
Sage Weil
1a29371b0a
Merge pull request #31685 from liewegas/fix-mgr-shutdown
mgr: _exit(0) from signal handler even if we are standby
2019-11-18 16:54:27 -06:00
Sage Weil
d2caaca81f Merge pull request #31695 from liewegas/wip-cd-simpler-bootstrap
ceph-daemon: bootstrap: make --output-* args optional
2019-11-18 16:09:13 -06:00
Yuval Lifshitz
c876a0d817 cmake: add cppcheck and iwyu static analysis targets
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
2019-11-18 19:43:14 +02:00
Joshua Schmid
7888b3c43b mgr/orch: adapt update_mgr/mon funcs to new parsing
update_mgr and update_mon (and their correspinding orch-backend
implementation) are adapted to the new parsing parsing method
introduced in ff9093873.

Signed-off-by: Joshua Schmid <jschmid@suse.de>
2019-11-18 18:11:55 +01:00
Lenz Grimmer
42954be80f
mgr/dashboard: Remove title from sparkline tooltips (#31645)
mgr/dashboard: Remove title from sparkline tooltips

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-11-18 17:04:21 +00:00
Kefu Chai
d28ed32c08
Merge pull request #31689 from tchaikov/wip/workunits/cephtool/test.sh
qa/workunits/cephtool/test.sh: a handful fixes

Reviewed-by: Sage Weil <sweil@redhat.com>
2019-11-18 23:23:21 +08:00
Jason Dillaman
34a540010a
Merge pull request #30397 from MahatiC/wip-ref-counting
librbd: add reference counting

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-18 10:07:08 -05:00
Xiubo Li
a3eb030089 preforker: remove useless code
No use any more for the r.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
2019-11-18 10:05:34 -05:00