Commit Graph

80585 Commits

Author SHA1 Message Date
Yao Zongyou
e74c7f84c0 mgr/dashboard: format chart's tooltip's label as friendly string
The default tooltip's label is a long number string, so format
the label as a user friendly string.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2017-11-06 23:40:00 +08:00
Jianpeng Ma
f533dda42f common/WorkQueue: fix a race avoiding drain endless.
In function ShardedThreadPool::shardedthreadpool_worker, when call
_proces, it don't get shardedpool_lock. So there is a race between
return_waiting_threads and _proces. If return_waiting_threads first run
and _process will lost this signal and wait until.
This may cause ShardedThreadPool::drain can't complete.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-11-06 21:40:12 +08:00
Jason Dillaman
baa65c255a
Merge pull request #16238 from trociny/wip-copy-deep
librbd: generalized deep copy function

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-11-06 08:35:06 -05:00
wumingqiao
9a3f0cc626 PG: fix name of WaitActingChange
the parent state of WaitActingChange is Primary, not Peering.

Signed-off-by: wumingqiao <wumingqiao@inspur.com>
2017-11-06 20:41:23 +08:00
Xinying Song
718066892a rgw: don't write bucket_header when it is not changed in rgw_bucket_prepare_op
Signed-off-by: Xinying Song <songxinying@cloudin.cn>
2017-11-06 20:18:07 +08:00
Jianpeng Ma
fb6eca1fb2 osd/OSD: Using Wait rather than WaitInterval to wait queue.is_empty().
Why use WaitInterval, there is a comment:"optimistically sleep a moment; maybe another work item will come along."
But in fact,we don't see any benefit for this optimization.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-11-06 19:46:05 +08:00
Enming Zhang
1c0e32d476 rgw: cleanup some unnecessary function called in RGWZoneGroup::add_zone
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
2017-11-06 16:38:18 +08:00
Mykola Golub
3a09801ceb qa/suites/rbd: enable fsx deep_copy test case
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-06 10:29:45 +02:00
Mykola Golub
428461a62a test/librbd: tweak fsx to optionally use deep-copy instead of clone
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-06 10:29:45 +02:00
Mykola Golub
97db2b2a4c librbd: add deep_copy function to API
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-06 10:29:44 +02:00
Mykola Golub
73f50a1310 rbd-mirror: use generalized deep copy for image sync
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-11-06 10:29:44 +02:00
Mykola Golub
5a1a217112 librbd: generalized deep copy function
(based on rbd-mirror image sync)

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-11-06 10:29:44 +02:00
Mykola Golub
a84b0a415a librbd: export ImageOptions print operator
(so it could be used for logging image options)

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-11-06 10:26:37 +02:00
Mykola Golub
ca25c56178 test/librbd: set rand seed for all tests
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-11-06 10:26:37 +02:00
Kefu Chai
de14103f52 mon/LogMonitor: "log last" should return up to n entries
limit the # of returned entries to "num", and backoff the start iterator
by one if it reaches the rend().

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-06 16:03:45 +08:00
Xie Xingguo
7e5a8a762d
Merge pull request #18635 from majianpeng/bluestore-omap-flush
os/bluestore: remove unused parameters.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-11-06 15:38:09 +08:00
Jianpeng Ma
a140996c42 os/bluestore: remove unused paramerter.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-11-06 19:05:27 +08:00
Kefu Chai
596942ef06
Merge pull request #18541 from trociny/wip-mstart-bashizm
mstart.sh: remove bashizm in /bin/sh script

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-06 12:15:41 +08:00
Kefu Chai
c5cf108467 mon: amend the comment of WRITE -> REFRESH transition
set the paxos's state to STATE_REFRESH avoid doing store->flush() while
we are in the async completion thread. this causes dead lock.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-06 12:12:43 +08:00
Kefu Chai
f265ed6b1c
Merge pull request #18729 from iliul/fix-vstart-typo
vstart.sh: fix a typo

Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-11-05 12:37:25 +08:00
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
yuliyang
72e8fc52fb rgw: add cors header rule check in cors option request
fix http://tracker.ceph.com/issues/22002

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
2017-11-04 08:19:01 +08: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
Sage Weil
4f30e67785 osd/PrimaryLogPG: do not pull-up snapc to snapset
make_writeable() had some logic to pull old request snapcs forward to
what was in the SnapSet.  This has no effect: if we pull forward, the
main block of make_writeable does not trigger, because no clone is
generated when snapc =~ snapset.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-11-03 15:56:25 -05: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
J. Eric Ivancich
b33f529e79 rgw: fix BZ 1500904, Stale bucket index entry remains after object deletion
We have a race condition:

 1. RGW client #1: requests an object be deleted.
 2. RGW client #1: sends a prepare op to bucket index OSD #1.
 3. OSD #1:        prepares the op, adding pending ops to the bucket dir entry
 4. RGW client #2: sends a list bucket to OSD #1
 5. RGW client #2: sees that there are pending operations on bucket
                   dir entry, and calls check_disk_state
 6. RGW client #2: check_disk_state sees that the object still exists, so it
                   sends CEPH_RGW_UPDATE to bucket index OSD (#1)
 7. RGW client #1: sends a delete object to object OSD (#2)
 8. OSD #2:        deletes the object
 9. RGW client #2: sends a complete op to bucket index OSD (#1)
10. OSD #1:        completes the op
11. OSD #1:        receives the CEPH_RGW_UPDATE and updates the bucket index
                   entry, thereby **RECREATING** it

Solution implemented:

At step #5 the object's dir entry exists. If we get to beginning of
step #11 and the object's dir entry no longer exists, we know that the
dir entry was just actively being modified, and ignore the
CEPH_RGW_UPDATE operation, thereby NOT recreating it.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-11-03 12:58:05 -04:00
Douglas Fuller
0e2cfdf507 cephfs: Do not check auth gid when not specified
For auth caps that omit the gid, do not check for a gid match.

Fixes: http://tracker.ceph.com/issues/22009
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
2017-11-03 12:40:48 -04: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