]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomon/OSDMonitor: Remove unused functions 20275/head
Brad Hubbard [Sat, 3 Feb 2018 01:56:26 +0000 (11:56 +1000)]
mon/OSDMonitor: Remove unused functions

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #20161 from tchaikov/wip-20086
Josh Durgin [Wed, 7 Feb 2018 22:43:59 +0000 (14:43 -0800)]
Merge pull request #20161 from tchaikov/wip-20086

test/librados: be more tolerant with timed lock tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #20173 from liewegas/wip-os-ch
Josh Durgin [Wed, 7 Feb 2018 22:04:08 +0000 (14:04 -0800)]
Merge pull request #20173 from liewegas/wip-os-ch

os: unify Sequencer and CollectionHandle

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #20144 from adamemerson/wip-cache-register
Adam C. Emerson [Wed, 7 Feb 2018 18:46:18 +0000 (13:46 -0500)]
Merge pull request #20144 from adamemerson/wip-cache-register

Cache Register!

Provide the ability to examine and delete elements from the cache.

rgw: Add cache introspection and manipulation

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20176 from dillaman/wip-librbd-clone-v2-1
Mykola Golub [Wed, 7 Feb 2018 17:54:50 +0000 (19:54 +0200)]
Merge pull request #20176 from dillaman/wip-librbd-clone-v2-1

librbd: initial hooks for clone v2 support

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agorgw: Add cache introspection and manipulation 20144/head
Adam C. Emerson [Sat, 27 Jan 2018 21:18:53 +0000 (16:18 -0500)]
rgw: Add cache introspection and manipulation

Provide the ability to examine and delete elements from the cache.

Fixes: http://tracker.ceph.com/issues/22603
Fixes: http://tracker.ceph.com/issues/22604
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #20318 from ovh/bp-limit-normalize-key
Kefu Chai [Wed, 7 Feb 2018 14:43:58 +0000 (22:43 +0800)]
Merge pull request #20318 from ovh/bp-limit-normalize-key

common/config: limit calls to normalize_key_name

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19958 from renhwztetecs/renhw-wip-osd-sighup
Kefu Chai [Wed, 7 Feb 2018 14:40:59 +0000 (22:40 +0800)]
Merge pull request #19958 from renhwztetecs/renhw-wip-osd-sighup

osd: Sign in early SIGHUP signal

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20264 from ceph/wip-rm22620
Andrew Schoen [Wed, 7 Feb 2018 14:21:04 +0000 (15:21 +0100)]
Merge pull request #20264 from ceph/wip-rm22620

ceph-volume dmcrypt support for simple

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20307 from tchaikov/wip-std-filesystem
Kefu Chai [Wed, 7 Feb 2018 13:56:28 +0000 (21:56 +0800)]
Merge pull request #20307 from tchaikov/wip-std-filesystem

test/admin_socket_output: switch to std::experimental::filesystem

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #20324 from tchaikov/wip-cmake-build-boost
Kefu Chai [Wed, 7 Feb 2018 13:53:30 +0000 (21:53 +0800)]
Merge pull request #20324 from tchaikov/wip-cmake-build-boost

cmake: fix the include dir for building boost::python

Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
7 years agoMerge pull request #20347 from Songweibin/wip-osd-cleanup
Xie Xingguo [Wed, 7 Feb 2018 07:34:04 +0000 (15:34 +0800)]
Merge pull request #20347 from Songweibin/wip-osd-cleanup

osd: drop redundant comment

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd: drop redundant comment 20347/head
songweibin [Wed, 7 Feb 2018 05:53:21 +0000 (13:53 +0800)]
osd: drop redundant comment

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agoMerge PR #20288 into master
Patrick Donnelly [Wed, 7 Feb 2018 04:38:14 +0000 (20:38 -0800)]
Merge PR #20288 into master

