]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agorgw: Fix swift object expiry not deleting objects 18821/head
Pavan Rallabhandi [Wed, 8 Nov 2017 16:05:54 +0000 (21:35 +0530)]
rgw: Fix swift object expiry not deleting objects

In cls_timeindex_list() though `to_index` has expired for a timespan, the marker is set for a subsequent index during the time boundary check.
This marker is further returned to RGWObjectExpirer::process_single_shard(), where this out_marker is trimmed from the respective shard,
resulting in a lost removal hint and a leaked object.

Fixes: http://tracker.ceph.com/issues/22084
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
7 years agoMerge pull request #18770 from tchaikov/wip-doc-log-file
John Spray [Wed, 8 Nov 2017 12:42:22 +0000 (12:42 +0000)]
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>
7 years agodoc: fix desc of option "mon cluster log file" 18770/head
Kefu Chai [Mon, 6 Nov 2017 16:21:13 +0000 (00:21 +0800)]
doc: fix desc of option "mon cluster log file"

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #18807 into master
Patrick Donnelly [Wed, 8 Nov 2017 06:12:55 +0000 (17:12 +1100)]
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>
7 years agoptl-tool: put common use-cases up front in README 18807/head
Patrick Donnelly [Wed, 8 Nov 2017 06:08:14 +0000 (17:08 +1100)]
ptl-tool: put common use-cases up front in README

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoptl-tool: only create tag if new branch
Patrick Donnelly [Wed, 8 Nov 2017 06:07:25 +0000 (17:07 +1100)]
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>
7 years agoptl-tool: hint how to skip contributor
Patrick Donnelly [Wed, 8 Nov 2017 06:07:03 +0000 (17:07 +1100)]
ptl-tool: hint how to skip contributor

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18709 from ivancich/wip-bktidx-race-bugfix
Matt Benjamin [Tue, 7 Nov 2017 17:10:23 +0000 (12:10 -0500)]
Merge pull request #18709 from ivancich/wip-bktidx-race-bugfix

rgw: fix BZ 1500904, stale bucket index entry remains after obj delete

7 years agoMerge pull request #18476 from majianpeng/objecter-misc-cleanup
Yuri Weinstein [Tue, 7 Nov 2017 17:02:08 +0000 (09:02 -0800)]
Merge pull request #18476 from majianpeng/objecter-misc-cleanup

osdc/Objecter: misc cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18768 from wumingqiao/wip-WaitActingChange
Yuri Weinstein [Tue, 7 Nov 2017 17:00:38 +0000 (09:00 -0800)]
Merge pull request #18768 from wumingqiao/wip-WaitActingChange

PG: fix name of WaitActingChange

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18789 from jcsp/wip-doc-config-set
Jason Dillaman [Tue, 7 Nov 2017 13:18:12 +0000 (08:18 -0500)]
Merge pull request #18789 from jcsp/wip-doc-config-set

doc: replace injectargs usage with "config set"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18769 from yaozongyou/wip-dashboard-format-label
John Spray [Tue, 7 Nov 2017 12:27:54 +0000 (12:27 +0000)]
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>
7 years agodoc: replace injectargs usage with "config set" 18789/head
John Spray [Tue, 7 Nov 2017 11:30:45 +0000 (11:30 +0000)]
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>
7 years agoMerge PR #18689 into master
Patrick Donnelly [Tue, 7 Nov 2017 06:21:04 +0000 (17:21 +1100)]
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>
7 years agoMerge PR #18386 into master
Patrick Donnelly [Mon, 6 Nov 2017 22:33:13 +0000 (09:33 +1100)]
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>
7 years agoMerge pull request #18658 from linuxbox2/wip-s3-post-20201
Yuri Weinstein [Mon, 6 Nov 2017 21:06:42 +0000 (13:06 -0800)]
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>
7 years agomgr/dashboard: format chart's tooltip's label as friendly string 18769/head
Yao Zongyou [Mon, 6 Nov 2017 15:40:00 +0000 (23:40 +0800)]
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>
7 years agoMerge pull request #16238 from trociny/wip-copy-deep
Jason Dillaman [Mon, 6 Nov 2017 13:35:06 +0000 (08:35 -0500)]
Merge pull request #16238 from trociny/wip-copy-deep

