Yuri Weinstein
89c26b9838
Merge pull request #18817 from ZVampirEM77/wip-em-zone-cleanup
...
rgw cleanup: some unnecessary function called and repeated assignment
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-11-09 09:36:26 -08:00
Sage Weil
3855d2cbfd
Merge pull request #18683 from tchaikov/wip-erasure-cleanup
...
erasure-code: refactor the interfaces to hide internals from public
Reviewed-by: Sage Weil <sage@redhat.com>
2017-11-09 11:10:27 -06:00
Casey Bodley
36d83f16e0
Merge pull request #18781 from iliul/correct-error-messages
...
rgw/rgw_op.cc: Fix error message in rgw_user_get_all_buckets_stats
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-11-09 09:48:26 -05:00
Casey Bodley
48d612001a
Merge pull request #18796 from ivancich/wip-fix-fmt-warnings
...
rgw: address warnings due to incorrect format code
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-11-09 09:43:33 -05:00
Kefu Chai
e2ade46c84
Merge pull request #17659 from majianpeng/osd-wait-ratherthan-waitinterval
...
osd/OSD: Using Wait rather than WaitInterval to wait queue.is_empty().
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-09 22:18:47 +08:00
Kefu Chai
a8f18c1539
Merge pull request #18759 from tchaikov/wip-mon-log-last
...
mon/LogMonitor: "log last" should return up to n entries
Reviewed-by: John Spray <john.spray@redhat.com>
2017-11-09 22:17:31 +08:00
Kefu Chai
cb58b34271
Merge pull request #18779 from tchaikov/wip-osd-remove-unused-objects_read_async
...
osd: remove unused ReplicatedBackend::objects_read_async()
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Xinze Chi <xinze@xsky.com>
2017-11-09 22:16:51 +08:00
Kefu Chai
b4f552d8cd
Merge pull request #18809 from tchaikov/wip-21904
...
mgr/zabbix: ignore osd with 0 kb capacity
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Wido den Hollander <wido@42on.com>
2017-11-09 22:15:06 +08:00
iliul
d60b57ef9c
rgw/rgw_op.cc: Fix error message in rgw_user_get_all_buckets_stats
...
Signed-off-by: iliul <liul.stone@gmail.com>
2017-11-09 13:36:43 +00: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
Enming Zhang
00ed892149
rgw: cleanup repeated assignment to need_zone_update in zone modify command
...
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
2017-11-08 20:38:18 +08: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
Ilja Slepnev
e532949556
mgr/zabbix: ignore osd with 0 kb capacity
...
Fixes: http://tracker.ceph.com/issues/21904
Signed-off-by: Ilja Slepnev <islepnev@gmail.com>
2017-11-08 16:09: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
J. Eric Ivancich
ededbedbfc
rgw: address warnings due to incorrect format code
...
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-11-07 12:55:10 -05: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
Kefu Chai
104c58a0c7
osd: use is_erasure() when appropriate
...
sometimes, we are using pool.info.require_rollback() even when what we
mean is "pool.info.is_erasure()", so fix it to improve the readability.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-07 14:24:15 +08:00
Kefu Chai
0cd7331358
osd: remove unused ReplicatedBackend::objects_read_async()
...
async read is not used by replica pool at all.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-07 14:24:15 +08: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
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
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