Commit Graph

78690 Commits

Author SHA1 Message Date
Kefu Chai
b7fbe46d55 cmake: compile Mach-O format instead of ELF on OSX
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
d709772240 cmake: link against libresolv on OSX
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
8857a3019a time: use mach_absolute_time() for monotonic time
* use mach_absolute_time() for monotonic time
  mach_absolute_time() is faster and monotonic, see
  https://developer.apple.com/library/content/qa/qa1398/_index.html

  for its implementation, see
  https://opensource.apple.com/source/xnu/xnu-3248.60.10/libsyscall/wrappers/mach_absolute_time.s

  it's using rdtsc.
* and remove unnecessary headers from ceph_time.h

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
6688768399 cmake: remove unnecessary linkage of librt
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
21e90b94ab cmake: do not link against librt on osx
as osx does not offer librt

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
4c9085b3d8 common/util: port collect_sys_info() to osx
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
fbee315949 msg/simple: port to osx
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
d7e2e727fd common/fd: port dump_open_fds() to osx
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
f409063bc0 cmake: move MemoryModel.cc to $mds_srcs
as it is only used by mds.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
0b922b681b global/signal_handler: port get_name_by_pid() to osx
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
bb4466ebe8 cmake: check for osx using APPLE not DARWIN
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
3475735e8a os,common: check __APPLE__ for osx not DARWIN
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
4b03dd309e common/io_priority: include <errno.h> on osx
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
4cb467ece5 cmake: s/-Wl,-export-dynamic/$CMAKE_EXE_EXPORTS_C_FLAG/
* s/-Wl,-export-dynamic/$CMAKE_EXE_EXPORTS_C_FLAG/
  this address the issue on osx:

    ld: unknown option: --export-dynamic

  because ld on osx does not support `-export-dynamic`, it supports
  `-export_dynamic` though.

  CMAKE_EXE_EXPORTS_C_FLAG is set to -Wl,-export-dynamic on FreeBSD
  and GNU/Linux.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
dcace330e1 Merge pull request #17718 from kungf/scrub_loadavg
osd: get loadavg per cpu for scrub load threshold check

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-16 09:56:13 +08:00
Kefu Chai
c1ba1435cb Merge pull request #17704 from liewegas/wip-osd-deq
osd: minor optimizations for op wq

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2017-09-16 09:55:34 +08:00
Kefu Chai
23701b29db Merge pull request #17666 from david-z/wip-objectore-tool
tools/ceph-objectstore-tool: split filestore directories offline to target hash level

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-09-16 09:54:06 +08:00
Kefu Chai
ffcd5813e5 Merge pull request #17748 from tchaikov/wip-mon-constness
mon: more constness

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-16 09:53:33 +08:00
Kefu Chai
8d04006c6a Merge pull request #17727 from tchaikov/wip-pybind-cleanup
pybind: remove unused get_ceph_version()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-09-16 09:52:03 +08:00
Kefu Chai
31441a0e87 Merge pull request #17749 from tchaikov/wip-vstart
vstart.sh: simplify the objectstore related logic

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-09-16 09:51:18 +08:00
Kefu Chai
91d7b9997f Merge pull request #17418 from Songweibin/wip-osdmap-full-try
rados: support python API of "set_osdmap_full_try"

Reviewed-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-09-16 09:50:17 +08:00
Kefu Chai
19a3e38987 Merge pull request #17295 from david-z/wip-compress-scrub-warning
mon: Compress the warnings of pgs not scrubbed or deep-scrubbed

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-16 09:48:06 +08:00
Jos Collin
cfe6c7a13f Merge pull request #17732 from Songweibin/wip-fix-comments
doc,os,osdc: drop and modify comments

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-16 01:04:57 +00:00
xie xingguo
3019126037 os/bluestore: propagate read-EIO for aio
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-16 08:42:06 +08:00
Sage Weil
5ba5ad000b Merge pull request #17675 from theanalyst/doc-rgw-reshard
doc: rgw: add a note for resharding in 12.2.1 docs
2017-09-15 16:25:34 -05:00
Abhishek Lekshmanan
aeddbc5201 doc: rgw: add a note for resharding in 12.2.1 docs
Since we're now enabling dynamic resharding, mention  this in release
notes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-09-15 23:20:27 +02:00
Patrick Donnelly
3c727d9a36
Merge PR #17701 into master
* refs/remotes/upstream/pull/17701/head:
	qa/cephfs: Fix error in test_filtered_df

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-15 14:12:35 -07:00
Patrick Donnelly
8a54e101e5
Merge PR #17694 into master
* refs/remotes/upstream/pull/17694/head:
	qa/cephfs: kill mount if it gets evicted by mds
	qa/cephfs: fix test_evict_client

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-15 14:12:33 -07:00
Patrick Donnelly
4e4ac47818
Merge PR #17681 into master
* refs/remotes/upstream/pull/17681/head:
	mon: remove mdsmap-derived perf counters

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-15 14:12:31 -07:00
Patrick Donnelly
064f1dfc3c
Merge PR #17676 into master
* refs/remotes/upstream/pull/17676/head:
	qa/tasks/cephfs: Whitelist POOL_APP_NOT_ENABLED for test_misc

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-15 14:12:29 -07:00
Patrick Donnelly
71b571b2e9
Merge PR #17671 into master
* refs/remotes/upstream/pull/17671/head:
	messages: Initilization of left memebers

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-15 14:12:27 -07:00
Patrick Donnelly
a7273f051c
Merge PR #17670 into master
* refs/remotes/upstream/pull/17670/head:
	messages: Initialization of member variables

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-15 14:12:25 -07:00
Patrick Donnelly
8a816946a4
Merge PR #17652 into master
* refs/remotes/upstream/pull/17652/head:
	client: use unsigned trim_caps count

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
2017-09-15 14:12:23 -07:00
Patrick Donnelly
1551b54f95
Merge PR #17598 into master
* refs/remotes/upstream/pull/17598/head:
	messages: Initialization of members MMDSCacheRejion

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-15 14:12:22 -07:00
Patrick Donnelly
38ff1cacd2
Merge PR #17595 into master
* refs/remotes/upstream/pull/17595/head:
	ceph-fuse: should free array using "delete[]"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