* refs/pull/20288/head:
ptl-tool: open githubmap with utf-8 code

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agotest/objectstore/TestObjectStoreState: make objects match collection 20173/head
Sage Weil [Mon, 5 Feb 2018 17:59:09 +0000 (11:59 -0600)]
test/objectstore/TestObjectStoreState: make objects match collection

- start pool at 1
- make hash fall within pg (just match it for now)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/ObjectStore: remove void *osr from Transaction
Sage Weil [Wed, 31 Jan 2018 16:48:45 +0000 (10:48 -0600)]
os/ObjectStore: remove void *osr from Transaction

No longer used!  (It was only needed for an ugly FileStore hack.)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/filestore: do not rely on ObjectStore::Transaction::osr
Sage Weil [Wed, 31 Jan 2018 16:48:20 +0000 (10:48 -0600)]
os/filestore: do not rely on ObjectStore::Transaction::osr

This was used only to name the osr for the purposes of the tracepoint. We
can do that ourselves!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: drop explicit calls to osr->flush
Sage Weil [Sat, 27 Jan 2018 17:02:23 +0000 (11:02 -0600)]
osd: drop explicit calls to osr->flush

These are no longer needed as the implementations do it themselves.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: drop unnecessary flush() on shutdown
Sage Weil [Sat, 27 Jan 2018 17:06:00 +0000 (11:06 -0600)]
osd/PrimaryLogPG: drop unnecessary flush() on shutdown

The ObjectStore implementation should handle this.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos: make implementation flush before collection_{list,empty}
Sage Weil [Sat, 27 Jan 2018 16:59:01 +0000 (10:59 -0600)]
os: make implementation flush before collection_{list,empty}

This takes the (awkward) burden off the caller.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoos/ObjectStore: make all read operations CollectionHandle-based
Sage Weil [Sat, 27 Jan 2018 03:37:56 +0000 (21:37 -0600)]
os/ObjectStore: make all read operations CollectionHandle-based

Drop the coll_t shims, and convert the last few that weren't already
handle-based.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20313 from guzhongyan/fix-22350
Sage Weil [Tue, 6 Feb 2018 20:01:41 +0000 (14:01 -0600)]
Merge pull request #20313 from guzhongyan/fix-22350

osd/OSDMap: misleading message in print_oneline_summary()

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20317 from liewegas/wip-pg-scrub-priority
Sage Weil [Tue, 6 Feb 2018 20:01:19 +0000 (14:01 -0600)]
Merge pull request #20317 from liewegas/wip-pg-scrub-priority

osd/PG: pass scrub priority to replica

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20319 from tchaikov/wip-ops_blocked_by_scrub-cleanup
Sage Weil [Tue, 6 Feb 2018 20:00:53 +0000 (14:00 -0600)]
Merge pull request #20319 from tchaikov/wip-ops_blocked_by_scrub-cleanup

osd: pass ops_blocked_by_scrub() to requeue_scrub()

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoceph-volume: do not test custom cluster names with simple 20264/head
Andrew Schoen [Tue, 6 Feb 2018 17:36:03 +0000 (11:36 -0600)]
ceph-volume: do not test custom cluster names with simple

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20279 from liewegas/wip-idempotent-sequence
Sage Weil [Tue, 6 Feb 2018 16:53:35 +0000 (10:53 -0600)]
Merge pull request #20279 from liewegas/wip-idempotent-sequence

ceph_test_filestore_idempotent_sequence: many fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoceph-volume: sleep 2 minutes after reboot in simple tests
Andrew Schoen [Tue, 6 Feb 2018 16:46:44 +0000 (10:46 -0600)]
ceph-volume: sleep 2 minutes after reboot in simple tests

This will allow for some time for OSD services to start back up after
reboot. If not we see race conditions where tests fail because they
were run before the OSD finished startup.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoos/ObjectStore: combine Sequencer and CollectionImpl in ObjectStore
Sage Weil [Mon, 15 Jan 2018 21:23:46 +0000 (15:23 -0600)]
os/ObjectStore: combine Sequencer and CollectionImpl in ObjectStore

