]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoosd: add option to disable startup check 8560/head
Sage Weil [Fri, 15 Apr 2016 13:05:13 +0000 (09:05 -0400)]
osd: add option to disable startup check

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: refuse to start if configure object limits don't work
Sage Weil [Tue, 12 Apr 2016 15:00:33 +0000 (11:00 -0400)]
osd: refuse to start if configure object limits don't work

Fail early if the configured max object name cannot be stored on
the (FileStore) backend.  This avoids rude surprises down the
line when some random rados op get ENAMETOOLONG.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agovstart.sh: --short to set ext4-friendly object name and namespace limits
Sage Weil [Wed, 13 Apr 2016 20:48:12 +0000 (16:48 -0400)]
vstart.sh: --short to set ext4-friendly object name and namespace limits

So devs can work on ext4.  Note that this will also mean s3-tests
will fail under vstart.

Signed-off-by: Sage Weil <sage@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 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 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 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 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 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 agoMerge pull request #8517 from kjurka/rgw-admin-doc-region-list
Sage Weil [Sat, 9 Apr 2016 18:21:43 +0000 (14:21 -0400)]
Merge pull request #8517 from kjurka/rgw-admin-doc-region-list

doc: rgw admin uses "region list" not "regions list"

9 years agoMerge pull request #8518 from wjin/fix
Sage Weil [Sat, 9 Apr 2016 18:21:10 +0000 (14:21 -0400)]
Merge pull request #8518 from wjin/fix

crush: fix typo

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agoMerge pull request #8462 from xiexingguo/xxg-wip-scrub
Sage Weil [Sat, 9 Apr 2016 17:38:20 +0000 (13:38 -0400)]
Merge pull request #8462 from xiexingguo/xxg-wip-scrub

osd: fix two scrub relevant issues

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8485 from liewegas/wip-fuse-log
Sage Weil [Sat, 9 Apr 2016 17:35:15 +0000 (13:35 -0400)]
Merge pull request #8485 from liewegas/wip-fuse-log

ceph-fuse: rotate log file

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8487 from liewegas/wip-copy-from-fail-cleanup
Sage Weil [Sat, 9 Apr 2016 17:34:39 +0000 (13:34 -0400)]
Merge pull request #8487 from liewegas/wip-copy-from-fail-cleanup

osd: clean up temp object if copy-from fails

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8486 from liewegas/wip-14695
Sage Weil [Sat, 9 Apr 2016 17:33:54 +0000 (13:33 -0400)]
Merge pull request #8486 from liewegas/wip-14695

librados: Revert "rados: Add new field flags for ceph_osd_op.copy_get."

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7956 from xiexingguo/xxg-wip-fixfstat
Sage Weil [Sat, 9 Apr 2016 17:32:57 +0000 (13:32 -0400)]
Merge pull request #7956 from xiexingguo/xxg-wip-fixfstat

common: buffer: put a guard for stat() syscall during read_file

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8516 from runsisi/wip-fix-ret
Jason Dillaman [Sat, 9 Apr 2016 13:22:12 +0000 (09:22 -0400)]
Merge pull request #8516 from runsisi/wip-fix-ret

journal: fix final result for JournalTrimmer::C_RemoveSet

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: add Ubuntu 16.04 xenial dockerfile 8519/head
Loic Dachary [Sat, 9 Apr 2016 07:06:50 +0000 (09:06 +0200)]
tests: add Ubuntu 16.04 xenial dockerfile

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agocrush: fix typo 8518/head
Wei Jin [Sat, 9 Apr 2016 06:52:11 +0000 (14:52 +0800)]
crush: fix typo

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
9 years agodoc: rgw admin uses "region list" not "regions list" 8517/head
Kris Jurka [Sat, 9 Apr 2016 04:47:28 +0000 (21:47 -0700)]
doc: rgw admin uses "region list" not "regions list"

