Commit Graph

58186 Commits

Author SHA1 Message Date
John Spray
84508408d9 mon: add MgrMonitor
This is responsible for learning the locations of
mgrs, picking an active one, and sharing that
info with MgrClient consumers who subscribe to 'mgrmap'

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:53 +01:00
John Spray
eaada77fea msg: introduce mgr entity_type_t
Mgr will probably ultimately have different auth caps,
so let's make it a separate entity up front instead
of e.g. pretending to be a mon.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:53 +01:00
John Spray
e3b2225f0b messages: add ceph-mgr messages
Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:53 +01:00
John Spray
7e6b4f1fcb client: refactor command handling
Create a CommandTable structure for places
in Client, MgrClient, Objecter where we do
basically the same kind of thing for sending
and tracking MCommands.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:52 +01:00
John Spray
a11ff90fea pybind: fix handling bad cmd json
The 'save_exception' local would otherwise
be referenced before assignment during
exception handling.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:52 +01:00
John Spray
6caae0e334 common/cmdparse: additional helpers
For dumping a cmdmap to a Formatter, and for
checking the prefix of a cmddesc.

Used by ceph-mgr when routing commands to python
modules.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:52 +01:00
John Spray
c4965fd04b common: add mgr config settings
Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:51 +01:00
John Spray
fefaac75cd common: add 'mgr' and 'mgrc' subsystems for logging
Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:51 +01:00
John Spray
1a331234e8 common: move ceph_version up into collect_sys_info
...so that we get this piece of metadata from every
service uniformly.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:51 +01:00
John Spray
85ba9a3667 mon: add with_monmap to MonClient
Analogous to Objecter::with_osdmap, for safe access
to the map.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:51 +01:00
John Spray
c5700ce4b4 mon: fix missing osd metadata (again)
The JSON output was getting broken by continuing
in the wrong place.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:50 +01:00
John Spray
27fdf87a0c monc: remove unused AuthAuthorizeHandlerRegistry
Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:50 +01:00
John Spray
fbe7ae50ae vstart: fix warning when no CEPH_MAX_MDS set
This was a typo in 29535caf

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:50 +01:00
John Spray
3f6676a8e5 mon: drop encoded buffer after decode
This bufferlist was being kept around as a
class member but it didn't need to be.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:49 +01:00
John Spray
51a610517d mon,mds: include 'addr' in daemon metadata
This is useful for correlating daemon metadata
to cluster maps.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:49 +01:00
John Spray
d2a209f169 msg: typedef uint8_t entity_type_t
...rather than having a mixture of explicit __u8
and implicit enums/ints.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:26:49 +01:00
John Spray
2715885464 Merge pull request #11137 from jcsp/wip-17173
mds: catch duplicates in DamageTable

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
2016-09-29 16:38:27 +01:00
Sage Weil
e1822c1691 os/bluestore: sloppy reshard boundaries to avoid spanning blobs
Make the extent map shard target size sloppy so that we can try to avoid
sharding boundaries that create spanning blobs.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-09-29 10:46:38 -04:00
Sage Weil
a5706d78de Merge pull request #11244 from xiexingguo/xxg-wip-bluestore-0928
os/bluestore: upgrade compression settings to atomics

Reviewed-by: Sage Weil <sage@redhat.com>
2016-09-29 08:45:29 -05:00
xie xingguo
83e9394837 os/bluestore: upgrade compression settings to atomics
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-09-29 10:18:51 +08:00
Michal Jarzabek
be2b51ded2 osd: pass shared_ptr by const reference
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-09-28 23:18:47 +01:00
Mykola Golub
ba6785f0d9 Merge pull request #11185 from dillaman/wip-17355
rbd-mirror: quiesce in-flight event commits before shut down

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 23:12:44 +03:00
Sage Weil
b8d4a4a273 Merge pull request #11250 from liewegas/wip-bluestore-leaks
os/bluestore: fix leaks in our use of rocksdb
2016-09-28 14:29:22 -05:00
Sage Weil
85fc102895 os/bluestore: do not leak when using EnvMirror
Signed-off-by: Sage Weil <sage@redhat.com>
2016-09-28 13:56:51 -04:00
Sage Weil
2a4b87f33c rocksdb: include EnvMirror leak fixes
Signed-off-by: Sage Weil <sage@redhat.com>
2016-09-28 13:56:40 -04:00
Gregory Farnum
b9f15e543e Merge pull request #11180 from liewegas/wip-mon-forward
messages/MForward: fix encoding features

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-09-28 10:28:56 -07:00
Sage Weil
d4f5e88f36 messages/MForward: fix encoding features
We were encoding the message with the sending client's
features, which makes no sense: we need to encode with
the recipient's features so that it can decode the
message.