librbd: generalized deep copy function

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoPG: fix name of WaitActingChange 18768/head
wumingqiao [Mon, 6 Nov 2017 12:41:23 +0000 (20:41 +0800)]
PG: fix name of WaitActingChange

the parent state of WaitActingChange is Primary, not Peering.

Signed-off-by: wumingqiao <wumingqiao@inspur.com>
7 years agoqa/suites/rbd: enable fsx deep_copy test case 16238/head
Mykola Golub [Tue, 31 Oct 2017 07:48:45 +0000 (09:48 +0200)]
qa/suites/rbd: enable fsx deep_copy test case

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agotest/librbd: tweak fsx to optionally use deep-copy instead of clone
Mykola Golub [Mon, 30 Oct 2017 20:57:31 +0000 (22:57 +0200)]
test/librbd: tweak fsx to optionally use deep-copy instead of clone

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agolibrbd: add deep_copy function to API
Mykola Golub [Tue, 31 Oct 2017 20:56:07 +0000 (22:56 +0200)]
librbd: add deep_copy function to API

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agorbd-mirror: use generalized deep copy for image sync
Mykola Golub [Wed, 27 Sep 2017 10:10:55 +0000 (12:10 +0200)]
rbd-mirror: use generalized deep copy for image sync

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
7 years agolibrbd: generalized deep copy function
Mykola Golub [Sat, 14 Oct 2017 15:58:11 +0000 (18:58 +0300)]
librbd: generalized deep copy function

(based on rbd-mirror image sync)

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
7 years agolibrbd: export ImageOptions print operator
Mykola Golub [Sat, 14 Oct 2017 15:54:28 +0000 (18:54 +0300)]
librbd: export ImageOptions print operator

(so it could be used for logging image options)

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agotest/librbd: set rand seed for all tests
Mykola Golub [Wed, 23 Aug 2017 08:40:56 +0000 (10:40 +0200)]
test/librbd: set rand seed for all tests

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
7 years agoMerge pull request #18635 from majianpeng/bluestore-omap-flush
Xie Xingguo [Mon, 6 Nov 2017 07:38:09 +0000 (15:38 +0800)]
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>
7 years agoos/bluestore: remove unused paramerter. 18635/head
Jianpeng Ma [Tue, 31 Oct 2017 12:19:23 +0000 (20:19 +0800)]
os/bluestore: remove unused paramerter.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoMerge pull request #18541 from trociny/wip-mstart-bashizm
Kefu Chai [Mon, 6 Nov 2017 04:15:41 +0000 (12:15 +0800)]
Merge pull request #18541 from trociny/wip-mstart-bashizm

mstart.sh: remove bashizm in /bin/sh script

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18729 from iliul/fix-vstart-typo
Kefu Chai [Sun, 5 Nov 2017 04:37:25 +0000 (12:37 +0800)]
Merge pull request #18729 from iliul/fix-vstart-typo

vstart.sh: fix a typo

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18693 from XinzeChi/wip-dup-async-read-stat
Kefu Chai [Sun, 5 Nov 2017 04:33:19 +0000 (12:33 +0800)]
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>
7 years agovstart.sh: fix a spelling mistake 18729/head
iliul [Sat, 4 Nov 2017 12:17:58 +0000 (12:17 +0000)]
vstart.sh: fix a spelling mistake

Signed-off-by: iliul <liul124@chinaunicom.cn>
7 years agoMerge pull request #18724 from iliul/add-missing-blank-line
Kefu Chai [Sat, 4 Nov 2017 11:27:41 +0000 (19:27 +0800)]
Merge pull request #18724 from iliul/add-missing-blank-line

