Commit Graph

100521 Commits

Author SHA1 Message Date
Sage Weil
91c0df8121 crimson/osdmap_service: add get_mnow(), get_up_epoch()
Signed-off-by: Sage Weil <sage@redhat.com>
2019-08-05 13:53:25 -05:00
Sage Weil
94b39c1c69 osd/PeeringState: take HeartbeatStamps refs for current interval
Signed-off-by: Sage Weil <sage@redhat.com>
2019-08-05 13:53:25 -05:00
Sage Weil
541e208cdf osd: track clock delta between peer OSDs
We need to keep track of the monotonic clock deltas between peer OSDs in
order to be able to exchange timestamps across messages.  We need an
upper and lower bound on this delta, depending on the context where it is
used.

We can use the existing ping messages to get this by assuming that a ping
message is sent instantly to get a bound, and to share our delta in a
follow-up reply to share the other bound.  The ping sender will get both
bounds with a single ping + ping_reply exchange.  The ping receiver will
get the delta value from the next round's ping.

Include up_from in the ping messages to ensure we don't mix up different
instances of the same OSD.

Signed-off-by: Sage Weil <sage@inktank.com>
2019-08-05 13:53:25 -05:00
Sage Weil
c5a7cb0a7d osd: add get_mnow() interface to OSDService, PG, PeeringState
Single helper to provide a monotonic time offset from startup_time.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-08-05 13:34:14 -05:00
Sage Weil
37a79dd209 osd: record startup_time
Signed-off-by: Sage Weil <sage@redhat.com>
2019-08-05 13:34:14 -05:00
Sage Weil
753a2ce164 osd: some minor refactoring/cleanup in handle_osd_ping
Signed-off-by: Sage Weil <sage@redhat.com>
2019-08-05 13:34:14 -05:00
Sage Weil
c6eafb7343 Merge PR #29337 into master
* refs/pull/29337/head:
	mon: enable telemetry module by default
	mgr/telemetry: force re-opt-in if the report contents change
	mgr/telemetry: less noise in the log
	mgr/telemetry: wake up serve on config change
	mgr/telemetry: track telemetry report revisions

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-08-05 13:08:53 -05:00
Kefu Chai
f4e911ac1e
Merge pull request #29457 from tchaikov/wip-consolidate-run-tox
cmake: one run_tox.sh to rule them all

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-08-06 01:52:31 +08:00
Kefu Chai
4a7df22cff script/run_tox.sh: add --help option
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-06 00:45:51 +08:00
Patrick Donnelly
c1659e536a
Merge PR #29492 into master
* refs/pull/29492/head:
	doc: Fix for new ceph-devel mailing list

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-08-05 09:10:28 -07:00
Kefu Chai
793308f82d cmake: pass tox envs to run_tox.sh explicitly
* add two optional keyword parameters to `add_tox_test()`
* use the default `TOX_PATH` parameter instead passing it explicitly,
  as it is always `${CMAKE_CURRENT_SOURCE_DIR}`
* drop the code to guess the tox envs in `run_tox.sh`, and always pass
  them explicitly in CMake script using the `--tox-envs` argument.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-06 00:06:29 +08:00
Kefu Chai
3553f8d891
Merge pull request #29471 from tchaikov/wip-googletest
googletest: pick up change to suppress CMP0048 warning

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-08-05 23:59:08 +08:00
David Zafman
45bc410037 doc: Fix for new ceph-devel mailing list
Signed-off-by: David Zafman <dzafman@redhat.com>
2019-08-05 07:36:04 -07:00
Casey Bodley
018429cf50
Merge pull request #29458 from mikulely/rgw-drop-flush
rgw: drop dead flush_read_list declaration

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-08-05 10:25:43 -04:00
Alfredo Deza
d7f481d749
Merge pull request #27675 from jan--f/c-v-console-logging-to-stderr
ceph-volume: print most logging messages to stderr

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-08-05 08:12:29 -04:00
Kefu Chai
6cd4c2c967 cmake: move tests to where they are implemented
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-05 19:11:51 +08:00
Kefu Chai
d68a84b0fd cmake: do not add gtest-parallel_ext if already added
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-05 19:11:51 +08:00
Kefu Chai
f0079a1030 cmake: use script/run_tox.sh for running tox for dashboard
* adapt script/run_tox.sh to use different envs for dashboard's tox
  test.