In practice we have a sequencer per collection. Combine them in the interface
to simplify our lives!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_objectstore_workloadgen: remove
Sage Weil [Mon, 29 Jan 2018 20:01:05 +0000 (14:01 -0600)]
ceph_test_objectstore_workloadgen: remove

Stale test code, never run.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/tasks/recovery_bench: drop recovery_bench task
Sage Weil [Mon, 29 Jan 2018 20:24:30 +0000 (14:24 -0600)]
qa/tasks/recovery_bench: drop recovery_bench task

This relies on smalliobench, which is gone now.  The task could
pretty easily be resurrected if we substitute in another tool.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_xattr_bench: drop
Sage Weil [Mon, 29 Jan 2018 21:19:24 +0000 (15:19 -0600)]
ceph_xattr_bench: drop

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest/bench: remove smallio bench tools
Sage Weil [Mon, 29 Jan 2018 20:23:39 +0000 (14:23 -0600)]
test/bench: remove smallio bench tools

These are stale and superceded by the fio ObjectStore (and other)
backends.  Shed the weight!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agolibrbd: drop unused variable from flatten state machine 20176/head
Jason Dillaman [Tue, 6 Feb 2018 13:20:42 +0000 (08:20 -0500)]
librbd: drop unused variable from flatten state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20267 from liewegas/wip-22847
Kefu Chai [Tue, 6 Feb 2018 06:49:35 +0000 (14:49 +0800)]
Merge pull request #20267 from liewegas/wip-22847

mon/OSDMonitor: filter out pgs that shouldn't exist from force-create-pg

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20259 from guzhongyan/rados-cleanup
Kefu Chai [Tue, 6 Feb 2018 06:48:42 +0000 (14:48 +0800)]
Merge pull request #20259 from guzhongyan/rados-cleanup

rados: clean up rados_getxattrs() and rados_striper_getxattrs()

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20260 from guzhongyan/fix-22042
Kefu Chai [Tue, 6 Feb 2018 06:45:03 +0000 (14:45 +0800)]
Merge pull request #20260 from guzhongyan/fix-22042

librados: invalid free() in rados_getxattrs_next()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20255 from david-z/wip-fix-kv-max-option
Kefu Chai [Tue, 6 Feb 2018 06:41:11 +0000 (14:41 +0800)]
Merge pull request #20255 from david-z/wip-fix-kv-max-option

config: Change bluestore_cache_kv_max to type INT64

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20301 from bigclouds/wip-fix-declaration-of-rados-striper-trunc
Kefu Chai [Tue, 6 Feb 2018 06:40:28 +0000 (14:40 +0800)]
Merge pull request #20301 from bigclouds/wip-fix-declaration-of-rados-striper-trunc

libradosstriper: fix the function declaration of rados_striper_trunc

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20233 from cbodley/wip-test-log-nullptr
Kefu Chai [Tue, 6 Feb 2018 06:35:18 +0000 (14:35 +0800)]
Merge pull request #20233 from cbodley/wip-test-log-nullptr

test/log: fix for crash with libc++

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20223 from Yan-waller/wip-walle-180124cephosd
Kefu Chai [Tue, 6 Feb 2018 06:31:52 +0000 (14:31 +0800)]
Merge pull request #20223 from Yan-waller/wip-walle-180124cephosd

osd: use existing osd_required variable for messenger policy

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20201 from majianpeng/mosdrepop-encode-log
Kefu Chai [Tue, 6 Feb 2018 06:29:34 +0000 (14:29 +0800)]
Merge pull request #20201 from majianpeng/mosdrepop-encode-log

osd: avoid encoding the same log entries repeatedly for different peers

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoos/filestore: add replay guards for omap operations 20279/head
Sage Weil [Mon, 5 Feb 2018 15:08:44 +0000 (09:08 -0600)]
os/filestore: add replay guards for omap operations

These were not guarded, meaning they could get replayed onto an object
that was cloned or renamed.  Eek!

