]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agocrimson/net: set policy from peer_type
Yingxin Cheng [Mon, 1 Apr 2019 14:03:03 +0000 (22:03 +0800)]
crimson/net: set policy from peer_type

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: fix Socket::read_exactly(0) case
Yingxin Cheng [Thu, 21 Mar 2019 14:21:07 +0000 (22:21 +0800)]
crimson/net: fix Socket::read_exactly(0) case

Do not raise read_eof when try to read 0 bytes.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agotest/crimson: fix perf_crimson_msgr to support v2
Yingxin Cheng [Tue, 19 Mar 2019 14:25:04 +0000 (22:25 +0800)]
test/crimson: fix perf_crimson_msgr to support v2

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agotest/crimson: msgr should wait before shutdown
Yingxin Cheng [Tue, 19 Mar 2019 14:20:12 +0000 (22:20 +0800)]
test/crimson: msgr should wait before shutdown

test_concurrent_dispatch() should wait for server->wait() before
shutting down its messengers.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agotest/crimson: unit test for v2 protocol
Yingxin Cheng [Tue, 19 Mar 2019 14:19:18 +0000 (22:19 +0800)]
test/crimson: unit test for v2 protocol

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: message frame exchanges (lossy part)
Yingxin Cheng [Tue, 19 Mar 2019 14:13:33 +0000 (22:13 +0800)]
crimson/net: message frame exchanges (lossy part)

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: add keepalive timestamps to connection
Yingxin Cheng [Tue, 19 Mar 2019 14:06:34 +0000 (22:06 +0800)]
crimson/net: add keepalive timestamps to connection

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: protocolv2 handshake frame exchanges
Yingxin Cheng [Wed, 13 Mar 2019 14:48:12 +0000 (22:48 +0800)]
crimson/net: protocolv2 handshake frame exchanges

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: ProtocolV2 auth part
Yingxin Cheng [Mon, 11 Mar 2019 08:23:11 +0000 (16:23 +0800)]
crimson/net: ProtocolV2 auth part

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: dummy auth for protocol v2
Yingxin Cheng [Mon, 11 Mar 2019 08:19:24 +0000 (16:19 +0800)]
crimson/net: dummy auth for protocol v2

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: add AuthConnectionMeta to Protocol
Yingxin Cheng [Mon, 11 Mar 2019 08:15:28 +0000 (16:15 +0800)]
crimson/net: add AuthConnectionMeta to Protocol

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: add peer_global_id to Connection
Yingxin Cheng [Mon, 11 Mar 2019 08:12:57 +0000 (16:12 +0800)]
crimson/net: add peer_global_id to Connection

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: banner exchange and HelloFrame
Yingxin Cheng [Wed, 6 Mar 2019 14:59:37 +0000 (22:59 +0800)]
crimson/net: banner exchange and HelloFrame

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: support frame read/write for ProtocolV2
Yingxin Cheng [Wed, 6 Mar 2019 14:58:48 +0000 (22:58 +0800)]
crimson/net: support frame read/write for ProtocolV2

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: add target_addr to SocketConnection
Yingxin Cheng [Wed, 6 Mar 2019 09:35:33 +0000 (17:35 +0800)]
crimson/net: add target_addr to SocketConnection

represent the peer target_addr accepted/connected

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: add get_mytype() to Messenger
Yingxin Cheng [Wed, 6 Mar 2019 09:32:41 +0000 (17:32 +0800)]
crimson/net: add get_mytype() to Messenger

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: add global_seq in ProtocolV2
Yingxin Cheng [Wed, 6 Mar 2019 09:59:52 +0000 (17:59 +0800)]
crimson/net: add global_seq in ProtocolV2

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: skeleton code for ProtocolV2 logic
Yingxin Cheng [Thu, 28 Feb 2019 08:40:24 +0000 (16:40 +0800)]
crimson/net: skeleton code for ProtocolV2 logic

crimson ProtocolV2 class is following a state-machine design style:
* states are defined in ProtocolV2::state_t;
* call `execute_<state_name>()` methods to trigger different states;
* V2 logics are implemented in each execute_<state_name>() methods, and
  with explicit transitions to other states at the end of the execute_*;