9 years agojournal: fix final result for JournalTrimmer::C_RemoveSet 8516/head
runsisi [Sat, 9 Apr 2016 03:03:56 +0000 (11:03 +0800)]
journal: fix final result for JournalTrimmer::C_RemoveSet

if the first journal object got removed successfully while later objects
failed then the final result should be set to fail

Signed-off-by: runsisi <runsisi@zte.com.cn>
9 years agotest/rados/misc.cc: add long locator key and namespace tests 8496/head
Samuel Just [Fri, 8 Apr 2016 21:56:51 +0000 (14:56 -0700)]
test/rados/misc.cc: add long locator key and namespace tests

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex: use chain_getxattr_buf
Samuel Just [Fri, 8 Apr 2016 18:38:06 +0000 (11:38 -0700)]
LFNIndex: use chain_getxattr_buf

LFN attrs can be longer than these hard coded limits, let's just do
buffer doubling everywhere.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agochain_xattr: add chain_getxattr_buf
Samuel Just [Fri, 8 Apr 2016 18:32:37 +0000 (11:32 -0700)]
chain_xattr: add chain_getxattr_buf

Otherwise callers need to implement buffer doubling in a lot of cases,
which is error prone.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex::lfn_parse_object_name: return int rather than bool
Samuel Just [Fri, 8 Apr 2016 18:10:18 +0000 (11:10 -0700)]
LFNIndex::lfn_parse_object_name: return int rather than bool

All current callers (except list_objects) already expect
ret < 0 for error.  Adjust list_objects to skip on EINVAL
instead of 0.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex::list_objects: lfn_translate does not set errno
Samuel Just [Fri, 8 Apr 2016 17:45:45 +0000 (10:45 -0700)]
LFNIndex::list_objects: lfn_translate does not set errno

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoFileStore::set_xattr_limits_via_conf: add warning if max xattr size smaller than...
Samuel Just [Mon, 4 Apr 2016 23:48:28 +0000 (16:48 -0700)]
FileStore::set_xattr_limits_via_conf: add warning if max xattr size smaller than max name

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agotest/objectstore/chain_xattr.cc: add test for ensure_single_attr
Samuel Just [Sat, 2 Apr 2016 00:50:37 +0000 (17:50 -0700)]
test/objectstore/chain_xattr.cc: add test for ensure_single_attr

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoLFNIndex: ensure that lfn and directory attrs are written atomically
Samuel Just [Fri, 1 Apr 2016 23:57:48 +0000 (16:57 -0700)]
LFNIndex: ensure that lfn and directory attrs are written atomically

We leave skip_chain_cleanup = false since the object may have been
written using code that split the lfn attr over multiple attrs.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agochain_[f]getxattr: always use size, no reaon to consider CHAIN_XATTR_MAX_BLOCK_LEN
Samuel Just [Fri, 8 Apr 2016 20:01:07 +0000 (13:01 -0700)]
chain_[f]getxattr: always use size, no reaon to consider CHAIN_XATTR_MAX_BLOCK_LEN

Users of setxattr can now set attrs larger than that size.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agochain_xattr: s/onechunk/skip_chain_cleanup, add ensure_single_attr
Samuel Just [Fri, 1 Apr 2016 23:56:43 +0000 (16:56 -0700)]
chain_xattr: s/onechunk/skip_chain_cleanup, add ensure_single_attr

onechunk was a deceptive name since it didn't actually ensure that
a single chunk would be used.  Rename to ensure_single_attr.  Also,
add a parameter to ensure that we use a single attribute.  We need
these to be distinct since we have LFN attrs which have been split
over 254 byte xattrs since after hammer which we need to correctly
clean up.  However, we need to ensure going forward that those attrs
are never split over more than one chunk -- it's not atomic.
Further, skip_chain_cleanup should imply ensure_single_attr, so make
them template params and add a static check to make sure we don't
mess this up in the future.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoos/,osd/: restructure the rados name length check
Samuel Just [Fri, 1 Apr 2016 23:24:42 +0000 (16:24 -0700)]
os/,osd/: restructure the rados name length check