Fixes: http://tracker.ceph.com/issues/22920
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest/objectstore/run_seed_to_range: stop on first error
Sage Weil [Mon, 5 Feb 2018 15:09:04 +0000 (09:09 -0600)]
test/objectstore/run_seed_to_range: stop on first error

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_idempotent_sequence: use coll_entry_t
Sage Weil [Sun, 4 Feb 2018 16:51:37 +0000 (10:51 -0600)]
ceph_test_idempotent_sequence: use coll_entry_t

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_filestore_idempotent_sequence: fix up clone, move ops; cleanup
Sage Weil [Sun, 4 Feb 2018 16:34:25 +0000 (10:34 -0600)]
ceph_filestore_idempotent_sequence: fix up clone, move ops; cleanup

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/tasks/filestore_idempotent: run failure tests later in sequence
Sage Weil [Sat, 3 Feb 2018 15:29:44 +0000 (09:29 -0600)]
qa/tasks/filestore_idempotent: run failure tests later in sequence

We want to get past the initial colleciton and object creation steps,
which don't include interesting ops.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocls/rbd: store original namespace type within trash snapshot namespace
Jason Dillaman [Tue, 6 Feb 2018 00:04:37 +0000 (19:04 -0500)]
cls/rbd: store original namespace type within trash snapshot namespace

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20016 from cbodley/wip-18885
Casey Bodley [Mon, 5 Feb 2018 21:44:37 +0000 (16:44 -0500)]
Merge pull request #20016 from cbodley/wip-18885

rgw: log unlink_instance mtime as object's mtime

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoceph-volume: adds the simple dmcrypt_plain and dmcrypt_luks tests
Andrew Schoen [Mon, 5 Feb 2018 20:18:28 +0000 (14:18 -0600)]
ceph-volume: adds the simple dmcrypt_plain and dmcrypt_luks tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: fix ceph-volume simple scan help menu test
Andrew Schoen [Mon, 5 Feb 2018 19:53:13 +0000 (13:53 -0600)]
ceph-volume: fix ceph-volume simple scan help menu test

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20145 from linuxbox2/rgwf-deref-readdir-off
Matt Benjamin [Mon, 5 Feb 2018 19:22:48 +0000 (14:22 -0500)]
Merge pull request #20145 from linuxbox2/rgwf-deref-readdir-off

rgw_file: avoid evaluating nullptr for readdir offset

7 years agoMerge pull request #20188 from cbodley/wip-rgw-frontend-multimap
Casey Bodley [Mon, 5 Feb 2018 18:52:04 +0000 (13:52 -0500)]
Merge pull request #20188 from cbodley/wip-rgw-frontend-multimap

rgw: beast frontend can listen on multiple endpoints

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #20013 from cbodley/wip-rgw-auth-skew
Casey Bodley [Mon, 5 Feb 2018 18:51:43 +0000 (13:51 -0500)]
Merge pull request #20013 from cbodley/wip-rgw-auth-skew

rgw: share time skew check between v2 and v4 auth

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #20017 from cbodley/wip-22248
Casey Bodley [Mon, 5 Feb 2018 18:50:48 +0000 (13:50 -0500)]
Merge pull request #20017 from cbodley/wip-22248

rgw: unlink deleted bucket from bucket's owner

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #20120 from cbodley/wip-22797
Casey Bodley [Mon, 5 Feb 2018 18:49:13 +0000 (13:49 -0500)]
Merge pull request #20120 from cbodley/wip-22797

rgw: fix for empty query string in beast frontend

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #20038 from oritwas/wip-rgw-22742
Orit Wasserman [Mon, 5 Feb 2018 18:02:06 +0000 (20:02 +0200)]
Merge pull request #20038 from oritwas/wip-rgw-22742

rgw: bucket resharding should not update bucket ACL or user stats
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20295 from trociny/wip-test_deep_copy_clone
Jason Dillaman [Mon, 5 Feb 2018 17:26:44 +0000 (12:26 -0500)]
Merge pull request #20295 from trociny/wip-test_deep_copy_clone

