]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoMerge pull request #9728 from liewegas/wip-bluestore-encoding
Sage Weil [Tue, 21 Jun 2016 17:30:53 +0000 (13:30 -0400)]
Merge pull request #9728 from liewegas/wip-bluestore-encoding

os/bluestore: space efficient int encoding

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore/bluestore_types: delta encode for ref_map offsets 9728/head
Sage Weil [Tue, 21 Jun 2016 16:37:47 +0000 (12:37 -0400)]
os/bluestore/bluestore_types: delta encode for ref_map offsets

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: make blob csum info encoding conditional
Sage Weil [Sun, 19 Jun 2016 13:05:30 +0000 (09:05 -0400)]
os/bluestore: make blob csum info encoding conditional

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: use FLAG_CSUM to indicate if checksums are present
Sage Weil [Sun, 19 Jun 2016 13:05:01 +0000 (09:05 -0400)]
os/bluestore: use FLAG_CSUM to indicate if checksums are present

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: fsck: print intervals in hex
Sage Weil [Sun, 19 Jun 2016 13:12:09 +0000 (09:12 -0400)]
os/bluestore: fsck: print intervals in hex

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: use varint for pextent count
Sage Weil [Sun, 19 Jun 2016 13:02:18 +0000 (09:02 -0400)]
os/bluestore: use varint for pextent count

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: varint or lba encode pextent, lextent, ref_map, onode
Sage Weil [Sun, 19 Jun 2016 10:29:40 +0000 (06:29 -0400)]
os/bluestore: varint or lba encode pextent, lextent, ref_map, onode

Certainly not done here, but this is a start.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoinclude/small_encoding: small encode/decode helpers
Sage Weil [Sat, 18 Jun 2016 16:54:10 +0000 (12:54 -0400)]
include/small_encoding: small encode/decode helpers

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9819 from dillaman/wip-16363
Mykola Golub [Tue, 21 Jun 2016 16:50:28 +0000 (19:50 +0300)]
Merge pull request #9819 from dillaman/wip-16363

librbd: fix lockdep issue when duplicate event detected

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9816 from dillaman/wip-16198
Mykola Golub [Tue, 21 Jun 2016 16:49:37 +0000 (19:49 +0300)]
Merge pull request #9816 from dillaman/wip-16198

librbd: potential race when replaying journal ops

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9788 from dillaman/wip-16230
Mykola Golub [Tue, 21 Jun 2016 16:48:47 +0000 (19:48 +0300)]
Merge pull request #9788 from dillaman/wip-16230

rbd-mirror: potential race condition accessing local image journal

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9787 from batrick/mds-rename-enotempty
John Spray [Tue, 21 Jun 2016 14:47:22 +0000 (15:47 +0100)]
Merge pull request #9787 from batrick/mds-rename-enotempty

mds: improve comments for ENOTEMPTY checks

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9840 from xiexingguo/xxg-wip-fix-bmap-fm
Sage Weil [Tue, 21 Jun 2016 14:26:06 +0000 (10:26 -0400)]
Merge pull request #9840 from xiexingguo/xxg-wip-fix-bmap-fm

os/bluestore: minor improvements for bitmap-freelist-manager

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9815 from xiexingguo/xxg-wip-fix-blue-cache
Sage Weil [Tue, 21 Jun 2016 13:55:01 +0000 (09:55 -0400)]
Merge pull request #9815 from xiexingguo/xxg-wip-fix-blue-cache

os/bluestore: cache relevant cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: make bytes_per_key a global member 9840/head
xie xingguo [Tue, 21 Jun 2016 07:38:36 +0000 (15:38 +0800)]
os/bluestore: make bytes_per_key a global member

