Commit Graph

56490 Commits

Author SHA1 Message Date
Yuri Weinstein
ffc81d1e49 Merge pull request #10343 from xiexingguo/xxg-wip-pipe-2016-07-19
msg/simple: fix wrong condition checking of writing TAG_CLOSE on closing

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2016-07-26 15:48:22 -07:00
Yuri Weinstein
71f393d786 Merge pull request #10345 from tchaikov/wip-dump-cmdline
global/signal_handler: dump cmdline instead of arg[0]

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-26 15:47:18 -07:00
Yuri Weinstein
3cb8e3520e Merge pull request #10356 from stiopaa1/msg_message_changeConstructorsRemoveCodeDuplication
msg/Message.h: remove code duplication

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-26 15:46:03 -07:00
Yuri Weinstein
f38717269a Merge pull request #9290 from xiexingguo/xxg-wip-replicatedpg-cleaner
tools: do not closed stdout ; fix overload of "<" operator

Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-26 15:39:51 -07:00
Yuri Weinstein
296e485126 Merge pull request #9362 from xiexingguo/xxg-wip-texttable-df
tools: use TextTable for "rados df" plain output

Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-26 15:39:03 -07:00
Yuri Weinstein
38609de1ec Merge pull request #9894 from gaowanlong/osd_recovery_max_omap_entries_per_chunk
osd: limit omap data in push op

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-26 15:38:10 -07:00
Yuri Weinstein
a6c0952cdd Merge pull request #10369 from ceph/wip-16715
msg/async/Event: ensure not refer to member variable which may destroyed

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-07-26 15:36:01 -07:00
Mark Nelson
17a5fd22e7 Merge pull request #10358 from xiexingguo/xxg-wip-bluestore-2016-07-20
kv/MemDB: fix wrong output target and add sanity checks

Mark's Comments:

This passed Jenkins checks.
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
2016-07-26 14:53:23 -05:00
Mark Nelson
796c29e908 Merge pull request #10349 from xiexingguo/xxg-wip-bluestore-2016-07-19
os/bluestore: add a boundary check of cache read

Mark's Comments:

This passed Jenkins checks.
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
2016-07-26 14:51:41 -05:00
Daniel Gryniewicz
4c32c37add Merge pull request #10442 from weiqiaomiao/wqm-wip-rgw-getlc
rgw: return "NoSuchLifecycleConfiguration" if lifecycle config does not exist
2016-07-26 15:07:35 -04:00
Orit Wasserman
5416960dee Merge pull request #10446 from cbodley/wip-16817
rgw: clear realm watch on failed watch_restart
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-07-26 19:43:03 +02:00
Ali Maredia
05e14bf850 Merge pull request #10391 from ceph/wip-cmake
cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-26 13:34:35 -04:00
Nathan Cutler
89c72828fc qa/qa_scripts/cephscrub.sh: do not try to remove ceph-fs-common package
The ceph-fs-common package is being dropped.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-26 19:12:22 +02:00
Casey Bodley
e5b8b5b275 rgw: clear realm watch on failed watch_restart
if the realm is deleted while the gateway has a watch, it's disconnected
and watch_restart() will fail. this results in a watch handle of 0,
which leads to a segfault on ~RGWRealmWatcher when we pass it to
unwatch()

this commit cleans up the watch when watch_restart() fails, so we don't
try to unwatch() on destruction

Fixes: http://tracker.ceph.com/issues/16817

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-26 12:50:15 -04:00
Kefu Chai
a459c500bf Merge pull request #10443 from wjwithagen/patch-13
src/CMakeLists.txt: remove double flag -Wno-invalid-offsetof

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-26 23:02:50 +08:00
Nathan Cutler
2b877cafe8 man/Makefile-client.am: drop legacy cephfs tool
Somehow c76c31d312 missed this bit.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-26 16:28:07 +02:00
Casey Bodley
4c4e0bc343 Merge pull request #10401 from theanalyst/rgw/test-multi-nose-attr
rgw: test/multi.py add a destructive attr to tests

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-26 09:53:58 -04:00
Greg Farnum
9884cd25b6 doc: describe snapshots for developers, and warn about multi-fs
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-07-26 06:25:55 -07:00
Willem Jan Withagen
a2e41a4f30 src/CMakeLists.txt: remove double flag -Wno-invalid-offsetof
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-07-26 14:56:09 +02:00
Igor Fedotov
c24d48071e Merge pull request #10375 from xiexingguo/xxg-wip-fix-bmap-ut-failure
os/bluestore: use small encoding for bluefs extent and fnode

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-07-26 15:43:21 +03:00
xie xingguo
cdbe210300 os/bluestore: use small encoding for bluefs extent and fnode
Also change bdev of extent from uint16_t to uint8_t, which matches
the fnode prefer_bdev field better, and is good for efficiency.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-26 20:09:31 +08:00
Dongsheng Yang
fbda59a654 test_librbd: add a test for newly introduced api of snap_remove2
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 07:37:20 -04:00
Dongsheng Yang
95240f2c77 rbd: introduce no-progress for rbd snap remove.
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 07:37:15 -04:00
Kefu Chai
0b9eeaadfe Merge pull request #10440 from tchaikov/wip-16686
msg/async: remove static member variable

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-26 19:10:09 +08:00
Nathan Cutler
df14dbf639 deb: merge ceph-fs-common into ceph-common
Fixes: http://tracker.ceph.com/issues/16808
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-26 12:45:31 +02:00
weiqiaomiao
b32b5f1c87 rgw: return "NoSuchLifecycleConfiguration" if lc config does not exist
return error code "NoSuchLifecycleConfiguration" if lifecycle configuration does not exist
as AmazonS3 latest API does.

Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-07-26 18:09:33 +08:00
zhouruisong
6c2b6cebc7 rgw:add a s3 API of make torrent for a object
When you execute the command gettorrent of a object, a torrent file will be produced and returned.
The torrent also will be save into a pool named default.rgw.torrent.
If the torrent of a object exists in default.rgw.torrent, it will be returned.

