]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomon/AuthMonitor: improve error message 17678/head
Douglas Fuller [Mon, 20 Nov 2017 18:12:08 +0000 (13:12 -0500)]
mon/AuthMonitor: improve error message

Improve the error message for 'ceph fs authorize' where the
given entity exists but has different auth caps.

Fixes: http://tracker.ceph.com/issues/21765
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agomon/OSDMonitor: disallow "all" as a key or value name
Douglas Fuller [Mon, 13 Nov 2017 22:31:34 +0000 (17:31 -0500)]
mon/OSDMonitor: disallow "all" as a key or value name

This avoids conflict with the wildcard "all" used for
OSD auth caps.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agocephfs, mon/AuthMonitor, OSD/osdcap: make 'all' a synonym for '*'
Douglas Fuller [Mon, 13 Nov 2017 21:40:43 +0000 (16:40 -0500)]
cephfs, mon/AuthMonitor, OSD/osdcap: make 'all' a synonym for '*'

Define the string 'all' to be a synonym for the wildcard '*'. This
avoids confusion in the event that some auth caps (typically with
ceph fs authorize) are not quoted and thus '*' is expanded by the shell.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agovstart.sh: Create an admin user for each CephFS
Douglas Fuller [Wed, 8 Nov 2017 20:49:09 +0000 (15:49 -0500)]
vstart.sh: Create an admin user for each CephFS

Issue a ceph fs authorize command for a new user corresponding to each
CephFS created.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agomon/AuthMonitor: Allow * wildcard for filesystem name
Douglas Fuller [Wed, 8 Nov 2017 20:44:23 +0000 (15:44 -0500)]
mon/AuthMonitor: Allow * wildcard for filesystem name

Extend ceph fs authorize to accept the * wildcard for the filesystem
name. This will grant access to all data pools associated with CephFS.
Therefore:

ceph fs authorize * client.foo /bar rwp

Is equivalent to:

ceph auth get-or-create client.foo mon "allow r" \
                                   mds "allow rwp path=/foo" \
                                   osd "allow rw tag cephfs data=*"

Note that the wildcard must be escaped from the shell in most cases.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agoOSD/OSDCap: Allow namespace and pool tag to be combined
Douglas Fuller [Mon, 9 Oct 2017 19:20:47 +0000 (15:20 -0400)]
OSD/OSDCap: Allow namespace and pool tag to be combined

Extend the OSD auth caps grammar to allow namespace and pool tag
cap combinations. Namespace must be listed first. Example:

allow rwx namespace ns* tag application key = value

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agoOSD/OSDCap: Namespace globbing
Douglas Fuller [Mon, 9 Oct 2017 19:18:43 +0000 (15:18 -0400)]
OSD/OSDCap: Namespace globbing

Permit the wildcard * at the end of namespace names to match any
namespace starting with the given prefix. The wildcard is only
allowed at the end of the namespace name.

Example:

allow rw namespace=foo*

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agomon/AuthMonitor: Use new osd auth caps for ceph fs authorize
Douglas Fuller [Tue, 3 Oct 2017 14:17:12 +0000 (10:17 -0400)]
mon/AuthMonitor: Use new osd auth caps for ceph fs authorize

Change 'ceph fs authorize' to grant osd auth caps by pool tag
instead of to current data pools. This makes:

ceph fs authorize cephfs_a client.foo /bar rw

now equivalent to:

ceph auth get-or-create client.foo mon 'allow r' mds 'allow rw path=/bar' osd 'allow rw tag cephfs data=cephfs_a'

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agoOSD/auth caps: Add OSD auth caps based on pool tag
Douglas Fuller [Wed, 23 Aug 2017 20:35:04 +0000 (16:35 -0400)]
OSD/auth caps: Add OSD auth caps based on pool tag

Extend the OSD auth caps syntax to include RADOS pool tags. New syntax:

allow rw tag <application> <key>=<value>

Access is granted if the pool contains the <key>:<value> in its
application metadata.

Feature: http://tracker.ceph.com/issues/21084
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agomon/FSCommands: Tag pools used for cephfs by default
Douglas Fuller [Wed, 23 Aug 2017 20:34:21 +0000 (16:34 -0400)]
mon/FSCommands: Tag pools used for cephfs by default