* each state is associated with a write state defined in Protocol.h:
  - none: not allowed to send;
  - delay: messages can be queued, but will be delayed to send;
  - open: dispatch queued message/keepalive/ack;
  - drop: not send any messages, drop them all.

crimson ProtocolV2 is alike async ProtocolV2, with some considerations:
* explicit and encapsulated client/server handshake workflow.
* futurized-exception-based fault handling, which can interrupt protocol
  workflow at any time in each state.
* introduced SERVER_WAIT state, meaning to wait for peer-client's socket
  to reset or be replaced, and expect no further reads.
* introduced an explicit REPLACING state, async-msgr would be at the
  NONE state during replacing.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: apple-to-apple server async-msgr
Yingxin Cheng [Thu, 28 Mar 2019 15:26:12 +0000 (23:26 +0800)]
crimson/net: apple-to-apple server async-msgr

The simplest async-msgr server which will have the same behavior with
crimson-msgr server for apple-to-apple performance test.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agotest/crimson: improved perf tool for crimson-msgr
Yingxin Cheng [Tue, 19 Mar 2019 14:26:59 +0000 (22:26 +0800)]
test/crimson: improved perf tool for crimson-msgr

New features:
* --jobs: start multiple client messengers from core #1 ~ #jobs;
* --core: can assign server core to get away from busy client cores;
* --rounds: a client will send <rounds>/<jobs> messages;

Improved:
* Better configuration report;
* Report individual client results plus a summary;
* Validate if CPU number is sufficient before running;
* Sleep 1 second while connecting, so it won't hurt performance;
* Simplify client logic and bug fixes;

Removed unecessary features:
* finish_decode() for MOSDOp;
* keepalive ratio;

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: fix messenger creation
Yingxin Cheng [Thu, 28 Mar 2019 15:07:35 +0000 (23:07 +0800)]
crimson/net: fix messenger creation

sharded data structures should only be allocated in core#0, or the
program will hang during exit.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: create SocketConnection based on address type
Yingxin Cheng [Fri, 15 Feb 2019 07:43:08 +0000 (15:43 +0800)]
crimson/net: create SocketConnection based on address type

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: use entity_addrvec_t::front() inside messenger
Yingxin Cheng [Fri, 15 Feb 2019 07:27:04 +0000 (15:27 +0800)]
crimson/net: use entity_addrvec_t::front() inside messenger

Do not expect legacy-addr in order to bind v2 address.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: added msgr2 setting for SocketConnection
Yingxin Cheng [Fri, 15 Feb 2019 07:12:55 +0000 (15:12 +0800)]
crimson/net: added msgr2 setting for SocketConnection

Provide entrypoint for the future ProtocolV2 class.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: implement factory method of Socket
Yingxin Cheng [Fri, 15 Feb 2019 03:34:16 +0000 (11:34 +0800)]
crimson/net: implement factory method of Socket

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: introduce SocketFRef
Yingxin Cheng [Thu, 14 Feb 2019 08:44:20 +0000 (16:44 +0800)]
crimson/net: introduce SocketFRef

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: introduce protocol-level abstraction
Yingxin Cheng [Thu, 14 Feb 2019 07:49:34 +0000 (15:49 +0800)]
crimson/net: introduce protocol-level abstraction

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: batch messages instead of chaining futures 26161/head
Yingxin Cheng [Tue, 29 Jan 2019 12:49:29 +0000 (20:49 +0800)]
crimson/net: batch messages instead of chaining futures

Instead of chaining writes with send_ready, connection will batch
messages in out_q, and will reap them by write_events() in the open
state.

The performance of pingpong is 3.7 times better from observation.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agocrimson/net: centralized write_event()
Yingxin Cheng [Fri, 25 Jan 2019 08:36:27 +0000 (16:36 +0800)]
crimson/net: centralized write_event()

* introduce write_state_t to decouple write behaviors from states.
* replace `h.promise` with `state_changed`, with a more general way to
  change write behaviors according to state switches.
* centralize write_event() to dispatch writes in the open state.
* friendly interface for v1/v2 protocol abstraction.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agoMerge PR #27044 into master
Sage Weil [Thu, 21 Mar 2019 17:04:59 +0000 (12:04 -0500)]
Merge PR #27044 into master

