Kefu Chai
2d06baeae7
Merge pull request #18693 from XinzeChi/wip-dup-async-read-stat
...
osd/PrimaryLogPG: fix dup stat for async read
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-11-05 12:33:19 +08:00
iliul
c4327eb3bb
vstart.sh: fix a spelling mistake
...
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-11-04 12:17:58 +00:00
Kefu Chai
fb7ad32f28
Merge pull request #18724 from iliul/add-missing-blank-line
...
doc: add missing blank line
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-04 19:27:41 +08:00
Mykola Golub
083eed6ed4
Merge pull request #18708 from dillaman/wip-22036
...
librbd: added preprocessor macro for detecting compare-and-write support
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-04 12:31:57 +02:00
Mykola Golub
033366ed33
Merge pull request #18704 from dillaman/wip-rbd-iscsi-win
...
doc/rbd: tweaks to the Windows iSCSI initiator directions
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-04 12:29:38 +02:00
Kefu Chai
38862b05e4
Merge pull request #18712 from liu-chunmei/rm_redundant_dpdksource
...
dpdk: remove redundant dpdk submodule
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-04 16:05:00 +08:00
Kefu Chai
10ab96be4d
Merge pull request #18711 from adamemerson/wip-system-includes
...
cmake: System Includes to silence warnings from submodules and libraries!
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-04 16:03:37 +08:00
Kefu Chai
95594cc17e
Merge pull request #18701 from tchaikov/wip-denc
...
denc: support enum with underlying type
Reviewed-by: Adam Emerson <aemerson@redhat.com>
2017-11-04 16:01:52 +08:00
Kefu Chai
2ce53a7b30
Merge pull request #18597 from tchaikov/wip-cmake-cleanup
...
cmake: cleanups
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
2017-11-04 16:00:47 +08:00
iliul
0e93527099
doc: Add missing blank line
...
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-11-04 14:53:58 +08:00
Adam C. Emerson
ab1fed6591
build: Merge wip-system-includes from upstream
...
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-11-04 00:03:14 -04:00
Adam C. Emerson
074cfc144b
Squashed 'src/dmclock/' changes from 1bbd42b8fe..d1ff03b667
...
d1ff03b667 Merge pull request #44 from adamemerson/wip-system-includes
4cc4b949ca build: Mark dependency includes as SYSTEM in dmclock
05096c1756 Merge pull request #43 from TaewoongKim/anticipation_conf
f356c45461 Add missing anticipation_timeout argument for PullPriorityQueue constructor
9896448ec5 Merge pull request #42 from tchaikov/wip-cmake
979899ef86 add travis CI on gnu/linux
8a3dabdbee cmake: the built archives are located in ${binary_dir}
ee15ced3e9 cmake: check for include in /usr/include also
git-subtree-dir: src/dmclock
git-subtree-split: d1ff03b667d9551478b2803ea533fc356ca441a9
2017-11-04 00:03:13 -04:00
Adam C. Emerson
8d4a07f89f
build: Mark dependency includes as SYSTEM
...
It is not really our business to debug python, boost, or our other
dependencies. Mark them as system includes.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-11-03 23:58:41 -04:00
Sage Weil
15e0224441
Merge pull request #18672 from jcsp/wip-21999
...
mgr: emit cluster log message on serve() exception
Reviewed-by: Sage Weil <sage@redhat.com>
2017-11-03 21:55:22 -05:00
Sage Weil
b6fe5d3d72
Merge pull request #18691 from liewegas/wip-fix-balancer
...
mgr/balancer: fix upmap; default balancer module enabled
2017-11-03 21:54:58 -05:00
Patrick Donnelly
1eb9766d86
Merge PR #18538 into master
...
* refs/pull/18538/head:
mds: clean up clog damage message when repairing
mds: flush after scrub repairs
mds: don't report repaired backtraces in damagetable
mds: cleaner scrub complete log msg
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-03 14:37:26 -07:00
Patrick Donnelly
cac6b91826
Merge PR #18555 into master
...
* refs/pull/18555/head:
mds: fix inode count check in MDCache::check_memory_usage()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-03 14:36:55 -07:00
Patrick Donnelly
9d9066ebfe
Merge PR #18612 into master
...
* refs/pull/18612/head:
mds: fix race in PurgeQueue::wait_for_recovery()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-03 14:36:23 -07:00
Patrick Donnelly
d8e47cfc1a
Merge PR #18624 into master
...
* refs/pull/18624/head:
mds: trim 'N' log segments according to how many log segments are there
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-03 14:35:52 -07:00
Patrick Donnelly
29b850c01b
Merge PR #18646 into master
...
* refs/pull/18646/head:
mds: fix MDS_FEATURE_INCOMPAT_FILE_LAYOUT_V2 definition
mds: remove useless incompat feature definination in FSMap.h
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-03 14:35:07 -07:00
Patrick Donnelly
5fb4782229
Merge PR #18654 into master
...
* refs/pull/18654/head:
ceph.in: pass RADOS inst to LibCephFS
Reviewed-by: Kefu Chai <kchai@redhat.com>
Tested-by: Jos Collin <jcollin@redhat.com>
2017-11-03 14:34:28 -07:00
Yuri Weinstein
bb0d8e2828
Merge pull request #18686 from xiexingguo/wip-bf-retry-interval
...
osd/PG: use osd_backfill_retry_interval for schedule_backfill_retry()
Reviewed-by: Sage Weil <sage@redhat.com>
2017-11-03 12:59:30 -07:00
chunmei
20b16ada36
remove redundant dpdk source folder, this one is not maintained since last Nov.2016,
...
the other one is located in src/spdk/dpdk, which is alwasy maintained and used by spdk.
so remove this src/dpdk folder, we only need maintain one copy.
Signed-off-by: chunmei <chunmei.liu@intel.com>
2017-11-03 12:32:32 -07:00
Jason Dillaman
95d716cc70
librbd: added preprocessor macro for detecting compare-and-write support
...
Fixes: http://tracker.ceph.com/issues/22036
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-11-03 12:03:49 -04:00
Yehuda Sadeh
a27b28e507
Merge pull request #17923 from cbodley/wip-rgw-beast-update
...
rgw: pull up beast submodule and update frontend
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-11-03 08:57:39 -07:00
Jason Dillaman
997bb80ba2
doc/rbd: tweaks to the Windows iSCSI initiator directions
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-11-03 11:05:02 -04:00
Casey Bodley
2079f8d287
Merge pull request #18522 from C2python/cleanup_to_string
...
rgw: Delete to_string functions. stringify defined in include/stringify.h can provide the same feature.
Reviewed-by: Adam Emerson <aemerson@redhat.com>
2017-11-03 11:01:28 -04:00
Casey Bodley
1145c38fe9
Merge pull request #18536 from ZVampirEM77/wip-fix-loadgen
...
rgw: loadgen fix generate random object name rgw crash issue
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-11-03 10:11:27 -04:00
Kefu Chai
56f05413e4
Merge pull request #18526 from tchaikov/wip-17454
...
mgr: In plugins 'module' classes need not to be called "Module" anymore.
Reviewed-by: John Spray <john.spray@redhat.com>
2017-11-03 20:10:37 +08:00
Kefu Chai
3c47534897
Merge pull request #18678 from liu-chunmei/fix_dpdk_coremask
...
msg/async: fix ms_dpdk_coremask and ms_dpdk_coremask conflict
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-03 20:05:59 +08:00
Sage Weil
e7d4f390d6
Merge pull request #18670 from liewegas/wip-min-in-4
...
qa/tasks/thrashosds: set min_in default to 4
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-03 06:55:23 -05:00
Sage Weil
5874a1d823
Merge pull request #18671 from ifed01/wip-ifed-bluefs-empty-reclaiming-fix
...
os/bluestore: do not release empty bluefs_extents_reclaiming.
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-11-03 06:55:00 -05:00
Mykola Golub
15a9796bb3
Merge pull request #18653 from dillaman/wip-21391
...
mgr/dashboard: added iSCSI IOPS/throughput metrics
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-03 11:27:56 +02:00
Kefu Chai
3fa4e8109e
denc: support enum with underlying type
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-03 16:30:59 +08:00
Kefu Chai
c8d4005558
cmake,deb: remove the last trace of atomic_ops
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-03 16:23:42 +08:00
Kefu Chai
c43bac48b0
cmake: fix indent
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-03 16:23:26 +08:00
Kefu Chai
4c2dd1607f
cmake: remove unused definitions
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-03 16:23:12 +08:00
Kefu Chai
761c729779
cmake: do not link ${XIO_LIBRARY} if not necessary
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-03 16:22:59 +08:00
chunmei
e6b71f2221
ms_dpdk_coremask and ms_async_op_threads has some relationship,
...
dpdk library will create threasds as many as bit 1 number in
ms_dpdk_coremask and the thredas num should be equal ms_async_op_threads+1,
by ceph default confiuration,ms_async_op_threads =3,ms_dpdk_coremask =1,
so dpdk library can't create enough threads for dpdk workers. the sytem
will stuck at NetworkStack::start().so set ms_dpdk_coremask default 0xF.
and add assert to comapre the two configurations.
Signed-off-by: chunmei <chunmei.liu@intel.com>
2017-11-02 22:26:45 -07:00
Kefu Chai
9502a8e521
Merge pull request #18695 from cooboos/wip-doc-wrongspell
...
doc/release-notes: fix typo 'psd' to 'osd'
Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-11-03 13:21:07 +08:00
wangsongbo
e0b0e911de
doc: correct wrong spell 'psd' to 'osd'
...
Signed-off-by: wangsongbo wangsongbo@cloudin.cn
2017-11-03 12:49:11 +08:00
Xinze Chi
87d188b848
osd/PrimaryLogPG: fix dup stat for async read
...
The async read would call do_osd_ops twice.
Signed-off-by: Xinze Chi <xinze@xsky.com>
2017-11-03 11:15:44 +08:00
Sage Weil
ed442164d5
pybind/mgr/mgr_module: fix calc_pg_upmaps
...
This was fixed in the object cleanup.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-11-02 16:18:03 -05:00
Sage Weil
26710f0a9b
mgr/balancer: enable module by default
...
It will still be "off".
Signed-off-by: Sage Weil <sage@redhat.com>
2017-11-02 16:11:26 -05:00
Enming Zhang
7d021782e2
rgw: loadgen fix rgw crash issue
...
When generating random bucket name and object name during
loadgen processing, RGW will crash. The reason is calling
"gen_rand_alphanumeric" with "cct = NULL".
Fixes: http://tracker.ceph.com/issues/22006
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
2017-11-03 00:52:43 +08:00
Yuri Weinstein
3c528845f6
Merge pull request #13992 from dreamhost/wip-19264
...
rgw: fix Swift container naming rules.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-11-02 09:47:31 -07:00
Yuri Weinstein
931d1ba1e0
Merge pull request #18606 from adamemerson/wip-op-perm-refactor
...
rgw: Small refactor and two bug fixes
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2017-11-02 09:46:20 -07:00
Kefu Chai
428c7751e2
Merge pull request #14955 from aclamk/fix-civetweb-cryptopp
...
radosgw: Make compilation with CryptoPP possible.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-02 23:59:03 +08:00
Orit Wasserman
87aff41a37
Merge pull request #18664 from oritwas/wip-rgw-21996
...
rgw: init oldest period after setting run_sync_thread
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-11-02 16:31:08 +02:00
Kefu Chai
9357e13a24
Merge pull request #18680 from tchaikov/wip-doc-mgr
...
doc/mgr: document facilities methods using `automethod` directive
Reviewed-by: John Spray <john.spray@redhat.com>
2017-11-02 20:39:25 +08:00