doc: add missing blank line

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18708 from dillaman/wip-22036
Mykola Golub [Sat, 4 Nov 2017 10:31:57 +0000 (12:31 +0200)]
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>
7 years agoMerge pull request #18704 from dillaman/wip-rbd-iscsi-win
Mykola Golub [Sat, 4 Nov 2017 10:29:38 +0000 (12:29 +0200)]
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>
7 years agoMerge pull request #18712 from liu-chunmei/rm_redundant_dpdksource
Kefu Chai [Sat, 4 Nov 2017 08:05:00 +0000 (16:05 +0800)]
Merge pull request #18712 from liu-chunmei/rm_redundant_dpdksource

dpdk: remove redundant dpdk submodule

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18711 from adamemerson/wip-system-includes
Kefu Chai [Sat, 4 Nov 2017 08:03:37 +0000 (16:03 +0800)]
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>
7 years agoMerge pull request #18701 from tchaikov/wip-denc
Kefu Chai [Sat, 4 Nov 2017 08:01:52 +0000 (16:01 +0800)]
Merge pull request #18701 from tchaikov/wip-denc

denc: support enum with underlying type

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #18597 from tchaikov/wip-cmake-cleanup
Kefu Chai [Sat, 4 Nov 2017 08:00:47 +0000 (16:00 +0800)]
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>
7 years agodoc: Add missing blank line 18724/head
iliul [Sat, 4 Nov 2017 06:53:58 +0000 (14:53 +0800)]
doc: Add missing blank line

Signed-off-by: iliul <liul124@chinaunicom.cn>
7 years agobuild: Merge wip-system-includes from upstream 18711/head
Adam C. Emerson [Sat, 4 Nov 2017 04:03:14 +0000 (00:03 -0400)]
build: Merge wip-system-includes from upstream

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoSquashed 'src/dmclock/' changes from 1bbd42b8fe..d1ff03b667
Adam C. Emerson [Sat, 4 Nov 2017 04:03:13 +0000 (00:03 -0400)]
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

7 years agobuild: Mark dependency includes as SYSTEM
Adam C. Emerson [Fri, 3 Nov 2017 19:14:35 +0000 (15:14 -0400)]
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>
7 years agoMerge pull request #18672 from jcsp/wip-21999
Sage Weil [Sat, 4 Nov 2017 02:55:22 +0000 (21:55 -0500)]
Merge pull request #18672 from jcsp/wip-21999

mgr: emit cluster log message on serve() exception

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18691 from liewegas/wip-fix-balancer
Sage Weil [Sat, 4 Nov 2017 02:54:58 +0000 (21:54 -0500)]
Merge pull request #18691 from liewegas/wip-fix-balancer

mgr/balancer: fix upmap; default balancer module enabled

7 years agoMerge PR #18538 into master
Patrick Donnelly [Fri, 3 Nov 2017 21:37:26 +0000 (14:37 -0700)]
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>
7 years agoMerge PR #18555 into master
Patrick Donnelly [Fri, 3 Nov 2017 21:36:55 +0000 (14:36 -0700)]
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>
7 years agoMerge PR #18612 into master
Patrick Donnelly [Fri, 3 Nov 2017 21:36:23 +0000 (14:36 -0700)]
Merge PR #18612 into master

