]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agocmake: test-ceph-helpers working
Ali Maredia [Mon, 11 Jan 2016 22:28:47 +0000 (17:28 -0500)]
cmake: test-ceph-helpers working

Moved all the libraries in CMAKE_BINARY_DIR/lib
and all the binaries in CMAKE_BINARY_DIR/bin. Set
various environment variables for test-ceph-helpers.
Put those variables throughout
qa/workunits/ceph-helpers.sh.

NOTE: This is a very rough draft of these fixes.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agocmake: Reorganized test dir, added cmake functions
Ali Maredia [Tue, 26 Jan 2016 20:45:15 +0000 (15:45 -0500)]
cmake: Reorganized test dir, added cmake functions

make check targets now use add_ceph_test, or
add_ceph_unittest to be added to CTest. Renamed and
reordered targets in tests/CMakeLists.txt

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #8606 from dillaman/wip-15457
Josh Durgin [Thu, 14 Apr 2016 23:46:27 +0000 (16:46 -0700)]
Merge pull request #8606 from dillaman/wip-15457

rbd: loosen image spec validation requirements

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8603 from rmechler/wip-15362
Josh Durgin [Thu, 14 Apr 2016 22:41:14 +0000 (15:41 -0700)]
Merge pull request #8603 from rmechler/wip-15362

pybind/rados: fix omap method return values

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorelease-notes: document rbd cli name validation override 8606/head
Jason Dillaman [Thu, 14 Apr 2016 19:34:02 +0000 (15:34 -0400)]
release-notes: document rbd cli name validation override

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: fail if cannot extract spec from legacy "--image" optional
Jason Dillaman [Thu, 14 Apr 2016 17:30:14 +0000 (13:30 -0400)]
rbd: fail if cannot extract spec from legacy "--image" optional

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: optionally disable spec validation when creating images/snapshots
Jason Dillaman [Thu, 14 Apr 2016 17:24:21 +0000 (13:24 -0400)]
rbd: optionally disable spec validation when creating images/snapshots

Setting the "rbd-validate-names" config propery to false will disable
spec validation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: add support for relaxed image spec validation
Jason Dillaman [Thu, 14 Apr 2016 17:13:42 +0000 (13:13 -0400)]
rbd: add support for relaxed image spec validation

Operations which create images or snapshots still fully enforce
the spec validation.  All other operations use a relaxed validation
format.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocommon: new rbd image spec validation option
Jason Dillaman [Thu, 14 Apr 2016 16:42:33 +0000 (12:42 -0400)]
common: new rbd image spec validation option

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoRemoved parentheses for if statement. 8603/head
Roland Mechler [Thu, 14 Apr 2016 20:30:41 +0000 (20:30 +0000)]
Removed parentheses for if statement.

Signed-off-by: Roland Mechler <rmechler@cisco.com>
9 years agoMerge pull request #8588 from yehudasa/wip-rgw-period-id
Orit Wasserman [Thu, 14 Apr 2016 19:06:13 +0000 (21:06 +0200)]
Merge pull request #8588 from yehudasa/wip-rgw-period-id

rgw: try to use current period id in a few more cases

9 years agoMerge pull request #8566 from cbodley/wip-rgw-period-reflect
Orit Wasserman [Thu, 14 Apr 2016 19:05:36 +0000 (21:05 +0200)]
Merge pull request #8566 from cbodley/wip-rgw-period-reflect

rgw: RGWPeriod::reflect() sets master zonegroup as default
Reviewed-by: Orit Wasserman<owasserm@redhat.com>
9 years agoupdate release-notes manually
Greg Farnum [Thu, 14 Apr 2016 18:29:05 +0000 (11:29 -0700)]
update release-notes manually

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8585 from cbodley/wip-rgw-reload-usage
Yehuda Sadeh [Thu, 14 Apr 2016 18:17:11 +0000 (11:17 -0700)]
Merge pull request #8585 from cbodley/wip-rgw-reload-usage

rgw: call rgw_log_usage_finalize() on reconfiguration

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8600 from liewegas/wip-rados-lfn
Samuel Just [Thu, 14 Apr 2016 16:16:33 +0000 (09:16 -0700)]
Merge pull request #8600 from liewegas/wip-rados-lfn

ceph_test_rados: make long name ~300 chars, (not ~800)

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8604 from gregsfortytwo/wip-fsmap-decode-fix
Sage Weil [Thu, 14 Apr 2016 16:03:36 +0000 (12:03 -0400)]
Merge pull request #8604 from gregsfortytwo/wip-fsmap-decode-fix