Enforce locator length vs the max name length and also
introduce a namespace length limit.

In addition to these checks, also pass the head object to the
ObjectStore implementation to validate.  This allows LFNIndex to account
for the idiosyncracies of its filename escaping and for different xattr
value max sizes.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8453 from cbodley/wip-rgw-sync-master-down
Orit Wasserman [Fri, 8 Apr 2016 15:43:25 +0000 (17:43 +0200)]
Merge pull request #8453 from cbodley/wip-rgw-sync-master-down

rgw: retry RGWRemoteMetaLog::read_log_info() while master is down
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoceph-disk: fix set_data_partition() when data is partition.
youji [Fri, 8 Apr 2016 14:16:04 +0000 (07:16 -0700)]
ceph-disk: fix set_data_partition() when data is partition.

Signed-off-by: You Ji <youji@ebay.com>
9 years agorgw-admin: fix period delete error message 8507/head
Karol Mroz [Fri, 8 Apr 2016 14:47:40 +0000 (16:47 +0200)]
rgw-admin: fix period delete error message

Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agorgw-admin: remove unused iterator
Karol Mroz [Fri, 8 Apr 2016 14:44:34 +0000 (16:44 +0200)]
rgw-admin: remove unused iterator

Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agoMerge pull request #8434 from theanalyst/rgw/typo-fix
Matt Benjamin [Fri, 8 Apr 2016 14:39:09 +0000 (10:39 -0400)]
Merge pull request #8434 from theanalyst/rgw/typo-fix

rgw: fix a typo in error message

9 years agoMerge pull request #8481 from weiqiaomiao/wq
Orit Wasserman [Fri, 8 Apr 2016 14:19:29 +0000 (16:19 +0200)]
Merge pull request #8481 from weiqiaomiao/wq

rgw: the map 'headers' is assigned a wrong value
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8488 from oritwas/wip-15318
Matt Benjamin [Fri, 8 Apr 2016 13:57:44 +0000 (09:57 -0400)]
Merge pull request #8488 from oritwas/wip-15318

rgw: fix problem deleting objects begining with double underscores

9 years agorbd-mirror: fixed infinite loop when disabling image mirroringReviewed-by: Jason...
Jason Dillaman [Fri, 8 Apr 2016 12:36:55 +0000 (08:36 -0400)]
rbd-mirror: fixed infinite loop when disabling image mirroringReviewed-by: Jason Dillaman <dillaman@redhat.com>

librbd: fixed infinite loop when disabling image mirroring

9 years agorbd-mirror: fixed bug that caused infinite loop when disabling image mirroring 8504/head
Ricardo Dias [Fri, 8 Apr 2016 10:00:55 +0000 (11:00 +0100)]
rbd-mirror: fixed bug that caused infinite loop when disabling image mirroring

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agoMerge pull request #8501 from dachary/wip-releases
Loic Dachary [Fri, 8 Apr 2016 09:41:08 +0000 (11:41 +0200)]
Merge pull request #8501 from dachary/wip-releases