On FS creation, add the cephfs application pool tag, plus
key "metadata" : value <fs_name> (for metadata pools)
key "data" : value <fs_name> (for data pools)

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agomon/OSDMonitor: Add key/value arguments for pool tagging
Douglas Fuller [Wed, 23 Aug 2017 20:34:07 +0000 (16:34 -0400)]
mon/OSDMonitor: Add key/value arguments for pool tagging

Enable the OSDMon to add keys and values to pool tags by application.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
7 years agoMerge pull request #18528 from tchaikov/wip-osd-misplaced
David Zafman [Wed, 25 Oct 2017 16:36:04 +0000 (09:36 -0700)]
Merge pull request #18528 from tchaikov/wip-osd-misplaced

osd/PG: fix calc of misplaced objects

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18523 from tchaikov/wip-vstart-quoted
Kefu Chai [Wed, 25 Oct 2017 16:18:40 +0000 (00:18 +0800)]
Merge pull request #18523 from tchaikov/wip-vstart-quoted

vstart.sh: should quote the parameters to get them quoted

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18062 into master
Patrick Donnelly [Wed, 25 Oct 2017 13:51:45 +0000 (06:51 -0700)]
Merge PR #18062 into master

* refs/pull/18062/head:
client: put MetaSession map container
client: simplify release context ref mgmt

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge pull request #18381 from cbodley/wip-21832
Matt Benjamin [Wed, 25 Oct 2017 13:37:06 +0000 (09:37 -0400)]
Merge pull request #18381 from cbodley/wip-21832

Revert "radosgw: fix awsv4 header line sort order."

7 years agoMerge pull request #18369 from baixueyu/refcount_bug
Matt Benjamin [Wed, 25 Oct 2017 12:58:07 +0000 (08:58 -0400)]
Merge pull request #18369 from baixueyu/refcount_bug

 rgw: source data in 'default.rgw.buckets.data' may not be deleted after inter-bucket copy

7 years agoMerge pull request #16605 from theanalyst/tools/release-notes-pyfixes
Kefu Chai [Wed, 25 Oct 2017 11:24:53 +0000 (19:24 +0800)]
Merge pull request #16605 from theanalyst/tools/release-notes-pyfixes

script: ceph-release-notes: minor fixes for split_component

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18482 from liewegas/wip-luminous-note-fix
Alfredo Deza [Wed, 25 Oct 2017 11:24:13 +0000 (07:24 -0400)]
Merge pull request #18482 from liewegas/wip-luminous-note-fix

doc/release-notes: add jewel->kraken notes

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #18481 from xiexingguo/wip-choose-acting
Kefu Chai [Wed, 25 Oct 2017 11:21:42 +0000 (19:21 +0800)]
Merge pull request #18481 from xiexingguo/wip-choose-acting

osd/PG: miscellaneous choose acting changes and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18473 from yuyuyu101/wip-objecter-mono
Kefu Chai [Wed, 25 Oct 2017 11:20:59 +0000 (19:20 +0800)]
Merge pull request #18473 from yuyuyu101/wip-objecter-mono

osdc/Objecter: using coarse_mono instead

Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #18471 from yuyuyu101/wip-omap-stat
Kefu Chai [Wed, 25 Oct 2017 11:20:35 +0000 (19:20 +0800)]
Merge pull request #18471 from yuyuyu101/wip-omap-stat

osd/ReplicatedPG: add omap write bytes to delta_stats

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #16332 from badone/wip-warn-about-objects-with-too-many-omap-entries
Kefu Chai [Wed, 25 Oct 2017 11:20:00 +0000 (19:20 +0800)]
Merge pull request #16332 from badone/wip-warn-about-objects-with-too-many-omap-entries

osd: Warn about objects with too many omap entries

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18506 from majianpeng/osd-scrub
Kefu Chai [Wed, 25 Oct 2017 11:18:50 +0000 (19:18 +0800)]
Merge pull request #18506 from majianpeng/osd-scrub

