Commit Graph

44764 Commits

Author SHA1 Message Date
Kefu Chai
b8dc21e8b6 Merge pull request #5857 from ceph/wip-da-SCA-20150812
SCA and compiler warning fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-17 18:54:24 +08:00
Kefu Chai
6e8e0e7bb5 Merge pull request #5870 from s09816/master
osd:the fuction osd::shutdown Lock failed.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-17 18:52:54 +08:00
Kefu Chai
47afe9aed2 Merge pull request #5096 from tchaikov/wip-add-bl-const-iterator
common/buffer: add bufferlist::const_iterator

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-17 18:51:36 +08:00
John Spray
e017aab23c CMake: fix libcephfs shared lib generation
Previously weren't generating versioned symlinks
etc, so python bindings didn't find it.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-17 11:27:26 +01:00
Kefu Chai
3045168f0a Merge pull request #5920 from caibo2014/fix-tool-bug
tools: ceph_monstore_tool: remove the output file when get map fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-17 17:09:18 +08:00
Kefu Chai
11e9c0667e Merge pull request #5960 from dachary/wip-13136-python3-coverage
install-deps.sh: disable python3

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-17 16:59:00 +08:00
Loic Dachary
7182499ca3 install-deps.sh: disable python3
Disable python3 support until
https://bugs.launchpad.net/ubuntu/+source/python-coverage/+bug/1496715
is fixed.

Nothing in the build process depends on python3 right now, there is no
harm disabling it.

http://tracker.ceph.com/issues/13136 Fixes: #13136

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-17 09:35:11 +02:00
Jianpeng Ma
a825f6864d client/MetaRequest: optimize func can_forward/auth_is_best.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-09-17 11:14:31 +08:00
xinxin shu
a1959284f1 unify order limit
Fixes: #13124

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2015-09-17 11:07:58 +08:00
Jianpeng Ma
f51afa63b1 client/MetaRequest: open w/ O_CREAT|O_TRUNC is write.
From the function name is_write, it judge MetaRequest whether write.
For open, if it w/ O_CREAT|O_TRUNC, it's a write op and vice versa.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-09-17 10:05:46 +08:00
Jianpeng Ma
8f46bd9c78 clinet/MetaRequest: Remove the useless condition.
"head.op & CEPH_MDS_OP_WRITE" include "head.op == CEPH_MDS_OP_CREATE".
So remove the conditon statement "head.op == CEPH_MDS_OP_CREATE".

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-09-17 09:57:04 +08:00
Kefu Chai
d0ac68bf17 mon/PGMap: calc min_last_epoch_clean when decode
Fixes: #13112
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-09-16 22:04:32 +08:00
Sage Weil
391cfb9f48 Merge pull request #5841 from ceph/wip-12994-rbd-replay-packaging
#12994: packaging: move rbd-replay* to ceph-common

Reviewed-by: James Page <jamespage@ubuntu.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-09-16 09:12:16 -04:00
Sage Weil
f389f6b8b9 Merge pull request #5946 from liewegas/wip-rgw-logdir
radosgw: log to /var/log/ceph instead of /var/log/radosgw

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-09-16 09:11:33 -04:00
Li Peng
d1505b5408 doc: delete wrong description of installing RPMs
In CentOS/RHEL 6/7, gitk and git-gui are available in default repository actually.

Signed-off-by: Li Peng <lip@dtdream.com>
2015-09-16 14:05:05 +08:00
weiqian
1f7a2dc506 doc:Replaces 'osd host' with 'host'
Signed-off-by: weiqian <weiq@dtdream.com>
2015-09-16 11:04:52 +08:00
Sage Weil
c1b28591a2 radosgw: log to /var/log/ceph instead of /var/log/radosgw
This is simpler.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-15 18:05:59 -04:00
Sage Weil
b615f35a04 Merge remote-tracking branch 'gh/infernalis' 2015-09-15 17:42:42 -04:00
Sage Weil
07893665a1 Merge pull request #5725 from liewegas/wip-scrub-stats
osd/ReplicatedPG: snaptimmer: adjust stats through ctx->delta_stats

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-09-15 17:36:47 -04:00
Sage Weil
ba0208086e Merge pull request #5925 from liewegas/wip-mon-leaks
fix various mon leaks

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-09-15 17:35:02 -04:00
Sage Weil
3e42b4b51c Merge pull request #5929 from liewegas/wip-osd-leaks
misc osd leaks

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-15 17:34:13 -04:00
John Spray
412e412aa6 osd: permit MDS to send writes on full pools
Same behaviour as the global full flag, for the
per-pool full flag.  The FS was broken by 67de12bf,
which added the pool flag handling.

Fixes: #12971
Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-15 22:11:20 +01:00
Samuel Just
eab300868d Revert "osd: purge the object from the cache when proxying and not promoting the op"
Fixes: #13108
This reverts commit da68bb371f.
2015-09-15 14:04:09 -07:00
John Spray
494c2e44b0 Merge pull request #5944 from tchaikov/wip-13090
mds: cast numbers for mds health to string when print

Reviewed-by: John Spray <john.spray@redhat.com>
2015-09-15 21:35:48 +01:00
John Spray
ca7861d28f osdc/Objecter: make unlocked 'full' helpers private
These never needed to be public, let's be safe.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-15 21:25:04 +01:00
John Spray
4d5d15c20a osdc: fix honor_osdmap_full
This was being ignored in new code that tested
the per-pool full flags.  Refactor it so that
all the tests of full flags go through _osdmap_pool_full
and thereby experience the honor_osdmap_full policy.