test/pybind/rbd: skip test_deep_copy_clone if layering not enabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: tweak handling for moving snapshots to trash namespace
Jason Dillaman [Mon, 5 Feb 2018 16:11:09 +0000 (11:11 -0500)]
cls/rbd: tweak handling for moving snapshots to trash namespace

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocmake: fix the include dir for building boost::python 20324/head
Kefu Chai [Mon, 5 Feb 2018 16:36:20 +0000 (00:36 +0800)]
cmake: fix the include dir for building boost::python

the "includes" directories are separated by spaces not semicolons.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/workunits/rbd: force use of v1 clone when testing orphan
Jason Dillaman [Tue, 30 Jan 2018 19:16:33 +0000 (14:16 -0500)]
qa/workunits/rbd: force use of v1 clone when testing orphan

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd-mirror: image deleter now handles clone v2
Jason Dillaman [Tue, 30 Jan 2018 02:12:10 +0000 (21:12 -0500)]
rbd-mirror: image deleter now handles clone v2

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoosd/OSDCap: rbd-read-only profile now permits use of clone class methods
Jason Dillaman [Tue, 30 Jan 2018 01:52:14 +0000 (20:52 -0500)]
osd/OSDCap: rbd-read-only profile now permits use of clone class methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librbd: fix negative test cases for clone
Jason Dillaman [Mon, 29 Jan 2018 22:50:49 +0000 (17:50 -0500)]
test/librbd: fix negative test cases for clone

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: snapshot remove request now handles clone v2
Jason Dillaman [Tue, 30 Jan 2018 03:15:11 +0000 (22:15 -0500)]
librbd: snapshot remove request now handles clone v2

The state machine was converted to the current style and the
final removal of the snapshot was delayed until the end to
permit the retry of a previously failed snapshot removal.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: flatten request now handles clone v2
Jason Dillaman [Wed, 24 Jan 2018 21:26:51 +0000 (16:26 -0500)]
librbd: flatten request now handles clone v2

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: flatten operation should detach child first
Jason Dillaman [Thu, 25 Jan 2018 19:00:54 +0000 (14:00 -0500)]
librbd: flatten operation should detach child first

That will permit the flatten operation to be replayed if there
is an issue.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: remove request now handles clone v2
Jason Dillaman [Wed, 24 Jan 2018 17:31:46 +0000 (12:31 -0500)]
librbd: remove request now handles clone v2

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: helper state machine for detaching children for v1/v2 clones
Jason Dillaman [Wed, 24 Jan 2018 22:24:12 +0000 (17:24 -0500)]
librbd: helper state machine for detaching children for v1/v2 clones

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: list children now includes v2 clones
Jason Dillaman [Wed, 24 Jan 2018 03:15:31 +0000 (22:15 -0500)]
librbd: list children now includes v2 clones

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: clone request now handles clone v2
Jason Dillaman [Tue, 30 Jan 2018 01:09:46 +0000 (20:09 -0500)]
librbd: clone request now handles clone v2

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: removed child cleanup from failed clone
Jason Dillaman [Wed, 24 Jan 2018 17:38:50 +0000 (12:38 -0500)]
librbd: removed child cleanup from failed clone

