Matt Benjamin
78dc1b3dc4
rgw_ldap: merge cleanups
...
* match LDAPHelper op return codes to RGW (-POSIX)
* make temporary LDAP handle local (MT-safe)
* add required --encode and --ttype to usage
* use versioned encoding macros
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-11 14:37:29 -05:00
Yehuda Sadeh
1d18a63794
rgw: silence compilation warnings
...
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-11 11:28:06 -08:00
Orit Wasserman
a0c816be0a
rgw: cleanup of debug messages
...
use ldout instead of derr and lderr and increase logging level
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-03-11 11:27:48 -08:00
Josh Durgin
b1f0cb902a
Merge pull request #7944 from trociny/wip-rbd-mirror-image-replayer-async
...
rbd-mirror: ImageReplayer async start/stop
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-11 11:24:12 -08:00
Josh Durgin
99a6934a29
Merge pull request #8028 from dillaman/wip-librbd-journal-replay
...
librbd: replaying a journal op post-refresh requires locking
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-11 11:22:10 -08:00
Samuel Just
193b300277
Merge pull request #7483 from liewegas/wip-osd-boot
...
osd: resolve boot vs NOUP set + clear race
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-11 11:03:58 -08:00
Orit Wasserman
9aaf672c66
Merge pull request #8030 from yehudasa/wip-rgw-sync-status
...
adds the radosgw-admin sync status command that gives a human readable status of the sync process at a specific zone
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-11 19:39:59 +01:00
Yehuda Sadeh
97b90e6235
Merge pull request #7615 from ceph/wip-14678
...
rgw: store system object meta in cache when creating it
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-11 10:21:03 -08:00
Yehuda Sadeh
c20d9c5faf
Merge pull request #8037 from yehudasa/wip-bucket-link
...
rgw:bucket link now set the bucket.instance acl (bug fix)
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-11 10:17:07 -08:00
Orit Wasserman
2f81879434
Merge pull request #8013 from yehudasa/wip-rgw-multisite-fixes
...
rgw multisite fixes
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-11 19:11:38 +01:00
Gregory Farnum
a7a0dac6a4
Merge pull request #6953 from jcsp/wip-fsmap
...
Multi-filesystem support
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-11 09:36:30 -08:00
Sage Weil
49c3521b05
Merge pull request #7465 from liewegas/wip-promote-throttle
...
osd: probabilistic cache tier promotion throttling
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-11 12:15:46 -05:00
Sage Weil
96c1da9cd1
v10.0.5
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlbi+tkACgkQ2kQg7SiJlcjm4gCeJ5FdX6wYXP69g3yrY7wHRxtM
TawAoMnRD5i0Ndz4cceCvcBMk64W7mQG
=Ta2C
-----END PGP SIGNATURE-----
Merge tag 'v10.0.5'
v10.0.5
Conflicts:
debian/changelog
2016-03-11 12:07:55 -05:00
Sage Weil
5acb2655ec
v10.0.5
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 12:05:13 -05:00
Dan Mick
10ca7f3efb
debian/changelog: Remove stray 'v' in version
...
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 0f7730c8f4
)
2016-03-11 11:57:56 -05:00
xie xingguo
48d929c4f0
msg: async: improve _send_keepalive_or_ack() a little
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-12 00:39:24 +08:00
xie xingguo
cbc7cdb15b
msg: async: fix connection perf counter description
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-12 00:35:11 +08:00
Sage Weil
8733c40ef5
Merge branch 'master' of github.com:ceph/ceph
2016-03-11 11:14:55 -05:00
Sage Weil
57c6d3b67a
Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph
...
Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
# debian/control
2016-03-11 11:14:18 -05:00
Sage Weil
55a66975ef
os/filestore: add filestore_punch_hole = false option
...
Make punch hole usage optional.
Default to off, since it's relatively untested.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 11:13:02 -05:00
Sage Weil
400975b09e
os/filestore: fix punch hole usage in _zero
...
If we punch a hole that extends past EOF, ObjectStore semantics are
that the file size is also extended. Do that.
Note that this bug was hidden before because we weren't passing
KEEP_SIZE to fallocate until 7bd95b595f
and the fallocate was *always* failing with EOPNOTSUPP (making us fall
back to writing actual zeros).
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 11:02:58 -05:00
Sage Weil
b96cfda4a3
Merge pull request #8045 from tchaikov/wip-scrubstore-cleanup
...
osd/ScrubStore: remove unused function
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-11 10:50:43 -05:00
Sage Weil
bd2285f695
osd: use correct shard for temp scrub object
...
Use ghobject_t type throughout. Make ghobject_t variant of
spg_t::make_temp_object().
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:39 -05:00
Sage Weil
19e6b643f0
os/bluestore: ref ovec for CLONE, CLONERANGE
...
This keeps ovec up to date. Marginally more efficient.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:39 -05:00
Sage Weil
35f6c5c9ac
os/bluestore: fix OP_TRY_RENAME
...
We don't need to create the dest onode.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:39 -05:00
Sage Weil
f2f0e7d75d
os/bluestore: fix _rename
...
Update the *target* object ref in ovec.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:38 -05:00
Sage Weil
fcb0786971
ceph_test_objectstore: rename assumes target does not exist
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:38 -05:00
Sage Weil
6dcc499865
os/memstore: assert src and dst collection match on rename
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:38 -05:00
Sage Weil
e8b94aec4f
os/filestore: make read replace (not append) to result bl
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:38 -05:00
Sage Weil
33b7058269
ceph_test_objectstore: add a few checks to the rename test
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:38 -05:00
Sage Weil
a2ecb1a88f
os/bluestore/BlueStore: do not cow_rmw_tail at or past eof
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:38 -05:00
Sage Weil
3dcadb43e8
os/bluestore: print debug on ENOTEMPTY
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:38 -05:00
Sage Weil
b71f9f14c2
os/bluestore: make _do_omap_clear debug line pretty
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:37 -05:00
Sage Weil
eee3d70085
include/buffer: make is_partial work on empty ptr
...
Add a few unit tests.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:37 -05:00
Sage Weil
6a60c12e58
osd/ScrubStore: do not use temp collection
...
Temp collections are deprecated, and used only internally by
FileStore for compat reasons.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:37 -05:00
Sage Weil
166a7a98af
osd: simplify split vs backfill behavior
...
This is more future-proof, in case we add special backfill
completion work in the future. In the worst case we will re-scan
the parent PG and find no changes.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-11 10:41:37 -05:00
Sage Weil
56fe749e2c
Merge pull request #7707 from xiexingguo/xxg-wip-14815
...
osd: filestore: fix wrong scope of result code for error cases during mount
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-11 10:33:13 -05:00
Sage Weil
4adeb410bf
Merge pull request #7726 from tchaikov/wip-fix-ftbfs-gcc6
...
test/time: no need to abs(uint64_t) for comparing
Reviewed-by: Adam Emerson <aemerson@redhat.com>
2016-03-11 10:32:38 -05:00
Sage Weil
07c41fcd49
Merge pull request #7955 from ErwanAliasr1/evelu-check-bufferlist
...
test/bufferlist: Avoid false-positive tests
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-11 10:32:05 -05:00
Sage Weil
a1490dc1bc
Merge pull request #7980 from liewegas/wip-14952
...
mon: initialize last_* timestamps on new pgs to creation time
Reviewed-by: John Spray <john.spray@redhat.com>
2016-03-11 10:31:34 -05:00
Sage Weil
5d745b2bee
Merge pull request #7982 from liewegas/wip-14606
...
qa/workunits/rest/test.py: add confirmation to 'mds setmap'
2016-03-11 10:30:53 -05:00
Sage Weil
4ab0fc51d1
Merge pull request #7983 from liewegas/wip-14616
...
log: do not repeat errors to stderr
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-11 10:29:55 -05:00
Sage Weil
c9124548e4
Merge pull request #8004 from liewegas/wip-rados-test-stderr
...
qa/workunits/rados/test.sh: capture stderr too
2016-03-11 10:29:39 -05:00
Sage Weil
243a36b37e
Merge pull request #8006 from liewegas/wip-big-pages
...
os/bluestore/KernelDevice: force block size
2016-03-11 10:29:00 -05:00
Sage Weil
134466532d
Merge pull request #8019 from kmroz/wip-upstream-civetweb-low-ports-6
...
rgw: drop permissions of rgw/civetweb after startup
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-11 10:28:17 -05:00
Kefu Chai
eb1c5feb9a
Merge pull request #8007 from wido/se-mirror-mail
...
mirrors: Change contact e-mail address for se.ceph.com
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-11 22:39:59 +08:00
Kefu Chai
f0c512b021
Merge pull request #7991 from xiexingguo/xxg-wip-remove-upthrupending
...
osd: remove up_thru_pending field, which is never used
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-11 22:39:29 +08:00
Kefu Chai
9e86b53906
Merge pull request #8023 from roidayan/xio-remove_unused_variable
...
xio: remove unused variable
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-11 22:15:54 +08:00
Mykola Golub
3295253d64
test: add rbd-mirror test script
...
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-11 16:12:00 +02:00
Mykola Golub
866a704882
test: rbd_mirror_image_replay improve commit position parsing
...
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-11 16:12:00 +02:00