Commit Graph

56240 Commits

Author SHA1 Message Date
John Spray
d9a0222197 Merge pull request #10436 from gregsfortytwo/wip-snapshot-doc
Add documentation about snapshots

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-27 12:44:25 +01:00
John Spray
49d6d40acc Merge pull request #10399 from renhwztetecs/renhw-wip-mds-cleanup2
mds: unuse Class and cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-27 12:42:57 +01:00
John Spray
fba249fd90 Merge pull request #10444 from SUSE/wip-drop-cephfs-mopup
man/Makefile-client.am: drop legacy cephfs tool

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-27 12:15:40 +01:00
huanwen ren
756810fe55 mds: unuse Class and cleanup
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-07-27 17:36:10 +08:00
Kefu Chai
4587b0d16d Merge pull request #10433 from SUSE/wip-16808
deb: merge ceph-fs-common into ceph-common

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-27 13:32:05 +08:00
Yuri Weinstein
9cd7e990ef Merge pull request #10342 from songbaisen/b6
logmon: check is_leader() before doing any work on get_trim_to()

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2016-07-26 15:48:54 -07:00
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
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
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
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
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
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
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
Kefu Chai
1194331665 Merge pull request #10261 from songbaisen/b1
mon: remove the redundant cancel_probe_timeout function

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:44:08 +08:00
Kefu Chai
d3a28465fc osd: fix the mem leak of RepGather
ReplicatedPG::new_repop() returns a pointer to RepGather with two refcounts,
one is held by ReplicatedPG::repop_queue, the other is supposed to be
held by the caller of this function. but it's caller
ReplicatedPG::submit_log_entries() assigns it to a
boost::intrusive_ptr<RepGather>() directly, why by default add_ref() in
its constructor. this makes the refcount 3. that's why we have a leak of
RepGather in `ReplicatedPG::new_repop(ObcLockManager&&,
boost::optional<std::function<void ()>>&&)`.

Fixes: http://tracker.ceph.com/issues/16801
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:29:41 +08:00
Kefu Chai
8268d1ba6a cmake: do not link against profiler if gperftools is found
this behaviour matches the autotools. and we should not enable profiling
unless asked to do so.

Fixes: http://tracker.ceph.com/issues/16804
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:22:20 +08:00
Kefu Chai
07206f3173 cmake: cleanup Findgperftools.cmake
remove unused bits

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:17:42 +08:00
Kefu Chai
98c3df5a0d cmake: cleanup Findudev.cmake
remove the crufts for handling the REQUIRED argument.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:40:30 +08:00
Kefu Chai
342d8279d4 cmake: cleanup Findblkid.cmake
* remove unused bits
* fix the wrong mark_as_advanced() call.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:40:30 +08:00
Kefu Chai
94db627c31 cmake: fix libaio detection
* we used to check the header file of "aio.h" which is part of glibc,
  the glibc async i/o, and the corresponding library is librt. but what
  we are using is libaio.
* reference libaio using AIO_LIBRARIES for consistency.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:40:30 +08:00
Kefu Chai
f8553f3ab9 cmake: do not include undefind paths
for example
```
include_directories(${LEVELDB_PREFIX}/include)
```
does not make sense if `LEVELDB_PREFIX` is not defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:40:30 +08:00
Kefu Chai
bfc25cbc93 cmake: cleanup Findbabeltrace.cmake
* we don't need the BABELTRACE_PATH_HINT setting, as packaging script
  requires the the babeltrace pacakges explicitly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:02 +08:00
Kefu Chai
03a860ed11 cmake: add missing FindBacktrace.cmake
FindBacktrace.cmake is missing in older versions of cmake. so put a copy
in our tree.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:02 +08:00
Kefu Chai
89521942c9 cmake: add "make uninstall" support
following https://cmake.org/Wiki/RecipeAddUninstallTarget

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:02 +08:00
Kefu Chai
d4104b747f cmake: add "WITH_SUBMAN" option
it is used by ceph.spec.in for installing subscription manager cron job
on rhel.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:01 +08:00