* refs/pull/18612/head:
mds: fix race in PurgeQueue::wait_for_recovery()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18624 into master
Patrick Donnelly [Fri, 3 Nov 2017 21:35:52 +0000 (14:35 -0700)]
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>
7 years agoMerge PR #18646 into master
Patrick Donnelly [Fri, 3 Nov 2017 21:35:07 +0000 (14:35 -0700)]
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>
7 years agoMerge PR #18654 into master
Patrick Donnelly [Fri, 3 Nov 2017 21:34:28 +0000 (14:34 -0700)]
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>
7 years agoMerge pull request #18686 from xiexingguo/wip-bf-retry-interval
Yuri Weinstein [Fri, 3 Nov 2017 19:59:30 +0000 (12:59 -0700)]
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>
7 years agoremove redundant dpdk source folder, this one is not maintained since last Nov.2016, 18712/head
chunmei [Fri, 3 Nov 2017 19:32:32 +0000 (12:32 -0700)]
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>
7 years agorgw: fix BZ 1500904, Stale bucket index entry remains after object deletion 18709/head
J. Eric Ivancich [Fri, 3 Nov 2017 13:15:13 +0000 (09:15 -0400)]
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>
7 years agocephfs: Do not check auth gid when not specified 18689/head
Douglas Fuller [Thu, 2 Nov 2017 20:30:17 +0000 (16:30 -0400)]
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>
7 years agolibrbd: added preprocessor macro for detecting compare-and-write support 18708/head
Jason Dillaman [Fri, 3 Nov 2017 16:03:49 +0000 (12:03 -0400)]
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>
7 years agoMerge pull request #17923 from cbodley/wip-rgw-beast-update
Yehuda Sadeh [Fri, 3 Nov 2017 15:57:39 +0000 (08:57 -0700)]
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>
7 years agodoc/rbd: tweaks to the Windows iSCSI initiator directions 18704/head
Jason Dillaman [Fri, 3 Nov 2017 14:09:38 +0000 (10:09 -0400)]
doc/rbd: tweaks to the Windows iSCSI initiator directions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18522 from C2python/cleanup_to_string
Casey Bodley [Fri, 3 Nov 2017 15:01:28 +0000 (11:01 -0400)]
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>
7 years agoMerge pull request #18536 from ZVampirEM77/wip-fix-loadgen
Casey Bodley [Fri, 3 Nov 2017 14:11:27 +0000 (10:11 -0400)]
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>
7 years agoMerge pull request #18526 from tchaikov/wip-17454
Kefu Chai [Fri, 3 Nov 2017 12:10:37 +0000 (20:10 +0800)]
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>
7 years agoMerge pull request #18678 from liu-chunmei/fix_dpdk_coremask
Kefu Chai [Fri, 3 Nov 2017 12:05:59 +0000 (20:05 +0800)]
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>
7 years agoMerge pull request #18670 from liewegas/wip-min-in-4
Sage Weil [Fri, 3 Nov 2017 11:55:23 +0000 (06:55 -0500)]
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>
7 years agoMerge pull request #18671 from ifed01/wip-ifed-bluefs-empty-reclaiming-fix
Sage Weil [Fri, 3 Nov 2017 11:55:00 +0000 (06:55 -0500)]
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>
7 years agoMerge pull request #18653 from dillaman/wip-21391
Mykola Golub [Fri, 3 Nov 2017 09:27:56 +0000 (11:27 +0200)]
Merge pull request #18653 from dillaman/wip-21391

mgr/dashboard: added iSCSI IOPS/throughput metrics

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agodenc: support enum with underlying type 18701/head
Kefu Chai [Fri, 3 Nov 2017 08:10:07 +0000 (16:10 +0800)]
denc: support enum with underlying type

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake,deb: remove the last trace of atomic_ops 18597/head
Kefu Chai [Fri, 27 Oct 2017 17:50:44 +0000 (01:50 +0800)]
cmake,deb: remove the last trace of atomic_ops

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: fix indent
Kefu Chai [Fri, 27 Oct 2017 17:57:55 +0000 (01:57 +0800)]
cmake: fix indent

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: remove unused definitions
Kefu Chai [Fri, 27 Oct 2017 17:59:06 +0000 (01:59 +0800)]
cmake: remove unused definitions

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: do not link ${XIO_LIBRARY} if not necessary
Kefu Chai [Fri, 3 Nov 2017 08:13:34 +0000 (16:13 +0800)]
cmake: do not link ${XIO_LIBRARY} if not necessary

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoms_dpdk_coremask and ms_async_op_threads has some relationship, 18678/head
chunmei [Thu, 2 Nov 2017 03:37:53 +0000 (20:37 -0700)]
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>
7 years agoMerge pull request #18695 from cooboos/wip-doc-wrongspell
Kefu Chai [Fri, 3 Nov 2017 05:21:07 +0000 (13:21 +0800)]
Merge pull request #18695 from cooboos/wip-doc-wrongspell