releases: update the v10.1.0 release link

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agomailmap: Luo Kexue name normalization 8522/head
Swami Reddy [Fri, 8 Apr 2016 09:27:38 +0000 (14:57 +0530)]
mailmap: Luo Kexue name normalization

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agomailmap: Ning Yao affiliation
Swami Reddy [Fri, 8 Apr 2016 09:21:18 +0000 (14:51 +0530)]
mailmap: Ning Yao affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agomailmap: Vitja Makarov affiliation
Swami Reddy [Fri, 8 Apr 2016 09:19:31 +0000 (14:49 +0530)]
mailmap: Vitja Makarov affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agorelease-notes: v10.1.1 release notes 8501/head
Loic Dachary [Fri, 8 Apr 2016 09:19:13 +0000 (11:19 +0200)]
release-notes: v10.1.1 release notes

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agorelease-notes: v10.1.1 release notes (draft)
Loic Dachary [Fri, 8 Apr 2016 09:06:33 +0000 (11:06 +0200)]
release-notes: v10.1.1 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.0..tags/v10.1.1 $(git rev-parse --show-toplevel)

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agomailmap: sunspot affiliation
Swami Reddy [Fri, 8 Apr 2016 09:14:03 +0000 (14:44 +0530)]
mailmap: sunspot affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agomailmap: Qinghua Jin affiliation
Swami Reddy [Fri, 8 Apr 2016 09:10:01 +0000 (14:40 +0530)]
mailmap: Qinghua Jin affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agomailmap: Richard W.M. Jones affiliation
Swami Reddy [Fri, 8 Apr 2016 09:07:16 +0000 (14:37 +0530)]
mailmap: Richard W.M. Jones affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agomailmap: Ira Cooper affiliation
Swami Reddy [Fri, 8 Apr 2016 09:01:44 +0000 (14:31 +0530)]
mailmap: Ira Cooper affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agomailmap: Star Guo affiliation
Swami Reddy [Fri, 8 Apr 2016 08:57:57 +0000 (14:27 +0530)]
mailmap: Star Guo affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agomailmap: Xiaoxi Chen affiliation
Swami Reddy [Fri, 8 Apr 2016 08:55:49 +0000 (14:25 +0530)]
mailmap: Xiaoxi Chen affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agomailmap: Jenkins name normalization
Swami Reddy [Fri, 8 Apr 2016 08:53:06 +0000 (14:23 +0530)]
mailmap: Jenkins name normalization

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
9 years agoreleases: firefly was EOL december 2015
Loic Dachary [Fri, 8 Apr 2016 07:54:12 +0000 (09:54 +0200)]
releases: firefly was EOL december 2015

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoreleases: update the v10.1.0 release link
Loic Dachary [Fri, 8 Apr 2016 07:45:55 +0000 (09:45 +0200)]
releases: update the v10.1.0 release link

And add the v10.1.1 release notes as well.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #8500 from linuxbox2/ldap-include
Dan Mick [Fri, 8 Apr 2016 00:43:18 +0000 (17:43 -0700)]
Merge pull request #8500 from linuxbox2/ldap-include

rgw_ldap: make ldap.h inclusion conditional

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoMerge pull request #8495 from athanatos/wip-14777
Sage Weil [Thu, 7 Apr 2016 23:40:56 +0000 (19:40 -0400)]
Merge pull request #8495 from athanatos/wip-14777

osd/ReplicatedPG::_rollback_to: update the OMAP flag

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agorgw_ldap: make ldap.h inclusion conditional 8500/head
Matt Benjamin [Thu, 7 Apr 2016 23:39:40 +0000 (19:39 -0400)]
rgw_ldap: make ldap.h inclusion conditional

The feature implementation is conditional, embarassingly, the
header inclusion is not.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw: fix problem deleting objects begining with double underscore 8488/head
Orit Wasserman [Thu, 7 Apr 2016 22:43:19 +0000 (00:43 +0200)]
rgw: fix problem deleting objects begining with double underscore

Fixes: http://tracker.ceph.com/issues/15318
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8493 from dillaman/wip-15354
Josh Durgin [Thu, 7 Apr 2016 21:49:22 +0000 (14:49 -0700)]
Merge pull request #8493 from dillaman/wip-15354

test: fix valgrind memcheck issues for rbd-mirror test cases

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8490 from dillaman/wip-15097
Josh Durgin [Thu, 7 Apr 2016 21:11:10 +0000 (14:11 -0700)]
Merge pull request #8490 from dillaman/wip-15097

rbd: journal reset should disable/re-enable journaling feature

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8477 from dillaman/wip-15364
Josh Durgin [Thu, 7 Apr 2016 21:07:51 +0000 (14:07 -0700)]
Merge pull request #8477 from dillaman/wip-15364