osd/PrimaryLogPG: add condition "is_chunky_scrub_active" to check object in chunky_scrub

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoscript: ceph-release-notes: minor fixes for split_component 16605/head
Abhishek Lekshmanan [Wed, 19 Apr 2017 08:40:19 +0000 (10:40 +0200)]
script: ceph-release-notes: minor fixes for split_component

make labels a set as intersection would fail otherwise, also sort the
results of prefixes before creating the title

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
7 years agoMerge pull request #18517 from dillaman/wip-iscsi-docs
Mykola Golub [Wed, 25 Oct 2017 07:41:41 +0000 (10:41 +0300)]
Merge pull request #18517 from dillaman/wip-iscsi-docs

doc/rbd: specify additional ESX prerequisites

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoOSD/PG: fix calc of misplaced objects 18528/head
Kefu Chai [Wed, 25 Oct 2017 06:29:18 +0000 (14:29 +0800)]
OSD/PG: fix calc of misplaced objects

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18466 from zealoussnow/wip-wrong-parameter
Kefu Chai [Wed, 25 Oct 2017 05:31:19 +0000 (13:31 +0800)]
Merge pull request #18466 from zealoussnow/wip-wrong-parameter

OSD: drop unsed parameter passed to check_osdmap_features

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>
7 years agoMerge pull request #18425 from ZVampirEM77/wip-options-cleanup
Kefu Chai [Wed, 25 Oct 2017 05:27:52 +0000 (13:27 +0800)]
Merge pull request #18425 from ZVampirEM77/wip-options-cleanup

common/options.cc: cleanup readable literals for default sizes

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17894 from chenliuzhong/change-aio-max-nr
Kefu Chai [Wed, 25 Oct 2017 05:25:24 +0000 (13:25 +0800)]
Merge pull request #17894 from chenliuzhong/change-aio-max-nr

ceph.spec.in,debian/rules: change aio-max-nr to 1048576

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agovstart.sh: should quote the parameters to get them quoted 18523/head
Kefu Chai [Wed, 25 Oct 2017 02:19:14 +0000 (10:19 +0800)]
vstart.sh: should quote the parameters to get them quoted

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18505 from badone/wip-unittest-crypto-getentropy-limit
Brad Hubbard [Wed, 25 Oct 2017 00:27:38 +0000 (10:27 +1000)]
Merge pull request #18505 from badone/wip-unittest-crypto-getentropy-limit

unittest_crypto: Don't exceed limit for getentropy

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18181 from tchaikov/wip-vstart-quoted-print
Josh Durgin [Tue, 24 Oct 2017 23:43:38 +0000 (16:43 -0700)]
Merge pull request #18181 from tchaikov/wip-vstart-quoted-print

vstart.sh: quote command only when necessary

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge PR #17266 into master
Patrick Donnelly [Tue, 24 Oct 2017 23:37:14 +0000 (16:37 -0700)]
Merge PR #17266 into master

* refs/pull/17266/head:
qa: update test_ceph_argparse to test fs cmds
qa: use fs rm_data_pool
qa: fix mdsmap lookup
qa: remove usage of mds dump
PendingReleaseNotes: add obsoleted mds commands
qa: remove use of obsolete mds commands
ceph_volume_client: remove use of obsolete mds cmd
doc: update on obsolete mds commands
cephfs: obsolete deprecated mds commands

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
7 years agoMerge pull request #17909 from tchaikov/wip-coverity
Josh Durgin [Tue, 24 Oct 2017 23:34:02 +0000 (16:34 -0700)]
Merge pull request #17909 from tchaikov/wip-coverity

test/objectstore/test_bluefs: cleanups

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoqa: update test_ceph_argparse to test fs cmds 17266/head
Patrick Donnelly [Tue, 24 Oct 2017 19:05:15 +0000 (12:05 -0700)]
qa: update test_ceph_argparse to test fs cmds

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18475 from yuyuyu101/wip-fix-alignment
Sage Weil [Tue, 24 Oct 2017 20:39:11 +0000 (15:39 -0500)]
Merge pull request #18475 from yuyuyu101/wip-fix-alignment