mds: FSmap decode fix

Reviewed-by: Sage Weil <sage@redhat.com>
Tested-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8565 from dillaman/wip-15471
Josh Durgin [Thu, 14 Apr 2016 15:59:41 +0000 (08:59 -0700)]
Merge pull request #8565 from dillaman/wip-15471

librbd: fix handling of proxied maintenance operations during shut down

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: do not return a failure if a peer cannot be notified of updateReviewed-by...
Josh Durgin [Thu, 14 Apr 2016 15:59:16 +0000 (08:59 -0700)]
librbd: do not return a failure if a peer cannot be notified of updateReviewed-by: Josh Durgin <jdurgin@redhat.com>

librbd: do not return a failure if a peer cannot be notified of update

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8511 from dillaman/wip-15436
Josh Durgin [Thu, 14 Apr 2016 15:58:57 +0000 (08:58 -0700)]
Merge pull request #8511 from dillaman/wip-15436

librbd: IO deadlock when dynamically enabling/disabling features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8494 from dillaman/wip-15352
Josh Durgin [Thu, 14 Apr 2016 15:58:15 +0000 (08:58 -0700)]
Merge pull request #8494 from dillaman/wip-15352

journal: possible race condition during live replay

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoFixes for python omap method return values.
Roland Mechler [Wed, 13 Apr 2016 23:08:58 +0000 (23:08 +0000)]
Fixes for python omap method return values.

Signed-off-by: Roland Mechler <rmechler@cisco.com>
9 years agoFSMap: guard the ever_enabled_multiple decode 8604/head
Greg Farnum [Thu, 14 Apr 2016 15:15:35 +0000 (08:15 -0700)]
FSMap: guard the ever_enabled_multiple decode

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
9 years agoceph_test_rados: make long name ~300 chars, (not ~800) 8600/head
Sage Weil [Wed, 13 Apr 2016 21:50:52 +0000 (17:50 -0400)]
ceph_test_rados: make long name ~300 chars, (not ~800)

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8594 from dachary/wip-releases
Sage Weil [Thu, 14 Apr 2016 12:38:56 +0000 (08:38 -0400)]
Merge pull request #8594 from dachary/wip-releases

release-notes: v10.1.2 release notes

9 years agocmake: pass RULE_LAUNCHER_* to cythonReviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 14 Apr 2016 12:37:33 +0000 (08:37 -0400)]
cmake: pass RULE_LAUNCHER_* to cythonReviewed-by: Josh Durgin <jdurgin@redhat.com>

cmake: pass RULE_LAUNCHER_* to cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agolibrbd: dynamically disabling exclusive lock might leave lingering request 8511/head
Jason Dillaman [Thu, 14 Apr 2016 12:14:46 +0000 (08:14 -0400)]
librbd: dynamically disabling exclusive lock might leave lingering request

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8534 from kmroz/wip-rgw-rados-cleanup-1
Orit Wasserman [Thu, 14 Apr 2016 07:46:54 +0000 (09:46 +0200)]
Merge pull request #8534 from kmroz/wip-rgw-rados-cleanup-1

rgw-rados: return RGWSystemMetaObj init directly
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorelease-notes: v10.1.2 release notes 8594/head
Loic Dachary [Thu, 14 Apr 2016 06:18:04 +0000 (08:18 +0200)]
release-notes: v10.1.2 release notes

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agorelease-notes: v10.1.2 release notes (draft)
Loic Dachary [Thu, 14 Apr 2016 06:15:54 +0000 (08:15 +0200)]
release-notes: v10.1.2 release notes (draft)

cd src/script
virtualenv v
source v/bin/activate
pip install githubpy GitPython requests
GITHUB_ACCESS_TOKEN=xxxxxxx ./ceph-release-notes \
    -r tags/v10.1.1..tags/v10.1.2 $(git rev-parse --show-toplevel)

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #8381 from ceph/wip-cython-tarball-build
Josh Durgin [Thu, 14 Apr 2016 01:59:21 +0000 (18:59 -0700)]
Merge pull request #8381 from ceph/wip-cython-tarball-build

cmake/pybind: fix include paths for cephfs

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8569 from jdurgin/wip-dev-package-doc
Josh Durgin [Thu, 14 Apr 2016 00:08:15 +0000 (17:08 -0700)]
Merge pull request #8569 from jdurgin/wip-dev-package-doc