* refs/pull/27044/head:
common: add bool log_to_file option

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #27048 into master
Sage Weil [Thu, 21 Mar 2019 16:48:29 +0000 (11:48 -0500)]
Merge PR #27048 into master

* refs/pull/27048/head:
doc: add changelog for nautilus

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27099 from tchaikov/wip-crimson-misc-logging
Kefu Chai [Thu, 21 Mar 2019 16:14:01 +0000 (00:14 +0800)]
Merge pull request #27099 from tchaikov/wip-crimson-misc-logging

crimson/{net,mon,osd}: misc logging changes

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #27089 from tchaikov/wip-cmake-with-ninja
Kefu Chai [Thu, 21 Mar 2019 14:05:54 +0000 (22:05 +0800)]
Merge pull request #27089 from tchaikov/wip-cmake-with-ninja

cmake: do not assume ${CMAKE_GENERATOR} == make

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27100 from ddiss/trivial_rgw_auth_keystone_gcc_warning
Casey Bodley [Thu, 21 Mar 2019 14:05:18 +0000 (10:05 -0400)]
Merge pull request #27100 from ddiss/trivial_rgw_auth_keystone_gcc_warning

[trivial] rgw: fix minor compiler warning in keystone auth

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27094 from tchaikov/wip-cmake-cmake-ubsan
Kefu Chai [Thu, 21 Mar 2019 14:03:14 +0000 (22:03 +0800)]
Merge pull request #27094 from tchaikov/wip-cmake-cmake-ubsan

cmake: workaround of false alarm from ubsan

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27088 from tchaikov/wip-update-seastar
Kefu Chai [Thu, 21 Mar 2019 13:59:28 +0000 (21:59 +0800)]
Merge pull request #27088 from tchaikov/wip-update-seastar

cmake,crimson: pick up latest seastar

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #26731 from wjwithagen/wjw-fix-cmake-os-release
Kefu Chai [Thu, 21 Mar 2019 13:53:23 +0000 (21:53 +0800)]
Merge pull request #26731 from wjwithagen/wjw-fix-cmake-os-release

build: FreeBSD does not have /etc/os-release

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26607 from tchaikov/wip-cython-language_level
Kefu Chai [Thu, 21 Mar 2019 13:51:14 +0000 (21:51 +0800)]
Merge pull request #26607 from tchaikov/wip-cython-language_level

pybind: set language_level for cythonize explicitly

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agorgw: fix minor compiler warning in keystone auth 27100/head
David Disseldorp [Thu, 21 Mar 2019 13:09:17 +0000 (14:09 +0100)]
rgw: fix minor compiler warning in keystone auth

Signed-off-by: David Disseldorp <ddiss@suse.de>
6 years agoMerge pull request #27093 from tchaikov/wip-crimson-test-alien-echo
Kefu Chai [Thu, 21 Mar 2019 13:00:10 +0000 (21:00 +0800)]
Merge pull request #27093 from tchaikov/wip-crimson-test-alien-echo

test/crimson: update to accomodate Dispatcher changes

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agocrimson/osd: more verbose logging 27099/head
Kefu Chai [Mon, 4 Mar 2019 03:15:56 +0000 (11:15 +0800)]
crimson/osd: more verbose logging

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/{mon,osd}: don't log ms_dispatch messages
Kefu Chai [Tue, 5 Mar 2019 03:05:48 +0000 (11:05 +0800)]
crimson/{mon,osd}: don't log ms_dispatch messages

msgr already logs them

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/net: log tx/rx messages
Kefu Chai [Sat, 2 Mar 2019 05:17:22 +0000 (13:17 +0800)]
crimson/net: log tx/rx messages

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #27092 into master
Sage Weil [Thu, 21 Mar 2019 12:22:06 +0000 (07:22 -0500)]
Merge PR #27092 into master

* refs/pull/27092/head:
mailmap: sort entries
mailmap: sort organizationmap
mailmap: updates for nautilus
doc: mailmap updates for mimic
mailmap fixes for 12.2.0

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26404 from sebastian-philipp/orchestrator-error-handling
Sebastian Wagner [Thu, 21 Mar 2019 11:30:13 +0000 (12:30 +0100)]
Merge pull request #26404 from sebastian-philipp/orchestrator-error-handling