os/ObjectStore: fix get_data_alignment return -1 causing problem in msg header

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge pull request #18297 from dzafman/wip-21803
Yuri Weinstein [Tue, 24 Oct 2017 20:31:40 +0000 (13:31 -0700)]
Merge pull request #18297 from dzafman/wip-21803

osd/PG: fix objects degraded higher than 100%

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #18479 from wzliao/wip-correct-scrub-cost
Yuri Weinstein [Tue, 24 Oct 2017 20:30:01 +0000 (13:30 -0700)]
Merge pull request #18479 from wzliao/wip-correct-scrub-cost

osd/OSD.cc: use option 'osd_scrub_cost' instead

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agodoc/rbd: specify additional ESX prerequisites 18517/head
Jason Dillaman [Tue, 24 Oct 2017 19:49:42 +0000 (15:49 -0400)]
doc/rbd: specify additional ESX prerequisites

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge PR #18109 into master
Patrick Donnelly [Tue, 24 Oct 2017 19:17:25 +0000 (12:17 -0700)]
Merge PR #18109 into master

* refs/pull/18109/head:
mds: clean up non-existent data pools in MDSMap
mds: reduce variable scope

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge PR #18366 into master
Patrick Donnelly [Tue, 24 Oct 2017 19:17:19 +0000 (12:17 -0700)]
Merge PR #18366 into master

* refs/pull/18366/head:
mon: s/mds_blacklist_interval/mon_mds_blacklist_interval/
mon: tidy up mds_blacklist_interval

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18384 into master
Patrick Donnelly [Tue, 24 Oct 2017 19:17:14 +0000 (12:17 -0700)]
Merge PR #18384 into master

* refs/pull/18384/head:
mds: disable early reply for dir layout and quota related requests
mds: make mksnap/setlayout wait for unsafe requests on other mds
mds: don't rdlock locks in replica object while auth mds is recovering
mds: move ScatterLock::state_flags into SimpleLock

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #18393 into master
Patrick Donnelly [Tue, 24 Oct 2017 19:17:08 +0000 (12:17 -0700)]
Merge PR #18393 into master

* refs/pull/18393/head:
ceph_context: re-expand admin_socket metavariables in child process

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18490 from dillaman/wip-21894
Mykola Golub [Tue, 24 Oct 2017 19:14:13 +0000 (22:14 +0300)]
Merge pull request #18490 from dillaman/wip-21894

rbd-mirror: strip environment/CLI overrides for remote cluster

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoqa: use fs rm_data_pool
Patrick Donnelly [Tue, 24 Oct 2017 18:51:02 +0000 (11:51 -0700)]
qa: use fs rm_data_pool

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: fix mdsmap lookup
Patrick Donnelly [Tue, 24 Oct 2017 18:36:06 +0000 (11:36 -0700)]
qa: fix mdsmap lookup

We were returning the file system structure and not the mdsmap.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: remove usage of mds dump
Patrick Donnelly [Tue, 24 Oct 2017 18:32:43 +0000 (11:32 -0700)]
qa: remove usage of mds dump

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #18514 from ceph/wip-fix-cv-create-path
Andrew Schoen [Tue, 24 Oct 2017 17:40:01 +0000 (12:40 -0500)]
Merge pull request #18514 from ceph/wip-fix-cv-create-path

ceph-volume lvm.prepare update to use create_osd_path

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume lvm.prepare update to use create_osd_path 18514/head
Alfredo Deza [Tue, 24 Oct 2017 17:29:18 +0000 (13:29 -0400)]
ceph-volume lvm.prepare update to use create_osd_path

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #18500 from scienceluo/wip-luo-fix-doc-log-level-branch
Kefu Chai [Tue, 24 Oct 2017 15:03:09 +0000 (23:03 +0800)]
Merge pull request #18500 from scienceluo/wip-luo-fix-doc-log-level-branch

doc: complete and update the subsystem logging level info table

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoosd/PrimaryLogPG: add condition "is_chunky_scrub_active" to check object in chunky_scrub. 18506/head
Jianpeng Ma [Tue, 24 Oct 2017 14:07:18 +0000 (22:07 +0800)]
osd/PrimaryLogPG: add condition "is_chunky_scrub_active" to check object in chunky_scrub.