The simplest way to fix this is to rip out the bizarre
msg_bl handling code and simply keep a decoded Message
reference, and encode it when we send.

We encode the encapsulated message with the intersection
of the target mon's features and the sending client's
features.  This probably doesn't matter, but it's
conceivable that there is some feature-dependent
behavior in the message encode/decode that is important.

Fixes: http://tracker.ceph.com/issues/17365
Signed-off-by: Sage Weil <sage@redhat.com>
2016-09-28 11:44:28 -04:00
Sage Weil
56ccf8ea08 Merge pull request #11243 from liewegas/wip-bluestore-deferred-csum
os/bluestore: remove deferred_csum machinery
2016-09-28 10:40:43 -05:00
Sage Weil
51a1f8600d Merge pull request #11113 from yuyuyu101/wip-fix-filestore-clone
os/filestore: disable use of splice by default

Reviewed-by: Sage Weil <sage@redhat.com>
2016-09-28 10:39:43 -05:00
Sage Weil
641d2ca04d Merge pull request #9652 from stiopaa1/osdc_ObjectCacher_constMember
osdc/ObjectCacher.h: add const to member functions

Reviewed-by: Sage Weil <sage@redhat.com>
2016-09-28 10:06:46 -05:00
Sage Weil
ad50703c15 Merge pull request #11248 from mikulely/cleanup-vstart-doc
doc: cleanup outdated radosgw description
2016-09-28 09:29:39 -05:00
Sage Weil
c48ee9d3ec Merge pull request #11217 from ceph/wip-17395-rbdmap-permissions
rpm: fix permissions for /etc/ceph/rbdmap

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2016-09-28 09:20:06 -05:00
Sage Weil
4182ee6654 Merge pull request #11240 from liewegas/wip-bluestore-assert
os/bluestore: add assert to compress_extent_map
2016-09-28 09:13:20 -05:00
Sage Weil
8a9e41a286 Merge pull request #11245 from xiexingguo/xxg-wip-bluestore-bsearch-shard
os/bluestore: binary search specified shard

Reviewed-by: Sage Weil <sage@redhat.com>
2016-09-28 09:12:50 -05:00
Sage Weil
539a86220e Merge pull request #11235 from xiexingguo/xxg-wip-bluestore-0926
os/bluestore: more cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
2016-09-28 08:56:47 -05:00
Haomai Wang
cac8b17a37 Merge pull request #11247 from majianpeng/msg-async-cleanup
msg/async: remove unused code.

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-09-28 21:36:21 +08:00
Jianpeng Ma
91bc79eed6 msg/async: remove unused code.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-09-28 22:32:48 +08:00
Mykola Golub
be25f843af rbd-mirror: replicate image metadata settings
Fixes: http://tracker.ceph.com/issues/16212
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 16:36:15 +03:00
Mykola Golub
7a43414513 cls::rbd: async methods to set/remove metadata
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 16:28:23 +03:00
Jason Dillaman
cc40473fb1 Merge pull request #10980 from trociny/wip-16213
rbd-mirror: replicate dynamic feature updates

Reviewed-by: Jason Dillaman <dillamana@redhat.com>
2016-09-28 09:06:29 -04:00
Mykola Golub
f99dbbd153 librbd: potential null pointer dereference when requesting exclusive lock
m_require_lock_on_read should be cleared when holding owner_lock.

For safety, also check that exclusive_lock is not null.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
ac71dbca3e librbd: interlock image state machine and update features operations
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
5a68e334d8 librbd: use counter to track exclusive lock block/unblock requests
It's possible the watch/notify message is duplicated resulting in two
concurrent block_requests() call.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
93cf63f993 rbd-mirror: replicate dynamic feature updates
Fixes: http://tracker.ceph.com/issues/16213
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
3c270b57bf librbd: async state machine to enable/disable image features
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
606344dd29 librbd: templetize journal StandardPolicy
It will be needed for unit tests with a mocked ImageCtx.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
4269a5fc0c librbd: allow to call append_disabled for DisabledPolicy
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
dcfb8aa141 librbd: async methods to enable/disable mirroring
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
953561f841 librbd: async method to check journal tag owner
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:19 +03:00
Mykola Golub
9026b515e6 librbd: async image set flags method
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-09-28 15:17:18 +03:00