mgr/orchestrator: Add error handling to interface

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
6 years agocmake: workaround of false alarm from ubsan 27094/head
Kefu Chai [Thu, 21 Mar 2019 10:51:48 +0000 (18:51 +0800)]
cmake: workaround of false alarm from ubsan

to workaround a GCC bug, see
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88684

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agotest/crimson: update to accomodate Dispatcher changes 27093/head
Kefu Chai [Thu, 21 Mar 2019 10:52:50 +0000 (18:52 +0800)]
test/crimson: update to accomodate Dispatcher changes

Dispatcher::ms_get_authorizer() was changed in f22d433a, so update the
test accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomailmap: sort entries 27092/head
Abhishek Lekshmanan [Thu, 21 Mar 2019 09:46:10 +0000 (10:46 +0100)]
mailmap: sort entries

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agomailmap: sort organizationmap
Abhishek Lekshmanan [Thu, 21 Mar 2019 09:43:21 +0000 (10:43 +0100)]
mailmap: sort organizationmap

since this will make it easier for editing entries in the future

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agomailmap: updates for nautilus
Abhishek Lekshmanan [Thu, 21 Mar 2019 09:32:32 +0000 (10:32 +0100)]
mailmap: updates for nautilus

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agocmake: disable -Werror when building seastar 27088/head
Kefu Chai [Thu, 21 Mar 2019 08:23:04 +0000 (16:23 +0800)]
cmake: disable -Werror when building seastar

when building seastar with a recent fmt, fmt complains:

src/fmt/include/fmt/time.h:13:2: error: #warning fmt/time.h is
deprecated, use fmt/chrono.h instead [-Werror=cpp]
 #warning fmt/time.h is deprecated, use fmt/chrono.h instead
  ^~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoseastar: pickup the latest seastar
Kefu Chai [Thu, 21 Mar 2019 07:06:27 +0000 (15:06 +0800)]
seastar: pickup the latest seastar

for couple improvements

dbf7b6b0: add fast path for small writes
2f357317: IPv6 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: link against libfmt
Kefu Chai [Thu, 21 Mar 2019 06:55:05 +0000 (14:55 +0800)]
cmake: link against libfmt

Seastar::seastar does pull in libfmt library as a PUBLIC linkage. but we
should not depend on this. if we use fmt directly, we should link against it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson: include headers if necessary
Kefu Chai [Thu, 21 Mar 2019 06:52:46 +0000 (14:52 +0800)]
crimson: include headers if necessary

we should not rely on seastar or other headers to do this. if we use
fmt or std functions, we should include corresponding header(s).

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: do not assume ${CMAKE_GENERATOR} == make 27089/head
Kefu Chai [Thu, 21 Mar 2019 05:16:13 +0000 (13:16 +0800)]
cmake: do not assume ${CMAKE_GENERATOR} == make

* modules/BuildDPDK.cmake: always use "make"
* modules/BuildSPDK.cmake: always use "make"
  DPDK only support "make". if user wants to use other generator than
  "make", we will fail to build DPDK support. so we should always use
  "make" here. and before using "make", we need to detect it.
* cmake/modules/BuildRocksDB.cmake: use cmake for build
* src/compressor/zstd/CMakeLists.txt: use cmake for build
  just use whatever generator use specifies, and use ${CMAKE_COMMAND}
  for building the specified target, no need to repeat
  ${CMAKE_GENERATOR} for building the target.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: build fmt submodule if libfmt is not found
Kefu Chai [Thu, 21 Mar 2019 04:07:10 +0000 (12:07 +0800)]
cmake: build fmt submodule if libfmt is not found

the recent seastar dropped fmt submodule, so we need to build from our
own fmt submodule.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agofmt: add fmt submodule back
Kefu Chai [Thu, 21 Mar 2019 03:53:21 +0000 (11:53 +0800)]
fmt: add fmt submodule back

seastar does not bring fmt as a submodule, so let's ready it by
ourselves.