So we don't have to figure it out everywhere.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: fix a typo(nonexistant->nonexistent)
xie xingguo [Tue, 21 Jun 2016 06:33:32 +0000 (14:33 +0800)]
os/bluestore: fix a typo(nonexistant->nonexistent)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: simplify BufferSpace::read() a little 9815/head
xie xingguo [Mon, 20 Jun 2016 12:16:33 +0000 (20:16 +0800)]
os/bluestore: simplify BufferSpace::read() a little

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: simplify BufferSpace::read() a little
xie xingguo [Mon, 20 Jun 2016 12:02:41 +0000 (20:02 +0800)]
os/bluestore: simplify BufferSpace::read() a little

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: change type of length of region_t from uint32_t to uint64_t
xie xingguo [Mon, 20 Jun 2016 10:56:51 +0000 (18:56 +0800)]
os/bluestore: change type of length of region_t from uint32_t to uint64_t

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: add sanity check when try to rm_buffer
xie xingguo [Mon, 20 Jun 2016 10:52:51 +0000 (18:52 +0800)]
os/bluestore: add sanity check when try to rm_buffer

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9828 from liewegas/wip-bluestore-read-before-write
Sage Weil [Tue, 21 Jun 2016 13:31:00 +0000 (09:31 -0400)]
Merge pull request #9828 from liewegas/wip-bluestore-read-before-write

os/bluestore: limit read-amp on overwrite

Reviewed-by: Varada Kari <varada.kari@sandisk.com>
9 years agoMerge pull request #9826 from liewegas/wip-bluefs
Sage Weil [Tue, 21 Jun 2016 13:30:18 +0000 (09:30 -0400)]
Merge pull request #9826 from liewegas/wip-bluefs

os/bluestore/BlueFS: instrument which file types we write to

Reviewed-by: Varada Kari <varada.kari@sandisk.com>
9 years agoMerge pull request #9834 from tchaikov/wip-silence-warnings
Kefu Chai [Tue, 21 Jun 2016 10:53:37 +0000 (18:53 +0800)]
Merge pull request #9834 from tchaikov/wip-silence-warnings

test, bluestore: silence warnings

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #9635 from liewegas/wip-make-dist
Kefu Chai [Tue, 21 Jun 2016 10:17:25 +0000 (18:17 +0800)]
Merge pull request #9635 from liewegas/wip-make-dist

make-dist: include src/.git_version and src/ceph_ver.h

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9836 from dx9/wip-hardcoded-tcmalloc
Kefu Chai [Tue, 21 Jun 2016 09:02:21 +0000 (17:02 +0800)]
Merge pull request #9836 from dx9/wip-hardcoded-tcmalloc

cmake: fix hard coded tcmalloc lib

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix hard coded tcmalloc lib 9836/head
John Coyle [Sat, 27 Feb 2016 19:20:22 +0000 (14:20 -0500)]
cmake: fix hard coded tcmalloc lib

Signed-off-by: John Coyle <dx9err@gmail.com>
9 years agoMerge pull request #9670 from ceph/wip-debian-clean
Kefu Chai [Tue, 21 Jun 2016 00:46:18 +0000 (08:46 +0800)]
Merge pull request #9670 from ceph/wip-debian-clean

debian: silence couple warnings

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agobluestore/BitAllocator: silence warnings of method hidden 9834/head
Kefu Chai [Mon, 20 Jun 2016 23:18:35 +0000 (07:18 +0800)]
bluestore/BitAllocator: silence warnings of method hidden

is_allocated(int64_t *blocks, int64_t num_blocks, int blk_off) only gets
called in BitMapAreaIN and its child classes. so it's safe to move this
method down to BitMapAreaIN.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoceph_test_objectstore: remove unused function
Kefu Chai [Mon, 20 Jun 2016 22:52:37 +0000 (06:52 +0800)]
ceph_test_objectstore: remove unused function

its caller was removed in 8a42e61

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9832 from ceph/wip-cmake-librbd-unittest-fix
Sage Weil [Mon, 20 Jun 2016 21:28:16 +0000 (17:28 -0400)]
Merge pull request #9832 from ceph/wip-cmake-librbd-unittest-fix

cmake: unittest_librbd missing a source file

9 years agocmake: unittest_librbd missing a source file 9832/head
Ali Maredia [Mon, 20 Jun 2016 21:23:37 +0000 (17:23 -0400)]
cmake: unittest_librbd missing a source file

