Commit Graph

52377 Commits

Author SHA1 Message Date
Yan, Zheng
fd2f4555f9 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>
2016-04-11 22:43:25 +08:00
Casey Bodley
f6820c0003 Merge pull request #8529 from oritwas/wip-rgw-fix-zone-set
radosgw-admin: allow
2016-04-11 09:56:47 -04:00
Ricardo Dias
b6d8c32ae8 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>
2016-04-11 14:50:30 +01:00
Karol Mroz
0b98b4fc87 rgw-rados: return RGWSystemMetaObj init directly
Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-04-11 14:54:54 +02:00
Loic Dachary
0913938d41 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>
2016-04-11 14:44:18 +02:00
Sage Weil
4e2a29ad4e Merge remote-tracking branch 'gh/jewel' 2016-04-11 08:38:27 -04:00
youji
14a66f67db ceph-disk: fix PrepareData.set_type() args should be class member.
Signed-off-by: You Ji <youji@ebay.com>
2016-04-11 05:28:43 -07:00
youji
4c203b3a14 ceph-disk: fix spelling mistake geattr to getattr.
Signed-off-by: You Ji <youji@ebay.com>
2016-04-11 05:28:43 -07:00
youji
5b098ca0e7 ceph-disk: fix lockbox set_or_create_partition()
Signed-off-by: You Ji <youji@ebay.com>
2016-04-11 05:28:13 -07:00
Orit Wasserman
14cec52b26 Merge pull request #8507 from kmroz/wip-rgw-admin-cleanup
rgw-admin: remove unused iterator and fix error message
2016-04-11 12:47:12 +02:00
Orit Wasserman
b7708da905 radosgw-admin: fix name checking
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-04-11 10:54:48 +02:00
Orit Wasserman
770846b2ee radosgw-admin: allow setting zone when there is no realm
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-04-11 10:54:48 +02:00
Robin H. Johnson
3b830016b5 rgw: Ensure xmlns is consistent on S3 responses.
At least one S3 client is overly strict about requiring the xmlns to be present
in server responses. Let's be strict about what we send, and continue to be lax
about what we receive.

- Put correct XMLNS in a define instead of repeating it.
- Correct XMLNS hostname: s/doc.s3.amazonaws.com/s3.amazonaws.com/
- Add XMLNS where it was missing:
-- CORSConfiguration
-- CopyObjectResult (see S3QL#190)
-- ListMultipartUploadsResult

S3QL bug #190: https://bitbucket.org/nikratio/s3ql/issues/190/sq3l-should-not-rely-on-xmlns-declarations

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-04-10 17:16:08 -07:00
Kefu Chai
30ce32a67d 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>
2016-04-11 00:46:31 +08:00
Loic Dachary
b474652070 Merge pull request #8522 from swamireddy/10.1.1-mailmap
mailmap update

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-04-10 17:14:01 +02:00
Swami Reddy
2145d72263 mailmap: Kris Jurka affiliation
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
2016-04-10 19:28:06 +05:30
Haomai Wang
175b3798d5 AsyncConnection: avoid is_connected require connection's lock
Fixes: http://tracker.ceph.com/issues/15440
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-04-10 17:02:58 +08:00
Michal Jarzabek
49886d5d8a 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>
2016-04-10 09:51:26 +01:00
Loic Dachary
871cd5a9b9 Merge pull request #8519 from dachary/wip-xenial
tests: add Ubuntu 16.04 xenial dockerfile

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-09 23:19:09 +02:00
Jason Dillaman
ad489f7b5c 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>
2016-04-09 14:44:41 -04:00
Jason Dillaman
fd2436156b librbd: acquire exclusive lock before disabling features
If object map or journaling is dynamically disabled, we want to
ensure that no in-flight IO could be updating the objects while
we attempt to delete them.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-09 14:28:14 -04:00
Sage Weil
adcc44b7d9 Merge pull request #8517 from kjurka/rgw-admin-doc-region-list
doc: rgw admin uses "region list" not "regions list"
2016-04-09 14:21:43 -04:00
Sage Weil
4d954fef85 Merge pull request #8518 from wjin/fix
crush: fix typo

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2016-04-09 14:21:10 -04:00
Sage Weil
55aeba24b3 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>
2016-04-09 13:38:20 -04:00
Sage Weil
71b539c821 Merge pull request #8485 from liewegas/wip-fuse-log
ceph-fuse: rotate log file

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-04-09 13:35:15 -04:00
Sage Weil
21c9a2406c 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>
2016-04-09 13:34:39 -04:00
Sage Weil
c672c309ad 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>
2016-04-09 13:33:54 -04:00
Sage Weil
e4eab045b4 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>
2016-04-09 13:32:57 -04:00
Jason Dillaman
458bef8401 librbd: dynamically disabling journaling needs to block writes
Need to clear any in-flight IO before the journal is closed to
avoid IO completions getting stuck in odd state.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-09 12:59:01 -04:00
Jason Dillaman
aa31e52572 test: fix race conditions with re-initializing the journal
Fixes: http://tracker.ceph.com/issues/15102
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-09 12:59:01 -04:00
Jason Dillaman
3c4a859aa2 librbd: AIO work queue needs to support dynamic feature updates
If the exclusive lock is enabled/disabled during an IO-driven
image refresh, we need to avoid deadlocking the queue.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-09 12:59:00 -04:00
Jason Dillaman
032fda55bc WorkQueue: add ability to requeue an item that was dequeued
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-09 12:59:00 -04:00
Jason Dillaman
a33ee34fcf qa/workunits/rbd: switch qemu test script shell to bash
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-09 12:59:00 -04:00
Jason Dillaman
30e943a9a9 Merge pull request #8516 from runsisi/wip-fix-ret
journal: fix final result for JournalTrimmer::C_RemoveSet

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-09 09:22:12 -04:00
Loic Dachary
8bc8085a00 tests: add Ubuntu 16.04 xenial dockerfile
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-04-09 10:18:53 +02:00
Wei Jin
0e4a92e5d0 crush: fix typo
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
2016-04-09 14:52:11 +08:00
Kris Jurka
0a622e6054 doc: rgw admin uses "region list" not "regions list" 2016-04-08 21:47:28 -07:00
runsisi
3c772925ca 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>
2016-04-09 11:33:06 +08:00
Samuel Just
3b54d5df28 test/rados/misc.cc: add long locator key and namespace tests
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-04-08 15:39:13 -07:00
Samuel Just
cb03d4d3c2 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>
2016-04-08 15:39:13 -07:00
Samuel Just
c7db303028 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>
2016-04-08 15:39:13 -07:00
Samuel Just
755c685f2d 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>
2016-04-08 15:38:17 -07:00
Samuel Just
e4916f68dd LFNIndex::list_objects: lfn_translate does not set errno
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-04-08 14:57:16 -07:00
Samuel Just
25f937e364 FileStore::set_xattr_limits_via_conf: add warning if max xattr size smaller than max name
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-04-08 14:57:16 -07:00
Samuel Just
18b9f95a4a test/objectstore/chain_xattr.cc: add test for ensure_single_attr
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-04-08 14:57:13 -07:00
Samuel Just
73778f1eb9 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>
2016-04-08 14:16:04 -07:00
Samuel Just
ac750cebc2 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>
2016-04-08 14:16:04 -07:00
Samuel Just
8dc033078f 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>
2016-04-08 14:16:04 -07:00
Samuel Just
21487fd0c2 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>
2016-04-08 14:16:00 -07:00
Orit Wasserman
7a94d9767b 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>
2016-04-08 17:43:25 +02:00