Avoid every time call scrubber.write_block_by_scrub. Most time scrubber
is inactive. And compare to write_block_by_scrub, is_chunky_scrub_active
is light.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agodoc/release-notes: fix backticks 18482/head
Sage Weil [Tue, 24 Oct 2017 12:30:05 +0000 (07:30 -0500)]
doc/release-notes: fix backticks

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18467 from yuyuyu101/wip-21883
Kefu Chai [Tue, 24 Oct 2017 13:19:43 +0000 (21:19 +0800)]
Merge pull request #18467 from yuyuyu101/wip-21883

msg/async/AsyncConnection: state will be NONE if replacing by another one

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18469 from yuyuyu101/wip-remove-legacy
Kefu Chai [Tue, 24 Oct 2017 13:18:15 +0000 (21:18 +0800)]
Merge pull request #18469 from yuyuyu101/wip-remove-legacy

msg/async/AsyncConnection: remove legacy feature case handle

Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18415 from majianpeng/msg-cleanup
Kefu Chai [Tue, 24 Oct 2017 13:17:25 +0000 (21:17 +0800)]
Merge pull request #18415 from majianpeng/msg-cleanup

msg/async: batch handle msg_iovlen

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18397 from tchaikov/wip-mon-opts
Kefu Chai [Tue, 24 Oct 2017 13:16:30 +0000 (21:16 +0800)]
Merge pull request #18397 from tchaikov/wip-mon-opts

common/options: set max_background_jobs instead of max_background_compactions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #18382 from ceph/wip-vstart-mgr-dashboard
Kefu Chai [Tue, 24 Oct 2017 13:15:10 +0000 (21:15 +0800)]
Merge pull request #18382 from ceph/wip-vstart-mgr-dashboard

cmake: add cython_rbd as a dependency to vstart target

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18480 from tchaikov/wip-doc-cleanup
Alfredo Deza [Tue, 24 Oct 2017 11:03:29 +0000 (07:03 -0400)]
Merge pull request #18480 from tchaikov/wip-doc-cleanup

doc: various cleanups

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoOSD: drop unsed parameter passed to check_osdmap_features 18466/head
Leo Zhang [Sun, 22 Oct 2017 16:11:33 +0000 (00:11 +0800)]
OSD: drop unsed parameter passed to check_osdmap_features

Signed-off-by: Leo Zhang <nguzcf@gmail.com>
7 years agoMerge pull request #18405 from dillaman/wip-21849
Mykola Golub [Tue, 24 Oct 2017 08:02:49 +0000 (11:02 +0300)]
Merge pull request #18405 from dillaman/wip-21849

librbd: default to sparse-reads for any IO operation over 64K

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agorpm,debian: use download.ceph.com/tarballs instead of ceph.com/download 18480/head
Kefu Chai [Tue, 24 Oct 2017 08:00:09 +0000 (16:00 +0800)]
rpm,debian: use download.ceph.com/tarballs instead of ceph.com/download

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agodoc: fix warning reported by "build-doc linkcheck"
Kefu Chai [Mon, 23 Oct 2017 11:26:28 +0000 (19:26 +0800)]
doc: fix warning reported by "build-doc linkcheck"

all the HTTP 301 (moved permanently) should be killed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoosd: Add a flag to ScrubMap to signal check needed 16332/head
Brad Hubbard [Fri, 13 Oct 2017 05:46:47 +0000 (15:46 +1000)]
osd: Add a flag to ScrubMap to signal check needed

If we know none of the scrub maps have errors early in
be_large_omap_check() we can return without doing a lot of unnecessary
work.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoosd: Warn about objects with too many omap entries
Brad Hubbard [Tue, 27 Jun 2017 01:40:47 +0000 (11:40 +1000)]
osd: Warn about objects with too many omap entries

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoosd: Move creation of 'master_set' to scrub_compare_maps
Brad Hubbard [Mon, 9 Oct 2017 07:24:17 +0000 (17:24 +1000)]
osd: Move creation of 'master_set' to scrub_compare_maps