This logic is already included in the remove image state machine
and will be executed when the clone is deleted post-failure.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agotest/librados_test_stub: added 'get_min_compatible_client' API
Jason Dillaman [Tue, 23 Jan 2018 21:06:06 +0000 (16:06 -0500)]
test/librados_test_stub: added 'get_min_compatible_client' API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocommon/options: added override for RBD clone format handling
Jason Dillaman [Tue, 23 Jan 2018 18:13:10 +0000 (13:13 -0500)]
common/options: added override for RBD clone format handling

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: removing an in-use snapshot should move it to the trash
Jason Dillaman [Fri, 19 Jan 2018 13:15:06 +0000 (08:15 -0500)]
cls/rbd: removing an in-use snapshot should move it to the trash

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: new cls methods for handling clone v2
Jason Dillaman [Fri, 19 Jan 2018 01:10:58 +0000 (20:10 -0500)]
cls/rbd: new cls methods for handling clone v2

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: add child reference counter to snapshot
Jason Dillaman [Tue, 16 Jan 2018 17:01:34 +0000 (12:01 -0500)]
cls/rbd: add child reference counter to snapshot

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: restrict snapshot rename to user-generated snapshots
Jason Dillaman [Fri, 19 Jan 2018 13:27:06 +0000 (08:27 -0500)]
cls/rbd: restrict snapshot rename to user-generated snapshots

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: helper method for iterating over all image snapshots
Jason Dillaman [Fri, 19 Jan 2018 14:02:00 +0000 (09:02 -0500)]
cls/rbd: helper method for iterating over all image snapshots

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agocls/rbd: fix incorrect error log upon success
Jason Dillaman [Mon, 29 Jan 2018 22:35:57 +0000 (17:35 -0500)]
cls/rbd: fix incorrect error log upon success

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd: resolve names of snapshot namespaces
Jason Dillaman [Wed, 24 Jan 2018 20:34:19 +0000 (15:34 -0500)]
rbd: resolve names of snapshot namespaces

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: new trash snapshot namespace
Jason Dillaman [Thu, 18 Jan 2018 17:16:00 +0000 (12:16 -0500)]
librbd: new trash snapshot namespace

Snapshots will be moved to the trash if they are still in-use
by clones when deleted.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agolibrbd: separate clone v2 op feature bit for parent/child
Jason Dillaman [Mon, 29 Jan 2018 18:49:39 +0000 (13:49 -0500)]
librbd: separate clone v2 op feature bit for parent/child

librbd needs to be able to handle the case when flattening a v2 clone
that is also a v2 parent of other images.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20309 from pritha-srivastava/wip-rgw-roles-error-codes
Casey Bodley [Mon, 5 Feb 2018 15:03:54 +0000 (10:03 -0500)]
Merge pull request #20309 from pritha-srivastava/wip-rgw-roles-error-codes

rgw: Reinstating error codes mapping for Roles.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20316 from smithfarm/wip-doc-log
Kefu Chai [Mon, 5 Feb 2018 14:53:34 +0000 (22:53 +0800)]
Merge pull request #20316 from smithfarm/wip-doc-log

doc: log-and-debug: fix default value of "log max recent"

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd: pass ops_blocked_by_scrub() to requeue_scrub() 20319/head
Kefu Chai [Mon, 5 Feb 2018 14:14:37 +0000 (22:14 +0800)]
osd: pass ops_blocked_by_scrub() to requeue_scrub()

less nesting levels, and less repeatings.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years ago common/config: limit calls to normalize_key_name 20318/head
Piotr Dałek [Mon, 5 Feb 2018 13:36:11 +0000 (14:36 +0100)]
 common/config: limit calls to normalize_key_name

It's not the most expensive thing in that module, but it's redundant
in _get_val, as it's later done also in _get_val_generic. And it's
still expensive.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
7 years agoosd/PG: pass scrub priority to replica 20317/head
Sage Weil [Mon, 5 Feb 2018 13:10:54 +0000 (07:10 -0600)]
osd/PG: pass scrub priority to replica

If we are scrubbing with high priority on the primary, pass that along
to the replica so that it can schedule its scrub work accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodoc: log-and-debug: fix default value of "log max recent" 20316/head
Nathan Cutler [Mon, 5 Feb 2018 12:53:05 +0000 (13:53 +0100)]
doc: log-and-debug: fix default value of "log max recent"

Doc says 1000000, but the real figure is two orders of magnitude less:

    Option("log_max_recent", Option::TYPE_INT, Option::LEVEL_ADVANCED)
      .set_default(500)
      .set_daemon_default(10000)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #20229 from zhsj/fix-dashboard-prefix