journal: fix race condition between Future and journal shutdown

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotest: fix memory leaks in rbd-mirror test cases 8493/head
Jason Dillaman [Thu, 7 Apr 2016 20:40:45 +0000 (16:40 -0400)]
test: fix memory leaks in rbd-mirror test cases

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: avoid leaking librados connections when creating pools
Jason Dillaman [Thu, 7 Apr 2016 20:38:33 +0000 (16:38 -0400)]
test: avoid leaking librados connections when creating pools

Fixes: http://tracker.ceph.com/issues/15354
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd: journal reset should disable/re-enable journaling feature 8490/head
Jason Dillaman [Thu, 7 Apr 2016 19:39:06 +0000 (15:39 -0400)]
rbd: journal reset should disable/re-enable journaling feature

Fixes: http://tracker.ceph.com/issues/15097
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomon: warn if 'sortbitwise' flag is not set and no legacy OSDs are presentReviewed...
Samuel Just [Thu, 7 Apr 2016 18:05:47 +0000 (11:05 -0700)]
mon: warn if 'sortbitwise' flag is not set and no legacy OSDs are presentReviewed-by: Samuel Just <sjust@redhat.com>

mon: warn if 'sortbitwise' flag is not set and no legacy OSDs are present

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8476 from dillaman/wip-rbd-mirror-lockdep
Josh Durgin [Thu, 7 Apr 2016 17:14:13 +0000 (10:14 -0700)]
Merge pull request #8476 from dillaman/wip-rbd-mirror-lockdep

rbd-mirror: workaround for intermingled lockdep singletons

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoosd/ReplicatedPG: clean up temp object if copy-from fails 8487/head
Sage Weil [Thu, 7 Apr 2016 15:41:55 +0000 (11:41 -0400)]
osd/ReplicatedPG: clean up temp object if copy-from fails

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph_test_rados_api_misc: make CopyFrom omap test be a big object
Sage Weil [Thu, 7 Apr 2016 15:40:51 +0000 (11:40 -0400)]
ceph_test_rados_api_misc: make CopyFrom omap test be a big object

This makes it so we check single-shot path and the one where we have a
temp object to clean up.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8456 from dreamhost/wip-authtool-help
Sage Weil [Thu, 7 Apr 2016 15:44:30 +0000 (11:44 -0400)]
Merge pull request #8456 from dreamhost/wip-authtool-help

authtool: update --help and manpage to match code.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8446 from liewegas/wip-15366
Sage Weil [Thu, 7 Apr 2016 15:36:34 +0000 (11:36 -0400)]
Merge pull request #8446 from liewegas/wip-15366

osd: fix/clean up full map request handling

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoRevert "rados: Add new field flags for ceph_osd_op.copy_get." 8486/head
Sage Weil [Thu, 7 Apr 2016 15:13:03 +0000 (11:13 -0400)]
Revert "rados: Add new field flags for ceph_osd_op.copy_get."

This reverts commit 2b4acfb1b808b98132a771cf1089063c0f7a75b5.

We fixed this on the receiving end in
fc51ce2a837e8e878d46d8ca54531aa7bd5d01b2 a few weeks after this commit
was added.  It's ugly and no longer needed.

This *does* mean that we'll start to copy some data and then abort
partway through, but that's better than an kludgey protocol/interface.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8472 from jmunhoz/fix-aws4-subdomain-calling
Orit Wasserman [Thu, 7 Apr 2016 14:59:09 +0000 (16:59 +0200)]
Merge pull request #8472 from jmunhoz/fix-aws4-subdomain-calling

rgw: aws4 subdomain calling bugfix
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorbd-mirror: workaround for intermingled lockdep singletons 8476/head
Jason Dillaman [Wed, 6 Apr 2016 20:08:15 +0000 (16:08 -0400)]
rbd-mirror: workaround for intermingled lockdep singletons

If librados constructs the CephContext, lockdep will be initialized
in both the librados shared address space and also within the app
address space.  This breaks lockdep's functionality and results in
a crash upon shutdown.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agologrotate.conf: poke ceph-fuse after log rotation 8485/head
Sage Weil [Thu, 7 Apr 2016 14:27:17 +0000 (10:27 -0400)]
logrotate.conf: poke ceph-fuse after log rotation