Moving it to scrub_compare_maps allows us to pass it to multiple
subsequently called functions.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agomon/OSDMonitor: more options in new-style 18397/head
Kefu Chai [Thu, 19 Oct 2017 11:28:49 +0000 (19:28 +0800)]
mon/OSDMonitor: more options in new-style

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocommon/options: set max_background_jobs instead of max_background_compactions
Kefu Chai [Thu, 19 Oct 2017 10:46:23 +0000 (18:46 +0800)]
common/options: set max_background_jobs instead of max_background_compactions

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18409 from liu-chunmei/fix_dpdk_assert
Haomai Wang [Tue, 24 Oct 2017 06:06:53 +0000 (01:06 -0500)]
Merge pull request #18409 from liu-chunmei/fix_dpdk_assert

Fix two dpdk assert happened in dpdk library.

Reviewed-by: Haomai Wang <haomai@xsky.com>
7 years agodoc: complete and update the subsystem logging level info table 18500/head
Luo Kexue [Tue, 24 Oct 2017 02:21:06 +0000 (10:21 +0800)]
doc: complete and update the subsystem logging level info table

Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
7 years agoceph.spec.in,debian/rules: change aio-max-nr to 1048576 17894/head
chenliuzhong [Tue, 24 Oct 2017 02:54:33 +0000 (10:54 +0800)]
ceph.spec.in,debian/rules: change aio-max-nr to 1048576

when osd is more than 14 in one host,it report error that aio is not enough.
As the default aio-max-nr is 65536, one OSD needs 4096 aios and other programs may use aios.
This patch change aio-max-nr to 1048576 when install ceph-osd rpm package and debian package

Signed-off-by: chenliuzhong <liuzhong.chen@easystack.cn>
7 years agounittest_crypto: Don't exceed limit for getentropy 18505/head
Brad Hubbard [Tue, 24 Oct 2017 04:34:26 +0000 (14:34 +1000)]
unittest_crypto: Don't exceed limit for getentropy

CryptoRandom::get_bytes calls getentropy directly if available and it
enforces a limit of 256 bytes.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #18460 from liewegas/wip-straw2-command
Kefu Chai [Tue, 24 Oct 2017 04:27:15 +0000 (12:27 +0800)]
Merge pull request #18460 from liewegas/wip-straw2-command

mon/OSDMonitor: add 'osd crush set-all-straw-buckets-to-straw2'

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18428 from liewegas/wip-21878
Sage Weil [Tue, 24 Oct 2017 03:30:05 +0000 (22:30 -0500)]
Merge pull request #18428 from liewegas/wip-21878

os/bluestore/BlueFS: fix race with log flush during async log compaction

Reviewed-by: Varada Kari <varada.kari@gmail.com>
7 years agoMerge pull request #18470 from yuyuyu101/wip-tracker-lock
Sage Weil [Tue, 24 Oct 2017 03:29:41 +0000 (22:29 -0500)]
Merge pull request #18470 from yuyuyu101/wip-tracker-lock

osd/OpRequest: reduce overhead when disabling tracking

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18472 from yuyuyu101/wip-kill-asynccompressor
Sage Weil [Tue, 24 Oct 2017 03:29:19 +0000 (22:29 -0500)]
Merge pull request #18472 from yuyuyu101/wip-kill-asynccompressor

compressor: kill AsyncCompressor which is broken

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd: Handle objects on non-actingbackfill nodes during recovery 18297/head
David Zafman [Tue, 24 Oct 2017 03:20:44 +0000 (20:20 -0700)]
osd: Handle objects on non-actingbackfill nodes during recovery

With this fix we can see more misplaced and no degraded when
doing recovery to a new up/acting set with node(s) containing
objects that are not longer part of up/acting.

Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agoosd/osd_type: kill log.approx_size() 18481/head
xie xingguo [Sat, 21 Oct 2017 02:21:56 +0000 (10:21 +0800)]
osd/osd_type: kill log.approx_size()

We used approx_size() because std::list::size() used to be O(n) instead of O(1),
but it is constant now in C++11.

Also counting the precise number of current log entries here is much more
meaningful.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/osd_type.h: kill pg_missing_set.have_old
xie xingguo [Mon, 16 Oct 2017 08:09:51 +0000 (16:09 +0800)]
osd/osd_type.h: kill pg_missing_set.have_old