This reverts commit 53a38bf57e10b681268378737955e50f6239e925.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27057 from yuriw/wip-yuriw-crontab
Yuri Weinstein [Wed, 20 Mar 2019 23:36:54 +0000 (16:36 -0700)]
Merge pull request #27057 from yuriw/wip-yuriw-crontab

qa/tests: reduced frequency for luminous and mimic runs...

6 years agoqa/tests: reduced frequency for luminous and mimic runs 27057/head
Yuri Weinstein [Tue, 19 Mar 2019 20:19:30 +0000 (13:19 -0700)]
qa/tests: reduced frequency for luminous and mimic runs
added all suites for nauitlus

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #26786 from aclamk/fix-rocksdb-compaction-ranges
Yuri Weinstein [Wed, 20 Mar 2019 16:30:38 +0000 (09:30 -0700)]
Merge pull request #26786 from aclamk/fix-rocksdb-compaction-ranges

common/kv/rocksdb: Fixed async compations.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27046 from smithfarm/wip-38812
Nathan Cutler [Wed, 20 Mar 2019 16:12:58 +0000 (17:12 +0100)]
Merge pull request #27046 from smithfarm/wip-38812

rpm: refrain from building ceph-resource-agents on SLE

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #27054 from cbodley/wip-37770
Casey Bodley [Wed, 20 Mar 2019 14:07:31 +0000 (10:07 -0400)]
Merge pull request #27054 from cbodley/wip-37770

doc/rgw: update civetweb rgw_frontends config example

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27035 from cbodley/wip-test-rgw-reshard-wait-clock
Casey Bodley [Wed, 20 Mar 2019 13:57:01 +0000 (09:57 -0400)]
Merge pull request #27035 from cbodley/wip-test-rgw-reshard-wait-clock

test/rgw: test_rgw_reshard_wait uses same clock for timing

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26853 from nathan-weinberg/more-cluster-tests
Lenz Grimmer [Wed, 20 Mar 2019 13:56:43 +0000 (14:56 +0100)]
Merge pull request #26853 from nathan-weinberg/more-cluster-tests

mgr/dashboard: Added breadcrumb tests to Manager modules and Alerts menu

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #27052 from rzarzynski/wip-rgw-drop_rgw_decode_pki_token
Casey Bodley [Wed, 20 Mar 2019 13:55:55 +0000 (09:55 -0400)]
Merge pull request #27052 from rzarzynski/wip-rgw-drop_rgw_decode_pki_token

rgw: drop unused rgw_decode_pki_token().

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27025 from yangdongsheng/poll_timeout
Jason Dillaman [Wed, 20 Mar 2019 12:58:04 +0000 (08:58 -0400)]
Merge pull request #27025 from yangdongsheng/poll_timeout

rbd: krbd: return -ETIMEDOUT in polling

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
6 years agodoc/rgw: update civetweb rgw_frontends config example 27054/head
Casey Bodley [Tue, 19 Mar 2019 16:57:55 +0000 (12:57 -0400)]
doc/rgw: update civetweb rgw_frontends config example

all of these civetweb options have to be on the same line as rgw_frontends

Fixes: https://tracker.ceph.com/issues/37770
Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27050 from theanalyst/build-doc-warns
Kefu Chai [Wed, 20 Mar 2019 12:16:13 +0000 (20:16 +0800)]
Merge pull request #27050 from theanalyst/build-doc-warns

admin/build-doc: keep-going when finding warnings

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26534 from majianpeng/skip-calc-crc-header-for-async-msg
Kefu Chai [Wed, 20 Mar 2019 11:53:24 +0000 (19:53 +0800)]
Merge pull request #26534 from majianpeng/skip-calc-crc-header-for-async-msg

msg/async: skip repeat calc crc header in Message::encode

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge PR #27009 into master
Sage Weil [Wed, 20 Mar 2019 11:51:51 +0000 (06:51 -0500)]
Merge PR #27009 into master

* refs/pull/27009/head:
ceph_release: the next release will be octopus

Reviewed-by: Kai Wagner <kwagner@suse.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge pull request #26514 from dillaman/wip-38381
Kefu Chai [Wed, 20 Mar 2019 11:51:27 +0000 (19:51 +0800)]
Merge pull request #26514 from dillaman/wip-38381