src/test/librbd/test_ConsistencyGroups.cc missing
from ${unittest_librbd_srcs}.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9531 from yehudasa/wip-16175
Casey Bodley [Mon, 20 Jun 2016 20:11:51 +0000 (16:11 -0400)]
Merge pull request #9531 from yehudasa/wip-16175

rgw: data sync debug logging

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9676 from efirs/fix_bitmap_freelist
Sage Weil [Mon, 20 Jun 2016 19:58:04 +0000 (15:58 -0400)]
Merge pull request #9676 from efirs/fix_bitmap_freelist

os/bluestore: Fix enumeration when only single key in BitmapFreelistManager

9 years agoos/bluestore/BlueFS: instrument which file types we write to 9826/head
Sage Weil [Mon, 20 Jun 2016 18:59:54 +0000 (14:59 -0400)]
os/bluestore/BlueFS: instrument which file types we write to

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: limit read-amp on overwrite 9828/head
Sage Weil [Mon, 20 Jun 2016 19:22:51 +0000 (15:22 -0400)]
os/bluestore: limit read-amp on overwrite

If we are doing a small overwrite over a blob with a large chunk size
(say, due to a large csum order), we are better off writing into a new
allocation than doing a large read/modify/write.  If the read amp will be
more than min_alloc_size, skip the read entirely and write into a new
blob.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agotest: remove remaining references to compression_dir
Sage Weil [Mon, 20 Jun 2016 19:57:02 +0000 (15:57 -0400)]
test: remove remaining references to compression_dir

Removed in 38c7f4a06673e4806d327931744338a7393b45ef

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9829 from ceph/wip-cmake-readme
Sage Weil [Mon, 20 Jun 2016 19:27:10 +0000 (15:27 -0400)]
Merge pull request #9829 from ceph/wip-cmake-readme

cmake: updated CMake README instructions

9 years agoMerge pull request #9814 from songbaisen/a11
Sage Weil [Mon, 20 Jun 2016 19:19:11 +0000 (15:19 -0400)]
Merge pull request #9814 from songbaisen/a11

mon: remove the repeat quorum size jugement

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9818 from ifed01/wip-zero-length-writes
Sage Weil [Mon, 20 Jun 2016 19:16:57 +0000 (15:16 -0400)]
Merge pull request #9818 from ifed01/wip-zero-length-writes

os/store_test: uniform zero length writes handling

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agocmake: updated CMake README instructions 9829/head
Ali Maredia [Mon, 20 Jun 2016 19:15:09 +0000 (15:15 -0400)]
cmake: updated CMake README instructions

Updated testing and cluster start up instructions
for CMake in README.md

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9605 from liewegas/wip-statfs
Sage Weil [Mon, 20 Jun 2016 16:39:03 +0000 (12:39 -0400)]
Merge pull request #9605 from liewegas/wip-statfs

os: simplify store_statfs_t

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #9261 from prallabh/user_quota
Daniel Gryniewicz [Mon, 20 Jun 2016 15:49:46 +0000 (11:49 -0400)]
Merge pull request #9261 from prallabh/user_quota

rgw: Let the default quota settings take effect during user creation

9 years agoMerge pull request #9817 from theanalyst/wip/boost-optional
Orit Wasserman [Mon, 20 Jun 2016 15:32:58 +0000 (17:32 +0200)]
Merge pull request #9817 from theanalyst/wip/boost-optional

rgw_swift: newer versions of boost/utility no longer include in_place
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agolibrbd: fix lockdep issue when duplicate event detected 9819/head
Jason Dillaman [Mon, 20 Jun 2016 14:32:04 +0000 (10:32 -0400)]
librbd: fix lockdep issue when duplicate event detected

Fixes: http://tracker.ceph.com/issues/16363
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoos/store_test: fix synthetic test cases to handle zero-writes properly, i.e. do not... 9818/head
Igor Fedotov [Mon, 20 Jun 2016 14:21:27 +0000 (17:21 +0300)]
os/store_test: fix synthetic test cases to handle zero-writes properly, i.e. do not increase object size.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/memstore: zero-length write should not effect object size
Sage Weil [Mon, 20 Jun 2016 13:53:46 +0000 (09:53 -0400)]
os/memstore: zero-length write should not effect object size

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph_test_objectstore: zero-length write should not affect object size
Sage Weil [Mon, 20 Jun 2016 13:51:56 +0000 (09:51 -0400)]
ceph_test_objectstore: zero-length write should not affect object size

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorgw_swift: newer versions of boost/utility no longer include in_place 9817/head
Abhishek Lekshmanan [Mon, 20 Jun 2016 13:56:50 +0000 (15:56 +0200)]
rgw_swift: newer versions of boost/utility no longer include in_place