doc: reinstate accidentally removed section header

Reviewed-by: Abhishek Lekshmanan <alekshmanan@suse.com>
9 years agoMerge pull request #8587 from emenguy/fix_dependencies_documentation
Josh Durgin [Thu, 14 Apr 2016 00:06:08 +0000 (17:06 -0700)]
Merge pull request #8587 from emenguy/fix_dependencies_documentation

doc: fix dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8584 from dillaman/wip-15479
Josh Durgin [Wed, 13 Apr 2016 23:20:20 +0000 (16:20 -0700)]
Merge pull request #8584 from dillaman/wip-15479

test: image replayer needs dummy remote mirror peer uuid

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorgw: try to use current period id in a few more cases 8588/head
Yehuda Sadeh [Wed, 13 Apr 2016 23:05:09 +0000 (16:05 -0700)]
rgw: try to use current period id in a few more cases

If missing period id, try to use the current period id. This is needed
for sync agent compatibility.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8188 from ceph/wip-systemd-restart-defaults
Sage Weil [Wed, 13 Apr 2016 20:50:46 +0000 (16:50 -0400)]
Merge pull request #8188 from ceph/wip-systemd-restart-defaults

systemd: Use the same restart limits as upstart

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agodoc: fix dependencies 8587/head
Etienne Menguy [Wed, 13 Apr 2016 19:31:16 +0000 (19:31 +0000)]
doc: fix dependencies

Signed-off-by: Etienne Menguy <etienne.menguy@corp.ovh.com>
9 years agosystemd: Use the same restart limits as upstart 8188/head
Boris Ranto [Thu, 17 Mar 2016 17:54:47 +0000 (18:54 +0100)]
systemd: Use the same restart limits as upstart

Currently, the systemd daemons are not restarted on failure. This patch
adds this functionality and sets the defaults to those defined in
upstart. This resolves to 3 fails per 30 minutes for osd, mon and mds
and 5 fails per 30 seconds for radosgw.

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agorgw: call rgw_log_usage_finalize() on reconfiguration 8585/head
Casey Bodley [Wed, 13 Apr 2016 17:30:16 +0000 (13:30 -0400)]
rgw: call rgw_log_usage_finalize() on reconfiguration

RGWRealmReloader was calling rgw_log_usage_init() with the new RGWRados
instance, but never cleaned up the previous one with
rgw_log_usage_finalize()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agotest: image replayer needs dummy remote mirror peer uuid 8584/head
Jason Dillaman [Wed, 13 Apr 2016 16:35:32 +0000 (12:35 -0400)]
test: image replayer needs dummy remote mirror peer uuid

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8498 from liewegas/wip-bluestore
Sage Weil [Wed, 13 Apr 2016 15:26:44 +0000 (11:26 -0400)]
Merge pull request #8498 from liewegas/wip-bluestore

os/bluestore: fix shortened bluefs paths in env mirror case

9 years agorgw: RGWPeriod::reflect() sets master zonegroup as default 8566/head
Casey Bodley [Tue, 12 Apr 2016 20:21:13 +0000 (16:21 -0400)]
rgw: RGWPeriod::reflect() sets master zonegroup as default

if RGWPeriod::reflect() is called right after a 'realm pull', it will
create the zonegroup objects but not set any as default.  so the next
time RGWRados is initialized, create_defaults() will add a new 'default'
zonegroup and set it as the master.  this causes a 'period update' to
find multiple master zonegroups and fail with EINVAL

reflect() now calls set_as_default(exclusive=true) on the master
zonegroup to guarantee that a default is set

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agojournal: race possible when re-watching a journal object 8494/head
Jason Dillaman [Wed, 13 Apr 2016 14:34:24 +0000 (10:34 -0400)]
journal: race possible when re-watching a journal object

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoos/bluestore: fix shortened bluefs paths in env mirror case 8498/head
Sage Weil [Thu, 7 Apr 2016 23:00:26 +0000 (19:00 -0400)]
os/bluestore: fix shortened bluefs paths in env mirror case

If we are mirroring the rocksdb env, don't shorten the
paths.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8556 from liewegas/wip-ext4
Sage Weil [Wed, 13 Apr 2016 13:19:19 +0000 (09:19 -0400)]
Merge pull request #8556 from liewegas/wip-ext4