pybind/rados: fixed Python3 string conversion issue on get_fsid

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26985 from rhcs-dashboard/38768-fix-sparkline-component
Kefu Chai [Wed, 20 Mar 2019 11:50:23 +0000 (19:50 +0800)]
Merge pull request #26985 from rhcs-dashboard/38768-fix-sparkline-component

mgr/dashboard: fix sparkline component

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
6 years agoMerge pull request #27034 from jan--f/mgr-prometheus-remove-scrape-duration
Kefu Chai [Wed, 20 Mar 2019 11:48:40 +0000 (19:48 +0800)]
Merge pull request #27034 from jan--f/mgr-prometheus-remove-scrape-duration

pybind/mgr/prometheus: remove scrape_duration metric

Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agoMerge pull request #26701 from adamemerson/wip-trip-the-light-clangtastic
Kefu Chai [Wed, 20 Mar 2019 11:36:57 +0000 (19:36 +0800)]
Merge pull request #26701 from adamemerson/wip-trip-the-light-clangtastic

fix clang build failures, and clean up warnings

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26836 from p-na/wip-pna-fix-osd
Kefu Chai [Wed, 20 Mar 2019 11:30:51 +0000 (19:30 +0800)]
Merge pull request #26836 from p-na/wip-pna-fix-osd

 mgr/dashboard: "1 osds exist in the crush map but not in the osdmap" breaks OSD page

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #26717 from ifed01/wip-ifed-objectstore-tool-fix
Kefu Chai [Wed, 20 Mar 2019 11:29:35 +0000 (19:29 +0800)]
Merge pull request #26717 from ifed01/wip-ifed-objectstore-tool-fix

tools: no-mon-config switch for ceph-objectstore-tool.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26926 from rouming/epoll-lost-epollet
Kefu Chai [Wed, 20 Mar 2019 11:26:40 +0000 (19:26 +0800)]
Merge pull request #26926 from rouming/epoll-lost-epollet

msg/async/EventEpoll: set EPOLLET flag on del_event()

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agorbd: krbd: return -ETIMEDOUT in polling 27025/head
Dongsheng Yang [Mon, 18 Mar 2019 03:04:52 +0000 (23:04 -0400)]
rbd: krbd: return -ETIMEDOUT in polling

We don't want to wait on uevent forever, but the return value
of polling in timeout is 0 rather than a negative value.

Fixes: http://tracker.ceph.com/issues/38792
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
6 years agoMerge pull request #26934 from sebastian-philipp/doc-rados-mon_command
Kefu Chai [Wed, 20 Mar 2019 10:27:47 +0000 (18:27 +0800)]
Merge pull request #26934 from sebastian-philipp/doc-rados-mon_command

doc/rados/api/python: Add documentation for mon_command

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26562 from familyuu/log
Lenz Grimmer [Wed, 20 Mar 2019 10:10:45 +0000 (11:10 +0100)]
Merge pull request #26562 from familyuu/log

mgr/dashboard: Add date range and log search functionality

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #27065 from tchaikov/wip-crimson-mgr-client
Kefu Chai [Wed, 20 Mar 2019 09:56:25 +0000 (17:56 +0800)]
Merge pull request #27065 from tchaikov/wip-crimson-mgr-client

crimson/osd: report pg_stats to mgr

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agocrimson/osd: connect OSD to mgr 27065/head
Kefu Chai [Wed, 6 Mar 2019 04:29:10 +0000 (12:29 +0800)]
crimson/osd: connect OSD to mgr

so OSD is able to report to mgr periodically using mgr::Client

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: include MonClient.h in .cc
Kefu Chai [Wed, 6 Mar 2019 04:27:36 +0000 (12:27 +0800)]
crimson/osd: include MonClient.h in .cc

mon::Client's definition is only necessary in .cc

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: add facilities for reporting pg stats
Kefu Chai [Mon, 4 Mar 2019 09:15:01 +0000 (17:15 +0800)]
crimson/osd: add facilities for reporting pg stats

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/mgr: add mgr client
Kefu Chai [Mon, 4 Mar 2019 09:13:29 +0000 (17:13 +0800)]
crimson/mgr: add mgr client

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd/pg: accessors for pg stats/state
Kefu Chai [Mon, 4 Mar 2019 09:12:22 +0000 (17:12 +0800)]
crimson/osd/pg: accessors for pg stats/state