boost > 1.58 no longer includes in_place in boost/utility, we need to
include in_place_factory explicitly. This causes build failures in
distros that ship with a higher version of boost. Since the only call is for
swift_ver_location, another possibility is to use emplace()
instead (though this requires boost ~ 1.56)

Fixes: http://tracker.ceph.com/issues/16391
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #9786 from pritha-srivastava/wip-multisite-error-msgs
Casey Bodley [Mon, 20 Jun 2016 13:52:40 +0000 (09:52 -0400)]
Merge pull request #9786 from pritha-srivastava/wip-multisite-error-msgs

rgw: modifying multi-site log messages.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agolibrbd: potential race when replaying journal ops 9816/head
Jason Dillaman [Mon, 20 Jun 2016 13:39:24 +0000 (09:39 -0400)]
librbd: potential race when replaying journal ops

Fixes: http://tracker.ceph.com/issues/16198
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9812 from zhjwpku/cephx_protocol
Sage Weil [Mon, 20 Jun 2016 12:43:00 +0000 (08:43 -0400)]
Merge pull request #9812 from zhjwpku/cephx_protocol

doc: cephx_protocol typos

9 years ago mon: remove the repeat quorum size jugement 9814/head
songbaisen [Mon, 20 Jun 2016 11:00:44 +0000 (19:00 +0800)]
  mon: remove the repeat quorum size jugement

  Signed-off-by:song baisen <song.baisen@zte.com.cn>

9 years agorgw: Add documentation for RGW default quota 9261/head
root [Sun, 19 Jun 2016 07:36:06 +0000 (13:06 +0530)]
rgw: Add documentation for RGW default quota

Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
9 years agoMerge pull request #9188 from rzarzynski/wip-rgw-swift-versioning-new-2
Orit Wasserman [Mon, 20 Jun 2016 10:36:53 +0000 (12:36 +0200)]
Merge pull request #9188 from rzarzynski/wip-rgw-swift-versioning-new-2

rgw: improve support for Swift's object versioning.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: modifying multi-site log messages. 9786/head
Pritha Srivastava [Thu, 16 Jun 2016 09:15:57 +0000 (14:45 +0530)]
rgw: modifying multi-site log messages.

Increasing the log level and removing 'ERROR' from messages that appear during normal multi-site operation.
Fixes: http://tracker.ceph.com/issues/16121
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
9 years agoMerge pull request #9804 from ceph/revert-9801-msg_msg_types_entity_name_t_makeprivate
Kefu Chai [Mon, 20 Jun 2016 04:01:00 +0000 (12:01 +0800)]
Merge pull request #9804 from ceph/revert-9801-msg_msg_types_entity_name_t_makeprivate

Revert "msg/msg_types.h: make members private in ..."

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoRevert "msg/msg_types.h: make members private in ..." 9804/head
Haomai Wang [Mon, 20 Jun 2016 02:45:45 +0000 (10:45 +0800)]
Revert "msg/msg_types.h: make members private in ..."

9 years agoMerge pull request #9801 from stiopaa1/msg_msg_types_entity_name_t_makeprivate
Kefu Chai [Mon, 20 Jun 2016 02:11:41 +0000 (10:11 +0800)]
Merge pull request #9801 from stiopaa1/msg_msg_types_entity_name_t_makeprivate

msg/msg_types.h: make members private in `entity_name_t`

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc:cephx_protocol 9812/head
Zhao Junwang [Sun, 19 Jun 2016 22:03:43 +0000 (18:03 -0400)]
doc:cephx_protocol

The goal of phase II is to provide C with a session key and ticekt
allowing it to communicate with S