2017-09-15 14:12:20 -07:00
Patrick Donnelly
c718d06790
githubmap: update contributors
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-15 14:12:19 -07:00
Patrick Donnelly
ad07135fdf
Merge PR #17542 into master
* refs/remotes/upstream/pull/17542/head:
	client: Delete onsafe

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-15 14:12:04 -07:00
Sage Weil
9c73305e3a Revert "osd/OSDMap: allow bidirectional swap of pg-upmap-items"
This reverts commit 09af9b8afb.

We need to prevent duplicates in the final result.  For example, we
can currently take
 [1,2,3] and apply [(1,2)] and get [2,2,3]
or
 [1,2,3] and apply [(3,2)] and get [1,2,2]

The rest of the system is not prepared to handle duplicates in the
result set like this.

The reverted commit was intended to allow

 [1,2,3] and [(1,2),(2,1)] to get [2,1,3]

to reorder primaries.  First, this bidirectional swap is hard to implement
in a way that also prevents dups.  For example,
 [1,2,3] and [(1,4),(2,3),(3,4)] would give [4,3,4]
but would we just drop the last step we'd have [4,3,3] which
is also invalid, etc.  Simpler to just not handle bidirectional
swaps.  In practice, they are not needed: if you just want to choose
a different primary then use primary_affinity, or pg_upmap
(not pg_upmap_items).

Fixes: http://tracker.ceph.com/issues/21410
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 16:52:28 -04:00
Sage Weil
7540332afd Merge pull request #17709 from liewegas/wip-bluestore-repair
ceph-bluestore-tool: better fsck/repair, bluefs-bdev-{expand,sizes}

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-15 15:35:03 -05:00
Sage Weil
8ade1afa58 mon/OSDMonitor: drop old upgrade guards; make upgrades stop at O
We may not end up doing this but it keeps a template for how the
guard worked before in the code for future reference.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 14:49:42 -04:00
Sage Weil
3e66d34521 include/ceph_features: define SERVER_O
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 14:49:42 -04:00
Sage Weil
3677e62d52 mon: app labels unconditional
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 14:49:42 -04:00
Sage Weil
eb4ae9e21c mon/OSDMonitor: new osd timeout handling is unconditional
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 14:49:42 -04:00
Sage Weil
e5e532008a mon/OSDMonitor: drop PURGED_SNAPDIRS flag setting
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 14:49:42 -04:00
Sage Weil
afda7157ae mon/OSDMonitor: encode_pending: drop luminous special casing, conversions
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 14:49:42 -04:00
Sage Weil
d0a477bfec mon/OSDMonitor: new creating_pgs handling is unconditional
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 14:49:42 -04:00
Sage Weil
82ea25ae4f mon/OSDMonitor: drop various luminous guards on new commands
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-15 14:49:36 -04:00
Kefu Chai
7592220333 Merge pull request #17388 from tchaikov/wip-rocksdb
rocksdb: sync with upstream

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-16 01:23:56 +08:00
John Spray
44dce0a566 mgr: set explicit thread name
This gets used as our process name in some situations
when respawning.  This is the same as what commit 4f177bb6b
did for the MDS.

Fixes: http://tracker.ceph.com/issues/21404
Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-15 17:26:34 +01:00
Kefu Chai
8c992762a9 Merge pull request #17706 from liewegas/wip-test-listsnaps
ceph_test_rados_api_tier: add ListSnap test

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-15 19:57:36 +08:00