doc/release-notes: fix typo 'psd' to 'osd'

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agodoc: correct wrong spell 'psd' to 'osd' 18695/head
wangsongbo [Fri, 3 Nov 2017 04:49:11 +0000 (12:49 +0800)]
doc: correct wrong spell 'psd' to 'osd'

Signed-off-by: wangsongbo wangsongbo@cloudin.cn
7 years agoosd/PrimaryLogPG: fix dup stat for async read 18693/head
Xinze Chi [Fri, 3 Nov 2017 03:12:52 +0000 (11:12 +0800)]
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>
7 years agopybind/mgr/mgr_module: fix calc_pg_upmaps 18691/head
Sage Weil [Thu, 2 Nov 2017 21:18:03 +0000 (16:18 -0500)]
pybind/mgr/mgr_module: fix calc_pg_upmaps

This was fixed in the object cleanup.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomgr/balancer: enable module by default
Sage Weil [Thu, 2 Nov 2017 21:11:26 +0000 (16:11 -0500)]
mgr/balancer: enable module by default

It will still be "off".

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw: loadgen fix rgw crash issue 18536/head
Enming Zhang [Wed, 25 Oct 2017 13:10:56 +0000 (21:10 +0800)]
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>
7 years agoMerge pull request #13992 from dreamhost/wip-19264
Yuri Weinstein [Thu, 2 Nov 2017 16:47:31 +0000 (09:47 -0700)]
Merge pull request #13992 from dreamhost/wip-19264

rgw: fix Swift container naming rules.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #18606 from adamemerson/wip-op-perm-refactor
Yuri Weinstein [Thu, 2 Nov 2017 16:46:20 +0000 (09:46 -0700)]
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>
7 years agoMerge pull request #14955 from aclamk/fix-civetweb-cryptopp
Kefu Chai [Thu, 2 Nov 2017 15:59:03 +0000 (23:59 +0800)]
Merge pull request #14955 from aclamk/fix-civetweb-cryptopp

radosgw: Make compilation with CryptoPP possible.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18664 from oritwas/wip-rgw-21996
Orit Wasserman [Thu, 2 Nov 2017 14:31:08 +0000 (16:31 +0200)]
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>
7 years agoMerge pull request #18680 from tchaikov/wip-doc-mgr
Kefu Chai [Thu, 2 Nov 2017 12:39:25 +0000 (20:39 +0800)]
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>
7 years agoMerge pull request #18685 from jcsp/wip-mgr-load-module
Kefu Chai [Thu, 2 Nov 2017 12:20:52 +0000 (20:20 +0800)]
Merge pull request #18685 from jcsp/wip-mgr-load-module

qa: fix mgr _load_module helper

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PG: use osd_backfill_retry_interval for schedule_backfill_retry() 18686/head
xie xingguo [Thu, 2 Nov 2017 12:17:22 +0000 (20:17 +0800)]
osd/PG: use osd_backfill_retry_interval for schedule_backfill_retry()

These two options currently share the same value and I have no particular
preference, but using osd_backfill_retry_interval for the specific scenario
gives us more flexible choices.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoqa: fix mgr _load_module helper 18685/head
John Spray [Thu, 2 Nov 2017 11:42:56 +0000 (07:42 -0400)]
qa: fix mgr _load_module helper

I inadvertently broke this with the latest change
to the module ls output.

Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #18656 from ceph/ceph-volume-bluestore-tests
Alfredo Deza [Thu, 2 Nov 2017 11:30:39 +0000 (07:30 -0400)]
Merge pull request #18656 from ceph/ceph-volume-bluestore-tests

ceph-volume: adds functional testing for bluestore

7 years agoMerge pull request #18399 from jcsp/wip-20950
John Spray [Thu, 2 Nov 2017 10:37:09 +0000 (10:37 +0000)]
Merge pull request #18399 from jcsp/wip-20950