which has no consumers, and removing the unused code should
always be the preferred option.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoos/PG: choose replicated acting by last_update
xie xingguo [Thu, 19 Oct 2017 09:05:59 +0000 (17:05 +0800)]
os/PG: choose replicated acting by last_update

Candidate which has a newer last_update should take precedence,
since it can be technically brought back to normal sooner than others.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd: Adjust misplaced calculation
David Zafman [Mon, 23 Oct 2017 21:49:02 +0000 (14:49 -0700)]
osd: Adjust misplaced calculation

When there are more backfill ndoes then misplaced nodes the
object calculation would cause misplace to drop too quickly.
Assuming that all backfill nodes are at approximate the same
place, we compute backfill per node and only adjust by
the number of misplaced nodes.

Fixes: http://tracker.ceph.com/issues/21898
Signed-off-by: David Zafman <dzafman@redhat.com>
7 years agoMerge PR #18255 into master
Patrick Donnelly [Tue, 24 Oct 2017 00:07:37 +0000 (17:07 -0700)]
Merge PR #18255 into master

* refs/pull/18255/head:
os/bluestore: handle compressed extents in blob unsharing checks

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17722 from amitkumar50/cov-rgw-6
Matt Benjamin [Mon, 23 Oct 2017 21:00:37 +0000 (17:00 -0400)]
Merge pull request #17722 from amitkumar50/cov-rgw-6

rgw: Initialization of epoch,len

7 years agoMerge pull request #17305 from theanalyst/rgw-lc-tagging
Yuri Weinstein [Mon, 23 Oct 2017 20:48:40 +0000 (13:48 -0700)]
Merge pull request #17305 from theanalyst/rgw-lc-tagging

RGW: support for tagging in lifecycle policies

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
7 years agoMerge pull request #18291 from ZVampirEM77/wip-copy-errormsg
Yuri Weinstein [Mon, 23 Oct 2017 20:46:01 +0000 (13:46 -0700)]
Merge pull request #18291 from ZVampirEM77/wip-copy-errormsg

rgw: copy object add response error messages

Reviewed-by: Amit Kumar amitkuma@redhat.com
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #18194 from ivancich/wip-mclock-repops-bitmap
Sage Weil [Mon, 23 Oct 2017 19:33:57 +0000 (14:33 -0500)]
Merge pull request #18194 from ivancich/wip-mclock-repops-bitmap

osd: replace mclock subop opclass w/ rep_op opclass; combine duplicated code

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18487 from liewegas/wip-20557
Sage Weil [Mon, 23 Oct 2017 19:09:53 +0000 (14:09 -0500)]
Merge pull request #18487 from liewegas/wip-20557

/etc/sysconfig/ceph: remove jemalloc option

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agorbd-mirror: strip environment/CLI overrides for remote cluster 18490/head
Jason Dillaman [Mon, 23 Oct 2017 18:53:30 +0000 (14:53 -0400)]
rbd-mirror: strip environment/CLI overrides for remote cluster

Fixes: http://tracker.ceph.com/issues/21894
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18448 from ceph/wip-bz1499840
Andrew Schoen [Mon, 23 Oct 2017 18:55:55 +0000 (13:55 -0500)]
Merge pull request #18448 from ceph/wip-bz1499840

ceph-volume lvm bluestore support

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agodoc/release-notes: add jewel->kraken notes
Sage Weil [Mon, 23 Oct 2017 12:09:34 +0000 (07:09 -0500)]
doc/release-notes: add jewel->kraken notes

Forgot to include this!

Also add a bit more warning around the 'crush location' option change.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18403 from dillaman/wip-librbd-flush
Mykola Golub [Mon, 23 Oct 2017 18:12:20 +0000 (21:12 +0300)]
Merge pull request #18403 from dillaman/wip-librbd-flush

 librbd: sync flush should re-use existing async flush logic

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agorbd: bench should flush prior to starting a test 18403/head
Jason Dillaman [Thu, 19 Oct 2017 14:37:01 +0000 (10:37 -0400)]
rbd: bench should flush prior to starting a test

