Commit Graph

80338 Commits

Author SHA1 Message Date
Yao Zongyou
b761989033 rgw: check going_down() when lifecycle processing
Fixes: http://tracker.ceph.com/issues/22099

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2017-11-09 20:40:15 +08:00
Jason Dillaman
5094838ab9
Merge pull request #18793 from idryomov/wip-qa-cram-path
qa/tasks/cram: include /usr/sbin in the PATH for all commands

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-11-08 11:00:41 -05:00
Yuri Weinstein
8328ccd67d
Merge pull request #18556 from joke-lee/validate_cors_rule_header_in_cors_option_request
rgw: add cors header rule check in cors option request

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-11-08 08:00:33 -08:00
Jason Dillaman
854e319822
Merge pull request #18795 from idryomov/wip-krbd-enable-generic-050-448
qa/suites/krbd: enable generic/050 and generic/448

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-11-08 11:00:03 -05:00
Yuri Weinstein
09295f58c3
Merge pull request #18706 from cbodley/wip-rgw-policy-emplace
rgw: simplify use of map::emplace in iam

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-11-08 07:59:13 -08:00
John Spray
f71a604fed
Merge pull request #18770 from tchaikov/wip-doc-log-file
doc: fix desc of option "mon cluster log file"

Reviewed-by: John Spray <john.spray@redhat.com>
2017-11-08 12:42:22 +00:00
Kefu Chai
73a5cd2464 doc: fix desc of option "mon cluster log file"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-08 19:15:26 +08:00
Patrick Donnelly
624b1a0fe7
Merge PR #18807 into master
* refs/pull/18807/head:
	ptl-tool: put common use-cases up front in README
	ptl-tool: only create tag if new branch
	ptl-tool: hint how to skip contributor

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-08 17:13:01 +11:00
Patrick Donnelly
f2137a35ee
ptl-tool: put common use-cases up front in README
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-08 17:10:40 +11:00
Patrick Donnelly
aaf1ff9b49
ptl-tool: only create tag if new branch
It doesn't make sense to create tags for branches that already exist.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-08 17:07:25 +11:00
Patrick Donnelly
1bb5a8d4e2
ptl-tool: hint how to skip contributor
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-08 17:07:03 +11:00
Matt Benjamin
51059a60d8
Merge pull request #18709 from ivancich/wip-bktidx-race-bugfix
rgw: fix BZ 1500904, stale bucket index entry remains after obj delete
2017-11-07 12:10:23 -05:00
Ilya Dryomov
8cd42742b6 qa/suites/krbd: enable generic/050 and generic/448
generic/448 has been failing on ext4 and is now fixed upstream.
The fix for generic/050 is in testing, scheduled for 4.15-rc1.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-11-07 18:05:44 +01:00
Yuri Weinstein
77eb76941d
Merge pull request #18476 from majianpeng/objecter-misc-cleanup
osdc/Objecter: misc cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-07 09:02:08 -08:00
Yuri Weinstein
ff159c6753
Merge pull request #18768 from wumingqiao/wip-WaitActingChange
PG: fix name of WaitActingChange

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-07 09:00:38 -08:00
Jason Dillaman
fb5e341546
Merge pull request #18789 from jcsp/wip-doc-config-set
doc: replace injectargs usage with "config set"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-11-07 08:18:12 -05:00
John Spray
5762d01c14
Merge pull request #18769 from yaozongyou/wip-dashboard-format-label
mgr/dashboard: format tooltip's label as user friendly string

Reviewed-by: John Spray <john.spray@redhat.com>
2017-11-07 12:27:54 +00:00
John Spray
6fc92dc981 doc: replace injectargs usage with "config set"
Cleaner and easier.  Also implicitly documents
the config set command, which hadn't been explicitly
called out in the docs before.

Signed-off-by: John Spray <john.spray@redhat.com>
2017-11-07 11:32:26 +00:00
Patrick Donnelly
3c61396038
Merge PR #18689 into master
* refs/pull/18689/head:
	cephfs: Do not check auth gid when not specified

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-07 17:21:04 +11:00
Patrick Donnelly
2a848b4301
Merge PR #18386 into master
* refs/pull/18386/head:
	ptl-tool: allow setting project/repo for GH req

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-11-07 09:33:39 +11:00
Yuri Weinstein
a2f9dbc9ff
Merge pull request #18658 from linuxbox2/wip-s3-post-20201
RGW: update S3 POST policy handling of Content-Type

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-11-06 13:06:42 -08:00
Ilya Dryomov
1591426c30 qa/tasks/cram: include /usr/sbin in the PATH for all commands
/usr/sbin is not in non-login PATH on centos.  We already do this for
workunits, see commit 0e53f5f38b ("workunit: include /usr/sbin in the
PATH for all commands").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2017-11-06 20:05:38 +01:00
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
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
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
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
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: d1ff03b667
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