mon: don't blow away bootstrap-mgr on upgrades

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18681 from tchaikov/wip-msg-async-popcnt
Haomai Wang [Thu, 2 Nov 2017 09:54:48 +0000 (04:54 -0500)]
Merge pull request #18681 from tchaikov/wip-msg-async-popcnt

msg/async: use bitset<> to do the popcnt

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agoMerge pull request #18652 from idryomov/wip-qa-krbd-blkroset
Ilya Dryomov [Thu, 2 Nov 2017 09:10:39 +0000 (10:10 +0100)]
Merge pull request #18652 from idryomov/wip-qa-krbd-blkroset

qa/suites/krbd: add krbd BLKROSET test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agomsg/async: use bitset<> to do the popcnt 18681/head
Kefu Chai [Thu, 2 Nov 2017 07:20:24 +0000 (15:20 +0800)]
msg/async: use bitset<> to do the popcnt

libstdc++ uses popcnt to count the bits. it's faster and simpler.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agodoc/mgr: document mgr/plugin using automethod 18680/head
Kefu Chai [Thu, 2 Nov 2017 04:19:33 +0000 (12:19 +0800)]
doc/mgr: document mgr/plugin using automethod

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agopybind/mgr: sync the docstring with the doc/mgr
Kefu Chai [Thu, 2 Nov 2017 06:29:46 +0000 (14:29 +0800)]
pybind/mgr: sync the docstring with the doc/mgr

also update the docstring to confirm to
http://www.sphinx-doc.org/en/stable/domains.html#info-field-lists.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomgr: In plugins 'module' classes need not to be called "Module" anymore. 18526/head
bhavishyagopesh [Mon, 9 Oct 2017 05:40:41 +0000 (11:10 +0530)]
mgr: In plugins 'module' classes need not to be called "Module" anymore.

Fixes: http://tracker.ceph.com/issues/17454
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: bhavishyagopesh <bhavishyagopesh@gmail.com>
7 years agoMerge pull request #18619 from trociny/wip-qa-mirror-remove
Jason Dillaman [Thu, 2 Nov 2017 01:34:35 +0000 (21:34 -0400)]
Merge pull request #18619 from trociny/wip-qa-mirror-remove

qa/workunits/rbd: unnecessary sleep after failed remove

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17983 from liewegas/wip-balancer
Sage Weil [Wed, 1 Nov 2017 19:46:07 +0000 (14:46 -0500)]
Merge pull request #17983 from liewegas/wip-balancer

mgr/balancer: make crush-compat mode work

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoptl-tool: allow setting project/repo for GH req 18386/head
Patrick Donnelly [Thu, 19 Oct 2017 04:59:09 +0000 (21:59 -0700)]
ptl-tool: allow setting project/repo for GH req

This allows using ptl-tool for other projects like ceph-linode.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomgr: emit cluster log message on serve() exception 18672/head
John Spray [Wed, 1 Nov 2017 16:08:03 +0000 (12:08 -0400)]
mgr: emit cluster log message on serve() exception

Fixes: http://tracker.ceph.com/issues/21999
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agorgw: add missing current_history initialization 18664/head
Orit Wasserman [Wed, 1 Nov 2017 15:49:46 +0000 (17:49 +0200)]
rgw: add missing current_history initialization

Fixes: http://tracker.ceph.com/issues/21996
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agorgw: init oldest period after setting run_sync_thread
Orit Wasserman [Wed, 1 Nov 2017 10:15:35 +0000 (12:15 +0200)]
rgw: init oldest period after setting run_sync_thread

Fixes: http://tracker.ceph.com/issues/21996
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #18657 from cbodley/wip-21990
Matt Benjamin [Wed, 1 Nov 2017 15:47:24 +0000 (11:47 -0400)]
Merge pull request #18657 from cbodley/wip-21990

rgw: remove placement_rule from rgw_link_bucket()