For the new read-based bench tests, flushing prior to the start of the test
will result in the exclusive lock being acquired and the object map being
utilized.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years ago/etc/sysconfig/ceph: remove jemalloc option 18487/head
Sage Weil [Mon, 23 Oct 2017 17:05:39 +0000 (12:05 -0500)]
/etc/sysconfig/ceph: remove jemalloc option

This breaks when used with rocksdb, which is now the default.

See http://tracker.ceph.com/issues/20557

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: _update_calc_stats: backfill targets do not always affect degraded
Sage Weil [Sun, 22 Oct 2017 03:16:27 +0000 (22:16 -0500)]
osd/PG: _update_calc_stats: backfill targets do not always affect degraded

Our progress on a backfill target should only count toward degraded if
the target is needed in order for us to reach the target pool size.  If
we have remapped other complete copies, we can backfill and not be degraded
at all.  And we may be some combination of the two if there are multiple
backfill targets; use the target(s) with the most objects.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18486 from liewegas/wip-20557
Sage Weil [Mon, 23 Oct 2017 16:52:43 +0000 (11:52 -0500)]
Merge pull request #18486 from liewegas/wip-20557

etc/default/ceph: remove jemalloc option

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agoetc/default/ceph: remove jemalloc option 18486/head
Sage Weil [Mon, 23 Oct 2017 16:16:26 +0000 (11:16 -0500)]
etc/default/ceph: remove jemalloc option

This breaks when used with rocksdb, which is now the default.

See http://tracker.ceph.com/issues/20557

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18408 from liewegas/wip-buffer-mempool-abi
Sage Weil [Mon, 23 Oct 2017 15:52:42 +0000 (10:52 -0500)]
Merge pull request #18408 from liewegas/wip-buffer-mempool-abi

buffer: avoid changing bufferlist ABI by removing new _mempool field

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #18356 from wido/docs-zabbix-mgr
Kefu Chai [Mon, 23 Oct 2017 15:35:51 +0000 (23:35 +0800)]
Merge pull request #18356 from wido/docs-zabbix-mgr

doc: Updated documentation for Zabbix Mgr module

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18474 from tchaikov/wip-debian-fix-upgrade
Kefu Chai [Mon, 23 Oct 2017 15:30:22 +0000 (23:30 +0800)]
Merge pull request #18474 from tchaikov/wip-debian-fix-upgrade

debian: fix package relationships after 40caf6a6

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoceph-volume lvm.activate only prime-osd-dir when directory is empty 18448/head
Alfredo Deza [Mon, 23 Oct 2017 13:44:27 +0000 (09:44 -0400)]
ceph-volume lvm.activate only prime-osd-dir when directory is empty

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoosd: replace mclock subop opclass w/ rep_op opclass; combine duplicated code 18194/head
J. Eric Ivancich [Wed, 30 Aug 2017 16:54:23 +0000 (12:54 -0400)]
osd: replace mclock subop opclass w/ rep_op opclass; combine duplicated code

The OSD subops were replaced with replication ops (i.e., MSG_OSD_REPOP
and MSG_OSD_REPOPREPLY) in jewel. mClock incorrectly used them as an
op class rather than the newer replication ops. This fixes that and
places eight ops into the repop class -- MSG_OSD_REPOP,
MSG_OSD_REPOPREPLY, MSG_OSD_PG_UPDATE_LOG_MISSING,
MSG_OSD_PG_UPDATE_LOG_MISSING_REPLY, MSG_OSD_EC_WRITE,
MSG_OSD_EC_WRITE_REPLY, MSG_OSD_EC_READ, and MSG_OSD_EC_READ_REPLY.

This alo removes dupliated code related to op classes in
mClockOpClassQueue and mClockClientQueue and combines into
mClockOpClassSupport.

The three configuration options
osd_op_queue_mclock_osd_subop_{res,wgt,lim} have also been replaced
with osd_op_queue_mclock_osd_rep_op_{res,wgt,lim}.

This also removes OpQueueItem::OpQueueable::op_type_t::osd_subop since
it's not a category core ceph recognizes and is instead it's part of
an mclock view of ops.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>