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
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
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
Sage Weil
139b5d6235
os: require Sequencer arg for apply_transaction()
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 20:09:50 -04:00
Sage Weil
7d89225acc
Merge pull request #5923 from ceph/wip-limits
...
set limits in systemd unit files
2015-09-14 16:40:22 -04:00
Sage Weil
df921125b5
ceph_objectstore_test: fix warnings
...
In file included from test/objectstore/store_test.cc:34:0:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23: required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int; bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:411:5: required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (expected == actual) {
^
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = unsigned int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23: required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = unsigned int; bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:2003:7: required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = long unsigned int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23: required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = int; T2 = long unsigned int; bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:2010:7: required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 = int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23: required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 = int; bool lhs_is_null_literal = false]’
test/objectstore/store_test.cc:2080:5: required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:39 -04:00
Sage Weil
1002201a09
os/KeyValueStore: better osr debug
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:39 -04:00
Sage Weil
83c83e4440
os/KeyValueStore: kill default_osr
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:39 -04:00
Sage Weil
e7b57cd0da
os/newstore: better sequencer debug
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:39 -04:00
Sage Weil
16c672c777
os/newstore: kill default_osr
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:39 -04:00
Sage Weil
47e7953c2b
os/FileStore: improve debug output for sequencers
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:38 -04:00
Sage Weil
b46cdc02fa
os/ObjectStore: fix leak ref on Sequencer_impl
...
This should start at 0 refs, not 1.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:38 -04:00
Sage Weil
10b00f09d6
os/FileStore: assert Sequencer is passed in; kill default_osr
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:38 -04:00
Sage Weil
fedf360a3e
osd: queue all transactions under an osr
...
This was missed in e7bbafa3bf
.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 16:33:28 -04:00
Sage Weil
8e13d89f0f
systemd: eliminate ceph-rgw tmpfiles.d file
...
This is for storing the rgw socket files for fastcgi, which we do not
want to enable by default.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 14:00:26 -04:00
Sage Weil
367c794cb1
systemd: no need to preprocess ceph-osd@service
...
This used to be necessary but now is not.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 14:00:26 -04:00
Sage Weil
8453a89cb2
systemd: set nofile limit in unit files
...
Make it big so hopefully nobody has to change it.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 14:00:26 -04:00
Sage Weil
1ff51a299d
osd: drop default map cache size from 500 -> 200
...
OSDs don't need this from each other anymore since they send
a pg_interval_map_t with pg notify. This cache is only used
during startup when loading things up (and 200 is still > the
max advance of 150), and when clients appear with super old maps
(pretty unusual unless they are idle for long periods).
It should mean a pretty significant cut in memory...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 12:31:42 -04:00
Sage Weil
8678a8acec
kill /etc/security/limits.d/ceph
...
This only affects login shells; not useful.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 12:04:50 -04:00
Sage Weil
c2a9764fdd
mon: do not return ref to MonOpRequest::get_session() caller
...
Most callers don't put the ref, and since we hold the op ref it's
not necessary. This will also make a somewhat cleaner transition
to MonSessionRef later.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 10:24:22 -04:00
Sage Weil
d99e6899ca
mon: fix MonSession leak when waitlisting op
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 09:56:57 -04:00
Sage Weil
40c3c85a39
mon: debug MonSession refs
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-13 22:04:29 -04:00
Sage Weil
640ebbfa3a
mon/PGMonitor: fix use-after-free in stats ack
...
The MonOpRequestRef owns one ref; we need to get() another so we
can pass it to send_reply.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-13 21:48:47 -04:00
Sage Weil
68ecc55d79
mon: do not leak ref creating MonOpRequest
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-13 21:44:51 -04:00
Sage Weil
3a7d91d250
msg/simple: debug refs on sent messages
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-13 21:42:27 -04:00
Sage Weil
7d112c6483
mon/MDSMonitor: drop incorrect m->put()
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-13 21:36:29 -04:00
Sage Weil
27d1e4d41e
Merge pull request #5901 from yuyuyu101/wip-13001
...
AsyncMessenger: Kepp file_lock hold when accessing its event field
2015-09-13 09:12:39 -04:00
Sage Weil
786f23c5bd
Merge pull request #5626 from majianpeng/objecter
...
Objecter: fix bus about objecter.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-13 09:12:25 -04:00