Commit Graph

78328 Commits

Author SHA1 Message Date
John Spray
38df5150ee mgr/dashboard: remove unneeded bits of AdminLTE
AdminLTE is delivered in a handy all-in format,
but we don't need all this stuff at runtime.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-18 06:32:39 -04:00
Kefu Chai
28c8e8953c Merge pull request #17737 from ivancich/wip-pull-updated-dmclock
osd: update dmclock library w git subtree pull

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-17 19:42:52 +08:00
Kefu Chai
cd6a312a4f Merge pull request #17762 from yaozongyou/fix-typo-in-php-rst
doc: fix typo in php.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-17 02:00:50 +08:00
Sage Weil
05653863aa Merge pull request #17763 from xiexingguo/wip-21409
qa: fix pool-quota related tests

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-16 12:59:12 -05:00
Yao Zongyou
8e3380f20a doc: fix typo in php.rst
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2017-09-16 13:54:03 +08:00
xie xingguo
5dd3458eec qa: fix pool-quota related tests
https://github.com/ceph/ceph/pull/17371 introduces support of
per-pool space-full flag, which turns out to set both
full and full_no_quota flags now if a pool is currently running out
of quota.

Actually this test is fragile as long as we keep appending new flags
at pool granularity, but let's not bother with that complexity now.

Fixes: http://tracker.ceph.com/issues/21409
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-16 13:50:18 +08:00
Kefu Chai
9d07597ccc Merge pull request #17615 from tchaikov/wip-osx
cmake,common: changes to port part of ceph to osx

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-09-16 13:30:26 +08:00
Kefu Chai
8f1318e15b client: use st_mtimespec instea of st_mtime on osx
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 12:02:36 +08:00
Kefu Chai
9099ca599d msg/msg_types: fix the dencoder of entity_addr_t
improve the interoperability between freebsd/osx and GNU/Linux, because
the their layouts of sockaddr_storage are different, and we use the
one of linux as the wire format. so need to convert it on freebsd/osx
side.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 12:02:36 +08:00
Sage Weil
cdd9a0bfe1 Merge pull request #17698 from liewegas/wip-bluestore-big-allocations
os/bluestore: allocate entire write in one go

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-15 21:48:27 -05:00
Kefu Chai
cea9f1e3da crc32c: pass integer param by uint64_t
the assembly is expecting 64bits input, so make this explicit.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:47:02 +08:00
Kefu Chai
de1cc425be crc32c: mach-o 64 follows the same calling convention as elf64 does
so reuse the register-parameter/variable mappings

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:47:02 +08:00
Kefu Chai
767df416da test/encoding/readable.sh: use sysctl -n hw.ncpu instead of nproc on osx also
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
5980a60ab3 cmake: check for fdatasync() on non osx
on osx, fdatasync() is a syscall without userspace wrapper.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
6f6e3af01f mds: use the best-effort if procfs is not available
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
0a35e18b14 cmake: allows undefined symbol in plugin on osx
clang on osx erros out when linking a dynamic library if any symbols is
missing by default. so disable this behavior.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
629ad1986d cmake: disable plugins using isa-l on osx
clang on osx emits functions with leading underscore, but the isa-l
assembly's functions have no leading underscore. we could label the
function declaration like `int foo asm("foo")` to remove the leading
underscore, but isa-l is a git submodule, let do this later. and in the
meanwhile, disable this plugin on osx.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
02067e7451 crc32: label assembler functions without leading underscore
clang onder osx adds leading undescore to the function names to be
ABI compatible. but the assembly code does not do so. so we need to
control the name using gcc/clang extension. see
https://gcc.gnu.org/onlinedocs/gcc-4.4.0/gcc/Asm-Labels.html#Asm-Labels

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
56a897449b compat: consolidate definitions of osx and freebsd
on osx, ENODATA = 96, so we need to fix it. also define
CLOCK_MONOTONIC_COARSE and CLOCK_REALTIME_COARSE for osx, ceph_time.h
defines this also, but i don't want to include compat.h in ceph_time.h
at this moment.

and silence the warning of
 #warning ENODATA already defined to a value different from 87 (ENOATRR), refining to fix
because it is fired everywhere on osx when "compat.h" is included.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
3eff8a65c7 msg/msg_types: fix the denc of sockaddr_storage on freebsd/osx
the layout of sockaddr_in and sockaddr_in6 are different on
GNU/Linux and FreeBSD/OSX:
 - on GNU/Linux, sockaddr does not have sa_len,
 - on GNU/Linux, sockaddr* use a 16 bit integer for sa_family, but
   on FreeBSD, a 32bit integer is used.
so we need to be more care when memcpy() between sockaddr_storage()
and ceph_sockaddr_storage().

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
cf778097d6 msg/msg_types: consolidate sockaddr_storage dencoders
utilize ceph_sockaddr_storage on FreeBSD and osx to perform the
dencoding, to improve the readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
a921f0663c cmake: do not pass --exclude-libs on osx
it is not supported by osx linker

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
Kefu Chai
5b0ad9a8a8 crc32c: only add qualifiers for elf64 format
they are not understood by non-elf formats

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-16 10:43:32 +08:00
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
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