Signed-off-by: zhouruisong <236131368@qq.com>
2016-07-26 15:38:26 +08:00
Loic Dachary
74eafb4a8c Merge pull request #10430 from tchaikov/wip-cephtool-test.sh
qa/workunits/cephtool/test.sh: use absolute path for TEMP_DIR

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-07-26 08:51:25 +02:00
Dongsheng Yang
ebc5b9e0f7 pybind: add remove_snap2 api in python binding
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
0575a9e872 tools/rbd: introduce an option of --force for snap remove
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
9cf4878c34 librbd: fix a incorrect input for cpp_strerror()
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
bb55b3b584 librbd: coding style: fix the indent problem
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
95502ecefe librbd: coding style: add space after comma
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
fe1d4c44a3 librbd: introduce a new flag of RBD_SNAP_REMOVE_FLATTEN
introduce RBD_SNAP_REMOVE_FLATTEN for flags of Image::snap_remove2()
to auto flatten the children of snapshot which we want to remove.

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
a3a547fc03 librbd: introduce a new api of snap_remove2
currently, we only have one api for snap_remove, but if we want to
pass more options about snapshot removal, that's impossible.

This patch introduce a new api of snap_remove2 here to solve
this problem.

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Kefu Chai
a36cbee2c5 Merge pull request #10423 from ceph/wip-16801
osd: fix the mem leak of RepGather

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-26 14:18:46 +08:00
Kefu Chai
e92c9cc1f0 cmake: move flock.cc from libmds into libcommon
as we don't need to compile the whole mds just for building the
libcephfs

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-26 13:51:08 +08:00
Kefu Chai
76e7b693d7 msg/async: remove static member variable
msgr is part of libcommon. and the later is linked into both libcephfs
and librados. and hence into cephfs.so and rados.so. that's why we have
double free.

Fixes: http://tracker.ceph.com/issues/16686
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-26 13:27:03 +08:00
Gregory Farnum
40b7016ebc Merge pull request #10304 from ukernel/wip-16610
ObjectCacher: fix last_write check in bh_write_adjacencies()
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-07-25 21:58:19 -07:00
weiqiaomiao
e14f21ff28 rgw: add lc_pool when decode or encode struct RGWZoneParams
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-07-26 11:12:35 +08:00
Dan Mick
7818d91faf Update to upstream rocksdb
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-07-25 20:08:16 -07:00
Dan Mick
7595b0b66f src/test/CMakeLists.txt: don't assume Intel (sse/sse2)
Fixes ARM64 build of ceph_perf_local test

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-07-25 20:05:26 -07:00
Dan Mick
dbdd1a8526 erasure-code/jerasure/CMakeLists.txt: set NEON flags for neon objs
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-07-25 20:05:26 -07:00
Jason Dillaman
6064f2346d librbd: ensure that AIO ops are started prior to request
Fixes: http://tracker.ceph.com/issues/16708
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-07-25 12:44:50 -04:00
Jason Dillaman
3df7213c0a librbd: helper method for creating and starting AioCompletions
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-07-25 12:42:26 -04:00
John Spray
2dbff88acc Merge pull request #10243 from jcsp/wip-cephfs-cleanup
CephFS: misc. cleanups and remove legacy cephfs tool

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-07-25 15:20:42 +01:00
John Spray
7fe9c15f0b mds: add assertion in handle_slave_rename_prep
This function assumes that the source path
does not point to a null dentry, and that
path_traverse is therefore setting the
passed inode.

Candidate code path for crash
in http://tracker.ceph.com/issues/16807

Signed-off-by: John Spray <john.spray@redhat.com>
2016-07-25 15:12:55 +01:00
John Spray
55691af628 Merge pull request #9716 from xiexingguo/xxg-wip-server_droppinlock2
Server: drop locks and auth pins if wait for pending truncate

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-07-25 14:29:10 +01:00
Igor Fedotov
9deee08920 os/bluestore: fix unittest_bluestore_types to properly handle different ref_map locations
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-07-25 15:11:20 +03:00
Kefu Chai
de68fe38e1 qa/workunits/cephtool/test.sh: use absolute path for TEMP_DIR
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:58:28 +08:00