This still leaves other loggers with un-reopened log files,
unfortunately.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph-fuse: reopen log file on SIGHUP
Sage Weil [Thu, 7 Apr 2016 14:26:43 +0000 (10:26 -0400)]
ceph-fuse: reopen log file on SIGHUP

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8460 from linuxbox2/jewel-nfs-fixes-3
Matt Benjamin [Thu, 7 Apr 2016 14:26:11 +0000 (10:26 -0400)]
Merge pull request #8460 from linuxbox2/jewel-nfs-fixes-3

Jewel nfs fixes 3

9 years agolibrbd: restore out-of-band future callbacks to avoid lock cycles 8477/head
Jason Dillaman [Wed, 6 Apr 2016 21:30:11 +0000 (17:30 -0400)]
librbd: restore out-of-band future callbacks to avoid lock cycles

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorgw: aws4 subdomain calling bugfix 8472/head
Javier M. Mellid [Wed, 6 Apr 2016 13:23:17 +0000 (15:23 +0200)]
rgw: aws4 subdomain calling bugfix

Fixes: http://tracker.ceph.com/issues/15369
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
9 years agorgw: the map 'headers' is assigned a wrong value 8481/head
weiqiaomiao [Thu, 7 Apr 2016 06:12:51 +0000 (14:12 +0800)]
rgw: the map 'headers' is assigned a wrong value

Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
9 years agoMerge pull request #8457 from dreamhost/wip-virtualenv-tmpdir
Loic Dachary [Thu, 7 Apr 2016 05:24:45 +0000 (07:24 +0200)]
Merge pull request #8457 from dreamhost/wip-virtualenv-tmpdir

build: Respect TMPDIR for virtualenv.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoauthtool: fix test output validation & minor whitespace. 8456/head
Robin H. Johnson [Wed, 6 Apr 2016 16:42:54 +0000 (09:42 -0700)]
authtool: fix test output validation & minor whitespace.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agojournal: fix context memory leak when shutting down live replay
Jason Dillaman [Wed, 6 Apr 2016 21:20:30 +0000 (17:20 -0400)]
journal: fix context memory leak when shutting down live replay

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agojournal: Future does not require metadata shared pointer
Jason Dillaman [Wed, 6 Apr 2016 21:18:33 +0000 (17:18 -0400)]
journal: Future does not require metadata shared pointer

Avoid keeping the metadata object alive through the lifespan of the
future.  Callers can expect to receive a re-entrant callback if the
future is already safe and flush/wait is invoked.

Fixes: http://tracker.ceph.com/issues/15364
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomon: warn if 'sortbitwise' flag is not set and no legacy OSDs are present 8432/head
Sage Weil [Wed, 6 Apr 2016 21:03:53 +0000 (17:03 -0400)]
mon: warn if 'sortbitwise' flag is not set and no legacy OSDs are present

If the user has upgraded, they should set sortbitwise.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8418 from liewegas/wip-blk-probe
Sage Weil [Wed, 6 Apr 2016 20:57:11 +0000 (16:57 -0400)]
Merge pull request #8418 from liewegas/wip-blk-probe

os/ObjectStore: make device uuid probe output something friendly

9 years agoMerge pull request #8428 from liewegas/wip-rest-mds
Sage Weil [Wed, 6 Apr 2016 20:10:53 +0000 (16:10 -0400)]
Merge pull request #8428 from liewegas/wip-rest-mds

ceph-rest-api: fix fs/flag/set

9 years agoMerge pull request #7981 from liewegas/wip-14364
Sage Weil [Wed, 6 Apr 2016 19:52:10 +0000 (15:52 -0400)]
Merge pull request #7981 from liewegas/wip-14364

osdc/Objecter: fix narrow race with tid assignment

Reviewed-by: Josh Durgin <jdurgin@redhat.com>