so OSD can collect pg stats and report them to mgr

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: create msgrs in main.cc
Kefu Chai [Wed, 20 Mar 2019 08:34:58 +0000 (16:34 +0800)]
crimson/osd: create msgrs in main.cc

update PG to hold references of messengers instead of pointers to them,
as their lifecycle will be managed in main.cc

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27045 from smithfarm/wip-38810
Nathan Cutler [Wed, 20 Mar 2019 09:04:17 +0000 (10:04 +0100)]
Merge pull request #27045 from smithfarm/wip-38810

rpm: fix "rhel <= 7" conditional

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #27066 from tchaikov/wip-crimson-sharded-stop
Kefu Chai [Wed, 20 Mar 2019 08:29:19 +0000 (16:29 +0800)]
Merge pull request #27066 from tchaikov/wip-crimson-sharded-stop

crimson/osd: create msgrs in main.cc

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agocrimson/os: use transparent comparator in xattr 27066/head
Kefu Chai [Mon, 11 Mar 2019 13:38:21 +0000 (21:38 +0800)]
crimson/os: use transparent comparator in xattr

so we don't need to allocate a temporary string for looking up OI or SS
attribute

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: cancel timers before restart
Kefu Chai [Fri, 15 Mar 2019 08:01:12 +0000 (16:01 +0800)]
crimson/osd: cancel timers before restart

otherwise we will rearm already-armed timer when booting up OSD again.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/net: call do_shutdown() in SocketMessenger::stop()
Kefu Chai [Sat, 16 Mar 2019 05:29:50 +0000 (13:29 +0800)]
crimson/net: call do_shutdown() in SocketMessenger::stop()

so sharded<SocketMessenger> can stop the messenger service with stop()

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: create msgrs in main.cc
Kefu Chai [Fri, 15 Mar 2019 11:15:43 +0000 (19:15 +0800)]
crimson/osd: create msgrs in main.cc

messengers are sharded<Service>. we should not create them in another
sharded service's start() method. to ensure the ordering of stop of
sharded services, we should create the sharded services in main().
and register their stop() method in the proper order.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27064 from tchaikov/wip-crimson-pg-init
Kefu Chai [Wed, 20 Mar 2019 07:28:20 +0000 (15:28 +0800)]
Merge pull request #27064 from tchaikov/wip-crimson-pg-init

crimson/osd: init PG with more info

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agocrimson/osd: init primary state in PG::read_state() 27064/head
Kefu Chai [Thu, 28 Feb 2019 13:48:27 +0000 (21:48 +0800)]
crimson/osd: init primary state in PG::read_state()

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: add PG::read_state()
Kefu Chai [Mon, 25 Feb 2019 13:03:12 +0000 (21:03 +0800)]
crimson/osd: add PG::read_state()

to load pg_info and past_intervals

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: skip fast_info if it is not around
Kefu Chai [Thu, 28 Feb 2019 10:44:04 +0000 (18:44 +0800)]
crimson/osd: skip fast_info if it is not around

fast_info is optional. for instance, there is chance that it
is the first time the info is written to store, in that case,
there is no delta, i.e. fast info yet.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: pass pgid, osdmap and msgr to PG's ctor
Kefu Chai [Fri, 22 Feb 2019 08:16:58 +0000 (16:16 +0800)]
crimson/osd: pass pgid, osdmap and msgr to PG's ctor

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27062 from tchaikov/wip-crimson-ceph-opts-in-argv
Kefu Chai [Wed, 20 Mar 2019 06:48:01 +0000 (14:48 +0800)]
Merge pull request #27062 from tchaikov/wip-crimson-ceph-opts-in-argv

crimson/osd: pass unknown args to ConfigProxy::parse_args()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #27003 from tchaikov/wip-crimson-for-classic
Kefu Chai [Wed, 20 Mar 2019 06:38:22 +0000 (14:38 +0800)]
Merge pull request #27003 from tchaikov/wip-crimson-for-classic

osd,messages: changes for preparing for crimson-osd

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>