Signed-off-by: Zhao Junwang <zhjwpku@gmail.com>
9 years agorgw: Do not bother to check against conf values during quota handling
root [Sun, 19 Jun 2016 07:18:42 +0000 (12:48 +0530)]
rgw: Do not bother to check against conf values during quota handling

Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
9 years agorgw: Let the default quota settings take effect during user creation
root [Mon, 23 May 2016 10:04:58 +0000 (15:34 +0530)]
rgw: Let the default quota settings take effect during user creation

Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
9 years agomsg/msg_types.h: make members private in ... 9801/head
Michal Jarzabek [Sat, 18 Jun 2016 07:28:34 +0000 (08:28 +0100)]
msg/msg_types.h: make members private in ...

... entity_name_t class.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9778 from ifed01/wip-bluestore-blob-reduce
Sage Weil [Sat, 18 Jun 2016 16:48:22 +0000 (12:48 -0400)]
Merge pull request #9778 from ifed01/wip-bluestore-blob-reduce

os/bluestore: reduce bluestore blob

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9750 from ifed01/wip-bluestore-csum-output-fix
Sage Weil [Sat, 18 Jun 2016 16:48:01 +0000 (12:48 -0400)]
Merge pull request #9750 from ifed01/wip-bluestore-csum-output-fix

os/bluestore: fix improper blob's csum visualization.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9756 from liewegas/wip-bluestore-diet
Sage Weil [Sat, 18 Jun 2016 16:47:43 +0000 (12:47 -0400)]
Merge pull request #9756 from liewegas/wip-bluestore-diet

os/bluestore: remove unused bluestore fields

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
9 years agodebian: move libcephfs-jni to section "java" 9670/head
Kefu Chai [Mon, 13 Jun 2016 14:05:08 +0000 (22:05 +0800)]
debian: move libcephfs-jni to section "java"

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodebian: remove X-Python-Version section
Kefu Chai [Sun, 12 Jun 2016 16:37:24 +0000 (00:37 +0800)]
debian: remove X-Python-Version section

it's obsolete and can be removed now,
see
https://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html#s-specifying_versions

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodebian: add ${shlibs:Depends} to binary packages' Depends
Kefu Chai [Sun, 12 Jun 2016 16:05:10 +0000 (00:05 +0800)]
debian: add ${shlibs:Depends} to binary packages' Depends

rationale
* this fixes:
  warning: dpkg-gencontrol: package python-rbd: unused substitution
  variable ${shlibs:Depends}
* and to comply to debian policy. see
  https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-dpkg-shlibdeps

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodebian: add jh_depends for ${java:Depends}
Kefu Chai [Sun, 12 Jun 2016 15:25:13 +0000 (23:25 +0800)]
debian: add jh_depends for ${java:Depends}

this fixes:
warning: dpkg-gencontrol: Depends field of package libcephfs-java:
unknown substitution variable ${java:Depends}

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomakefile: add librgw_file_* as noninst_PROGRAMS
Kefu Chai [Sun, 12 Jun 2016 14:57:03 +0000 (22:57 +0800)]
makefile: add librgw_file_* as noninst_PROGRAMS

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9119 from runsisi/wip-fix-cmake-desc
Kefu Chai [Sat, 18 Jun 2016 15:51:41 +0000 (23:51 +0800)]
Merge pull request #9119 from runsisi/wip-fix-cmake-desc

cmake: update description for cmake module Findkeyutils.cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9799 from stiopaa1/common_address_helper_changeScope
Kefu Chai [Sat, 18 Jun 2016 14:28:06 +0000 (22:28 +0800)]
Merge pull request #9799 from stiopaa1/common_address_helper_changeScope

common/address_helper.cc:move variables closer...

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9797 from Yan-waller/yj-wip-rgwcompiling
Casey Bodley [Sat, 18 Jun 2016 14:21:13 +0000 (10:21 -0400)]
Merge pull request #9797 from Yan-waller/yj-wip-rgwcompiling

rgw: kill compiling warning

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocommon/address_helper.cc:move variables closer... 9799/head
Michal Jarzabek [Sat, 18 Jun 2016 12:15:42 +0000 (13:15 +0100)]
common/address_helper.cc:move variables closer...