* use script/run_tox.sh for running dashboard's tox test
* remove pybind/mgr/dashboard/run-tox.sh

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-05 19:11:51 +08:00
Kefu Chai
d359227ec0 cmake/modules/AddCephTest.cmake: make ${name}-venv a target
so we can prepare the venv for tox with `make tests`. and it's optional,
as run_tox.sh will check for it and setup a venv if it's not around.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-05 18:47:08 +08:00
Kefu Chai
a19761b8e8 src: remove unused run-tox.sh
they are not used anymore after b9c9f74f

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-05 18:47:08 +08:00
Igor Fedotov
383a9c948a
Merge pull request #29393 from ifed01/wip-ifed-bluestore-header-cleanup
os/bluestore: remove unused _tune_cache_size() method declaration

Reviewed-by: Mark Nelson <mnelson@redhat.com>
2019-08-05 13:42:15 +03:00
Lenz Grimmer
7a6f741cbe
mgr/dashboard: update npm packages (#28343)
mgr/dashboard: update npm packages

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-08-05 12:20:20 +02:00
Kefu Chai
9f4b2be015
Merge pull request #29403 from rhcs-dashboard/wip-41013-master
install-deps.sh: remove failing error catching

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-05 18:07:39 +08:00
Kefu Chai
815f52831f
Merge pull request #29476 from tchaikov/wip-test/journal-close-object
test/journal: always close object

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-08-05 17:37:33 +08:00
Kefu Chai
29397ca589 test/journal: always close object
otherwise when we destruct `TestObjectRecorder::Handler::lock` or
`journal::JournalRecorder::m_object_locks`, it/they would be still
being waited by some condition variable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-05 09:07:22 +08:00
Kefu Chai
6415160dbe
Merge pull request #29474 from wjwithagen/wjw-fix-rbd_ggate_Server.cc
rbd-ggate: fix compile errors from ceph::mutex update

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-04 22:42:19 +08:00
Willem Jan Withagen
7acffc19c4 rbd-ggate: fix compile errors from ceph::mutex update
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2019-08-04 15:47:45 +02:00
Kefu Chai
eb3a998c2f googletest: pick up change to suppress CMP0048 warning
newer cmake complains about googletest should have set CMP0048

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-04 09:44:11 +08:00
Kefu Chai
fd67409912
Merge pull request #29472 from wjwithagen/wjw-fix-src/osdc/ObjectCacher.cc
osdc: Fix a missing ':' for the correct namespace

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-04 00:58:13 +08:00
Willem Jan Withagen
691016dc12 osdc: Fix a missing ':' for the correct namespace
Clang complains:
/home/jenkins/workspace/ceph-master/src/osdc/ObjectCacher.cc:1848:22: error: no viable constructor or deduction guide for deduction of template arguments of 'unique_lock'
    std::unique_lock l{lock, std:adopt_lock};

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2019-08-03 17:04:46 +02:00
Kefu Chai
79b88eaf7c
Merge pull request #29322 from rzarzynski/wip-objclass-cleanup
objclass, osd: clean up the cls-host interface. Turn ClassHandler into singleton

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-08-03 20:25:39 +08:00
Kefu Chai
0fb6b3c776
Merge pull request #29113 from tchaikov/wip-ceph-mutex
src/: s/Mutex/ceph::mutex/

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-08-03 20:16:24 +08:00
Kefu Chai
dc21fd028d common/Mutex: remove Mutex
as it's replaced by `ceph::mutex`

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:21 +08:00
Kefu Chai
57a3254f3d common/Cond.h: remove Cond
as it's replaced by ceph::condition_variable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:21 +08:00
Kefu Chai
9eead2052b osd/PG: support is_locked() in non-debug mode
`PG` print details info in the prefix of logging messages if the PG is
being locked by current thread. but `ceph::mutex` is an alias of
`std::mutex` in non-debug mode, so neither `mutex::is_locked_by_me()` nor
`mutex::is_locked()` is supported in non-debug mode. to continue supporting
this feature, `PG::locked_by` is added to memorize the thread id of the owner
of the lock.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:21 +08:00
Kefu Chai
fbf91b4d03 common/ceph_context.cc: include necessary header
for using functions like `lockdep_unregister_ceph_context()`

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:21 +08:00
Kefu Chai
3a12e120da test/testmsgr: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:21 +08:00
Kefu Chai
757796c370 test/librados: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
067ab99798 test/compressor: do not include unused header
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
1af73d2a70 test/common/Throttle: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
8b6f0977a1 common/obj_bencher: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
a1a25d2d4f auth: remove unused forwarde declaration
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
e3e65af172 test/librados_test_stub: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
af0e1b4ec6 libcephfs: remove unused #include
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
778f96af53 cls_kvs: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
108fc27d78 crush: remove unused #include
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
15f13561d1 fusetrace: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
5ca9df3bb7 tools/rbd_nbd: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
6e7cfc1e30 tools/rbd_ggate: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00
Kefu Chai
a7ac68d4fd tools/rbd: s/Mutex/ceph::mutex/
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-08-03 11:27:20 +08:00