John Spray [Mon, 5 Feb 2018 12:07:33 +0000 (13:07 +0100)]
Merge pull request #20229 from zhsj/fix-dashboard-prefix

pybind/mgr/dashboard: fix duplicated slash in html href

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoosd/OSDMap: misleading message in print_oneline_summary() 20313/head
Gu Zhongyan [Mon, 5 Feb 2018 10:45:54 +0000 (18:45 +0800)]
osd/OSDMap: misleading message in print_oneline_summary()
The output scared people as showing so many osds were full/nearfull

Improve the output to make the message clearer

Fixes: http://tracker.ceph.com/issues/22350
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
7 years agocommon: Sign in early SIGHUP signal 19958/head
huanwen ren [Mon, 5 Feb 2018 07:23:42 +0000 (15:23 +0800)]
common: Sign in early SIGHUP signal

Contains the following process:
ceph-mon ceph-mgr ceph-mds ceph-fuse radosgw.

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agorgw: Reinstating error codes mapping for Roles. 20309/head
Pritha Srivastava [Mon, 5 Feb 2018 09:50:10 +0000 (15:20 +0530)]
rgw: Reinstating error codes mapping for Roles.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
7 years agotest/admin_socket_output: switch to std::experimental::filesystem 20307/head
Kefu Chai [Mon, 5 Feb 2018 09:12:14 +0000 (17:12 +0800)]
test/admin_socket_output: switch to std::experimental::filesystem

so we don't need to compile boost::filesystem anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20114 from cethikdata/ceph-disk-lock
Kefu Chai [Mon, 5 Feb 2018 06:10:49 +0000 (14:10 +0800)]
Merge pull request #20114 from cethikdata/ceph-disk-lock

ceph-disk: reduce the scope of activate_lock.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotest/pybind/test_rados.py: expand test_xattrs/test_obj_xattrs 20260/head
Gu Zhongyan [Mon, 5 Feb 2018 04:14:42 +0000 (12:14 +0800)]
test/pybind/test_rados.py: expand test_xattrs/test_obj_xattrs
to cover attribute with empty value case.

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
7 years agolibrados: invalid free() in rados_getxattrs_next()
Gu Zhongyan [Fri, 2 Feb 2018 10:01:05 +0000 (18:01 +0800)]
librados: invalid free() in rados_getxattrs_next()

Invalid free() can cause corruption when getting an object
attribute with empty value.

Check the validity of the pointer before free(). Also move
the free() call at the start of rados_getxattrs_next() to
avoid memory leak.

Fixes: http://tracker.ceph.com/issues/22042
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
7 years agolibradosstriper: fix the function declaration of rados_striper_trunc 20301/head
yuelongguang [Mon, 5 Feb 2018 02:29:26 +0000 (10:29 +0800)]
libradosstriper: fix the function declaration of rados_striper_trunc
change the type of first parameter from rados_ioctx_t to rados_striper_t

Signed-off-by: yuelongguang <yuelongguang@gmail.com>
7 years agoMerge pull request #20270 from ivancich/wip-fix-bad-dmclock-sim-change
Kefu Chai [Mon, 5 Feb 2018 03:05:35 +0000 (11:05 +0800)]
Merge pull request #20270 from ivancich/wip-fix-bad-dmclock-sim-change

osd,dmclock: fix dmclock test simulator change

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20258 from tchaikov/wip-balancer-cleanup
Kefu Chai [Mon, 5 Feb 2018 02:01:11 +0000 (10:01 +0800)]
Merge pull request #20258 from tchaikov/wip-balancer-cleanup

 mgr/balancer: replace magic value of -1 for DEFAULT_CHOOSE_ARGS

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20230 from ifed01/wip-ifed-store-test-improve
Kefu Chai [Mon, 5 Feb 2018 01:59:39 +0000 (09:59 +0800)]
Merge pull request #20230 from ifed01/wip-ifed-store-test-improve

test/store_test: update Many4KWritesTest* test cases to finalize with…

Reviewed-by: Sage Weil <sage@redhat.com>