Fixes: #12971
Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-15 21:25:04 +01:00
Ken Dreyer
96486fd6f2 packaging: move rbd-replay* to ceph-common
The rbd-replay* utilities are useful for Ceph users with RBD clients.
Currently the rbd-replay* utilities ship in the "ceph-test" package, and
we intend this ceph-test package for Ceph developers and contributors,
not normal users.

Move the rbd-replay* utilities to "ceph-common".

http://tracker.ceph.com/issues/12994 Fixes: #12994

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-15 14:01:18 -06:00
Samuel Just
f162e33f66 src/test/osd/Object: allow a hole at the end of the object
This way, we test the case with holes at the end of the file more
often.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-09-15 11:07:36 -07:00
Samuel Just
f9d107a1a1 osd_types.cc: add size to ObjectRecoveryInfo print
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-09-15 11:07:36 -07:00
Samuel Just
1d3e46bedb ReplicatedBackend::prepare_pull: set recover_info.size for clones
Fixes: #12828
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-09-15 11:07:35 -07:00
Sage Weil
c842555cee mon: debug refs on output replies
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-15 13:58:37 -04:00
Sage Weil
03b8ed3b6c msg/simple: discard local queued messages on shutdown
Otherwise these generate leak detection noise.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-15 13:58:37 -04:00
Sage Weil
137eb7e375 mon/Monitor: fix MonSession Leak
dispatch() does not need to keep a ref; we hold one indirectly
via the MonOpRequest.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-15 12:53:58 -04:00
Sage Weil
0b309e97c9 mon: fix MonSession operator<<
Print the object, not its pointer.  Make output unambiguously
terminated.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-15 12:53:56 -04:00
Sage Weil
89cc479e93 mon: do not leak messages on shutdown
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-15 12:53:53 -04:00
Kefu Chai
9546252584 mds: cast numbers for mds health to string when print
MDSHealthMetric.metadata is a map<string,string>, so the num in
`m.metadata["foo"] = num` is casted to char when being printed.
they should be coverted into std::string instead.

Fixes: #13090
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-09-16 00:21:36 +08:00
Sage Weil
97ea80ca41 Merge remote-tracking branch 'gh/infernalis' 2015-09-15 09:40:53 -04:00
Kefu Chai
5dfcd3ffc5 Merge pull request #5916 from xiaoxichen/fix1
os/OSD.cc cast osd_max_write_size to int64_t

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-15 21:25:15 +08:00
Loic Dachary
a59cd6f92a Merge pull request #5940 from flyd1005/master
doc: Fixes a wrong directory name and a broken hyperlink

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-09-15 15:22:33 +02:00
Kefu Chai
422d290cc6 Merge pull request #5912 from badone/bug_7822
examples: hello_world.cc: fix the displayed content

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-15 21:18:21 +08:00
Kefu Chai
646e53c17a Merge pull request #5933 from dachary/wip-max-stale
common: osd_pg_epoch_persisted_max_stale < map_cache_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-15 21:14:51 +08:00
Li Peng
71f6529573 doc: fix a broken hyperlink
Signed-off-by: Li Peng <lip@dtdream.com>
2015-09-15 20:55:08 +08:00
Sage Weil
4b3ccc693c Merge pull request #5934 from cernceph/wip-logrotate
logrotate: logs are now owned by ceph:ceph

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-15 08:21:51 -04:00
Li Peng
bbe27dc6d7 doc: Fixes a wrong directory name.
Signed-off-by: Li Peng <lip@dtdream.com>
2015-09-15 20:06:39 +08:00
John Spray
98ded95aa4 Merge pull request #5937 from ukernel/wip-13067
Wip 13067

Reviewed-by: John Spray <john.spray@redhat.com>
2015-09-15 11:36:56 +01:00
Brad Hubbard
26bcb362f4 Examples: hello_world.cc, content displayed after read is not null terminated.
Copy contents of bufferlist to a string before sending to stdout since a
bufferlist is not null terminated.

Fixes: #7822
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-09-15 18:58:44 +10:00
Yan, Zheng
4e8242a049 mds: reset MDSRank heartbeat timeout even when MDS is laggy
Fixes: #13067
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-09-15 16:34:48 +08:00
Loic Dachary
807a34cc0d common: osd_pg_epoch_persisted_max_stale < map_cache_size
1ff51a299d reduced map_cache_size to 200,
osd_pg_epoch_persisted_max_stale must be lowered because it does not
make sense for it to be the equal or greater than map_cache_size.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-15 10:15:24 +02:00
Dan van der Ster
73d7bed94c logrotate: logs are now owned by ceph:ceph
Add the su directive to avoid this error during logrotate:

error: skipping "/var/log/ceph/ceph-osd.0.log" because parent
directory has insecure permissions (It's world writable or writable
by group which is not "root") Set "su" directive in config file to
tell logrotate which user/group should be used for rotation.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
2015-09-15 09:10:59 +02:00
Xiaoxi Chen
7250fb18fb os/OSD.cc cast osd_max_write_size to int64_t
Otherwise overflow may occur and negative values generated.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
2015-09-15 09:33:35 +08:00