... to the point where they are first used.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agorgw: kill compiling warning 9797/head
Yan Jun [Sat, 18 Jun 2016 07:54:55 +0000 (15:54 +0800)]
rgw: kill compiling warning

test/rgw/test_http_manager.cc: In member function ‘virtual void HTTPManager_SignalThread_Test::TestBody()’:
test/rgw/test_http_manager.cc:40:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   for (int i = 0; i < num_requests; i++) {
                       ^

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
9 years agoMerge pull request #9764 from vasukulkarni/master
vasukulkarni [Fri, 17 Jun 2016 22:41:17 +0000 (15:41 -0700)]
Merge pull request #9764 from vasukulkarni/master

mention change of owner for /var/log/ceph

9 years agoMerge pull request #9599 from sdieffen/feature15904
Samuel Just [Fri, 17 Jun 2016 21:46:11 +0000 (14:46 -0700)]
Merge pull request #9599 from sdieffen/feature15904

added -f flag for formatting to rados command line tool

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9785 from cbodley/wip-rgw-httpmgr-select
Orit Wasserman [Fri, 17 Jun 2016 18:54:02 +0000 (20:54 +0200)]
Merge pull request #9785 from cbodley/wip-rgw-httpmgr-select

rgw: fix deadlock in RGWHTTPManager when HAVE_CURL_MULTI_WAIT=0
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9765 from dx9/wip-run-cmake
Ali Maredia [Fri, 17 Jun 2016 18:11:24 +0000 (14:11 -0400)]
Merge pull request #9765 from dx9/wip-run-cmake

cmake: add arguments to cmake invocation to support cache configuration

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9634 from ceph/cmake-git-rev
Ali Maredia [Fri, 17 Jun 2016 17:57:28 +0000 (13:57 -0400)]
Merge pull request #9634 from ceph/cmake-git-rev

Update git rev parsing in CMake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9601 from ceph/wip-cmake
Ali Maredia [Fri, 17 Jun 2016 17:51:03 +0000 (13:51 -0400)]
Merge pull request #9601 from ceph/wip-cmake

cmake: add ceph_test_* used by qa units and ceph-qa-suite tasks

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agomds: improve comments for ENOTEMPTY checks 9787/head
Patrick Donnelly [Fri, 17 Jun 2016 16:00:59 +0000 (12:00 -0400)]
mds: improve comments for ENOTEMPTY checks

There are two checks in the code for ENOTEMPTY, clarify that the first check is
doing a fast check without locks.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
9 years agoMerge pull request #9725 from SUSE/wip-16327
Orit Wasserman [Fri, 17 Jun 2016 17:25:24 +0000 (19:25 +0200)]
Merge pull request #9725 from SUSE/wip-16327

rgw: check for -ERR_NOT_MODIFIED in rgw_rest_s3.cc
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: add pipe fd to set for select() in do_curl_wait() 9785/head
Casey Bodley [Fri, 17 Jun 2016 02:51:54 +0000 (22:51 -0400)]
rgw: add pipe fd to set for select() in do_curl_wait()

when HAVE_CURL_MULTI_WAIT is 0, the pipe fd is never added to the
readfds for select(), so FD_ISSET() is always false. this prevents us
from ever trying to read from the fd, and the pipe's buffer eventually
fills up and deadlocks callers of RGWHTTPManager::signal_thread() when
they try to write to the pipe

Fixes: http://tracker.ceph.com/issues/16368
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agotest/rgw: add unit test for HTTPManager
Casey Bodley [Thu, 16 Jun 2016 23:55:07 +0000 (19:55 -0400)]
test/rgw: add unit test for HTTPManager

unit test to detect a deadlock in RGWHTTPManager::signal_thread() when
HAVE_CURL_MULTI_WAIT=0

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9779 from smanjara/wip-zone-rename
Casey Bodley [Fri, 17 Jun 2016 15:58:50 +0000 (11:58 -0400)]
Merge pull request #9779 from smanjara/wip-zone-rename

rgw: added zone rename to radosgw_admin

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agolibrbd: journal callback to interrupt replay 9788/head
Jason Dillaman [Thu, 16 Jun 2016 13:27:50 +0000 (09:27 -0400)]
librbd: journal callback to interrupt replay

If the exclusive lock is lost while the journal is in the
replay state, the journal close will block until the replay
completes. The new callback will facilitate stopping replay
in a timely fashion so that the journal can be closed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: keep local pointer to image journal
Jason Dillaman [Thu, 16 Jun 2016 03:04:48 +0000 (23:04 -0400)]
rbd-mirror: keep local pointer to image journal

Fixes: http://tracker.ceph.com/issues/16230
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9686 from weiqiaomiao/wqm-wip-rgw-output
Orit Wasserman [Fri, 17 Jun 2016 15:32:09 +0000 (17:32 +0200)]
Merge pull request #9686 from weiqiaomiao/wqm-wip-rgw-output

rgw: remove unnecessary output
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9687 from theanalyst/rgw/orphans-find-msg
Orit Wasserman [Fri, 17 Jun 2016 15:30:29 +0000 (17:30 +0200)]
Merge pull request #9687 from theanalyst/rgw/orphans-find-msg

rgw-admin: don't print on ENOENT for orphans find
Reviewed-by" Orit Wasserman <owasserm@redhat.com>

9 years agoMerge pull request #9736 from tchaikov/wip-test-timeout
Samuel Just [Fri, 17 Jun 2016 15:08:45 +0000 (08:08 -0700)]
Merge pull request #9736 from tchaikov/wip-test-timeout

test: disable dup test for mds respawn cmd

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9086 from ceph/wip-15849
Haomai Wang [Fri, 17 Jun 2016 14:29:55 +0000 (22:29 +0800)]
Merge pull request #9086 from ceph/wip-15849

msg/async/AsyncConnection: create writable event for in progress connection

9 years agoMerge pull request #9461 from liewegas/wip-msgr2
Sage Weil [Fri, 17 Jun 2016 14:26:56 +0000 (10:26 -0400)]
Merge pull request #9461 from liewegas/wip-msgr2

doc: msgr2 protocol spec

9 years agoMerge pull request #8963 from yuyuyu101/wip-15758
Sage Weil [Fri, 17 Jun 2016 14:24:59 +0000 (10:24 -0400)]
Merge pull request #8963 from yuyuyu101/wip-15758

msg/async: Separated nonfast message and fast dispatch message thread

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: change bluestore_extent_ref_map_t key value(i.e. offset) from 64 to... 9778/head
Igor Fedotov [Fri, 17 Jun 2016 11:51:35 +0000 (14:51 +0300)]
os/bluestore: change bluestore_extent_ref_map_t key value(i.e. offset) from 64 to 32 bits.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore: remove bluestore_blob_t::length field
Igor Fedotov [Thu, 16 Jun 2016 16:51:38 +0000 (19:51 +0300)]
os/bluestore: remove bluestore_blob_t::length field

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agorgw: added zone rename to radosgw_admin 9779/head
Shilpa Jagannath [Fri, 17 Jun 2016 12:59:42 +0000 (18:29 +0530)]
rgw: added zone rename to radosgw_admin

Added zone rename option to radosgw-admin help

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
9 years agoMerge pull request #9759 from dillaman/wip-16352
Mykola Golub [Fri, 17 Jun 2016 11:15:56 +0000 (14:15 +0300)]
Merge pull request #9759 from dillaman/wip-16352

rbd-mirror: ensure replay status formatter has completed before stopping

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9730 from dillaman/wip-16329
Mykola Golub [Fri, 17 Jun 2016 11:15:16 +0000 (14:15 +0300)]
Merge pull request #9730 from dillaman/wip-16329

rbd-mirror: gracefully handle missing sync point snapshots

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9751 from dillaman/wip-16348
Mykola Golub [Fri, 17 Jun 2016 11:14:50 +0000 (14:14 +0300)]
Merge pull request #9751 from dillaman/wip-16348

librbd: unable to disable journaling feature if in unexpected mirror state

Reviewed-by: Mykola Golub <mgolub@mirantis.com>