doc: recommend against ext4

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
9 years agoMerge pull request #8574 from tchaikov/wip-readable-test-fix
Kefu Chai [Wed, 13 Apr 2016 12:32:50 +0000 (20:32 +0800)]
Merge pull request #8574 from tchaikov/wip-readable-test-fix

test/encoding/readable: use [ for "test" not ((

Reviewed-by: Erwan Velu <erwan@redhat.com>
9 years agoMerge pull request #8567 from cbodley/wip-rgw-period-pull-url
Orit Wasserman [Wed, 13 Apr 2016 11:30:05 +0000 (13:30 +0200)]
Merge pull request #8567 from cbodley/wip-rgw-period-pull-url

radosgw-admin: allow 'period pull --url' without full multisite config
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agotest/encoding/readable: use [ for "test" not (( 8574/head
Kefu Chai [Wed, 13 Apr 2016 08:04:33 +0000 (16:04 +0800)]
test/encoding/readable: use [ for "test" not ((

and use '&&' instead, easier to understand.

this also fixes following error in the ubuntu gitbuilder

error: Added files:
+ cat .git/added-files
src/0

where sh points to dash.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agojournal: potential for double-free of context on shut down
Jason Dillaman [Wed, 13 Apr 2016 02:29:50 +0000 (22:29 -0400)]
journal: potential for double-free of context on shut down

The context associated with a scheduled watch might be freed
by two ObjectPlayers.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: possible race condition during live replay
Jason Dillaman [Thu, 7 Apr 2016 21:34:37 +0000 (17:34 -0400)]
journal: possible race condition during live replay

When two objects are being actively watched, it was possible for
the watch context to complete before the second watch was
associated.

Fixes: http://tracker.ceph.com/issues/15352
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agodoc: reinstate accidentally removed section header 8569/head
Josh Durgin [Wed, 13 Apr 2016 01:06:38 +0000 (18:06 -0700)]
doc: reinstate accidentally removed section header

Accidentally removed in 63be401a411ffc7c2f78e450a29c69eee1af02d3

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoradosgw-admin: 'realm pull' only accepts --url 8567/head
Casey Bodley [Mon, 11 Apr 2016 20:53:48 +0000 (16:53 -0400)]
radosgw-admin: 'realm pull' only accepts --url

'realm pull' is defined as a 'raw storage op', so cannot use the
--remote argument to refer to endpoints from the period or local
zonegroup

refactored send_to_url() slightly to make it easier to call directly

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoradosgw-admin: allow 'period pull --url' without full multisite config
Casey Bodley [Fri, 8 Apr 2016 19:54:27 +0000 (15:54 -0400)]
radosgw-admin: allow 'period pull --url' without full multisite config

to support 'period pull --remote', radosgw-admin needs a complete
multisite configuration to look up remote endpoints by name

however, 'period pull' will also accept a --url argument, which doesn't
require a working configuration. this patch splits the handling of these
two cases, so that 'period pull --url' can succeed when run on a cluster
that hasn't yet been fully configured

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8520 from yuyuyu101/wip-15440
Sage Weil [Tue, 12 Apr 2016 20:23:57 +0000 (16:23 -0400)]
Merge pull request #8520 from yuyuyu101/wip-15440

msg/async: AsyncConnection: avoid is_connected require connection's lock

9 years agolibrbd: cancel ops before blocking IO 8565/head
Jason Dillaman [Tue, 12 Apr 2016 20:17:05 +0000 (16:17 -0400)]
librbd: cancel ops before blocking IO

Ops might have in-flight IO -- blocking IO after canceling the ops
will result in the in-flight IO being flushed.  Shutdown also requires
an intermediate state where is still acts like it downs the lock
until after all ops are canceled and all IO is flushed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: delay invalidation of exclusive lock pointer
Jason Dillaman [Tue, 12 Apr 2016 19:35:08 +0000 (15:35 -0400)]
librbd: delay invalidation of exclusive lock pointer

Certain IO and maintenance ops code paths have an expectation
that the exclusive lock pointer will be valid while in-flight.
Let the exclusive lock state machine clean up the pointer after
it has flushed all IO and canceled all ops.

Fixes: http://tracker.ceph.com/issues/15471
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: cleanly fail bench-write upon failure
Jason Dillaman [Tue, 12 Apr 2016 15:23:19 +0000 (11:23 -0400)]
rbd: cleanly fail bench-write upon failure

Fixes: http://tracker.ceph.com/issues/15456
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: gracefully handle blacklisted client in ImageWatcher
Jason Dillaman [Tue, 12 Apr 2016 15:19:45 +0000 (11:19 -0400)]
librbd: gracefully handle blacklisted client in ImageWatcher

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8559 from liewegas/wip-15643
Sage Weil [Tue, 12 Apr 2016 18:03:56 +0000 (14:03 -0400)]
Merge pull request #8559 from liewegas/wip-15643

rgw: fix unsafe c_str() usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years ago10.1.2 v10.1.2
Jenkins Build Slave User [Tue, 12 Apr 2016 17:42:56 +0000 (17:42 +0000)]
10.1.2

9 years agodoc/configuration/filesystem-recommendations: recommend against ext4 8556/head
Sage Weil [Tue, 12 Apr 2016 17:24:56 +0000 (13:24 -0400)]
doc/configuration/filesystem-recommendations: recommend against ext4

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/release-notes: mention ext4 in the release notes
Sage Weil [Tue, 12 Apr 2016 13:06:14 +0000 (09:06 -0400)]
doc/release-notes: mention ext4 in the release notes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/start/os-recommendations: drop ancient 'syncfs' note
Sage Weil [Tue, 12 Apr 2016 13:02:48 +0000 (09:02 -0400)]
doc/start/os-recommendations: drop ancient 'syncfs' note

...and with it it's mention of ext4.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/rados/configuration: minor cleanup of inline xattr description
Sage Weil [Tue, 12 Apr 2016 12:50:49 +0000 (08:50 -0400)]
doc/rados/configuration: minor cleanup of inline xattr description

- whitespace
- it's not omap

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorgw/rgw_rados: use to_str() instead of c_str() 8559/head
Sage Weil [Tue, 12 Apr 2016 14:25:19 +0000 (10:25 -0400)]
rgw/rgw_rados: use to_str() instead of c_str()

bufferlist::c_str() doesn't guarantee null termination.

Fixes: http://tracker.ceph.com/issues/15463
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agobuffer: add list::to_str()
Sage Weil [Tue, 12 Apr 2016 14:14:56 +0000 (10:14 -0400)]
buffer: add list::to_str()

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8552 from tchaikov/wip-15426
Kefu Chai [Tue, 12 Apr 2016 15:09:55 +0000 (23:09 +0800)]
Merge pull request #8552 from tchaikov/wip-15426

PG: set epoch_created and parent_split_bits for child pg

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8521 from stiopaa1/checkgenerated
Kefu Chai [Tue, 12 Apr 2016 14:57:44 +0000 (22:57 +0800)]
Merge pull request #8521 from stiopaa1/checkgenerated

check-generated.sh: can't source bash from sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge branch 'jewel'
Greg Farnum [Tue, 12 Apr 2016 14:32:48 +0000 (07:32 -0700)]
Merge branch 'jewel'

9 years agoMerge remote-tracking branch 'origin/greg-fs-testing-411' into jewel
Greg Farnum [Tue, 12 Apr 2016 14:32:34 +0000 (07:32 -0700)]
Merge remote-tracking branch 'origin/greg-fs-testing-411' into jewel

9 years agodoc: do not include ext4 as an example
Sage Weil [Tue, 12 Apr 2016 12:49:55 +0000 (08:49 -0400)]
doc: do not include ext4 as an example

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/8/ceph-deploy: do not include ext4 as an example value
Sage Weil [Tue, 12 Apr 2016 12:48:46 +0000 (08:48 -0400)]
doc/8/ceph-deploy: do not include ext4 as an example value

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc: list ext4 last
Sage Weil [Tue, 12 Apr 2016 12:48:25 +0000 (08:48 -0400)]
doc: list ext4 last

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/dev: remove ancient filestore-filesystem-compat doc
Sage Weil [Tue, 12 Apr 2016 12:39:00 +0000 (08:39 -0400)]
doc/dev: remove ancient filestore-filesystem-compat doc

This describes a problem we fixed years ago.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoPG: set epoch_created and parent_split_bits for child pg 8552/head
Kefu Chai [Tue, 12 Apr 2016 09:31:27 +0000 (17:31 +0800)]
PG: set epoch_created and parent_split_bits for child pg

if we have a wrong "created", OSD receiving an osd_pg_create message
could fail to project its history and crash. a bad split_bits could
mislead the monitor and osd, and hence cause problems.
* set child.info.history.epoch_created to osdmap.get_epoch() instead of
  using the parent's epoch_created
* set child.info.stats.parent_split_bits to the calculated split_bits
  instead using the parent's split_bits

Fixes: http://tracker.ceph.com/issues/15426
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agopybind/Makefile.am: fix build with ccache 8523/head
Kefu Chai [Tue, 12 Apr 2016 04:47:46 +0000 (12:47 +0800)]
pybind/Makefile.am: fix build with ccache

as a work-around of https://bugs.python.org/issue8027, pass ${CC} and
${LDSHARED} to distutils, so we can still have a working compiling
command line even ${CC} is "ccache gcc".

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8544 from xiexingguo/xxg-wip-15464
Kefu Chai [Tue, 12 Apr 2016 02:50:52 +0000 (10:50 +0800)]
Merge pull request #8544 from xiexingguo/xxg-wip-15464

test: fix ut test failure caused by lfn change

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotest: fix ut test failure caused by lfn change 8544/head
xie xingguo [Tue, 12 Apr 2016 01:06:36 +0000 (09:06 +0800)]
test: fix ut test failure caused by lfn change

"https://github.com/ceph/ceph/pull/8496/commits/755c685f2d09c36b53bc39589a77fa73faba5149"
change the lfn_parse_object_name() return type from bool to int but does not
change the relevant test correspondingly.

Fixes: http://tracker.ceph.com/issues/15464
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agolibrbd: do not return a failure if a peer cannot be notified of update 8543/head
Jason Dillaman [Tue, 12 Apr 2016 00:58:50 +0000 (20:58 -0400)]
librbd: do not return a failure if a peer cannot be notified of update

Maintenance ops that fail to notify a peer of the update should not
report a failure to the original user.

Fixes: http://tracker.ceph.com/issues/15351
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge branch 'jewel-15402' of git://github.com/ukernel/ceph into greg-fs-testing
Greg Farnum [Mon, 11 Apr 2016 21:13:07 +0000 (14:13 -0700)]
Merge branch 'jewel-15402' of git://github.com/ukernel/ceph into greg-fs-testing

Do not ignore standby_for_fscid when selecting a standby.

https://github.com/ceph/ceph/pull/8536

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoFixed ceph-common install.
John Wilkins [Mon, 11 Apr 2016 16:54:02 +0000 (09:54 -0700)]
Fixed ceph-common install.

Fixes: #15438
Signed-off-by: John Wilkins <jowilkin@redhat.com>
9 years agolibrbd: fixed bug in disabling non-primary image mirroring
Jason Dillaman [Mon, 11 Apr 2016 16:33:25 +0000 (12:33 -0400)]
librbd: fixed bug in disabling non-primary image mirroring

librbd: fixed bug in disabling non-primary image mirroring

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8496 from athanatos/wip-15312
Sage Weil [Mon, 11 Apr 2016 15:49:58 +0000 (11:49 -0400)]
Merge pull request #8496 from athanatos/wip-15312

os/filestore: force lfn attrs to be written atomically, restructure name length limits

9 years agomds: take standby_for_fscid into account in FSMap::find_unused() 8536/head
Yan, Zheng [Mon, 11 Apr 2016 14:39:50 +0000 (22:39 +0800)]
mds: take standby_for_fscid into account in FSMap::find_unused()

Fixes: http://tracker.ceph.com/issues/15402
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #8529 from oritwas/wip-rgw-fix-zone-set
Casey Bodley [Mon, 11 Apr 2016 13:56:47 +0000 (09:56 -0400)]
Merge pull request #8529 from oritwas/wip-rgw-fix-zone-set

radosgw-admin: allow

9 years agolibrbd: Fixed bug in disabling non-primary image mirroring 8512/head
Ricardo Dias [Fri, 8 Apr 2016 20:40:20 +0000 (21:40 +0100)]
librbd: Fixed bug in disabling non-primary image mirroring

It is only possible to remove image from rbd_mirroring object if the
mirroring image state is set to DISABLING.

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agorgw-rados: return RGWSystemMetaObj init directly 8534/head
Karol Mroz [Mon, 11 Apr 2016 12:54:54 +0000 (14:54 +0200)]
rgw-rados: return RGWSystemMetaObj init directly

Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agoMerge pull request #8508 from JiYou/fix-ceph-disk
Loic Dachary [Mon, 11 Apr 2016 12:44:18 +0000 (14:44 +0200)]
Merge pull request #8508 from JiYou/fix-ceph-disk

ceph-disk: do not always fail when re-using a partition

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Mon, 11 Apr 2016 12:38:27 +0000 (08:38 -0400)]
Merge remote-tracking branch 'gh/jewel'

9 years agoceph-disk: fix PrepareData.set_type() args should be class member. 8508/head
youji [Fri, 8 Apr 2016 15:36:44 +0000 (08:36 -0700)]
ceph-disk: fix PrepareData.set_type() args should be class member.

Signed-off-by: You Ji <youji@ebay.com>
9 years agoceph-disk: fix spelling mistake geattr to getattr.
youji [Fri, 8 Apr 2016 15:33:35 +0000 (08:33 -0700)]
ceph-disk: fix spelling mistake geattr to getattr.

Signed-off-by: You Ji <youji@ebay.com>
9 years agoceph-disk: fix lockbox set_or_create_partition()
youji [Fri, 8 Apr 2016 15:29:45 +0000 (08:29 -0700)]
ceph-disk: fix lockbox set_or_create_partition()

Signed-off-by: You Ji <youji@ebay.com>
9 years agoMerge pull request #8507 from kmroz/wip-rgw-admin-cleanup
Orit Wasserman [Mon, 11 Apr 2016 10:47:12 +0000 (12:47 +0200)]
Merge pull request #8507 from kmroz/wip-rgw-admin-cleanup

rgw-admin: remove unused iterator and fix error message

9 years agoradosgw-admin: fix name checking 8529/head
Orit Wasserman [Mon, 11 Apr 2016 08:53:36 +0000 (10:53 +0200)]
radosgw-admin: fix name checking

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoradosgw-admin: allow setting zone when there is no realm
Orit Wasserman [Mon, 11 Apr 2016 08:38:20 +0000 (10:38 +0200)]
radosgw-admin: allow setting zone when there is no realm

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agocmake: pass RULE_LAUNCHER_* to cython
Kefu Chai [Sun, 10 Apr 2016 14:37:59 +0000 (22:37 +0800)]
cmake: pass RULE_LAUNCHER_* to cython

* pass the environment variables using `env` to pass environment
  varibles with space(s) in them to the COMMAND in add_custom_target.
  otherwise, cmake will try to quote the space with "\". this breaks the
  generated command line.
* add a comment for ccache to note that we do not expect ccache to speed
  up linking. we use it as the linker's launcher to workaround
  https://bugs.python.org/issue8027. to be specific,
  distutils.UnixCCompiler.link overwrites the first linker CLI's arg
  using the the first C++ compiler's CLI arg, if "env" is not used to
  launch the linker. this breaks the cythonization of our pybind APIs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8522 from swamireddy/10.1.1-mailmap
Loic Dachary [Sun, 10 Apr 2016 15:14:01 +0000 (17:14 +0200)]
Merge pull request #8522 from swamireddy/10.1.1-mailmap

mailmap update

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoAsyncConnection: avoid is_connected require connection's lock 8520/head
Haomai Wang [Sun, 10 Apr 2016 07:21:55 +0000 (15:21 +0800)]
AsyncConnection: avoid is_connected require connection's lock

Fixes: http://tracker.ceph.com/issues/15440
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agocheck-generated.sh: can't source bash from sh 8521/head
Michal Jarzabek [Sun, 10 Apr 2016 08:36:06 +0000 (09:36 +0100)]
check-generated.sh: can't source bash from sh

'source' is not sh command and executing bash commands in sh won't
work. We could try to replace it with:
'. ../qa/workunits/ceph-helpers.sh'
but the above file uses bash.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #8519 from dachary/wip-xenial
Loic Dachary [Sat, 9 Apr 2016 21:19:09 +0000 (23:19 +0200)]
Merge pull request #8519 from dachary/wip-xenial

tests: add Ubuntu 16.04 xenial dockerfile

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agolibrbd: exclusive lock might be disabled while waiting to acquire lock
Jason Dillaman [Sat, 9 Apr 2016 18:29:14 +0000 (14:29 -0400)]
librbd: exclusive lock might be disabled while waiting to acquire lock

Disabling exclusive lock will now acquire the exclusive lock before
proceeding.  If this resulted in another client releasing the lock
and re-requesting it, support for exclusive locking might be disabled
while a request is pending.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>